guoxiaohuan 4 years ago
parent
commit
6523efa453
5 changed files with 20 additions and 20 deletions
  1. 4 4
      public/systemConf.js
  2. 2 1
      src/App.vue
  3. 10 11
      src/components/Legend/src/legend.vue
  4. 2 3
      src/components/editLengend.vue
  5. 2 1
      src/store/index.js

+ 4 - 4
public/systemConf.js

@@ -24,11 +24,11 @@ var __systemConf = {
     systemCode: 'wandaBmGuide',
     conf: {
         // 阿里云
-        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        // editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
         // http://glsms.wanda-dev.cn/ 测试服
-        // editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
-        // wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
+        editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
         // editerUrl: 'http://localhost:8091/wandaEditer/', // 编辑器地址
         // wandaBmGuideUrl: 'http://localhost:8090/wandaBmGuide/', //管理书地址
     },

+ 2 - 1
src/App.vue

@@ -17,7 +17,8 @@ export default {
             canvasID: '',
             key: '23f30a832a862c58637a4aadbf50a566',
             appName: '万达可视化系统',
-            mapServerURL: `http://map.wanda.cn/editor`
+            mapServerURL: `http://map.wanda.cn/editor`,
+            mapthemeUrl: `http://map.wanda.cn/editor/webtheme`
         }
     },
     /**

+ 10 - 11
src/components/Legend/src/legend.vue

@@ -115,9 +115,8 @@ export default {
     data() {
         return {
             remarksText: '', //查询出来的备注
-            text1:
-                '<p>主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
-            text2: '<p>图例后×的数字,代表此位置的数量</p>',
+            text1: '主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房',
+            text2: '图例后×的数字,代表此位置的数量',
             loading: true,
             loading1: true,
             viewTable: [],
@@ -270,11 +269,11 @@ export default {
                         remarksText = Res
                     } else {
                         if (this.planNum && this.typeNum) {
-                            remarksText = `1.${this.text1}2.${this.text2}`
+                            remarksText = `<p>1.${this.text1}</p><p>2.${this.text2}</p>`
                         } else if (this.planNum) {
-                            remarksText = `1.${this.text1}`
+                            remarksText = `<p>1.${this.text1}</p>`
                         } else if (this.typeNum) {
-                            remarksText = `1.${this.text2}`
+                            remarksText = `<p>1.${this.text2}</p>`
                         } else {
                             remarksText = ''
                         }
@@ -375,17 +374,17 @@ export default {
                         }
                     })
                 }
-                let remarksTexts = ''
+                let remarksText = ''
                 if (this.planNum && this.typeNum) {
-                    remarksText = `1.${this.text1}2.${this.text2}`
+                    remarksText = `<p>1.${this.text1}</p><p>2.${this.text2}</p>`
                 } else if (this.planNum) {
-                    remarksText = `1.${this.text1}`
+                    remarksText = `<p>1.${this.text1}</p>`
                 } else if (this.typeNum) {
-                    remarksText = `1.${this.text2}`
+                    remarksText = `<p>1.${this.text2}</p>`
                 } else {
                     remarksText = ''
                 }
-                this.$store.commit('SETREMARKSTEXT', remarksTexts)
+                this.$store.commit('SETREMARKSTEXT', remarksText)
                 this.$nextTick(() => {
                     if (this.$refs.viewLengend) {
                         this.$refs.viewLengend.setSelected()

+ 2 - 3
src/components/editLengend.vue

@@ -141,8 +141,6 @@ export default {
         },
         // 编辑图例取消
         cancel() {
-            console.log(this.editNum)
-
             if (this.editNum.length > 0) {
                 this.$confirm('图例中的数据发生变化, 是否需要保存?', {
                     confirmButtonText: '保存',
@@ -176,7 +174,7 @@ export default {
                 val.forEach(e => {
                     let obj = {
                         BuildingId: '1',
-                        Num: Number(e.Num),
+                        Num: e.Num == '' ? null : Number(e.Num),
                         GraphElementId: e.GraphElementId,
                         FloorId: this.$cookie.get('floorMapId'),
                         ProjectId: e.ProjectId,
@@ -190,6 +188,7 @@ export default {
                     Content: arr
                 }
             }
+
             updateStatis(params)
                 .then(res => {
                     if (res.Result == 'success') {

+ 2 - 1
src/store/index.js

@@ -8,7 +8,8 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:lengqiang',
+        // ssoToken: 'admin:lengqiang',
+        ssoToken: 'admin:xuliping',
         // ssoToken: null,
         plazaName: '',
         isPreview: false,