Browse Source

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

zhulizhen1111 4 năm trước cách đây
mục cha
commit
2eed1d072e

+ 3 - 3
src/components/Legend/src/legend.vue

@@ -211,8 +211,8 @@ export default {
         },
         // 弹窗组件内传入floorInfo,查询 getDraftNum
         floorInfo: {
-            handler(newV,oldV) {
-                 if (newV !== oldV) {
+            handler(newV, oldV) {
+                if (newV !== oldV) {
                     clearInterval(this.timer)
                     this.getDraftNum()
                     this.timer = setInterval(() => {
@@ -355,7 +355,7 @@ export default {
             }
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
-            window.open(url, true)
+            window.open(url)
         },
         handleSwich(val) {
             this.queryView(!val)

+ 2 - 2
src/components/menuList.vue

@@ -128,7 +128,7 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}&token=${this.$store.state.ssoToken}`
             let url = editerUrl + 'drafts?' + encodeURIComponent(data)
-            window.open(url, true)
+            window.open(url)
         },
         currentTime() {
             this.times = moment().format('YYYY.MM.DD HH:mm')
@@ -179,7 +179,7 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf
             const wandaBmGuideUrl = conf[process.env.NODE_ENV + '_wandaBmGuideUrl']
-            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`, true)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`)
         }
     }
 }

+ 4 - 4
src/views/equipment/table/wbTable.vue

@@ -189,20 +189,20 @@ export default {
             console.log(row)
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         // 工单
         ycgd(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         //多余输入框监听

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

@@ -186,12 +186,12 @@ export default {
         },
         innerTable(row) {
             if (row.workorderid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`)
             }
         },
         //跳转工单编号
         staff(row) {
-            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`, true)
+            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`)
         },
         //多余输入框监听
         confirm(wonum) {

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

@@ -177,7 +177,7 @@ export default {
         },
         innerTable(row) {
             if (row.gczxwx_lineid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.gczxwx_lineid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.gczxwx_lineid}`)
             }
         },
         //下拉框查询

+ 1 - 1
src/views/other/zhsxOtherTable2.vue

@@ -166,7 +166,7 @@ export default {
         //第三方任务
         innerTable(row) {
             if (row.id) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`)
             }
         },
         changeSelect() {

+ 1 - 1
src/views/room/room4.vue

@@ -110,7 +110,7 @@ export default {
         //工单详情
         innerTable(row) {
             if (row.workorderid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         computedHeight() {

+ 4 - 4
src/views/room/room5.vue

@@ -115,20 +115,20 @@ export default {
         innerTable(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         // 工单
         ycgd(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         indexMethod(index) {