Prechádzať zdrojové kódy

竖井台账业务空间样式调整

LXXXY 5 rokov pred
rodič
commit
3cd5b79731

+ 2 - 14
src/components/data_admin/zoneInput.vue

@@ -34,20 +34,16 @@ export default {
     labelWidth: {
       default: "130px",
       type: String
-    },
-    inputList: {
-      type: Array,
-      default: []
     }
   },
   created() {
   },
   methods: {
     //初始化
-    init() {
+    init(val) {
       this.inputTypeList = {};
       this.inputData = [];
-      this.inputData = this.inputList.concat()
+      this.inputData = val.concat()
       this.filterInput();
       this.inputGroup();
     },
@@ -121,14 +117,6 @@ export default {
       }
       return f;
     }
-  },
-  watch: {
-    "inputList.length": {
-      handler() {
-        this.init();
-      },
-      immediate: true
-    }
   }
 }
 </script>

+ 4 - 3
src/views/data_admin/buildGraphy/createPointZone.vue

@@ -30,8 +30,8 @@
           <i style="cursor: pointer;" :class="showEx"
             @click="showEx = (showEx == 'el-icon-arrow-up' ? 'el-icon-arrow-down' : 'el-icon-arrow-up')"></i>
           <div v-show="showEx == 'el-icon-arrow-up'" v-loading="loadingOtherMsg">
-            <zoneInput v-if="otherList.length" :inputList="otherList" labelWidth="140px" ref="zoneInput"></zoneInput>
-            <p v-else>请选择业务空间类型</p>
+            <zoneInput v-show="otherList.length" :inputList="otherList" labelWidth="140px" ref="zoneInput"></zoneInput>
+            <p v-show="!otherList.length">请选择业务空间类型</p>
           </div>
         </div>
         <div class="item">
@@ -114,6 +114,7 @@ export default {
           this.RoomLocalID = ''
           this.buildFloor = []
           this.space = ''
+          this.otherList = []
         })
       }
       else if (!this.RoomLocalName) {
@@ -125,7 +126,6 @@ export default {
       else {
         this.$message("请选择业务空间类型");
       }
-      console.log(param);
     },
     //获取空间列表
     getSpaceList() {
@@ -154,6 +154,7 @@ export default {
           return filterCode.indexOf(item.InfoPointCode) == -1
         });
         this.otherList = res.Content;
+        this.$refs.zoneInput.init(this.otherList);
       })
     },
     //返回

+ 18 - 4
src/views/ledger/cenotelist/relatedSpace.vue

@@ -14,10 +14,12 @@
           <addSpaceDialog :dialogVisible.sync="dialogVisible" ref="addSpaceDialog" @refresh="refresh" :params="cenoteObj" :spaceType="spaceType"
             :floorType="floorType"></addSpaceDialog>
         </div>
-        <el-select v-model="space" placeholder="请选择业务空间" @change="changeSpace" style="margin-left:15px;">
-          <el-option v-for="item in spaceList" :key="item.Code" :label="item.Name" :value="item.Code">
-          </el-option>
-        </el-select>
+        <el-badge :is-dot="showSpaceDot">
+          <el-select v-model="space" placeholder="请选择业务空间" @change="changeSpace" style="margin-left:15px;">
+            <el-option v-for="item in spaceList" :key="item.Code" :label="item.Name" :value="item.Code">
+            </el-option>
+          </el-select>
+        </el-badge>
       </div>
       <div class="saga-build-tab">
         <el-radio-group v-model="isMyTab" @change="changeRadio" style="width: 136px;">
@@ -26,9 +28,11 @@
         </el-radio-group>
       </div>
       <div v-show="isMyTab == 1" class="data-item">
+        <el-badge :is-dot="showBuildDot">
         <el-select v-model="building" placeholder="请选择建筑" @change="changeBuilding" v-loading="buildingLoading">
           <el-option v-for="item in buildingList" :key="item.value" :label="item.BuildLocalName" :value="item.BuildID"></el-option>
         </el-select>
+        </el-badge>
         <div style="height:calc(100% - 42px);margin:10px 0 0 0;width:100%;position:relative;">
           <el-scrollbar style="height:100%;width:148px;border:1px solid rgb(201,201,201);margin:0px;float:left;">
             <div class="floor" style="width:149px;height:100%;">
@@ -75,6 +79,8 @@ export default {
       spaceType: {},//空间种类
       floorType: {},//子组件楼层信息
       buildingLoading: false,//左侧列表加载
+      showSpaceDot:false,//空间提示红点
+      showBuildDot:false,//楼层提示红点
     }
   },
   computed: {
@@ -128,6 +134,9 @@ export default {
     showDefaultSpace() {
       if (this.spaceList.length) {
         this.space = this.spaceList[0].Code;
+        if(this.spaceList.length > 1 && this.cenoteObj.onlyRead){
+          this.showSpaceDot = true;
+        }
       }
       //处理空间类型
       this.spaceList.map(item => {
@@ -185,6 +194,9 @@ export default {
         if (this.buildingObj.Floor && this.buildingObj.Floor.length) {
           this.floor = this.buildingObj.Floor[0].FloorID;
         }
+        if(this.buildingList.length > 1 && this.cenoteObj.onlyRead){
+          this.showBuildDot = true;
+        }
       }
       this.buildingList.map(item => {
         if (item.BuildID && item.BuildLocalName) {
@@ -203,6 +215,7 @@ export default {
     changeSpace(val) {
       this.space = val;
       this.loadBuildingData();
+      this.showSpaceDot = false;
     },
     //更换建筑
     changeBuilding(bid) {
@@ -214,6 +227,7 @@ export default {
           }
         }
       })
+      this.showBuildDot = false;
     },
     //更换楼层
     changeFloor(fid) {

+ 3 - 3
src/views/ledger/cenotelist/relatedSpaceList.vue

@@ -1,13 +1,13 @@
 <template>
   <div id="relatedSpaceList" style="height:100%;">
     <div class="query">
-      <el-input v-model="keyword" placeholder="请输入关键词" @keyup.enter.native="getSpaceList" style="width:240px;margin:0 0 0 10px;">
+      <el-input v-model="keyword" placeholder="请输入关键词" @keyup.enter.native="getSpaceList" style="width:240px;margin:0 0;">
         <i slot="suffix" class="el-input__icon el-icon-search" @click="getSpaceList"></i>
       </el-input>
       <el-cascader v-model="Buildfloor" :options="buildingData" @change="handleChange"></el-cascader>
     </div>
     <div class="table-area" style="height:calc(100% - 52px)">
-      <el-scrollbar style="height:calc(100% - 40px);">
+      <el-scrollbar style="height:calc(100% - 48px);">
         <el-table :data="tableData" style="width: 100%;height:100%;" v-loading="loading" :header-cell-style="headerStyle">
           <el-table-column label='业务空间建筑楼层' show-overflow-tooltip min-width="200" header-align='center' align="center">
             <template slot-scope="scope">
@@ -32,7 +32,7 @@
       </el-scrollbar>
       <!-- 分页 -->
       <el-pagination @size-change="getSpaceList" @current-change="getSpaceList" :current-page="currentPage" :page-sizes="pageSizes"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length" style="float:right;">
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length" style="float:right;padding:20px 20px 0 0;">
       </el-pagination>
     </div>
   </div>