guoxiaohuan 4 gadi atpakaļ
vecāks
revīzija
548dbea01e

+ 184 - 184
src/assets/css/rotation.css

@@ -1,260 +1,260 @@
 .overview {
-    background: #f2f5f7;
-    padding: 16px 20px 20px 20px;
-    height: calc(100% - 48px);
-    width: 100%;
+  background: #f2f5f7;
+  padding: 16px 20px 20px 20px;
+  height: calc(100% - 48px);
+  width: 100%;
 }
 .overview .view-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 .overview .view-title nav {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
 .overview .view-title nav span:nth-of-type(1) {
-    width: 3px;
-    height: 16px;
-    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-    border-radius: 2px;
-    margin-right: 4px;
-    display: inline-block;
+  width: 3px;
+  height: 16px;
+  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+  border-radius: 2px;
+  margin-right: 4px;
+  display: inline-block;
 }
 .overview .view-title nav span:nth-of-type(2) {
-    height: 24px;
-    font-size: 16px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #1f2429;
+  height: 24px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #1f2429;
 }
 .overview .view-title .view-button {
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    line-height: 22px;
-    width: 106px;
-    height: 32px;
-    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-    font-size: 14px;
-    color: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    border-radius: 4px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 22px;
+  width: 106px;
+  height: 32px;
+  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+  font-size: 14px;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  border-radius: 4px;
 }
 .overview .view-title .view-button img {
-    display: inline-block;
-    height: 16px;
-    width: 16px;
-    margin-right: 6px;
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  margin-right: 6px;
 }
 .overview .view-box {
-    height: calc(100% - 32px);
-    display: flex;
-    justify-content: space-between;
+  height: calc(100% - 32px);
+  display: flex;
+  justify-content: space-between;
 }
 .overview .view-box .view-left {
-    width: 58.5%;
-    margin-right: 10px;
-    display: flex;
-    flex-direction: column;
+  width: 58.5%;
+  margin-right: 10px;
+  display: flex;
+  flex-direction: column;
 }
 .overview .view-box .view-left .lb-left {
-    width: 100%;
-    height: 66%;
-    flex: 1;
-    margin-top: 12px;
-    margin-bottom: 10px;
-    position: relative;
-    border: 1px solid #ccc;
-    border-radius: 4px;
+  width: 100%;
+  height: 66%;
+  flex: 1;
+  margin-top: 12px;
+  margin-bottom: 10px;
+  position: relative;
+  border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-left img {
-    width: 100%;
+  width: 100%;
 }
 .overview .view-box .view-left .lb-left .lb-icon {
-    z-index: 99;
-    position: absolute;
-    top: 0;
-    right: 0px;
-    width: 32px;
-    height: 32px;
-    background: rgba(0, 0, 0, 0.6);
-    border-radius: 0px 4px 0px 4px;
-    cursor: pointer;
+  z-index: 99;
+  position: absolute;
+  top: 0;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-left .lb-img {
-    z-index: 101;
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    top: 8px;
-    right: 10px;
-    cursor: pointer;
+  z-index: 101;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-bottom {
-    height: 34%;
-    background: #ffffff;
-    padding: 12px 16px;
+  height: 34%;
+  background: #ffffff;
+  padding: 12px 16px;
 }
 .overview .view-box .view-left .lb-bottom nav {
-    width: 161px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-    margin-bottom: 12px;
-    border-radius: 4px;
+  width: 161px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+  margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(1) {
-    width: 2px;
-    height: 16px;
-    background: #025baa;
-    margin-right: 6px;
-    display: inline-block;
+  width: 2px;
+  height: 16px;
+  background: #025baa;
+  margin-right: 6px;
+  display: inline-block;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(2) {
-    width: 107px;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #025baa;
+  width: 107px;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #025baa;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 {
-    height: 24px;
-    font-size: 16px;
-    font-family: MicrosoftYaHeiSemibold;
-    color: #1f2429;
-    line-height: 21px;
-    margin-bottom: 8px;
+  height: 24px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: #1f2429;
+  line-height: 21px;
+  margin-bottom: 8px;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 img {
-    width: 16px;
-    height: 16px;
-    margin-right: 3px;
-    margin-top: -3px;
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
+  margin-top: -3px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 {
-    margin: 16px 0;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    color: #1f2429;
-    line-height: 19px;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    margin-top: 0px;
+  margin: 16px 0;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #1f2429;
+  line-height: 19px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+  margin-top: 0px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 img {
-    width: 16px;
-    height: 16px;
-    margin-right: 3px;
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom {
-    display: flex;
+  display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box {
-    width: 50%;
-    display: flex;
+  width: 50%;
+  display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left {
-    display: flex;
-    align-items: center;
-    flex-direction: column;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left span {
-    display: inline-block;
-    width: 56px;
-    margin-right: 8px;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: #646c73;
-    line-height: 22px;
+  display: inline-block;
+  width: 56px;
+  margin-right: 8px;
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: #646c73;
+  line-height: 22px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right span {
-    display: inline-block;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: #1f2429;
-    line-height: 22px;
+  display: inline-block;
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: #1f2429;
+  line-height: 22px;
 }
 .overview .view-box .view-right {
-    flex: 1;
+  flex: 1;
 }
 .overview .view-box .view-right .view-right-box {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 .overview .view-box .view-right .view-right-box .lb-right {
-    flex: 1;
-    height: 47%;
-    margin-top: 12px;
-    margin-bottom: 10px;
-    position: relative;
-    border: 1px solid #ccc;
-    border-radius: 4px;
+  flex: 1;
+  height: 47%;
+  margin-top: 12px;
+  margin-bottom: 10px;
+  position: relative;
+  border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
-    z-index: 99;
-    position: absolute;
-    top: 0;
-    right: 0px;
-    width: 32px;
-    height: 32px;
-    background: rgba(0, 0, 0, 0.6);
-    border-radius: 0px 4px 0px 4px;
-    cursor: pointer;
+  z-index: 99;
+  position: absolute;
+  top: 0;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-img {
-    z-index: 101;
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    top: 8px;
-    right: 10px;
-    cursor: pointer;
+  z-index: 101;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
-    height: 53%;
-    background: #ffffff;
-    padding: 12px 16px;
-    overflow: hidden;
+  height: 53%;
+  background: #ffffff;
+  padding: 12px 16px;
+  overflow: hidden;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav {
-    width: 161px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-    margin-bottom: 12px;
-    border-radius: 4px;
+  width: 161px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+  margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(1) {
-    width: 2px;
-    height: 16px;
-    background: #025baa;
-    margin-right: 6px;
-    display: inline-block;
+  width: 2px;
+  height: 16px;
+  background: #025baa;
+  margin-right: 6px;
+  display: inline-block;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(2) {
-    width: 107px;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #025baa;
+  width: 107px;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #025baa;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom .view-right-bottom {
-    overflow: auto;
+  overflow: auto;
 }
 @media only screen and (min-width: 768px) and (max-width: 1366px) {
 }

+ 2 - 2
src/assets/css/rotation.less

@@ -91,7 +91,7 @@
                     height: 16px;
                     position: absolute;
                     top: 8px;
-                    right: 10px;
+                    right: 8px;
                     cursor: pointer;
                 }
             }
@@ -221,7 +221,7 @@
                         height: 16px;
                         position: absolute;
                         top: 8px;
-                        right: 10px;
+                        right: 8px;
                         cursor: pointer;
                     }
                 }

+ 14 - 4
src/components/404.vue

@@ -3,7 +3,7 @@
         <div class='not-img'>
             <img src='@/assets/imgs/dlsb.png' alt />
         </div>
-        <div class='not-text' v-if='isPermissions'>
+        <div class='not-text' v-if='permissions.length==0'>
             <span>您的权限不足……</span>
             <span>建议您联系管理员开通管理说明书相关权限</span>
         </div>
@@ -11,16 +11,26 @@
             <span>您的访问出错了!</span>
             <span>建议您稍后再试,或直接联系管理员解决</span>
         </div>
-        <div class='not-button'>
+        <div class='not-button' @click='goLogin'>
             <span>关闭页面</span>
         </div>
     </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 export default {
     data() {
-        return {
-            isPermissions: true //是否有访问权限
+        return {}
+    },
+    computed: {
+        ...mapGetters(['permissions'])
+    },
+    mounted() {
+        console.log(this)
+    },
+    methods: {
+        goLogin() {
+            window.open('http://oauth.wanda-dev.cn/login', true)
         }
     }
 }

+ 8 - 6
src/components/Legend/src/legend.vue

@@ -358,13 +358,15 @@ export default {
                 if (res.Result == 'success') {
                     //console.log('更新图例', res)
                     this.$message({
-                        message: '编辑图例成功',
+                        message: '操作成功',
                         type: 'success'
                     })
                     this.queryEditNum(this.editSwitch)
+                    this.show2 = false
+                    this.show = true
                 } else {
                     this.$message({
-                        message: '编辑图例失败',
+                        message: '操作失败',
                         type: 'error'
                     })
                 }
@@ -378,10 +380,10 @@ export default {
                 this.queryEdit(val)
                 this.isShow2()
             } else {
-                this.isShow2()
-                this.queryEditNum(true)
+                this.show2 = false
+                // this.isShow2()
+                // this.queryEditNum(true)
             }
-            this.show2 = true
         },
         addFloor() {
             this.isFloor = true
@@ -472,7 +474,7 @@ export default {
     .legend-tab {
         position: absolute;
         top: 0;
-        right: 44px;
+        right: 47px;
         .legend-table {
             padding: 16px;
             height: 546px;

+ 23 - 20
src/components/editLengend.vue

@@ -109,7 +109,7 @@
             </div>
             <div class='legendFoot'>
                 <el-button size='mini' @click='cancel'>取消</el-button>
-                <el-button size='mini' v-if='editNum.length==0' disabled type='primary'>保存</el-button>
+                <el-button size='mini' v-if='editNum.length==0' type='primary' disabled style='opacity: 0.5'>保存</el-button>
                 <el-button size='mini' v-else @click='save' type='primary'>保存</el-button>
             </div>
         </div>
@@ -147,22 +147,23 @@ export default {
             this.$emit('handleSwich2', val)
         },
         save() {
-            this.$confirm('图例中的数据发生变化, 是否需要保存?', {
-                confirmButtonText: '保存',
-                cancelButtonText: '放弃修改',
-                type: 'warning'
-            })
-                .then(() => {
-                    this.$emit('saveNum', this.editNum)
-                })
-                .catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已放弃修改'
-                    })
-                    this.editNum = []
-                    this.$emit('saveNum', this.editNum)
-                })
+            this.$emit('saveNum', this.editNum)
+            // this.$confirm('图例中的数据发生变化, 是否需要保存?', {
+            //     confirmButtonText: '保存',
+            //     cancelButtonText: '放弃修改',
+            //     type: 'warning'
+            // })
+            //     .then(() => {
+            //         this.$emit('saveNum', this.editNum)
+            //     })
+            //     .catch(() => {
+            //         this.$message({
+            //             type: 'info',
+            //             message: '已放弃修改'
+            //         })
+            //         this.editNum = []
+            //         this.$emit('saveNum', this.editNum)
+            //     })
         },
         init() {
             this.tbData1 = []
@@ -198,7 +199,7 @@ export default {
     .legend-tab2 {
         position: absolute;
         top: -44px;
-        right: 44px;
+        right: 47px;
         width: 385px;
         // width: 420px;
         height: 535px;
@@ -237,8 +238,10 @@ export default {
         line-height: 20px;
         margin: 0 auto;
         img {
-            width: 100%;
-            height: 100%;
+            display: block;
+            max-width: 100%;
+            max-height: 100%;
+            margin: 0 auto;
         }
     }
     .legendFoot {

+ 5 - 0
src/components/floorMap/canvasFun.vue

@@ -151,6 +151,7 @@ export default {
     .el-slider__button {
         width: 13px;
         height: 13px;
+        border: 2px solid #025baa;
     }
     .el-slider__runway {
         height: 3px;
@@ -167,5 +168,9 @@ export default {
         border-top-left-radius: 1px;
         border-bottom-left-radius: 1px;
     }
+    .action-box .el-slider__runway {
+        background-color: #e8e8e8 !important;
+        background: #e8e8e8 !important;
+    }
 }
 </style>

+ 1 - 1
src/components/legendremarks.vue

@@ -148,7 +148,7 @@ export default {
     cursor: pointer;
 }
 .edit_container {
-    margin: 10px 0 0;
+    margin: 0px;
     .p1 {
         position: absolute;
         bottom: 65px;

+ 3 - 2
src/components/menuList.vue

@@ -5,7 +5,7 @@
             <div class='downright'></div>
             <div class='home-box'>
                 <img src='@/assets/imgs/logo.png' alt />
-                <span v-if="plazas">{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
+                <span v-if='plazas'>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
             </div>
         </div>
         <div>
@@ -243,7 +243,7 @@ export default {
             float: left;
             width: 80px;
             height: 48px;
-            margin: 0 10px;
+            margin: 0 12px;
             cursor: pointer;
             transition: all 0.2s;
         }
@@ -251,6 +251,7 @@ export default {
             color: #025baa;
             font-weight: bolder;
             border-bottom: 2px solid #025baa;
+            padding: 0 8px;
             background: linear-gradient(180deg, rgba(2, 91, 170, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
         }
     }

+ 4 - 2
src/components/viewLengend.vue

@@ -153,8 +153,10 @@ export default {
         line-height: 20px;
         margin: 0 auto;
         img {
-            width: 100%;
-            height: 100%;
+            display: block;
+            max-width: 100%;
+            max-height: 100%;
+            margin: 0 auto;
         }
     }
 }

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

@@ -1,6 +1,6 @@
 <template>
     <div class='floorFunc-box'>
-        <div class='eq-title'>
+        <div class='lcgn-title'>
             <span class='span1'>{{floorInfo.code}}</span>
         </div>
         <!-- 图例 -->
@@ -56,11 +56,12 @@ export default {
     background: rgba(242, 245, 247, 1);
     height: calc(100vh - 48px);
     flex: 1;
-    .eq-title {
+    .lcgn-title {
         position: fixed;
         z-index: 2;
-        top: 92px;
-        left: 242px;
+        display: block;
+        top: 120px;
+        left: 146px;
         width: 140px;
         height: 32px;
         background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);

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

@@ -239,7 +239,7 @@ export default {
             width: 1035px;
             height: 544px;
             margin: 0 auto;
-            margin-top: 93px;
+            margin-top: 200px;
             img {
                 max-width: 100%;
                 max-height: 100%;

+ 1 - 1
src/views/other/zhsxOther.vue

@@ -83,7 +83,7 @@ export default {
             position: absolute;
             width: 16px;
             height: 16px;
-            left: 274px;
+            left: 260px;
             top: 3px;
             img {
                 width: 100%;

+ 2 - 7
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>
@@ -65,12 +65,7 @@
                         </div>
                         <div class='fileOpen' slot='reference'>{{row.glsmsZhsxfj.length}}</div>
                     </el-popover>
-                    <div v-else>
-                        <div>
-                            <p style='color: rgba(0, 145, 255, 1);' v-for='(item,index) in row.glsmsZhsxfj' :key='index'>{{item.description}}</p>
-                        </div>
-                        <div class='fileOpen' slot='reference'>{{'--'}}</div>
-                    </div>
+                    <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>
         </el-table>

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

@@ -13,10 +13,9 @@
             <Select
                 width='200'
                 tipPlace='top'
-                caption='状态'
+                caption='状态'
                 size='small'
                 v-model='ztdsf'
-                style='margin-right:12px'
                 v-if='status2.length>0'
                 :selectdata='status2'
                 :placeholder='"请选择"'
@@ -26,11 +25,10 @@
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
-                caption='部门'
+                caption='部门'
                 v-if='zgbm.length>0'
                 size='small'
                 v-model='bmdsf'
-                style='margin-right:12px'
                 :selectdata='zgbm'
                 :placeholder='"请选择"'
             ></Select>
@@ -38,9 +36,8 @@
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
-                caption='检测结论'
+                caption='检测结论'
                 size='small'
-                style='margin-right:12px'
                 v-if='conclusion.length>0'
                 :selectdata='conclusion'
                 :placeholder='"请选择"'

+ 13 - 6
src/views/overview/index.vue

@@ -10,7 +10,7 @@
                 <span></span>
                 <span>项目基本信息</span>
             </nav>
-            <div class='view-button'>
+            <div class='view-button' @click='findxmzl'>
                 <img src='../../assets/imgs/wd.png' alt />
                 项目资料
             </div>
@@ -192,7 +192,8 @@ export default {
             pic1: [], //区位图
             pic2: [], //鸟瞰图
             build: {}, //左下信息
-            constructions: [] //右下数组
+            constructions: [], //右下数组
+            shuzihuayijiao: ''
         }
     },
     methods: {
@@ -203,6 +204,11 @@ export default {
                 this.$refs.picModal.showModal(this.pic2)
             }
         },
+        findxmzl() {
+            if (this.shuzihuayijiao) {
+                window.open(`${this.shuzihuayijiao}`, true)
+            }
+        },
         query() {
             let params = {
                 getParams: {
@@ -213,10 +219,11 @@ export default {
             queryFact(params).then(res => {
                 if (res.result == 'success') {
                     this.loading = false
-                    this.pic1 = res.pic1
-                    this.pic2 = res.pic2
-                    this.build = res.build
-                    this.constructions = res.constructions
+                    this.pic1 = res.pic1 ? res.pic1 : []
+                    this.pic2 = res.pic2 ? res.pic2 : []
+                    this.build = res.build ? res.build : {}
+                    this.constructions = res.constructions ? res.constructions : []
+                    this.shuzihuayijiao = res.shuzihuayijiao ? res.shuzihuayijiao : ''
                 }
             })
         },

+ 2 - 2
src/views/room/detail.vue

@@ -17,7 +17,7 @@
                 style='margin-right:12px'
                 v-if='sbglgs.length>=0'
                 tipPlace='top'
-                caption='管理归属'
+                caption='管理归属'
                 @change='changeSbglgsStr'
                 size='small'
                 :selectdata='sbglgs'
@@ -27,7 +27,7 @@
                 style='margin-right:12px'
                 v-if='sb_status.length>=0'
                 tipPlace='top'
-                caption='设备状态'
+                caption='设备状态'
                 size='small'
                 @change='changeSb_status'
                 v-model='statusStr'

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

@@ -279,7 +279,7 @@
                                 width='220'
                                 tipPlace='top'
                                 v-model='statuSelect5'
-                                caption='任务状态'
+                                caption='任务状态'
                                 v-if='status.length>0'
                                 :selectdata='status'
                                 :placeholder='"请选择"'