Quellcode durchsuchen

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

zhulizhen1111 vor 4 Jahren
Ursprung
Commit
1237f64ea5

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

@@ -363,7 +363,7 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             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)
+            window.open(url, "edit")
         },
         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)
+            window.open(url, "drafts")
         },
         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}`)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`, "legendLibrary")
         }
     }
 }

+ 22 - 21
src/views/other/zhsxOtherTable1.vue

@@ -32,6 +32,7 @@
                 placeholder='搜索记录事项'
                 @keyup.enter.native='getZhjl'
                 @blur='getZhjl'
+                @change='getZhjl'
                 size='small'
                 prefix-icon='el-icon-search'
                 v-model='ssjlsx'
@@ -115,33 +116,33 @@ export default {
                 {
                     name: '供电系统原理图.png',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.pdf',
-                    url: 'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921260429024467352%E5%8C%BA%E4%BD%8D%E5%9B%BE.png'
+                    url: 'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921260429024467352%E5%8C%BA%E4%BD%8D%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.html',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.png',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.png',
-                    url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg'
-                }
+                    url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg',
+                },
             ],
             allArr: [
                 {
                     id: '全部',
-                    name: '全部'
-                }
-            ]
+                    name: '全部',
+                },
+            ],
         }
     },
     components: { Select },
@@ -149,10 +150,10 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.urlname
+                        url: el.urlname,
                     }
                     this.imgUrl.push(obj)
                 })
@@ -195,7 +196,7 @@ export default {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
                 size: this.size,
-                orderBy: 'createdate,0'
+                orderBy: 'createdate,0',
             }
             if (this.searVal && this.searVal != '全部') {
                 getParams.department = this.searVal
@@ -207,7 +208,7 @@ export default {
                 getParams.createdateStartDate = this.dateVal[0] + '000000'
                 getParams.createdateEndDate = this.dateVal[1] + '000000'
             }
-            queryGlams({ getParams }).then(res => {
+            queryGlams({ getParams }).then((res) => {
                 if (res.result == 'success') {
                     this.loading = false
                     this.total = res.count
@@ -225,22 +226,22 @@ export default {
             let postParams = [
                 {
                     columnName: { department: 'department' },
-                    tableName: 'sms_zhsxjl'
-                }
+                    tableName: 'sms_zhsxjl',
+                },
             ]
             let data = {
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log('政府部门', res)
                 let department = [],
                     newArr = []
                 department = res.data.data.sms_zhsxjl.department ? res.data.data.sms_zhsxjl.department : []
                 if (department.length > 0) {
-                    department.forEach(el => {
+                    department.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value,
                         }
                         newArr.push(obj)
                     })
@@ -253,12 +254,12 @@ export default {
             if (this.isOpen) {
                 // window.open('http://bing.com', true)
             }
-        }
+        },
     },
     mounted() {},
     created() {
         this.changeSelect()
-    }
+    },
 }
 </script>
 <style lang="less" scoped>

+ 2 - 2
vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                // target: 'http://60.205.177.43',
-                target: 'http://10.199.143.126',
+                target: 'http://60.205.177.43',
+                // target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,