guoxiaohuan 4 years ago
parent
commit
1e4359c5b6

+ 2 - 2
public/systemConf.js

@@ -24,8 +24,8 @@ 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/', //管理书地址

+ 6 - 0
src/assets/css/rotation.css

@@ -185,11 +185,17 @@
   justify-content: flex-start;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right span {
+  cursor: pointer;
   display: inline-block;
   font-size: 12px;
   font-family: MicrosoftYaHei;
   color: #1f2429;
   line-height: 22px;
+  width: 300px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
 }
 .overview .view-box .view-right {
   flex: 1;

+ 6 - 0
src/assets/css/rotation.less

@@ -183,11 +183,17 @@
                             flex-direction: column;
                             justify-content: flex-start;
                             span {
+                                cursor: pointer;
                                 display: inline-block;
                                 font-size: 12px;
                                 font-family: MicrosoftYaHei;
                                 color: rgba(31, 36, 41, 1);
                                 line-height: 22px;
+                                width: 300px;
+                                overflow: hidden;
+                                white-space: nowrap;
+                                text-overflow: ellipsis;
+                                -o-text-overflow: ellipsis;
                             }
                         }
                     }

+ 6 - 0
src/components/editLengend.vue

@@ -110,6 +110,7 @@
                 <el-switch v-model='value' @change='changeSwitch'></el-switch>
                 <span>隐藏数量为0的项目</span>
             </div>
+            <div class='lengend-text'>广场上没有的图例需要填写数量,值为0</div>
             <div class='legendFoot'>
                 <el-button size='mini' @click='cancel'>取消</el-button>
                 <el-button size='mini' v-if='editNum.length==0' type='primary' disabled style='opacity: 0.5'>保存</el-button>
@@ -308,6 +309,11 @@ export default {
             margin: 0 auto;
         }
     }
+    .lengend-text {
+        font-size: 12px;
+        color: red;
+        padding-left: 16px;
+    }
     .legendFoot {
         position: absolute;
         right: 16px;

+ 4 - 3
src/components/floorMap/index.vue

@@ -104,12 +104,13 @@ export default {
                         this.fParser.parseData(res)
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
-                            t.nameSize = 14
+                            t.nameSize = 12
                             t.nameColor = '#646A73'
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].brandname
                             } else {
-                                t.name = t.data.Name
+                                // t.name = t.data.Name
+                                t.name = ''
                             }
                         })
                         this.fParser.wallList.forEach(t => this.scene.addItem(t))
@@ -228,7 +229,7 @@ export default {
                         selectItem1.data.GraphElementId != '100129'
                     ) {
                         if (location) {
-                            this.$refs.boxRoom.open({ name: name, type: this.type, location: location })
+                            this.$refs.boxRoom.open({ name: selectItem1.name, type: this.type, location: location })
                         }
                     }
                 }

+ 1 - 1
src/components/viewLengend.vue

@@ -39,7 +39,7 @@
                 <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
                     <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Num' label='数量'>
+                <el-table-column prop='Num' label='数量' align='center'>
                     <template slot-scope='{row}'>
                         <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
                         <span v-else-if='row.Num==null'></span>

+ 22 - 0
src/views/equipment/index.vue

@@ -185,6 +185,25 @@ export default {
             } else {
                 this.$store.commit('SETSHOWVIEW', 0)
             }
+        },
+        smsxtQuery() {
+            if (this.smsxt == '1001') {
+                this.$cookie.set('categoryId', 'GDXT')
+            } else if (this.smsxt == '1002') {
+                this.$cookie.set('categoryId', 'NTXT')
+            } else if (this.smsxt == '1003') {
+                this.$cookie.set('categoryId', 'XFXT')
+            } else if (this.smsxt == '1004') {
+                this.$cookie.set('categoryId', 'RDXT')
+            } else if (this.smsxt == '1005') {
+                this.$cookie.set('categoryId', 'JPSXT')
+            } else if (this.smsxt == '1006') {
+                this.$cookie.set('categoryId', 'DTXT')
+            } else if (this.smsxt == '1007') {
+                this.$cookie.set('categoryId', 'RQYL')
+            } else {
+                this.$cookie.set('categoryId', 'SCPZ')
+            }
         }
     },
     /* mounted() {
@@ -205,7 +224,9 @@ export default {
     mounted() {
         window._vm = this
         if (this.$route.query.smsxt) {
+            console.log(this.$route.query.smsxt)
             this.smsxt = this.$route.query.smsxt
+            this.smsxtQuery()
             this.system.forEach(el => {
                 if (el.smsxt == this.smsxt) {
                     this.everySystem = el.children
@@ -227,6 +248,7 @@ export default {
             this.viewLengend()
         }
         this.init()
+        console.log(this.floorInfo.gname)
         this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {

+ 10 - 10
src/views/overview/index.vue

@@ -30,12 +30,12 @@
                         <span></span>
                         <span>建筑综合信息</span>
                     </nav>
-                    <p class='place-p1'>
+                    <!-- <p class='place-p1'>
                         <span>
                             <img src='@/assets/imgs/jz.png' alt />
                             {{build.length>0?formatter('项目名称',build):'--'}}
                         </span>
-                    </p>
+                    </p>-->
                     <p class='place-p2'>
                         <span>
                             <img src='@/assets/imgs/didian.png' alt />
@@ -51,10 +51,10 @@
                                 <span>车位信息</span>
                             </div>
                             <div class='place-right'>
-                                <span>{{build.length>0?formatter('建筑面积',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('建筑高度',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('楼层分布',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('车位信息',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("建筑面积",build):"--"}`'>{{build.length>0?formatter('建筑面积',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("建筑高度",build):"--"}`'>{{build.length>0?formatter('建筑高度',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("楼层分布",build):"--"}`'>{{build.length>0?formatter('楼层分布',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("车位信息",build):"--"}`'>{{build.length>0?formatter('车位信息',build):'--'}}</span>
                             </div>
                         </div>
                         <div class='place-box'>
@@ -65,10 +65,10 @@
                                 <span>移交日期</span>
                             </div>
                             <div class='place-right'>
-                                <span>{{build.length>0?formatter('租赁面积',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('竣工日期',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('开业日期',build):'--'}}</span>
-                                <span>{{build.length>0?formatter('移交日期',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("租赁面积",build):"--"}`'>{{build.length>0?formatter('租赁面积',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("竣工日期",build):"--"}`'>{{build.length>0?formatter('竣工日期',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("开业日期",build):"--"}`'>{{build.length>0?formatter('开业日期',build):'--'}}</span>
+                                <span :title='`${build.length>0?formatter("移交日期",build):"--"}`'>{{build.length>0?formatter('移交日期',build):'--'}}</span>
                             </div>
                         </div>
                     </div>

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

@@ -5,7 +5,7 @@
 */
 <template>
     <div class='compute-box'>
-        <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
+        <el-dialog :title='`${systemName}`' :visible.sync='visible' :fullscreen='true'>
             <el-tooltip
                 class='item'
                 effect='dark'