Merge remote-tracking branch 'origin/master'

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

@@ -46,7 +46,10 @@
         <el-col :span="6">
           <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="工单编号:" prop="orderId">
-              <font>{{form.orderId}}</font>
+              <!-- <font>{{form.orderId}}</font> -->
+              <template slot-scope="scope">
+                <el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
+              </template>
             </el-form-item>
             <el-form-item label="处理状态:" prop="dealStatus">
               <font v-if="form.orderId == null || form.orderId == ''">未生成工单</font>
@@ -519,6 +522,16 @@ export default {
           ]
         });
       },
+      
+      /** 详细信息跳转 */
+    showDetail(orderId) {
+      this.$router.push({
+         path: '/workOrder/detail',
+         query:{
+           orderId : orderId
+         }
+      }) //带参跳转
+    },
       getDetail (){
         getDeviceAlarm(this.alarmId).then(response =>{
           const { deviceName, deviceCode, alarmType,alarmValue,startTime,endTime,deviceStatus} = response.data;

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

@@ -104,7 +104,10 @@
           <el-col :span="6">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
               <el-form-item label="工单编号:" prop="orderId">
-                <font>{{form.orderId}}</font>
+                <!-- <font>{{form.orderId}}</font> -->
+                <template slot-scope="scope">
+                  <el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
+                </template>
               </el-form-item>
             </el-form>
           </el-col>
@@ -256,7 +259,15 @@ export default {
         this.resetForm("form");
       },
      
-
+      /** 详细信息跳转 */
+    showDetail(orderId) {
+      this.$router.push({
+         path: '/workOrder/detail',
+         query:{
+           orderId : orderId
+         }
+      }) //带参跳转
+    },
       /** 归档按钮操作 */
     handleFinish(res) {
       // this.reset();

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

@@ -61,9 +61,9 @@
       <el-table-column label="工单编号" align="center" prop="orderId" />
       <el-table-column label="工单类型" align="center" prop="orderType" >
         <template slot-scope="scope">
-          <span type="primary" v-if="scope.row.orderType == 1">巡检信息</span>
-          <span type="primary" v-if="scope.row.orderType == 2">隐患信息</span>
-          <span type="primary" v-if="scope.row.orderType == 3">报警信息</span>
+          <el-button type="primary" v-if="scope.row.orderType == 1">巡检信息</el-button>
+          <el-button type="warning" v-if="scope.row.orderType == 2">隐患信息</el-button>
+          <el-button type="danger" v-if="scope.row.orderType == 3">报警信息</el-button>
         </template>
       </el-table-column>
       <el-table-column label="指定执行人员" align="center" prop="appointInspectorName">
@@ -71,10 +71,10 @@
       <el-table-column label="工单名称" align="center" prop="orderName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
-          <el-button type="info" v-if="scope.row.orderStatus == 0">未接收</el-button>
-          <el-button type="warning" v-if="scope.row.orderStatus == 1">已接收</el-button>
-          <el-button type="primary" v-if="scope.row.orderStatus == 2">已反馈</el-button>
-          <el-button type="success" v-if="scope.row.orderStatus == 3">已归档</el-button>
+          <span type="info" v-if="scope.row.orderStatus == 0">未接收</span>
+          <span type="warning" v-if="scope.row.orderStatus == 1">已接收</span>
+          <span type="primary" v-if="scope.row.orderStatus == 2">已反馈</span>
+          <span type="success" v-if="scope.row.orderStatus == 3">已归档</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="allotTime" width="180">

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

@@ -69,7 +69,7 @@
                   <font v-if="form.deviceType == 4">压力表</font>
                 </el-form-item>
                 <el-form-item label="设备名称:" prop="deviceName" style="margin-bottom: 0px;">
-                  <font v-if="form.orderType != 1">{{form.deviceName}}</font>
+                  <!-- <font v-if="form.orderType != 1">{{form.deviceName}}</font> -->
                   <el-tree
                     :data="deviceOptions"
                     :props="defaultProps"
@@ -601,6 +601,7 @@ export default {
     }
     .el-tree{
       margin-top: 5px;
+      margin-left: 70px;
     }
     .avatar-uploader{
         width: 25%;