Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

src/assets/scss/modules/visual/basicInfoMain.scss

@@ -51,21 +51,35 @@
     .div_search {
       width: 100%;
       height: 56px;
-      background: #011168;
-      border-radius: 4px;
       text-align: center;
+      background-color: #011168;
+      border-radius: 4px 0 0 4px;
+      border: none;
+      box-shadow: 0 0 10px inset #1a5afd;
+      font-size: 18px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #ffffff;
+      opacity: 0.7;
       display: flex;
-      justify-content: flex-end;
+      justify-content: space-between;
-
+      .div_search_left {
-      .icon {
         display: flex;
-        align-items: center;
+        justify-content: flex-start;
-        margin-left: 29px;
+        .icon {
-        margin-top: 16px;
+          display: flex;
+          align-items: center;
+          margin-left: 29px;
+
+          > img {
+            width: 24px;
+            height: 24px;
+          }
+        }
 
-        > img {
+        > span {
-          width: 24px;
+          line-height: 56px;
-          height: 24px;
+          margin-left: 10px;
         }
       }
 
@@ -83,6 +97,10 @@
       }
     }
 
+    .div_search:hover {
+      cursor: pointer;
+    }
+
     .div_info {
       box-sizing: border-box;
       width: 100%;

src/views/modules/base/community/buildForm.vue

@@ -168,13 +168,16 @@ export default {
       this.dataForm.gridId = agencyObj.gridId
       this.dataForm.neighborHoodId = agencyObj.id
 
-      map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
       this.formType = type
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.buildingId = this.dataForm.buildingId
         this.buildType = this.dataForm.buildingTypeKey
+
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+      } else {
+        map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
       }
 
 

src/views/modules/base/community/communityForm.vue

@@ -277,14 +277,16 @@ export default {
     async initForm (type, row, agencyObj) {
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
-      // debugger
-      map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
 
       this.formType = type
       if (row) {
-
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.neighborHoodId = this.dataForm.neighborHoodId
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+
+      } else {
+        map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
       }
 
 

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -11,11 +11,11 @@
         <el-select v-model="selBuildingId"
                    :popper-append-to-body="false"
                    placeholder="请选择">
-          <el-option v-for="item in buildingArray"
+          <el-option v-for="(item,index) in buildingArray"
                      :key="item.buildingId"
                      :label="item.buildingName"
                      :value="item.buildingId"
-                     @click="handleClickBuilding(index)">
+                     @click.native="handleClickBuilding(index)">
           </el-option>
         </el-select>
       </div>
@@ -393,10 +393,14 @@ export default {
     },
 
     //切换楼栋
-    handleClickBuilding (index) {
+    async handleClickBuilding (index) {
+
       this.selBuildingId = this.buildingArray[index].buildingId
       this.selBuildingName = this.buildingArray[index].buildingName
 
+      await this.loadRoom()
+      this.roomLoaded = true
+
       this.$emit('refreshInfoList', this.selBuildingId, 'building')
     },
     //选择房间

src/views/modules/visual/basicinfo/basicInfoMain.vue

@@ -38,20 +38,18 @@
       </div>
 
       <div class="div_data">
-        <div class="div_search">
+        <div @click="handleSearch"
-          <el-input size="mini"
+             class="div_search">
-                    @focus="handleSearch"
+          <div class="div_search_left">
-                    WarningColor='warning'
-                    placeholder="请输入姓名">
             <i slot="prefix"
                class="icon">
               <img src="../../../../assets/img/modules/visual/sousuo.png"
                    alt />
             </i>
-          </el-input>
+            <span>请输入姓名</span>
+          </div>
 
-          <div class="btn"
+          <div class="btn">搜索</div>
-               @click="handleSearch">搜索</div>
 
         </div>
 
@@ -291,11 +289,12 @@ const vueGis = {
 
     //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）   search 点击搜索  people 点击详情
     async toSubAgency (type, e, searchName) {
-      //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
+      console.log(e)
       this.runNum++
       this.runAgencyArray.push(this.orgData)
-
+      //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
       if (type === 'people') {
+
         this.orgLevel = 'people'
         this.selUserId = e
         this.orgId = ''
@@ -307,6 +306,8 @@ const vueGis = {
         this.searchName = searchName
 
       } else if (type === 'search') {
+
+
         this.orgLevel = 'search'
         this.orgId = ''
         this.orgData = {
@@ -320,7 +321,8 @@ const vueGis = {
 
       } else {
         this.subAgencyArray.forEach(item => {
-          if (item.id === e.selected[0].id_) {
+
+          if (item.id === e.selected[0].values_.id) {
             this.orgId = item.id
             this.orgLevel = item.level
             this.orgData = item
@@ -338,6 +340,7 @@ const vueGis = {
         } else {
           this.refreshMap(true)
         }
+
       }
 
 
@@ -365,7 +368,6 @@ const vueGis = {
 
     //返回所选组织
     handleClickAgency (index) {
-
       const cutNum = this.runAgencyArray.length - index//要减去的长度
       this.runNum = this.runNum - cutNum
       this.orgData = this.runAgencyArray[index]
@@ -379,10 +381,8 @@ const vueGis = {
 
       if (this.orgLevel === 'people') {
 
-
       } else if (this.orgLevel === 'search') {
         this.$nextTick(() => {
-
           this.$refs.ref_search.loadByName(this.searchName);
         });
 
@@ -430,7 +430,8 @@ const vueGis = {
 
     //加载当前园区的标注
     loadPolygon (subAgencyArray) {
-      polygonSource.clear()//清空变电站标注
+      polygonSource.clear()//清空多边形标注
+      iconSource.clear()//清空多边形标注
 
       let featureData = []//标注数据
       if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注
@@ -473,9 +474,7 @@ const vueGis = {
             oneData.geometry.coordinates.push(polygonArray)
             featureData.push(oneData)
           }
-
         });
-
       }
 
       if (featureData && featureData.length > 0) {
@@ -489,6 +488,7 @@ const vueGis = {
 
         let iconFeatures = [];
         feature.forEach(oneIcon => {
+
           var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
           // var center = getCenter(extent);   //获取边界区域的中心位置
           //添加标注
@@ -497,19 +497,17 @@ const vueGis = {
 
           let oneArray = [x, y]
           this.iconCoordinators.push(oneArray)
-
+          // debugger
           //视频监控样式
           let oneCctv = new Feature({
             geometry: new Point([x, y]),
-            id: oneIcon.id,
+            id: oneIcon.id_,
             properties: {
               type: "icon",
-              id: oneIcon.id
+              id: oneIcon.id_
             }
           });
 
-          console.log(oneIcon.values_)
-
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],
@@ -525,9 +523,7 @@ const vueGis = {
           iconFeatures.push(oneCctv);
 
         });
-        console.log(iconFeatures)
 
-        iconSource.clear(); //清空cctyv标注
         iconSource.addFeatures(iconFeatures);
       }
 
@@ -591,7 +587,7 @@ const vueGis = {
       })
 
       map.on('singleclick', function (e) {
-        console.log(e.coordinate)
+        // console.log(e.coordinate)
         // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
       })
 
@@ -745,19 +741,7 @@ export default vueGis;
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-.el-input__inner[WarningColor="warning"] {
+
-  background-color: #011168;
-  border-radius: 4px 0 0 4px;
-  height: 56px;
-  border: none;
-  box-shadow: 0 0 10px inset #1a5afd;
-  padding-left: 70px;
-  font-size: 18px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #ffffff;
-  opacity: 0.7;
-}
 .el-scrollbar__wrap {
   overflow-x: hidden !important;
 }

src/views/modules/workSys/mapConfig.vue

@@ -4,7 +4,7 @@
     <div class="div_search">
 
       <el-select v-model="selAgencyId"
-                 placeholder="无下级组织">
+                 placeholder="请选择或点击区域选择">
         <el-option @click.native="orgChange(index)"
                    v-for="(item,index) in subAgencyArray"
                    :key="item.id"
@@ -12,7 +12,7 @@
                    :value="item.id">
         </el-option>
       </el-select>
-      <div v-if="subAgencyArray.length>0">
+      <div v-if="selAgencyId && subAgencyArray.length>0">
         <el-button v-if="showBtn&&!hasPolygon"
                    style="margin-left:10px"
                    type="primary"
@@ -198,7 +198,7 @@ const vueGis = {
       await this.loadOrgData()
 
       //加载当前园区的标注
-      await this.loadPolygon(this.subAgencyArray)
+      this.loadPolygon(this.subAgencyArray)
 
       //重置地图中心点
       if (isRefreshView) {
@@ -210,7 +210,7 @@ const vueGis = {
 
     //返回上一级组织
     handleBack () {
-
+      this.selAgencyId = ''
       this.runNum--
       this.runAgency.pop()
       if (this.runNum === 0) {
@@ -241,14 +241,15 @@ const vueGis = {
         this.subAgencyArray = []
         if (this.runNum === 0) {//第一次进入，绘制本级
           this.subAgencyArray.push(data)
-          this.selAgencyId = data.id
+          // this.selAgencyId = data.id
         } else {
+
           if (data.children && data.children.length > 0) {
             this.subAgencyArray = data.children
-            this.selAgencyId = this.subAgencyArray[0].id
+            // this.selAgencyId = this.subAgencyArray[0].id
           } else {
             this.subAgencyArray = []
-            this.selAgencyId = ''
+            // this.selAgencyId = ''
           }
         }
 
@@ -300,9 +301,7 @@ const vueGis = {
             oneData.geometry.coordinates.push(polygonArray)
             featureData.push(oneData)
           }
-
         });
-
       }
 
       if (featureData && featureData.length > 0) {
@@ -320,23 +319,26 @@ const vueGis = {
     //选择feature
     selectFeature (e) {
 
-      if (this.method === undefined || this.method === '') {
+      if (e.selected.length > 0) {
-        this.selAgencyId = e.selected[0].id_
+        console.log("selectFeature22222222222222222222222")
-        this.subAgencyArray.forEach((element, index) => {
+        if (this.method === undefined || this.method === '') {
-          if (element.id === e.selected[0].id_) {
+          this.selAgencyId = e.selected[0].id_
-            this.selAgencyIndex = index
+          this.subAgencyArray.forEach((element, index) => {
-            this.orgChange(index)
+            if (element.id === e.selected[0].id_) {
-          }
+              this.selAgencyIndex = index
+              this.orgChange(index)
+            }
 
-        });
+          });
+        }
       }
 
-
     },
     //下钻到下一级
     toSubAgency (e) {
 
       if (this.method != 'mAddPolygon' && this.level != 'neighborHood') {
+        this.selAgencyId = ''
         //下钻到下一级
         this.subAgencyArray.forEach(item => {
           if (item.id === e.selected[0].id_) {
@@ -359,10 +361,12 @@ const vueGis = {
 
     //高亮某个标注
     highlightPolygon () {
+
       let features = polygonSource.getFeatures()
       features.forEach(element => {
 
         if (element.id_ === this.selAgencyId) {
+
           selectedFeatures.push(element)
         }
       });
@@ -383,11 +387,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 14
+        this.zoom = 13
       } else if (agencyLevel === 'street') {
-        this.zoom = 15
+        this.zoom = 14
       } else if (agencyLevel === 'community') {
-        this.zoom = 16
+        this.zoom = 15
       }
 
     },

src/views/modules/workSys/resiCate.vue

@@ -2,35 +2,43 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-select
+        <el-form :inline="true" :model="form" class="demo-form-inline">
-        v-model="value"
+          <el-form-item label="是否预警">
-          placeholder="请选择"
+            <el-select
-          size="small"
+              v-model="isWarn"
-          clearable
+              placeholder="请选择"
-        >
+              size="small"
-          <el-option
+              clearable
-            v-for="item in options"
+            >
-            :key="item.value"
+              <el-option
-            :label="item.label"
+                v-for="item in options"
-            :value="item.value"
+                :key="item.value"
-          >
+                :label="item.label"
-          </el-option>
+                :value="item.value"
-        </el-select>
+              >
-        <el-select
+                </el-option>
-        v-model="value"
+            </el-select>
-          placeholder="请选择"
+          </el-form-item>
-          size="small"
+          <el-form-item label="预警类型">
-          clearable
+            <el-select
-        >
+              v-model="level"
-          <el-option
+              placeholder="请选择"
-            v-for="item in options"
+              size="small"
-            :key="item.value"
+              clearable
-            :label="item.label"
+            >
-            :value="item.value"
+              <el-option
-          >
+                v-for="item in optionsType"
-          </el-option>
+                :key="item.value"
-        </el-select>
+                :label="item.label"
-        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+                :value="item.value"
+              >
+                </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <el-table
         :data="tableData"
@@ -150,10 +158,10 @@
           <el-switch v-model="form.warn"></el-switch>
         </el-form-item>
         <el-form-item label="黄色预警">
-          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字" @change="handleLevelChange"></el-input-number> 人/楼宇
         </el-form-item>
         <el-form-item label="红色预警">
-          <el-input-number v-model="form.level2" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level2" :min="form.level1" size="small" label="描述文字" ></el-input-number> 人/楼宇
         </el-form-item>
       </el-form>
       <div class="resi-btns">
@@ -188,13 +196,23 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
-      value: '',
+      isWarn: null,
+      level: null,
       options: [
         {
           label: '是',
           value: 1
         },{
           label: '否',
+          value: 0
+        }
+      ],
+      optionsType: [
+        {
+          label: '黄色预警',
+          value: 1
+        },{
+          label: '红色预警',
           value: 2
         }
       ],
@@ -246,8 +264,9 @@ export default {
         managementIcon: '',
         houseShowIcon: '',
         warn: '',
-        level1: '',
+        level1: 0,
-        level2: ''
+        level2: 0,
+        level3: 0
       },
       rules: {
         managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
@@ -311,6 +330,9 @@ export default {
       this.conditions = val
       this.getTableData()
     },
+    handleLevelChange(val) {
+      if (val > this.form.level2) this.form.level2 = val
+    },
     
     handlerCancle() {
       this.dialogVisible = false
@@ -362,12 +384,21 @@ export default {
     },
     async handleEdit(row) {
       
-      this.form = { ...row }
+      this.form = { 
+        ...row, 
+        warn: row.warn == '1' ? true : false, 
+        level1: row.level1 || 0, 
+        level2: row.level2 || 0,
+        level3: row.level3 || 0 
+      }
       this.dialogVisible = true
     },
     async handleSUbmit() {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
+          if (this.form.warn) {
+            if (!this.form.level1) return this.$message.error('黄色预警不能为0')
+          }
           this.btnLoading = true
           const _form = {
             ...this.form,
@@ -458,6 +489,8 @@ export default {
       this.tableLoading = true
       let params = {
         // formCode: 'resi_base_info',
+        isWarn: this.isWarn,
+        level: this.level,
         pageNo: this.currentPage,
         pageSize: this.pageSize
       }