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

src/assets/scss/modules/management/epidemic.scss

@@ -37,12 +37,15 @@
   .div_search {
     background: #ffffff;
     border-radius: 4px;
-    padding: 30px 20px 5px;
+    padding: 20px 20px 5px 5px;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   }
 
   .list_item_width_1 {
-    width: 185px;
+    width: 165px;
+  }
+  .list_item_width_2 {
+    width: 135px;
   }
 }
 

src/views/modules/base/huji/houseChange/houseChangeList.vue

@@ -4,7 +4,7 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'90px'">
+               :label-width="'80px'">
         <div>
 
           <el-form-item label="所属网格"
@@ -48,7 +48,7 @@
                              :disabled="!this.formData.neighborHoodId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeB">
                     <el-option v-for="item in optionsB"
                                :key="item.value"
@@ -63,7 +63,7 @@
                              size="small"
                              :disabled="!this.formData.buildingId"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeD">
                     <el-option v-for="item in optionsD"
                                :key="item.value"
@@ -78,7 +78,7 @@
                              :disabled="!this.formData.buildingUnitId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2">
                     <el-option v-for="item in optionsH"
                                :key="item.value"
                                :label="item.label"
@@ -305,9 +305,9 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getValiheList()
-      this.getBuildList()
+      // this.getBuildList()
-      this.getUniList()
+      // this.getUniList()
-      this.getHouseList()
+      // this.getHouseList()
     },
     handleChangeV (val) {
       console.log('val', val)
@@ -315,15 +315,15 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getBuildList()
-      this.getUniList()
+      // this.getUniList()
-      this.getHouseList()
+      // this.getHouseList()
     },
     handleChangeB (val) {
       console.log('val', val)
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getUniList()
-      this.getHouseList()
+      // this.getHouseList()
     },
     handleChangeD () {
       this.formData.houseId = ''
@@ -379,7 +379,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId })
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.buildingUnitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -462,7 +462,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+      return this.$store.state.inIframe ? this.clientHeight - 365 + this.iframeHeight : this.clientHeight - 365
 
     },
 
@@ -479,6 +479,10 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_width_1 {
+  width: 260px;
+}
 </style>
 
 

src/views/modules/base/huji/immigration/edit.vue

@@ -40,81 +40,90 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select
+          <el-input
-            v-model.trim="fmData.villageId"
+            v-if="formType == 'detail'"
-            placeholder="请选择小区"
+            class="item_width_2"
-            size="small"
+            placeholder="请输入来源地"
-            clearable
+            disabled
-            class="resi-cell-select"
+            v-model="fmData.allName"
-            @clear="handleClearVillage"
+          />
-            @change="handleChangeV"
+          <template v-else>
-            :disabled="formType === 'edit'"
+            <el-select
-            style="margin-right: 8px; width: 120px"
+              v-model.trim="fmData.villageId"
-          >
+              placeholder="请选择小区"
-            <el-option
+              size="small"
-              v-for="item in optionsV"
+              clearable
-              :key="item.value"
+              class="resi-cell-select"
-              :label="item.label"
+              @clear="handleClearVillage"
-              :value="item.value"
+              @change="handleChangeV"
+              :disabled="formType === 'edit'"
+              style="margin-right: 8px; width: 120px"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsV"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.buildId"
+                :label="item.label"
-            placeholder="楼号"
+                :value="item.value"
-            size="small"
+              >
-            clearable
+              </el-option>
-            style="margin-right: 8px; width: 120px"
+            </el-select>
-            class="resi-cell-select"
+            <el-select
-            :disabled="changeVDisabled || formType === 'edit'"
+              v-model.trim="fmData.buildId"
-            @clear="handleClearBuild"
+              placeholder="楼号"
-            @change="handleChangeB"
+              size="small"
-          >
+              clearable
-            <el-option
+              style="margin-right: 8px; width: 120px"
-              v-for="item in optionsB"
+              class="resi-cell-select"
-              :key="item.value"
+              :disabled="changeVDisabled || formType === 'edit'"
-              :label="item.label"
+              @clear="handleClearBuild"
-              :value="item.value"
+              @change="handleChangeB"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsB"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.unitId"
+                :label="item.label"
-            :disabled="changeBDisabled || formType === 'edit'"
+                :value="item.value"
-            placeholder="单元"
+              >
-            size="small"
+              </el-option>
-            clearable
+            </el-select>
-            style="margin-right: 8px; width: 120px"
+            <el-select
-            class="resi-cell-select"
+              v-model.trim="fmData.unitId"
-            @click="handleClearDan"
+              :disabled="changeBDisabled || formType === 'edit'"
-            @change="handleChangeD"
+              placeholder="单元"
-          >
+              size="small"
-            <el-option
+              clearable
-              v-for="item in optionsD"
+              style="margin-right: 8px; width: 120px"
-              :key="item.value"
+              class="resi-cell-select"
-              :label="item.label"
+              @click="handleClearDan"
-              :value="item.value"
+              @change="handleChangeD"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsD"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.homeId"
+                :label="item.label"
-            :disabled="changeDDisabled || formType === 'edit'"
+                :value="item.value"
-            placeholder="房号"
+              >
-            size="small"
+              </el-option>
-            clearable
+            </el-select>
-            @change="handleChangeH"
+            <el-select
-            style="width: 120px"
+              v-model.trim="fmData.homeId"
-            class="resi-cell-select"
+              :disabled="changeDDisabled || formType === 'edit'"
-          >
+              placeholder="房号"
-            <el-option
+              size="small"
-              v-for="item in optionsH"
+              clearable
-              :key="item.value"
+              @change="handleChangeH"
-              :label="item.label"
+              style="width: 120px"
-              :value="item.value"
+              class="resi-cell-select"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsH"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </template>
         </el-form-item>
 
         <el-form-item
@@ -256,16 +265,17 @@
           label-width="150px"
           style="display: block"
         >
-          <el-cascader ref="nowArea" class="item_width_1" :props="areaProps" 
+          <el-input
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+            v-if="formType == 'detail'"
-          <!-- <el-input
+            class="item_width_2"
-            class="item_width_1"
             placeholder="请输入来源地"
+            disabled
             v-model="fmData.sourceAddress"
-          > -->
+          />
-          </el-input>
+          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps" 
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          
         </el-form-item>
-
         <el-form-item
           label="详细地址"
           prop="address"

src/views/modules/base/huji/immigration/index.vue

@@ -292,7 +292,7 @@
         >
         </el-table-column>
 
-        <el-table-column prop="gender" align="center" width="60" label="性别">
+        <el-table-column prop="genderName" align="center" width="60" label="性别">
         </el-table-column>
 
         <el-table-column prop="age" align="center" width="60" label="年龄">

src/views/modules/visual/communityGovern/processAnalyze.vue

@@ -183,26 +183,7 @@ export default {
       status: 'pending',//状态:待处理 pending，结案closed
       agencyInfo: {},
       projectList: [],
-      projectList1: [
+
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'pending',
-          title: '南宁第二网格南宁第二网格',
-          latitude: 36.062227,
-          longitude: 120.389455,
-        },
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'closed',
-          latitude: 36.082227,
-          longitude: 120.389455,
-          title: "南宁第二网格",
-        }
-      ],
 
       iconUrlArray: [],
       iconTextStyle: {},
@@ -212,6 +193,7 @@ export default {
       customerList: [],
       iscascaderShow: 0,
 
+
       optionProps: {
         multiple: false,
         value: 'agencyId',
@@ -273,6 +255,13 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+        let treeData = []
+        console.log(this.treeData)
+        treeData.push(data)
+        //重构树，去除网格
+        let treeDataNew
+        treeDataNew = this.filterTree(treeData)
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -291,7 +280,7 @@ export default {
         this.agencyIdArray.length = []
 
         if (data) {
-          this.casOptions.push(data)
+          this.casOptions = treeDataNew
           this.agencyIdArray.push(this.agencyId)
         }
 
@@ -301,6 +290,17 @@ export default {
 
     },
 
+    //重构树，去除网格
+    filterTree (treeData) {
+
+      let newTree = treeData.filter(x => x.level !== 'grid')
+      newTree.forEach(x => x.subAgencyList && (x.subAgencyList = this.filterTree(x.subAgencyList)))
+      return newTree
+
+    },
+
+
+
     //加载项目
     async getProjectTotal () {
       if (this.$refs.pieChart) {
@@ -370,12 +370,7 @@ export default {
       if (code === 0) {
 
         this.projectList = [...data]
-        // if (this.status === 'closed') {
-        //   this.projectList = this.projectList1
-        // } else {
-        //   this.projectList = this.projectList2
 
-        // }
         this.projectList.forEach(item => {
           item.values_ = {
             name: item.title

src/views/modules/visual/communityGovern/typeAnalyze.vue

@@ -210,12 +210,14 @@ export default {
 
     // 获取当前登录人员信息及组织信息
     async getAgencylist () {
-      const url = "/gov/org/customeragency/agencygridtree";
+      // const url = "/gov/org/customeragency/agencygridtree";
+      const url = '/gov/org/customeragency/agencylist'
 
       let params = {};
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -389,7 +391,7 @@ export default {
     },
 
     async handleChangeAgency (value) {
-
+      this.demand.list = []
       this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
       this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
       await this.getPieChart()