Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/src/router/index.js

@@ -132,7 +132,58 @@ export const constantRoutes = [
       }
     ]
   },
-  
+  {
+    path: '/inspectionPlan',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'inspectiondetail',
+        component: (resolve) => require(['@/views/deviceInspection/inspectionPlan/inspectiondetail'], resolve),
+        name: 'inspectionPlan-inspectiondetail',
+        meta: { title: '详情' }
+      }
+    ],
+  },
+  {
+    path: '/inspectionPlan',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/deviceInspection/inspectionPlan/index'], resolve),
+        name: 'index',
+        meta: { title: '返回' }
+      }
+    ]
+  },
+  {
+    path: '/deviceAlarm',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'alarmdetail',
+        component: (resolve) => require(['@/views/dataMonitoring/deviceAlarm/alarmdetail'], resolve),
+        name: 'deviceAlarm-alarmdetail',
+        meta: { title: '详情' }
+      }
+    ],
+  },
+  {
+    path: '/deviceAlarm',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/dataMonitoring/deviceAlarm/index'], resolve),
+        name: 'index',
+        meta: { title: '返回' }
+      }
+    ]
+  },
   {
     path: '/gen',
     component: Layout,

gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue

@@ -288,7 +288,7 @@ export default {
     /** 工单详细信息跳转 */
     showDetail(row) {
       this.$router.push({
-        path: '/basicsInfo/detail',
+        path: '/deviceAlarm/alarmdetail',
         query:{
           orderId : row.orderId
         }

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -315,7 +315,7 @@
       /** 详细信息跳转 */
       showDetail(row) {
         this.$router.push({
-          path: '/basicsInfo/detail',
+          path: '/inspectionPlan/inspectiondetail',
           query:{
             orderId : row.orderId
           }

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -170,7 +170,6 @@
                 <!-- </el-button> -->
                 
               </div>
-              <el-divider></el-divider>
         </div>
 
         <!-- 归档 -->
@@ -182,6 +181,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(form.orderId)"
             v-hasPermi="['workOrder:basicsInfo:edit']"
+            v-if="form.orderStatus == 0"
           >修改</el-button>
             <el-button
               type="primary"
@@ -189,6 +189,7 @@
               icon="el-icon-edit"
               @click="handleFinish(form.orderId)"
               v-hasPermi="['workOrder:basicsInfo:editStatus']"
+              v-if="form.orderStatus == 2"
             >归档</el-button>
             <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
               <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -239,7 +240,7 @@
 
   <script>
 
-  import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
+  import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, updateOrderStatus, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
   import { deviceTree } from "@/api/device/deviceInfo";
   import gaodeMap from "utils/gaodeMap.js";
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
@@ -420,6 +421,9 @@ export default {
       // 节点单击事件
       handleNodeClick(data) {
 
+      },
+      setUserId(val){
+        this.form.appointInspector = val;
       },
       // 取消按钮
       cancel() {
@@ -477,7 +481,7 @@ export default {
       handleUpdate(res) {
       // this.reset();
       this.getInspectorList();
-      getBasicsInfo(res).then(response => {
+      getBasicsInfo(this.orderId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "工单信息修改";