Kaynağa Gözat

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

yunxing 4 yıl önce
ebeveyn
işleme
539ac781e1

+ 2 - 2
public/systemConf.js

@@ -25,8 +25,8 @@ var __systemConf = {
     conf: {
         // 阿里云
         editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
-        wandaBmGuideUrl: 'http://192.168.200.100:8090/wandaBmGuide/', //管理书地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        // wandaBmGuideUrl: 'http://192.168.200.13:8090/wandaBmGuide/', //管理书地址
     },
 }
 window.__systemConf = __systemConf

BIN
src/assets/imgs/bjj.png


+ 30 - 13
src/components/Legend/src/legend.vue

@@ -35,13 +35,13 @@
         </div>
 
         <!-- 单独展示新增分布图 -->
-        <div class='edit_map1' v-if='floors.length==0' @click='addFloor'>
-            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+        <el-tooltip effect='dark' v-if='floors.length==0' content='新增分布图' placement='left'>
+            <div class='edit_map1' @click='addFloor'>
                 <!-- <p class='tltk' style='margin-left: -5px;'> -->
-                <img src='@/assets/imgs/xzfbt.png' alt />
+                <img src='@/assets/imgs/bjj.png' alt />
                 <!-- </p> -->
-            </el-tooltip>
-        </div>
+            </div>
+        </el-tooltip>
 
         <div class='edit_map' v-else>
             <!-- 备注编辑器 -->
@@ -57,7 +57,7 @@
             <!-- 新增分布图 -->
             <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
-                    <img src='@/assets/imgs/xzfbt.png' alt />
+                    <img src='@/assets/imgs/bjj.png' alt />
                 </p>
             </el-tooltip>
             <!-- 编辑分布图 -->
@@ -79,7 +79,7 @@
             </span>
         </div>
         <div class='select-floor' v-if='isFloor'>
-            <p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
+            <p class='p1'>{{`请选择需要创建"${categoryId=='FZQZL'?'分水器支路分布图':'消防泵房引出管路分布图'}"的楼层`}}</p>
             <p class='p2'>
                 <Select width='240' tipPlace='top' v-model='floor' caption='楼层:' size='mini' :selectdata='floorSelectAble' :placeholder='"请选择"'></Select>
             </p>
@@ -106,8 +106,8 @@ export default {
         return {
             remarksText: '', //查询出来的备注
             text1:
-                '<p>1.主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
-            text2: '<p>2.图例后×的数字,代表此位置的数量</p>',
+                '<p>主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
+            text2: '<p>图例后×的数字,代表此位置的数量</p>',
             text2: '',
             show: true,
             show2: false,
@@ -555,6 +555,7 @@ export default {
         margin-bottom: 10px;
         display: none;
         cursor: pointer;
+        border: 1px solid #eee;
     }
 }
 .edit_map:hover .tltk {
@@ -568,6 +569,17 @@ export default {
     bottom: 28px;
     right: 30px;
     z-index: 1;
+    width: 48px;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.2);
+    border-radius: 90px;
+    text-align: center;
+    img {
+        display: block;
+        margin-top: 12px;
+        margin-left: 12px;
+    }
     .select-floor {
         width: 288px;
         height: 220px;
@@ -586,9 +598,9 @@ export default {
     border-radius: 2px;
     border: 1px solid rgba(228, 229, 231, 1);
     position: fixed;
-    bottom: 40px;
-    right: 70px;
-    padding: 24px;
+    bottom: 26px;
+    right: 84px;
+    padding: 24px 24px 20px 24px;
     .p1 {
         font-size: 14px;
         font-family: MicrosoftYaHei;
@@ -634,7 +646,12 @@ export default {
     }
     .el-table td,
     .el-table th {
-        padding: 6px 0;
+        padding: 3px 0;
+    }
+    .el-checkbox__input.is-checked .el-checkbox__inner,
+    .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        border-radius: 2px;
     }
 }
 </style>

+ 2 - 1
src/components/editLengend.vue

@@ -54,7 +54,7 @@
                         <el-table-column prop label='单位'>
                             <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                         </el-table-column>
-                        <el-table-column prop label='图例'>
+                        <el-table-column prop label='图例' align='center'>
                             <template slot-scope='{row}'>
                                 <div v-if='row.Url' class='Url-img'>
                                     <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
@@ -229,6 +229,7 @@ export default {
         width: 20px;
         height: 22px;
         line-height: 20px;
+        margin: 0 auto;
         img {
             width: 100%;
             height: 100%;

+ 1 - 2
src/components/legendremarks.vue

@@ -51,7 +51,6 @@ export default {
         },
         // 更新底图备注
         markUpdate(val) {
-            console.log(val)
             let params = {
                 postParams: {
                     graphId: this.$cookie.get('graphId'),
@@ -60,7 +59,7 @@ export default {
                 }
             }
             updateRead(params).then(res => {
-                console.log('更新备注', res)
+                // console.log('更新备注', res)
                 this.$message({
                     showClose: true,
                     message: '更新成功',

+ 7 - 6
src/components/viewLengend.vue

@@ -4,7 +4,7 @@
 *@info:图例展示状态
 */
 <template>
-    <div class='view'>
+    <div class='views'>
         <div v-if='systemName=="土建系统"'>
             <el-table
                 ref='dataTable'
@@ -18,7 +18,7 @@
                         <span>{{(row.Properties && row.Properties.ItemExplain)?row.Properties.ItemExplain:'--'}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop label='图例' width='60'>
+                <el-table-column prop label='图例' width='60' align='center'>
                     <template slot-scope='{row}'>
                         <div class='scpz-img' :style='`background:${row.Properties.FillColor};border:1px solid ${row.Properties.StrokeColor}`'></div>
                     </template>
@@ -35,7 +35,7 @@
                 @selection-change='handleSelectionChange'
                 :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
             >
-                <el-table-column type='selection' width='45'></el-table-column>
+                <el-table-column type='selection' width='45' align='center'></el-table-column>
                 <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
                     <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                 </el-table-column>
@@ -48,7 +48,7 @@
                 <el-table-column prop='Unit' label='单位' width='70'>
                     <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Url' label='图例' width='55'>
+                <el-table-column prop='Url' label='图例' width='55' align='center'>
                     <template slot-scope='{row}'>
                         <div v-if='row.Url' class='Url-img'>
                             <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
@@ -114,7 +114,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.view {
+.views {
     .swich {
         display: flex;
         justify-content: flex-end;
@@ -151,6 +151,7 @@ export default {
         width: 20px;
         height: 22px;
         line-height: 20px;
+        margin: 0 auto;
         img {
             width: 100%;
             height: 100%;
@@ -159,7 +160,7 @@ export default {
 }
 </style>
 <style lang="less">
-.view {
+.views {
     .el-input--mini .el-input__inner {
         width: 50px;
     }

+ 2 - 2
src/views/equipment/fenbuPic.vue

@@ -31,7 +31,7 @@ export default {
             loadName: '',
             type: '',
             floors: [],
-            modalHeight: 500,   //适配底图
+            modalHeight: 500 //适配底图
         }
     },
     props: ['typecode'],
@@ -88,7 +88,7 @@ export default {
                     })
                 }
                 this.floorInfo = this.floors[0]
-                this.init()
+                // this.init()
             })
         },
         init() {

+ 5 - 6
src/views/equipment/index.vue

@@ -20,7 +20,7 @@
                 <div class='eq-right-bottom'>
                     <div class='title-box'>
                         <div class='eq-title'>
-                            <span class="span1">{{floorInfo.code}}</span>
+                            <span class='span1'>{{floorInfo.code}}</span>
                         </div>
                     </div>
                     <div class='eq-content'>
@@ -134,9 +134,8 @@ export default {
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
-                console.log('附加数据', res)
+                // console.log('附加数据', res)
                 this.fqPic = res.data
-                console.log(this.fqPic)
             })
         },
         init() {
@@ -266,9 +265,9 @@ export default {
                             margin-right: 10px;
                             margin-top: 8px;
                         }
-                        .span1{
-                                position: absolute;
-                                top: 3px;
+                        .span1 {
+                            position: absolute;
+                            top: 3px;
                         }
                     }
                 }

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

@@ -55,10 +55,10 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' width='100'>
+            <el-table-column prop='floor' label='楼层' width='180'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width="300">
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -107,10 +107,9 @@ export default {
     },
     methods: {
         indexMethod(index) {
-            return (this.currentPage-1) * this.size + index +1
+            return (this.currentPage - 1) * this.size + index + 1
         },
         rowHandle(row) {
-            console.log(row)
             this.innerVisible = true
             this.row = row
         },
@@ -172,7 +171,6 @@ export default {
             }
         },
         floor(newV, oldV) {
-            console.log(newV, oldV)
             this.getList()
         }
     },

+ 1 - 1
src/views/legendLibrary/addLegend.vue

@@ -125,7 +125,7 @@ export default {
                 this.InfoTypeIdList = []
 
                 // this.InfosList = [...row.InfoLocal.map(({ id }) => id), ...row.InfoSystem]
-                this.InfosList = [...row.InfoLocal.map(({ id }) => id)]
+                this.InfosList = row.InfoLocal ? [...row.InfoLocal.map(({ id }) => id)] : []
                 this.InfoTypeIdList = row.InfoTypeId
                 console.log(this.InfosList, this.InfoTypeIdList)
                 console.log(this.info)

+ 7 - 5
src/views/other/index.vue

@@ -17,7 +17,7 @@
             </div>
             <!-- 楼层 -->
             <div class='other-right' v-if='matterId!=1'>
-                <floor-list-other v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list-other>
+                <floor-list v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list>
             </div>
             <!-- 图例 -->
             <!-- <div class='legend-boxs' v-if='matterId!=1'>
@@ -42,7 +42,7 @@ import ZhsxOther from './zhsxOther'
 import GcfzDialog from './gcfzDialog'
 import OtherDialog from './otherDialog'
 import { queryPic, queryTab } from '@/api/public.js'
-import floorListOther from '@/components/floorListOther.vue'
+import floorList from '@/components/floorList.vue'
 import { matter } from '@/utils/plugins/components.js'
 import { mapGetters } from 'vuex'
 export default {
@@ -62,7 +62,7 @@ export default {
             floorData: []
         }
     },
-    components: { floorListOther, OtherDialog, ZhsxOther, GcfzDialog },
+    components: { floorList, OtherDialog, ZhsxOther, GcfzDialog },
     methods: {
         tabSyatem(item) {
             this.matterId = item.id
@@ -249,8 +249,10 @@ export default {
             margin: 0 auto;
             margin-top: 93px;
             img {
-                width: 100%;
-                height: 100%;
+                max-width: 100%;
+                max-height: 100%;
+                display: block;
+                margin: 0 auto;
             }
         }
     }

+ 3 - 3
src/views/other/zhsxOtherTable1.vue

@@ -25,7 +25,7 @@
                 style='margin-right:12px'
                 v-if='department.length>0'
                 :selectdata='department'
-                :placeholder='"选择政府部门"'
+                :placeholder='""'
             ></Select>
             <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:200px'></el-input>
         </div>
@@ -38,13 +38,13 @@
             style='width: 100%;margin-top:12px'
         >
             <el-table-column label='序号' type='index' width='60'></el-table-column>
-            <el-table-column prop sortable label='日期' width='90' resizable>
+            <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='政府部门' width='80'>
                 <template slot-scope='{row}'>{{row.department||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' width='700'>
+            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='700'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='工作要求' width='160'>

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

@@ -56,13 +56,13 @@
             style='width: 100%;margin-top:12px'
         >
             <el-table-column label='序号' type='index' width='60'></el-table-column>
-            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width="540">
+            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='状态' width='90'>
                 <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='部门' width='90' :show-overflow-tooltip='true'>
+            <el-table-column prop label='部门' width='260' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.zgbm||'--'}}</template>
             </el-table-column>
             <el-table-column prop :show-overflow-tooltip='true' label='检测结论'>
@@ -167,7 +167,6 @@ export default {
                         this.status2.push(obj)
                     })
                 }
-                //console.log(this.status2)
                 if (zgbm.length > 0) {
                     zgbm.forEach(el => {
                         let obj = {

+ 7 - 3
src/views/room/index.vue

@@ -275,6 +275,7 @@
                                 style='margin-right:12px;width:220px;'
                             ></el-input>
                             <Select
+                                @change='Index4'
                                 width='220'
                                 tipPlace='top'
                                 v-model='statuSelect5'
@@ -491,7 +492,7 @@ export default {
             rwwcrq: '',
             ycgdtbsj: '',
             ycgdyssj: '',
-            smsxtArr: { smsx: '1001' }
+            smsxtArr: { smsx: '1001', smsxtname: '供电系统' }
         }
     },
     components: {
@@ -529,9 +530,12 @@ export default {
                 typename: '位置布置图',
                 location: '1809',
                 module: '1002',
-                system: system,
+                // system: system,
                 plazaId: this.plazaId
             }
+            if (system) {
+                getParams.system = system
+            }
             queryPic({ getParams }).then(res => {
                 //console.log('机房布置图', res)
                 this.tableImg = res.data ? res.data : []
@@ -843,7 +847,7 @@ export default {
             } else if (name.type == 'system') {
                 let floor = this.$cookie.get('floorNow')
                 this.content = `查看${floor}层楼层功能图`
-                this.init()
+                this.Index(null)
             }
         },
         // 机房右上角的跳转 如果是在楼层功能打开的机房则要跳转到设备设施对应的系统\楼层 反之亦然