Kaynağa Gözat

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan 4 yıl önce
ebeveyn
işleme
d662b87f1c

+ 2 - 2
package.json

@@ -12,9 +12,9 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.24",
-        "@saga-web/big": "1.0.92",
+        "@saga-web/big": "1.0.93",
         "@saga-web/draw": "2.1.105",
-        "@saga-web/feng-map": "1.0.27",
+        "@saga-web/feng-map": "1.0.28",
         "@saga-web/graph": "2.1.117",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",

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

@@ -405,7 +405,7 @@ export default {
                 .title-box {
                     position: fixed;
                     z-index: 2;
-                    top: 146px;
+                    top: 156px;
                     left: 260px;
                     display: flex;
                     img {

+ 3 - 4
src/views/equipment/table/djspTable.vue

@@ -52,7 +52,7 @@ export default {
     data() {
         return {
             tableData: [],
-            floor: '',
+            floor: '1',
             innerVisible: false, //详情弹框
             shopsnum: '',
             welldes: '',
@@ -88,7 +88,7 @@ export default {
                 orderBy: `floor,0;welldesm,1;meterbox,1;`,
                 plazaId: this.plazaId
             }
-            if (this.floor) {
+            if (this.floor && this.floor != 1) {
                 getParams.floor = this.floor
             }
             getParams.keyword = ''
@@ -133,7 +133,7 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 name: '全部',
-                id: ''
+                id: '1'
             })
             this.floorSelect.forEach(el => {
                 this.floorAllSelect.push(el)
@@ -163,7 +163,6 @@ export default {
     },
     mounted() {
         // this.floor = this.$cookie.get('floorMapId')
-        console.log(this.floor)
         this.getList()
         this.getFloorAllSelect()
     }

+ 11 - 11
src/views/equipment/table/eqDetaileDialog.vue

@@ -16,7 +16,7 @@
             ></el-input>
             <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属:' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
             <Select
-                width='146'
+                width='160'
                 style='margin: 0 12px;'
                 v-model='status'
                 tipPlace='top'
@@ -132,11 +132,11 @@ export default {
             sbjc: '',
             brand: '',
             wzjc: '',
-            floor: '',
-            status: '',
+            floor: '1',
+            status: '1',
             manufacturer: '',
             fws: '',
-            sbglgs: '',
+            sbglgs: '1',
             sbglgsOption: [],
             statusOption: [],
             floorAllSelect: []
@@ -203,12 +203,12 @@ export default {
                 this.sbglgsOption = []
                 this.sbglgsOption.push({
                     name: '全部',
-                    id: ''
+                    id: '1'
                 })
                 this.statusOption = []
                 this.statusOption.push({
                     name: '全部',
-                    id: ''
+                    id: '1'
                 })
                 sb_status.forEach(el => {
                     this.statusOption.push({
@@ -252,7 +252,7 @@ export default {
             //输入框搜索
             data.keyword = ''
             if (this.sbjc) {
-                data.keyword += `${this.sbjc}:type_name,assetnum;`
+                data.keyword += `${this.sbjc}:sbjc,assetnum;`
             }
             if (this.brand) {
                 data.keyword += `${this.brand}:brand,sbxh;`
@@ -277,13 +277,13 @@ export default {
                 brand: this.row.brand || '--'
             }
             //下拉筛选
-            if (this.floor) {
+            if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor
             }
-            if (this.sbglgs) {
+            if (this.sbglgs && this.sbglgs != 1) {
                 postParams.sbglgs = this.sbglgs
             }
-            if (this.status) {
+            if (this.status && this.status != 1) {
                 postParams.status = this.status
             }
             queryAsset({ data, postParams }).then(res => {
@@ -295,7 +295,7 @@ export default {
         getFloorAllSelect() {
             this.floorAllSelect = []
             this.floorAllSelect.push({
-                id: '',
+                id: '1',
                 name: '全部'
             })
             this.floorSelect.forEach(el => {

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

@@ -112,7 +112,7 @@ export default {
             manufacturer: '',
             sbjc: '',
             row: {},
-            floor: '',
+            floor: '1',
             tableMaxHeight: 0,
             type_name: '',
             floorAllSelect: []
@@ -146,7 +146,7 @@ export default {
                 major: this.major
             }
             //下拉
-            if (this.floor) {
+            if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor
             }
             //输入框搜索
@@ -173,7 +173,7 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 name: '全部',
-                id: ''
+                id: '1'
             })
             this.floorSelect.forEach(el => {
                 this.floorAllSelect.push(el)
@@ -189,7 +189,7 @@ export default {
                     // 页面渲染完成后的回调
                     this.tableMaxHeight = this.$refs.tableBox.offsetHeight
                 })
-                 this.getFloorAllSelect()
+                this.getFloorAllSelect()
             }
         },
         /* floor(newV, oldV) {

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

@@ -81,7 +81,7 @@ export default {
                 gzglid: '',
                 wonum: '',
                 ssfasm: '',
-                status: '',
+                status: '1',
                 yssjwcsj: ''
             }
         }

+ 6 - 6
src/views/equipment/table/otherTable.vue

@@ -101,7 +101,7 @@ export default {
             currentPage: 1,
             size: 10,
             keyword: '',
-            handleresults: '',
+            handleresults: '1',
             handledate: '',
             handleOption: [],
             tableMaxHeight: 0
@@ -144,7 +144,7 @@ export default {
                 getParams.data.handledateEndDate = this.handledate[1] + '000000'
             }
             //下拉
-            if (this.handleresults) {
+            if (this.handleresults && this.handleresults != 1) {
                 getParams.data.handleresults = this.handleresults
             }
             queryQtsx(getParams).then(res => {
@@ -190,8 +190,8 @@ export default {
                 let handleresults = res.data.data.sms_qtsx.handleresults
                 this.handleOption = []
                 this.handleOption.push({
-                    id:"",
-                    name:'全部'
+                    id: '1',
+                    name: '全部'
                 })
                 handleresults.forEach(el => {
                     this.handleOption.push({
@@ -213,9 +213,9 @@ export default {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()
-                 this.$nextTick(() => {
+                this.$nextTick(() => {
                     // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight;
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
                 })
             }
         },

+ 3 - 3
src/views/equipment/table/standTable.vue

@@ -101,7 +101,7 @@ export default {
             currentPage: 1,
             size: 10,
             keyword: '',
-            floor: '',
+            floor: '1',
             row: {},
             sbjc: '',
             manufacturer: '',
@@ -152,7 +152,7 @@ export default {
                 // floor:this.floor
             }
             //下拉
-            if (this.floor) {
+            if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor
             }
             //输入框搜索
@@ -178,7 +178,7 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 name: '全部',
-                id: ''
+                id: '1'
             })
             this.floorSelect.forEach(el => {
                 this.floorAllSelect.push(el)

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

@@ -150,14 +150,14 @@ export default {
             size: 10,
             sjjssj: '',
             reportdate: '',
-            ischange: '',
+            ischange: '2',
             sbjc: '',
             formatter,
             number_format,
             changeOption: [
                 {
-                    id:'',
-                    name:"全部"
+                    id: '2',
+                    name: '全部'
                 },
                 {
                     id: '1',
@@ -225,7 +225,7 @@ export default {
                 }
             }
             //下拉
-            if (this.ischange) {
+            if (this.ischange && this.ischange != 2) {
                 // getParams.data.ischangepj = this.ischange
                 getParams.data.ismodel = this.ischange
             }

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

@@ -150,7 +150,7 @@ export default {
             size: 10,
             reportdate: '',
             sjjssj: '',
-            ischange: '',
+            ischange: '2',
             sbjc: '',
             matters: '',
             wonum: '',
@@ -159,8 +159,8 @@ export default {
             imgUrl: [],
             changeOption: [
                 {
-                    id:'',
-                    name:"全部"
+                    id: '2',
+                    name: '全部'
                 },
                 {
                     id: '1',
@@ -213,7 +213,7 @@ export default {
                 }
             }
             //下拉
-            if (this.ischange) {
+            if (this.ischange && this.ischange != 2) {
                 getParams.data.ismodel = this.ischange
                 // getParams.data.ischangepj = this.ischange
             }

+ 14 - 12
src/views/equipment/table/zwTable.vue

@@ -143,11 +143,12 @@ export default {
             size: 10,
             keyword: '',
             nd: '',
-            lb: '',
-            sxjd: '',
+            lb: '1',
+            sxjd: '1',
             formatter,
             number_format,
-            xm: '',
+            xm: '1',
+            status: '1',
             statusOption: [],
             sxjdOption: [],
             xmOption: [],
@@ -166,9 +167,10 @@ export default {
         },
         //多余输入框监听
         confirm(status, yssjwcsj) {
+            console.log(status)
             this.yssjwcsj = yssjwcsj
             this.status = status
-
+            console.log(this.status)
             this.getList()
         },
         pageChanged(page) {
@@ -221,21 +223,21 @@ export default {
                 this.lbOption = []
                 this.lbOption.push({
                     name: '全部',
-                    id: ''
+                    id: '1'
                 })
                 this.xmOption = []
                 this.xmOption.push({
-                    id: '',
+                    id: '1',
                     name: '全部'
                 })
                 this.sxjdOption = []
                 this.sxjdOption.push({
-                    id: '',
+                    id: '1',
                     name: '全部'
                 })
                 this.statusOption = []
                 this.statusOption.push({
-                    id: '',
+                    id: '1',
                     name: '全部'
                 })
                 sxjd.forEach(el => {
@@ -278,13 +280,13 @@ export default {
             if (this.nd) {
                 getParams.data.nd = this.nd
             }
-            if (this.lb) {
+            if (this.lb && this.lb != 1) {
                 getParams.data.lb = this.lb
             }
-            if (this.xm) {
+            if (this.xm && this.xm != 1) {
                 getParams.data.xm = this.xm
             }
-            if (this.sxjd) {
+            if (this.sxjd && this.sxjd != 1) {
                 getParams.data.sxjd = this.sxjd
             }
             //验收
@@ -296,7 +298,7 @@ export default {
                 getParams.data.lxsjwcsjStartDate = this.lxsjwcsj[0] + '000000'
                 getParams.data.lxsjwcsjEndDate = this.reportdate[1] + '000000'
             }
-            if (this.status) {
+            if (this.status && this.status != 1) {
                 getParams.data.status = this.status
             }
 

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

@@ -84,19 +84,76 @@
             </div>
         </div>
         <div v-if='ruleForm.Type=="Image"' class='form5'>
-            <div class='form5-top'>上传新图标</div>
-            <div>
-                <el-upload
-                    class='upload-demo'
-                    action='https://jsonplaceholder.typicode.com/posts/'
-                    :http-request='getFile'
-                    :file-list='fileList'
-                    :on-change='handleChange'
-                    :on-remove='handleRemove'
-                >
-                    <el-button size='small' style='color:#1F2329;'>点击上传</el-button>
-                </el-upload>
-            </div>
+            <el-row :gutter='20'>
+                <el-col :span='16'>
+                    <div class='form5-top start'>上传新图标</div>
+                    <div>
+                        <el-upload
+                            class='upload-demo'
+                            action='https://jsonplaceholder.typicode.com/posts/'
+                            :http-request='getFile'
+                            :file-list='fileList'
+                            :on-change='handleChange'
+                            :on-remove='handleRemove'
+                        >
+                            <el-button size='small' style='color:#1F2329;'>点击上传</el-button>
+                        </el-upload>
+                    </div>
+                </el-col>
+                <el-col :span='8'>
+                    <div class='form5-top'>默认图标显示尺寸</div>
+                    <el-input-number
+                        v-model='ruleForm.Size.Width'
+                        @change='handleChangeWidth'
+                        size='small'
+                        :min='1'
+                        :max='2000'
+                        :controls='false'
+                        style='width:72px'
+                    ></el-input-number>
+                    <i style='margin:0 10px'>x</i>
+                    <el-input-number
+                        v-model='ruleForm.Size.Height'
+                        @change='handleChangeHeight'
+                        size='small'
+                        :min='1'
+                        :max='2000'
+                        :controls='false'
+                        style='width:72px'
+                    ></el-input-number>
+                </el-col>
+            </el-row>
+
+            <!-- <el-row :gutter='20'>
+                <el-col :span='8'>
+                    <div>宽</div>
+                    <Select
+                        width='200'
+                        height='40'
+                        v-model='ruleForm.Size.Width'
+                        :isReadOnly='true'
+                        :hideClear='true'
+                        :selectdata='kuan'
+                        :placeholder='"请选择"'
+                        style='margin-bottom:10px'
+                        @change='handleKuan'
+                    />
+                </el-col>
+                <el-col :span='12'>
+                    <div>高</div>
+                    <Select
+                        width='200'
+                        height='40'
+                        v-model='ruleForm.Size.Height'
+                        :isReadOnly='true'
+                        :hideClear='true'
+                        :selectdata='gao'
+                        :placeholder='"请选择"'
+                        style='margin-bottom:10px'
+                        @change='handleGao'
+                    />
+                </el-col>
+            </el-row>-->
         </div>
         <div v-if='ruleForm.Type!="None"' class='form4'>
             <div class='form4-top'>
@@ -169,7 +226,16 @@ export default {
                     name: '线条'
                 }
             ],
-
+            kuan: [
+                { id: '16', name: '16' },
+                { id: '32', name: '32' },
+                { id: '64', name: '64' }
+            ],
+            gao: [
+                { id: '16', name: '16' },
+                { id: '32', name: '32' },
+                { id: '64', name: '64' }
+            ],
             selectedIds: [],
             borderLineOption: [
                 {
@@ -226,11 +292,24 @@ export default {
     props: ['ruleForm', 'title', 'InfosList', 'InfoTypeIdList'],
 
     methods: {
+        handleChangeWidth(val) {
+            this.$set(this.ruleForm.Size, 'Width', val)
+        },
+        handleChangeHeight(val) {
+            this.$set(this.ruleForm.Size, 'Height', val)
+        },
         //业下设备分类和位置分类树形结构
         initQueryDeviceAndPOsition() {
             let postParams = {}
             queryDeviceAndPOsition({ postParams }).then(res => {
-                this.deviceList = res.data
+                this.deviceList = res.data.map(i => {
+                    i.children &&
+                        i.children.map(child => {
+                            child.id = child.id + child.type
+                            child.name = child.name
+                        })
+                    return i
+                })
             })
         },
         handleRemove(file, fileList) {
@@ -465,7 +544,13 @@ export default {
                     }
                     return i
                 })
-            InfoLocal = info
+            InfoLocal = info.map(i => {
+                return {
+                    type: i.id.split('')[i.id.length - 1],
+                    name: i.name,
+                    id: i.id.substr(0, i.id.length - 1)
+                }
+            })
             this.$set(this.ruleForm, 'InfoLocal', InfoLocal)
             this.$set(this.ruleForm, 'InfoSystem', InfoSystem)
         },
@@ -504,6 +589,7 @@ export default {
         }
     },
     mounted() {
+        console.log(this.ruleForm, 'form')
         this.initQueryDeviceAndPOsition()
         this.visualization()
         if (this.title == '修改图例库') {
@@ -644,11 +730,12 @@ export default {
     }
     .form5 {
         width: 720px;
-        height: 86px;
+        // height: 86px;
         background: rgba(245, 246, 247, 1);
         border-radius: 4px;
         margin-top: 20px;
         padding-left: 12px;
+        padding-bottom: 20px;
         .form5-top {
             padding: 12px 0 8px 0;
         }

+ 6 - 0
src/views/legendLibrary/addLegend.vue

@@ -82,6 +82,7 @@ export default {
                 Url: '',
                 LineWidth: '',
                 LineDash: '',
+                Size: { Height: '32', Width: '32' },
                 InfoTypeId: [], //铺位可视化typeid
                 InfoLocal: [], //工程信息化位置与设备分类
                 InfoSystem: [] //工程信息化专业/系统
@@ -122,6 +123,8 @@ export default {
                     FillColor: '#ffffff',
                     Color: '#ffffff',
                     Url: '',
+                    Size: { Height: '32', Width: '32' },
+
                     InfoTypeId: [], //铺位可视化typeid
                     InfoLocal: [], //工程信息化位置与设备分类
                     InfoSystem: [] //工程信息化专业/系统
@@ -137,6 +140,8 @@ export default {
                     FillColor: '#ffffff',
                     Color: '#ffffff',
                     Url: '',
+                    Size: { Height: '32', Width: '32' },
+
                     InfoTypeId: [], //铺位可视化typeid
                     InfoLocal: [], //工程信息化位置与设备分类
                     InfoSystem: [] //工程信息化专业/系统
@@ -170,6 +175,7 @@ export default {
                 FillColor: '#ffffff',
                 Color: '#ffffff',
                 Url: '',
+                Size: { Height: '32', Width: '32' },
                 InfoTypeId: [], //铺位可视化typeid
                 InfoLocal: [], //工程信息化位置与设备分类
                 InfoSystem: [] //工程信息化专业/系统

+ 11 - 1
src/views/room/detail.vue

@@ -328,7 +328,7 @@ export default {
                 {
                     columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
                     params: {
-                        type_code: this.type_code
+                        type_code: this.row.type_code
                     },
                     tableName: 'sms_asset'
                 }
@@ -341,6 +341,11 @@ export default {
                 if (res.data.data) {
                     let sb_status = [],
                         sbglgs = []
+                    this.sb_status = []
+                    this.sb_status.push({
+                        id: '',
+                        name: '全部'
+                    })
                     sb_status = res.data.data.sms_asset ? res.data.data.sms_asset.sb_status : []
                     sbglgs = res.data.data.sms_asset ? res.data.data.sms_asset.sbglgs : []
                     if (sb_status.length > 0) {
@@ -352,6 +357,11 @@ export default {
                             this.sb_status.push(obj)
                         })
                     }
+                    this.sbglgs = []
+                    this.sbglgs.push({
+                        name: '全部',
+                        id: ''
+                    })
                     if (sbglgs.length > 0) {
                         sbglgs.forEach(el => {
                             let obj = {