合并

 {
 {
   "presets": ["es2015", "stage-2"],
   "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
+  "plugins": ["transform-runtime","transform-vue-jsx"],
   "comments": false
   "comments": false
 }
 }

@@ -23,7 +23,7 @@ module.exports = {
   },
   },
   dev: {
   dev: {
     env: require('./dev.env'),
     env: require('./dev.env'),
-    port: 8001,
+    port: 4006,
     autoOpenBrowser: true,
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     assetsPublicPath: '/',

@@ -975,6 +975,12 @@
       "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
       "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
       "dev": true
       "dev": true
     },
     },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
     "babel-plugin-syntax-object-rest-spread": {
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
@@ -1317,6 +1323,15 @@
         "babel-types": "^6.24.1"
         "babel-types": "^6.24.1"
       }
       }
     },
     },
+    "babel-plugin-transform-vue-jsx": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz",
+      "integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "babel-polyfill": {
     "babel-polyfill": {
       "version": "6.26.0",
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",

@@ -33,10 +33,13 @@
     "autoprefixer": "^6.7.2",
     "autoprefixer": "^6.7.2",
     "axios-mock-adapter": "^1.7.1",
     "axios-mock-adapter": "^1.7.1",
     "babel-core": "^6.22.1",
     "babel-core": "^6.22.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-loader": "^6.2.10",
     "babel-loader": "^6.2.10",
+    "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-transform-vue-jsx": "^3.7.0",
     "babel-polyfill": "^6.16.0",
     "babel-polyfill": "^6.16.0",
-    "babel-preset-env": "^1.2.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.22.0",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "babel-register": "^6.22.0",

+const loginuserInfo = JSON.parse(sessionStorage.getItem('user'));
+export  default loginuserInfo;

+import axios from 'axios'
+
+let base = 'hqpt-process/job';
+
+
+export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
+
+
+export const remove = params => { return axios({
+    method: 'DELETE',
+    url: `${base}/del`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+//批量删除
+export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
+
+export const edit = params => { return axios({
+    method: 'PUT',
+    url: `${base}/edit`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+export const add = params => { return axios({
+    method: 'POST',
+    url: `${base}/add`,
+    params: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+export const startJob = params => { return axios({
+    method: 'PUT',
+    url: `${base}/start`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};

+import axios from 'axios'
+
+let base = 'hqpt-process/process';
+
+
+export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
+
+
+export const remove = params => { return axios({
+    method: 'DELETE',
+    url: `${base}/del`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+//批量删除
+export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
+
+export const edit = params => { return axios({
+    method: 'PUT',
+    url: `${base}/edit`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+export const add = params => { return axios({
+    method: 'POST',
+    url: `${base}/add`,
+    params: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+export const updateRolePerm = params => { return axios({
+    method: 'PUT',
+    url: `${base}/permSet`,
+    data: params,
+    headers: {
+        'Content-Type': 'application/json;charset=UTF-8'
+    }
+})};
+
+export const vacationTypeOptions = [
+    {
+        value: '0',
+        label: '运维检查'
+    },
+    {
+        value: '1',
+        label: '设备故障'
+    },
+    {
+        value: '2',
+        label: '电话报修'
+    }
+];

@@ -84,6 +84,8 @@ let routes = [
             { path: '/security_inspection', component: SecrityInspection, name: '职工公寓安全巡视管理' },
             { path: '/security_inspection', component: SecrityInspection, name: '职工公寓安全巡视管理' },
             { path: '/key', component: Key, name: '职工公寓备用钥匙使用登记管理' },
             { path: '/key', component: Key, name: '职工公寓备用钥匙使用登记管理' },
             { path: '/maintain', component: Maintain, name: '职工公寓设施设备维修记录管理' },
             { path: '/maintain', component: Maintain, name: '职工公寓设施设备维修记录管理' },
+            { path: '/come_car', component: ComeCar, name: '职工公寓外来人员车辆登记管理' },
+            { path: '/on_duty', component: OnDuty, name: '职工公寓值班巡视记录管理' },
         ]
         ]
     },
     },
     {
     {

@@ -378,6 +378,7 @@
                     }
                     }
                 });
                 });
             },
             },
+
             //编辑
             //编辑
             editSubmit: function () {
             editSubmit: function () {
                 this.$refs.editForm.validate((valid) => {
                 this.$refs.editForm.validate((valid) => {