guoxiaohuan 4 years ago
parent
commit
41f8cb69cd

BIN
public/imgs/xzfbt.png


BIN
src/assets/imgs/bj.png


BIN
src/assets/imgs/wtp.png


BIN
src/assets/imgs/xzfbt.png


+ 104 - 4
src/components/Legend/src/legend.vue

@@ -37,7 +37,7 @@
                 </div>
             </el-collapse-transition>
         </div>
-        <div class='edit_map'>
+        <div class='edit_map' v-if='1!=1'>
             <!-- 备注编辑器 -->
             <el-tooltip effect='dark' content='编辑备注' placement='left'>
                 <span v-if='systemName != "土建系统"' class='bjtk' @click='legendClik'>备注</span>
@@ -48,8 +48,14 @@
                     <img src='@/assets/imgs/bjtl.png' alt />
                 </p>
             </el-tooltip>
-            <!-- 编辑平面图 -->
-            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑平面图' placement='left'>
+            <!-- 新增分布图 -->
+            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+                <p class='tltk' style='margin-left: -5px;'>
+                    <img src='@/assets/imgs/xzfbt.png' alt />
+                </p>
+            </el-tooltip>
+            <!-- 编辑分布图 -->
+            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑分布图' placement='left'>
                 <span class='edit-icon' @click='goToEditer'>
                     <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
                 </span>
@@ -58,6 +64,25 @@
                 <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
             </span>
         </div>
+        <!-- 单独展示新增分布图 -->
+        <div class='edit_map1' v-else @click='addFloor'>
+            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+                <!-- <p class='tltk' style='margin-left: -5px;'> -->
+                <img src='@/assets/imgs/xzfbt.png' alt />
+                <!-- </p> -->
+            </el-tooltip>
+        </div>
+        <div class='select-floor' v-if='isFloor'>
+            <p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
+            <p class='p2'>
+                <Select width='240' tipPlace='top' caption='楼层:' size='mini' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
+            </p>
+            <p class='p3'>
+                <span @click='cancel'>取消</span>
+                <span @click='determine'>确定</span>
+            </p>
+        </div>
+
         <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
     </div>
 </template>
@@ -88,11 +113,12 @@ export default {
             multipleSelection: [],
             editText: '',
             editSwitch: false,
+            isFloor: false,
             editPmt: true //是否有跳转道图例库的权限
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'fmapID'])
+        ...mapGetters(['plazaId', 'fmapID', 'floorSelect'])
     },
     props: ['systemName'],
     components: { lengendView, legendRemarks, lengendEdit },
@@ -235,6 +261,18 @@ export default {
             } else {
                 this.isShow2()
             }
+        },
+        addFloor() {
+            console.log(111111)
+            this.isFloor = true
+        },
+        // 新增楼层取消
+        cancel() {
+            this.isFloor = false
+        },
+        // 新增楼层确定
+        determine() {
+            this.isFloor = false
         }
     },
     mounted() {}
@@ -330,6 +368,68 @@ export default {
 .edit_map:hover .bjtk {
     display: block;
 }
+.edit_map1 {
+    position: fixed;
+    bottom: 28px;
+    z-index: 1;
+    .select-floor {
+        width: 288px;
+        height: 220px;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+        border-radius: 2px;
+        border: 1px solid rgba(228, 229, 231, 1);
+        position: relative;
+        right: 0;
+    }
+}
+.select-floor {
+    width: 288px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+    border-radius: 2px;
+    border: 1px solid rgba(228, 229, 231, 1);
+    position: fixed;
+    bottom: 40px;
+    right: 70px;
+    padding: 24px;
+    .p1 {
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: rgba(31, 36, 41, 1);
+        line-height: 19px;
+    }
+    .p2 {
+        margin-top: 8px;
+        margin-bottom: 68px;
+    }
+    .p3 {
+        display: flex;
+        justify-content: flex-end;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        line-height: 22px;
+        text-align: center;
+        span:nth-of-type(1) {
+            width: 58px;
+            height: 24px;
+            background: rgba(255, 255, 255, 1);
+            border: 1px solid rgba(195, 199, 203, 1);
+            margin-right: 12px;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+        span:nth-of-type(2) {
+            width: 58px;
+            height: 24px;
+            background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+            border-radius: 2px;
+            color: rgba(255, 255, 255, 1);
+            border-radius: 2px;
+            cursor: pointer;
+        }
+    }
+}
 </style>
 <style lang="less">
 .legend-container {

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

@@ -10,11 +10,7 @@
         <div class='eq-bottom'>
             <div class='eq-left'>
                 <ul v-for='(eve,index) in everySystem' :key='"o"+index'>
-                    <li
-                        class='li-style'
-                        :class='{"is-active": eve.id}' 
-                        @click='dialogVisible(eve)'
-                    >
+                    <li class='li-style' :class='{"is-active": eve.id}' @click='dialogVisible(eve)'>
                         <span class='circle'></span>
                         <span class='hanzi'>{{eve.label}}</span>
                     </li>
@@ -78,7 +74,7 @@ export default {
             fqPic: [],
             loadName: '',
             type: '',
-            objCount:[]
+            objCount: []
         }
     },
     components: { floorList, eqDialog, floorMap, editList },
@@ -97,12 +93,12 @@ export default {
             this.init()
         },
         //判断有没有原理图,如果没有则不出现系统原理图列表li
-        emitCount(objCount){
+        emitCount(objCount) {
             this.objCount = objCount
         },
         emitFloor(item) {
             this.floorInfo = item
-            this.$refs.floorMap.init(this.floorInfo.gname)
+            // this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
         },
         dialogVisible(eve) {
@@ -149,7 +145,7 @@ export default {
         }
         this.everySystem = this.system[0].children
         this.init()
-        this.$refs.floorMap.init(this.floorInfo.gname)
+        // this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {
         ...mapGetters(['floorsArr'])

+ 5 - 5
src/views/other/zhsxOtherTable2.vue

@@ -56,16 +56,16 @@
             style='width: 100%;margin-top:12px'
         >
             <el-table-column label='序号' type='index' width='50'></el-table-column>
-            <el-table-column prop='name' :show-overflow-tooltip='true' sortable label='任务名称'>
+            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='type' label='状态' width='90'>
-                <template slot-scope='{row}'>{{row.status2||'--'}}</template>
+            <el-table-column prop label='状态' width='90'>
+                <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='thing' label='部门' width='90' :show-overflow-tooltip='true'>
+            <el-table-column prop label='部门' width='90' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.zgbm||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='name' :show-overflow-tooltip='true' label='检测结论'>
+            <el-table-column prop :show-overflow-tooltip='true' label='检测结论'>
                 <template slot-scope='{row}'>{{row.conclusion||'--'}}</template>
             </el-table-column>
         </el-table>

+ 5 - 4
src/views/room/index.vue

@@ -506,7 +506,7 @@ export default {
     methods: {
         handleClick(tab) {
             if (tab.label == '机房布置图') {
-                this.Index()
+                this.Index(this.smsxtArr.smsxt)
             } else if (tab.label == '配电室低压柜及出线明细表') {
                 this.Index1()
             } else if (tab.label == '机房内核心设备') {
@@ -522,13 +522,13 @@ export default {
         show() {
             this.dialogFormVisible = !this.dialogFormVisible
         },
-        Index() {
+        Index(system) {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 typename: '位置布置图',
                 location: '1809',
                 module: '1002',
-                system: '1002',
+                system: system,
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
@@ -819,6 +819,7 @@ export default {
             querySystem(params).then(res => {
                 this.smsxtArr = res.data[0]
                 console.log(this.smsxtArr)
+                this.Index(this.smsxtArr.smsxt)
                 this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })
         },
@@ -845,7 +846,7 @@ export default {
         }
     },
     mounted() {
-        this.Index()
+        // this.Index()
     }
 }
 </script>

+ 4 - 2
src/views/room/room4.vue

@@ -36,7 +36,7 @@
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='费用(万元)' min-width='100' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.cost||'--'}}</template>
+                        <template slot-scope='{row}'>{{row.cost?number_format(row.cost):'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='费用出处' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.source||'--'}}</template>
@@ -72,6 +72,7 @@
 <script>
 import Select from '@/components/Select/Select.vue'
 import moment from 'moment'
+import { number_format } from '@/utils/format.js'
 
 export default {
     props: ['table4', 'total', 'page', 'size', 'loading'],
@@ -79,7 +80,8 @@ export default {
         return {
             dateVal: '',
             value1: '',
-            searVal: ''
+            searVal: '',
+            number_format
         }
     },
     components: { Select },