Browse Source

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

zhulizhen1111 4 years ago
parent
commit
b551bb688e

+ 2 - 0
.gitignore

@@ -2,6 +2,8 @@
 node_modules
 node_modules
 package-lock.json
 package-lock.json
 /dist
 /dist
+# 忽略提交打包后的wandaBmGuide目录
+/wandaBmGuide 
 
 
 # local env files
 # local env files
 .env.local
 .env.local

+ 10 - 7
src/components/floorList.vue

@@ -12,11 +12,11 @@
                 <div class='floor-center'>
                 <div class='floor-center'>
                     <div
                     <div
                         class='floor-item'
                         class='floor-item'
-                        :class='item==floorId?"isActive":""'
+                        :class='item.code==floorId?"isActive":""'
                         @click='tabFloor(item,index)'
                         @click='tabFloor(item,index)'
                         v-for='(item,index) in floorsArr'
                         v-for='(item,index) in floorsArr'
                         :key='index'
                         :key='index'
-                    >{{item}}</div>
+                    >{{item.code}}</div>
                 </div>
                 </div>
             </div>
             </div>
             <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='removeBottom(num)'></i>
             <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='removeBottom(num)'></i>
@@ -33,7 +33,8 @@ export default {
             floorId: '',
             floorId: '',
             showT: true,
             showT: true,
             showB: true,
             showB: true,
-            num: 0
+            num: 0,
+            floorMapIdName: ''
         }
         }
     },
     },
     mounted() {
     mounted() {
@@ -44,12 +45,14 @@ export default {
         ...mapGetters(['floorsArr'])
         ...mapGetters(['floorsArr'])
     },
     },
     methods: {
     methods: {
-        tabFloor(item = '1F', index) {
+        tabFloor(item = 'F1', index) {
+            console.log(item)
             this.showT = true
             this.showT = true
             this.showB = true
             this.showB = true
-            this.$cookie.set('floorNow', item, 3)
-            this.floorId = this.$cookie.get('floorNow') || item
-            console.log(index)
+            this.$cookie.set('floorNow', item.code, 3)
+            this.$cookie.set('floorMapId', item.gname, 3)
+            this.floorId = this.$cookie.get('floorNow') || item.code
+            this.floorMapIdName = this.$cookie.get('floorMapIdName') || item.gname
             this.$emit('emitFloor', [index + 1, item])
             this.$emit('emitFloor', [index + 1, item])
         },
         },
         removeTop(num) {
         removeTop(num) {

+ 13 - 12
src/components/floorMap/index.vue

@@ -31,31 +31,32 @@ export default {
             fParser: null,
             fParser: null,
             loading: true,
             loading: true,
             view: null,
             view: null,
-            isQuerying: false, // 限制重复查询
+            isQuerying: false // 限制重复查询
         }
         }
     },
     },
     components: { RoomBox, canvasFun },
     components: { RoomBox, canvasFun },
     methods: {
     methods: {
         init(floorid) {
         init(floorid) {
             if (this.isQuerying) {
             if (this.isQuerying) {
-                console.log("正在查询");
+                console.log('正在查询')
                 // this.$message.warning('正在查询')
                 // this.$message.warning('正在查询')
                 return
                 return
             }
             }
-            this.isQuerying = true;
+            this.isQuerying = true
             this.clearGraphy()
             this.clearGraphy()
             this.scene = new FloorScene()
             this.scene = new FloorScene()
             this.scene.selectContainer.connect('listChange', this, this.listChange)
             this.scene.selectContainer.connect('listChange', this, this.listChange)
             this.fmap = new SFengParser('fengMap', `${this.mapServerURL}/${this.fmapID}`, this.key, this.appName, null)
             this.fmap = new SFengParser('fengMap', `${this.mapServerURL}/${this.fmapID}`, this.key, this.appName, null)
-            if (isNaN(Number(floorid))) {
-                console.log('楼层id错误')
-                // this.$message.warning("楼层id错误");
-                floorid = 1;
-            }
-            this.fmap.parseData(this.fmapID, Number(floorid), res => {
+            // if (isNaN(Number(floorid))) {
+            //     console.log('楼层id错误')
+            //     // this.$message.warning("楼层id错误");
+            //     floorid = 1
+            // }
+            console.log(floorid)
+            this.fmap.parseData(this.fmapID, 'f1', res => {
                 if (res.err) {
                 if (res.err) {
-                    console.log(res.err);
-                    return;
+                    console.log(res.err)
+                    return
                 }
                 }
                 this.fParser = new SFloorParser(null)
                 this.fParser = new SFloorParser(null)
                 this.fParser.parseData(res)
                 this.fParser.parseData(res)
@@ -71,7 +72,7 @@ export default {
                 this.view.scene = this.scene
                 this.view.scene = this.scene
                 this.view.fitSceneToView()
                 this.view.fitSceneToView()
                 this.loading = false
                 this.loading = false
-                this.isQuerying = false;
+                this.isQuerying = false
                 console.log('success')
                 console.log('success')
             })
             })
         },
         },

+ 3 - 3
src/store/index.js

@@ -12,7 +12,7 @@ export default new Vuex.Store({
             orgCode: '',
             orgCode: '',
             username: 'aiyu6', //账户名称
             username: 'aiyu6', //账户名称
         },
         },
-        plazaId: '1001145',
+        plazaId: '1000423',
         floorsArr: [], //楼层数组
         floorsArr: [], //楼层数组
         floorSelect: [], //楼层下拉框
         floorSelect: [], //楼层下拉框
     },
     },
@@ -38,8 +38,8 @@ export default new Vuex.Store({
             if (data.length > 0) {
             if (data.length > 0) {
                 data.forEach((e) => {
                 data.forEach((e) => {
                     let obj = {
                     let obj = {
-                        id: e,
-                        name: e,
+                        id: e.code,
+                        name: e.code,
                     }
                     }
                     state.floorSelect.push(obj)
                     state.floorSelect.push(obj)
                 })
                 })

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

@@ -88,7 +88,7 @@ export default {
             this.smsxt = item.smsxt
             this.smsxt = item.smsxt
         },
         },
         emitFloor(item) {
         emitFloor(item) {
-            console.log(item)
+            console.log('item', item)
             this.floorInfo.floorId = item[0]
             this.floorInfo.floorId = item[0]
             this.$refs.floorMap.init(item[0])
             this.$refs.floorMap.init(item[0])
             this.floorInfo.floorName = item[1]
             this.floorInfo.floorName = item[1]

+ 5 - 5
src/views/floorFunc/index.vue

@@ -29,22 +29,22 @@ export default {
             show: false,
             show: false,
             floorInfo: {
             floorInfo: {
                 floorName: 'F1',
                 floorName: 'F1',
-                floorId: '1'
+                floorMapIdName: 'f1'
             }
             }
         }
         }
     },
     },
     methods: {
     methods: {
         emitFloor(item) {
         emitFloor(item) {
-            console.log(item)
-            this.floorInfo.floorId = item
-            this.$refs.floorMap.init(item)
+            this.floorInfo.floorName = item[1].code
+            this.floorInfo.floorMapIdName = item[1].gname
+            this.$refs.floorMap.init(this.floorInfo.floorMapIdName)
         },
         },
         additionalColl() {
         additionalColl() {
             this.show = !this.show
             this.show = !this.show
         }
         }
     },
     },
     mounted() {
     mounted() {
-        this.$refs.floorMap.init(1)
+        this.$refs.floorMap.init(this.floorInfo.floorMapIdName)
     }
     }
 }
 }
 </script>
 </script>

+ 5 - 17
src/views/legendLibrary/addForm.vue

@@ -201,7 +201,7 @@ export default {
             view: null,
             view: null,
             scene: null,
             scene: null,
             typeVisualization: [],
             typeVisualization: [],
-            visualizationList: [], //已选铺位可视化
+
             majorList: [], //专业
             majorList: [], //专业
             deviceList: []
             deviceList: []
         }
         }
@@ -210,7 +210,6 @@ export default {
     methods: {
     methods: {
         getFile(file) {
         getFile(file) {
             this.file = file.file
             this.file = file.file
-            console.log(file)
             var formData = new FormData()
             var formData = new FormData()
             formData.append('file', file.file)
             formData.append('file', file.file)
             if (this.ruleForm.Url) {
             if (this.ruleForm.Url) {
@@ -218,7 +217,6 @@ export default {
             }
             }
             let postParams = formData
             let postParams = formData
             uploadImg({ postParams }).then(res => {
             uploadImg({ postParams }).then(res => {
-                console.log(res)
                 if (res.Result == 'success') {
                 if (res.Result == 'success') {
                     this.$set(this.ruleForm, 'Url', res.EntityList[0])
                     this.$set(this.ruleForm, 'Url', res.EntityList[0])
                     this.$message.success('图标上传成功!')
                     this.$message.success('图标上传成功!')
@@ -232,7 +230,6 @@ export default {
             }
             }
 
 
             createLegend({ postParams }).then(res => {
             createLegend({ postParams }).then(res => {
-                console.log(res)
                 if (res.Result == 'success') {
                 if (res.Result == 'success') {
                     this.$message.success('添加图例成功!')
                     this.$message.success('添加图例成功!')
                     this.$emit('addSuccess')
                     this.$emit('addSuccess')
@@ -322,14 +319,6 @@ export default {
         //线条宽度
         //线条宽度
         changeLineWidth(val) {
         changeLineWidth(val) {
             this.$set(this.ruleForm, 'LineWidth', val)
             this.$set(this.ruleForm, 'LineWidth', val)
-            // this.linepxObject = val && this.linepxOption.find(item => item.id == val)
-            // if (this.$refs.select && this.$refs.select.$el) {
-            //     this.$refs.select.$el.children[0].children[0].setAttribute(
-            //         'style',
-            //         'background:url(' + this.linepxObject.src + ') center center no-repeat;color:transparent;'
-            //     )
-            // }
-
             if (this.view) {
             if (this.view) {
                 this.view.lineWidth = Number(val)
                 this.view.lineWidth = Number(val)
             }
             }
@@ -374,18 +363,17 @@ export default {
                 })
                 })
             }
             }
         },
         },
-        // 多选返回的id组
+        // 铺位可视化
         treeConfirm(data) {
         treeConfirm(data) {
-            console.log(data, 'data')
-            this.visualizationList = data
+            this.$set(this.ruleForm, 'InfoTypeId', data)
         },
         },
         //专业
         //专业
         treeConfirmMajor(id, info) {
         treeConfirmMajor(id, info) {
-            console.log(id)
+            this.$set(this.ruleForm, 'InfoSystem', data)
         },
         },
         //位置/设备
         //位置/设备
         treeConfirmDevice(id, info) {
         treeConfirmDevice(id, info) {
-            console.log(id)
+            this.$set(this.ruleForm, 'InfoLocal', data)
         },
         },
         focusChange(status) {
         focusChange(status) {
             // console.log('focusChange', status)
             // console.log('focusChange', status)

+ 20 - 8
src/views/legendLibrary/addLegend.vue

@@ -39,7 +39,10 @@ export default {
                 FillColor: '',
                 FillColor: '',
                 Url: '',
                 Url: '',
                 LineWidth: '',
                 LineWidth: '',
-                LineDash: ''
+                LineDash: '',
+                InfoTypeId: [], //铺位可视化typeid
+                InfoLocal: [], //工程信息化位置与设备分类
+                InfoSystem: [] //工程信息化专业/系统
             },
             },
             title: '',
             title: '',
             GraphCategoryId: 'DTXT',
             GraphCategoryId: 'DTXT',
@@ -66,7 +69,10 @@ export default {
                     Type: 'None',
                     Type: 'None',
                     Unit: '',
                     Unit: '',
                     FillColor: '',
                     FillColor: '',
-                    Url: ''
+                    Url: '',
+                    InfoTypeId: [], //铺位可视化typeid
+                    InfoLocal: [], //工程信息化位置与设备分类
+                    InfoSystem: [] //工程信息化专业/系统
                 }
                 }
             } else if (title == '添加图例库') {
             } else if (title == '添加图例库') {
                 this.dialogVisible = true
                 this.dialogVisible = true
@@ -75,7 +81,10 @@ export default {
                     Type: 'None',
                     Type: 'None',
                     Unit: '',
                     Unit: '',
                     FillColor: '',
                     FillColor: '',
-                    Url: ''
+                    Url: '',
+                    InfoTypeId: [], //铺位可视化typeid
+                    InfoLocal: [], //工程信息化位置与设备分类
+                    InfoSystem: [] //工程信息化专业/系统
                 }
                 }
             } else if (title == '修改图例库') {
             } else if (title == '修改图例库') {
                 this.dialogVisible = true
                 this.dialogVisible = true
@@ -98,7 +107,10 @@ export default {
                 Type: 'None',
                 Type: 'None',
                 Unit: '',
                 Unit: '',
                 FillColor: '',
                 FillColor: '',
-                Url: ''
+                Url: '',
+                InfoTypeId: [], //铺位可视化typeid
+                InfoLocal: [], //工程信息化位置与设备分类
+                InfoSystem: [] //工程信息化专业/系统
             }
             }
         },
         },
         mesg() {
         mesg() {
@@ -117,7 +129,7 @@ export default {
                 this.$message.info('请填写图例名称')
                 this.$message.info('请填写图例名称')
                 return false
                 return false
             } else {
             } else {
-                if (this.info.Type != 'Image') {
+                if (this.info.Type != 'Image' && this.info.Type != 'None') {
                     this.$refs.add.saveImg()
                     this.$refs.add.saveImg()
                 } else {
                 } else {
                     if (this.title == '添加图例库') {
                     if (this.title == '添加图例库') {
@@ -129,9 +141,9 @@ export default {
                     }
                     }
                 }
                 }
                 this.dialogVisible = false
                 this.dialogVisible = false
-                if (!this.title || this.info.Type == 'None') {
-                    this.$refs.add.create()
-                }
+                // if (!this.title || this.info.Type == 'None') {
+                //     this.$refs.add.create()
+                // }
             }
             }
         },
         },
         treeConfirm(ids, dataObj) {
         treeConfirm(ids, dataObj) {

+ 2 - 2
src/views/legendRules/index.vue

@@ -61,8 +61,8 @@ export default {
         }
         }
     },
     },
     methods: {
     methods: {
-        handleNodeClick(data) {
-            this.GraphCategoryId = data
+        handleNodeClick(data, e) {
+            this.GraphCategoryId = [e.node.eventKey]
             this.getData()
             this.getData()
         },
         },
         deleteClick(row) {
         deleteClick(row) {

+ 3 - 2
src/views/other/gcfz2.vue

@@ -4,7 +4,7 @@
             <div class='picker-box'>
             <div class='picker-box'>
                 <span class='picker-span'>记录日期:</span>
                 <span class='picker-span'>记录日期:</span>
                 <el-date-picker
                 <el-date-picker
-                    v-model='dateVal'
+                    v-model='cg.dateVal'
                     value-format='yyyyMMdd'
                     value-format='yyyyMMdd'
                     type='daterange'
                     type='daterange'
                     size='mini'
                     size='mini'
@@ -12,6 +12,7 @@
                     range-separator='-'
                     range-separator='-'
                     start-placeholder
                     start-placeholder
                     end-placeholder
                     end-placeholder
+                    @change='changelc'
                 ></el-date-picker>
                 ></el-date-picker>
             </div>
             </div>
 
 
@@ -86,6 +87,7 @@ export default {
             dateVal: '',
             dateVal: '',
             searVal: '',
             searVal: '',
             cg: {
             cg: {
+                dateVal: '',
                 floors: '',
                 floors: '',
                 searVal: ''
                 searVal: ''
             }
             }
@@ -102,7 +104,6 @@ export default {
             this.$emit('queryChange')
             this.$emit('queryChange')
         },
         },
         changelc() {
         changelc() {
-            console.log(this.cg)
             this.$emit('changeEmit', this.cg)
             this.$emit('changeEmit', this.cg)
         }
         }
     }
     }

+ 9 - 1
src/views/other/gcfzDialog.vue

@@ -41,7 +41,8 @@ export default {
             floor: '',
             floor: '',
             bgjlTable: [],
             bgjlTable: [],
             floors: '',
             floors: '',
-            searVal: ''
+            searVal: '',
+            dateVal: ''
         }
         }
     },
     },
     mounted() {
     mounted() {
@@ -71,6 +72,9 @@ export default {
             if (val.searVal) {
             if (val.searVal) {
                 this.searVal = val.searVal
                 this.searVal = val.searVal
             }
             }
+            if (val.dateVal) {
+                this.dateVal = val.dateVal
+            }
             this.queryChange()
             this.queryChange()
         },
         },
         // 变更记录
         // 变更记录
@@ -86,6 +90,10 @@ export default {
             if (this.searVal) {
             if (this.searVal) {
                 getParams.keyword = `${this.searVal}:region`
                 getParams.keyword = `${this.searVal}:region`
             }
             }
+            if (this.dateVal) {
+                getParams.changedateStartDate = this.dateVal[0] + '000000'
+                getParams.changedateEndDate = this.dateVal[1] + '000000'
+            }
             queryfzyfchange({ getParams }).then(res => {
             queryfzyfchange({ getParams }).then(res => {
                 if (res.result == 'success') {
                 if (res.result == 'success') {
                     console.log('变更记录', res)
                     console.log('变更记录', res)

+ 5 - 1
src/views/other/zhsxOtherTable1.vue

@@ -2,7 +2,7 @@
     <div class='tableZh'>
     <div class='tableZh'>
         <div class='tab-top' style='display:flex;'>
         <div class='tab-top' style='display:flex;'>
             <div class='picker-box'>
             <div class='picker-box'>
-                <span class='picker-span'>结束日期:</span>
+                <span class='picker-span'>日期:</span>
                 <el-date-picker
                 <el-date-picker
                     style='width:190px'
                     style='width:190px'
                     v-model='dateVal'
                     v-model='dateVal'
@@ -117,6 +117,10 @@ export default {
             if (this.ssjlsx) {
             if (this.ssjlsx) {
                 getParams.keyword = `${this.ssjlsx}:recordsx`
                 getParams.keyword = `${this.ssjlsx}:recordsx`
             }
             }
+            if (this.dateVal) {
+                getParams.createdateStartDate = this.dateVal[0] + '000000'
+                getParams.createdateEndDate = this.dateVal[1] + '000000'
+            }
             queryGlams({ getParams }).then(res => {
             queryGlams({ getParams }).then(res => {
                 if (res.result == 'success') {
                 if (res.result == 'success') {
                     this.loading = false
                     this.loading = false

+ 5 - 1
vue.config.js

@@ -41,5 +41,9 @@ module.exports = {
             .loader("vue-svg-loader")
             .loader("vue-svg-loader")
     },
     },
     lintOnSave: false,
     lintOnSave: false,
-    publicPath: "/",
+    publicPath: "/wandaBmGuide",
+    // 打包名称
+    outputDir: 'wandaBmGuide',
+    // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录
+    assetsDir: 'static',
 }
 }