Переглянути джерело

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

fujunwen 4 роки тому
батько
коміт
998d1117a8
2 змінених файлів з 12 додано та 7 видалено
  1. 11 7
      src/views/equipment/eqDialog.vue
  2. 1 0
      src/views/other/zhsxOther.vue

+ 11 - 7
src/views/equipment/eqDialog.vue

@@ -193,7 +193,7 @@ export default {
     },
     computed: {
         showImg: function () {
-            let arr = ['QD', 'YL', 'GJSP']
+            let arr = ['QD', 'YL']
             //  日常维保/维修事项 tab页,  不显示icon
             let flag = true
             let labelArr = ['日常维保事项', '日常维修事项']
@@ -203,7 +203,11 @@ export default {
                 flag = true
             }
             // title右侧 icon入口
-            return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.label !== '查看图纸' && flag
+            // 1. 主要设备清单, 系统原理图 不显示 icon
+            // 2. 供电系统 楼层电井(间)控制商铺范围清单(GJSP)不显示icon
+            // 3. 查看图纸 不显示icon
+            // 4. 点开 主要设备维保事项/维修事项, 专维及其他事项 中的日常维保事项,日常维修事项 不显示 icon
+            return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.id !== 'GJSP' && this.dialogInfo.label !== '查看图纸' && flag
         },
     },
     mounted() {},
@@ -225,16 +229,16 @@ export default {
     methods: {
         //打开弹窗
         showModal(item) {
-            console.log(item)
+            // console.log(item)
             this.visible = true
             this.dialogInfo = item
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {
                 this.activeName = this.dialogInfo.children[0].param.tab_code
-                console.log(this.dialogInfo)
+                // console.log(this.dialogInfo)
                 this.diff = this.dialogInfo.children[0].param.diff
                 //给排水的专维区分
                 this.difference = this.dialogInfo.children[0].param.difference
-                console.log(this.diff)
+                // console.log(this.diff)
                 if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                     this.typecode = this.dialogInfo.children[0].param.type_code
                     this.activeName = this.typecode
@@ -254,7 +258,7 @@ export default {
         },
         //点击tab函数
         handleClick(tab) {
-            console.log(tab)
+            // console.log(tab)
             this.key++
             if (this.param) {
                 this.param = tab.name
@@ -308,7 +312,7 @@ export default {
             let tabData = system.children.filter((v) => v.label === this.dialogInfo.label)[0]
             // 获取到子系统的param
             let param = tabData.children.filter((v) => v.label === this.tabLabel)[0].param
-            console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
+            // console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
             // 获取到 wznw,apply
             const { wznw, apply, difference } = param
             // 打开记录表格

+ 1 - 0
src/views/other/zhsxOther.vue

@@ -115,6 +115,7 @@ export default {
       height: 16px;
       left: 260px;
       top: 3px;
+      cursor: pointer;
       img {
         width: 100%;
         height: 100%;