Browse Source

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan 4 years ago
parent
commit
dd4d52d311

+ 1 - 1
src/views/equipment/eqDialog.vue

@@ -9,7 +9,7 @@
                 <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"' -->
                 <img
                     v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP" && dialogInfo.label !== "查看图纸"'
-                    src='../../assets/imgs/zy2.jpg'
+                    src='../../assets/imgs/zy2.png'
                     @click='visibalBox'
                     style='margin-top:-4px;'
                     alt

+ 3 - 0
src/views/equipment/table/recordDialog.vue

@@ -119,5 +119,8 @@ export default {
         margin-top: 7vh !important;
         overflow-y: scroll !important;
     }
+    /deep/.el-dialog__header {
+        background: #fff !important;
+    }
 }
 </style>

+ 8 - 2
src/views/equipment/table/wbTable.vue

@@ -95,7 +95,11 @@
             </el-table-column>
             <el-table-column prop='brand' label='现场照片' width='70'>
                 <template slot-scope='{row}'>
-                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div
+                        v-if='row.glsmsImage'
+                        style='cursor:pointer;color: #0091ff;'
+                        @click.stop='clickPic(row.glsmsImage)'
+                    >{{row.glsmsImage.length+'张'}}</div>
                     <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>
@@ -107,7 +111,8 @@
             </el-table-column>
             <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>
-                    <div @click='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid || '--'}}</div>
+                    <div v-if="row.wb_gzglid" @click.stop='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid}}</div>
+                    <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>
         </el-table>
@@ -280,6 +285,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .wb-list {
+    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;

+ 8 - 2
src/views/equipment/table/wxTable.vue

@@ -98,7 +98,7 @@
                     <div
                         v-if='row.glsmsImage'
                         style='cursor:pointer;color: #0091ff;'
-                        @click.prevent='clickPic(row.glsmsImage)'
+                        @click.stop='clickPic(row.glsmsImage)'
                     >{{row.glsmsImage.length+'张'}}</div>
                     <div v-else>{{'---'}}</div>
                 </template>
@@ -111,7 +111,8 @@
             </el-table-column>
             <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>
-                    <div style='cursor:pointer;color: #0091ff;'>{{row.wonum || '--'}}</div>
+                    <div v-if='row.wonum' @click.stop='staff' style='cursor:pointer;color: #0091ff;'>{{row.wonum}}</div>
+                    <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>
         </el-table>
@@ -179,6 +180,10 @@ export default {
                 window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`, true)
             }
         },
+        //跳转工单编号
+        staff(row) {
+            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`, true)
+        },
         //多余输入框监听
         confirm(wonum) {
             this.wonum = wonum
@@ -267,6 +272,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .wx-list {
+    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;

+ 1 - 0
src/views/equipment/table/zwTable.vue

@@ -326,6 +326,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .zw-list {
+    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;