报警查看工单 gengdidi

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

@@ -236,6 +236,16 @@
           </el-dialog>
       </div>
     </div>
+    <el-dialog
+      title = "工单信息"
+      lock-scroll
+      :visible.sync="dialogVisible"
+      width="70%"
+    >
+      <div style="height:80vh;overflow:auto">
+        <workOrder :linkOrderId="form.orderId"/>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -248,14 +258,17 @@
   import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";
   import echarts from 'echarts';
+  import workOrder from "../../workOrder/detail/index.vue"
 
 export default {
   props:["resourceId"],
   name: "DeviceAlarm",
   components: {
+    workOrder
   },
   data() {
     return {
+      dialogVisible: false,
       dataListdetail: [],
       alarmId:'',
       // 折线图标题
@@ -656,12 +669,13 @@ export default {
       },
       /** 详细信息跳转 */
       showDetail(orderId) {
-        this.$router.push({
+        /*this.$router.push({
            path: '/workOrder/detail',
            query:{
              orderId : orderId
            }
-        }) //带参跳转
+        }) //带参跳转*/
+        this.dialogVisible = true;
       },
       getDetail (){
         getDeviceAlarm(this.alarmId).then(response =>{

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

@@ -209,6 +209,17 @@
         </el-dialog>
       </div>
     </div>
+
+    <el-dialog
+      title = "工单信息"
+      lock-scroll
+      :visible.sync="dialogVisible"
+      width="70%"
+    >
+      <div style="height:80vh;overflow:auto">
+        <workOrder :linkOrderId="form.orderId"/>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -221,14 +232,17 @@
   import { inspectorList } from "@/api/system/user";
   import { deviceTree } from "@/api/device/deviceInfo";
   import { deviceNodeTree } from "@/api/device/deviceInfo";
+  import workOrder from "../../workOrder/detail/index.vue"
 
   export default {
     props:["resourceId"],
     name: "InspectionPlanDetail",
     components: {
+      workOrder
     },
     data() {
       return {
+        dialogVisible: false,
         // 遮罩层
         loading: true,
         // 导出遮罩层
@@ -540,12 +554,13 @@
       },
       /** 详细信息跳转 */
       showDetail(orderId) {
-        this.$router.push({
+        /*this.$router.push({
           path: '/workOrder/detail',
           query: {
             orderId: orderId
           }
-        }) //带参跳转
+        }) //带参跳转*/
+        this.dialogVisible = true;
       },
       /** 归档按钮操作 */
       handleFinish(res) {

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -104,7 +104,8 @@
               <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
                 <el-form-item label="工单编号:" prop="orderId">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
+                    <font v-if="resourceId != undefined">{{form.orderId}}</font>
+                    <el-button type="text" @click="showDetail(form.orderId)" v-if="resourceId == undefined">{{form.orderId}}</el-button>
                   </template>
                 </el-form-item>
               </el-form>
@@ -351,12 +352,13 @@
         </div>
 
           <el-dialog
+            title = "工单信息"
             lock-scroll
             :visible.sync="dialogVisible"
             width="70%"
          >
           <div style="height:80vh;overflow:auto">
-            <workOrder :orderIdByHidden="form.orderId"/>
+            <workOrder :linkOrderId="form.orderId"/>
           </div>
         </el-dialog>
       </div>

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

@@ -4,7 +4,7 @@
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
         <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
-          <div v-if="orderIdByHidden == undefined" style="height: 45px;" @click="$router.go(-1)">
+          <div v-if="linkOrderId == undefined" style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
             <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png"
@@ -46,9 +46,12 @@
         <el-col :span="6">
           <el-form ref="form" v-model="form" :rules="rules" style="width: 100%;">
             <el-form-item label="工单类型:" prop="orderType" style="margin-bottom: 0px;">
-              <el-button type="text" v-if="form.orderType == 1" @click="detailInfos(form.orderType)">巡检信息</el-button>
-              <el-button type="text" v-if="form.orderType == 2" @click="detailInfos(form.orderType)">隐患信息</el-button>
-              <el-button type="text" v-if="form.orderType == 3" @click="detailInfos(form.orderType)">报警信息</el-button>
+              <font v-if="form.orderType == 1 && linkOrderId != undefined">巡检信息</font>
+              <font v-if="form.orderType == 2 && linkOrderId != undefined">隐患信息</font>
+              <font v-if="form.orderType == 3 && linkOrderId != undefined">报警信息</font>
+              <el-button type="text" v-if="form.orderType == 1 && linkOrderId == undefined" @click="detailInfos(form.orderType)">巡检信息</el-button>
+              <el-button type="text" v-if="form.orderType == 2 && linkOrderId == undefined" @click="detailInfos(form.orderType)">隐患信息</el-button>
+              <el-button type="text" v-if="form.orderType == 3 && linkOrderId == undefined" @click="detailInfos(form.orderType)">报警信息</el-button>
             </el-form-item>
             <el-form-item label="工单编号:" prop="orderId" style="margin-bottom: 0px;">
               <font>{{form.orderId}}</font>
@@ -250,9 +253,9 @@
 
       <div class="" style="width: 95%;margin-left: 50px;text-align: center;margin-top: 10px;">
         <el-button style="margin-bottom: 15px;margin-top: 10px;" type="primary" size="normal" icon="el-icon-edit" @click="handleUpdate(form.orderId)"
-                   v-hasPermi="['workOrder:basicsInfo:edit']" v-if="form.orderStatus == 0 && orderIdByHidden == undefined">修改</el-button>
+                   v-hasPermi="['workOrder:basicsInfo:edit']" v-if="form.orderStatus == 0 && linkOrderId == undefined">修改</el-button>
         <el-button style="margin-bottom: 15px;margin-top: 10px;" type="primary" size="normal" icon="el-icon-edit" @click="handleFinish(form.orderId)"
-                   v-hasPermi="['workOrder:basicsInfo:editStatus']" v-if="form.orderStatus == 2 && orderIdByHidden == undefined">归档</el-button>
+                   v-hasPermi="['workOrder:basicsInfo:editStatus']" v-if="form.orderStatus == 2 && linkOrderId == undefined">归档</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">
             <div v-if="this.title == '工单信息修改'">
@@ -295,6 +298,7 @@
       </div>
     </div>
     <el-dialog
+      title="巡检信息"
       lock-scroll
       :visible.sync="inspectionDialogVisible"
       width="70%"
@@ -305,6 +309,7 @@
     </el-dialog>
 
     <el-dialog
+      title="隐患信息"
       lock-scroll
       :visible.sync="hiddenTroubleDialogVisible"
       width="70%"
@@ -315,6 +320,7 @@
     </el-dialog>
 
     <el-dialog
+      title="报警信息"
       lock-scroll
       :visible.sync="alarmDialogVisible"
       width="70%"
@@ -338,7 +344,7 @@
   import alarm from "../../dataMonitoring/alarmdetail/index.vue";
 
   export default {
-    props:["orderIdByHidden"],
+    props:["linkOrderId"],
     name: "BasicsInfo",
     components: {
       inspection,
@@ -420,8 +426,8 @@
     created() {
       // 如果是跳转来的，则接受初始化参数
       // this.user_id = this.$route.query.id; //详细信息页接收参数
-      if(this.orderIdByHidden){
-        this.orderId = this.orderIdByHidden;
+      if(this.linkOrderId){
+        this.orderId = this.linkOrderId;
       }else{
         this.orderId = this.$route.query.orderId;
       }