Merge branch 'fax' into dev

src/assets/scss/modules/index.scss

@@ -46,7 +46,7 @@
     position: relative;
     // position: fixed; 
     padding-left: 14px;
-    height: 16px;
+    height: 30px;
     margin-right: 10px;
     font-size: 15px;
     z-index: 1;
@@ -109,12 +109,13 @@
     }
 
     .header {
+        padding: 4px 0;
         font-size: 15px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: rgba(0, 0, 0, 0.85);
         line-height: 17px;
-        margin-top: 16px;
+        margin-top: 10px;
         margin-left: 10px;
 
         >img {
@@ -127,7 +128,7 @@
 
     .newqsa {
         border-left: 4px solid #2683DB;
-        height: 100%;
+        height: 70%;
         // width: 4px;
         margin-left: -10px;
         padding-left: 8px;
@@ -154,26 +155,28 @@
 
 .m-search {
     box-sizing: border-box;
-    padding: 0px 16px;
+    padding: 40px 80px;
     margin-bottom: 10px;
-    height: 220px;
+    height: 200px;
-    display: flex;
-    flex-direction: column;
     // background-image: url("../../images/index/chaxun-bg.png");
     background-size: cover;
     position: relative;
 
     .wrap {
-       
+        position: absolute;
+        top: 0;
+        left: 0;
         width: 100%;
     }
 
     .mewq {
         // background-color: #333;
-        margin-top: 24px;
         width: inherit;
+        margin-left: -69px;
         height: 64px;
+        margin-top: 85px;
         box-sizing: border-box;
+        margin-right: -68px;
         display: grid;
         grid-template-columns: repeat(7, 1fr);
         gap: 5px;
@@ -246,12 +249,13 @@
         margin-top: 15px;
         display: flex;
         align-items: center;
+        margin-left: 10px;
 
         .search-input {
             position: relative;
             left: 0;
             right: 0;
-            width: 100%;
+            width: 98%;
             height: 48px;
             background: #ffffff;
             border-radius: 4px;
@@ -349,7 +353,7 @@
     overflow: hidden;
 
     .flex_box {
-        height: 100%;
+        height: calc(100% - 30px);
         width: 100%;
         overflow: hidden;
         display: flex;
@@ -558,9 +562,8 @@
 }
 
 .m-tb {
-    height: 238px;
+    height: 260px;
-    display: flex;
+
-    flex-direction: column;
     .cnt {
         box-sizing: border-box;
         margin-top: 20px;
@@ -671,6 +674,4 @@
 
 .update-settings {
     margin-right: 25px;
-    display: flex;
-    align-items: center;
 }

src/components/GridTree/nodeWrap.vue

@@ -35,7 +35,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'">
-                    <div @click="gotoPersonnel(item)" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item)" :class="[ item.id === '1704434839867420673'?'dyzxhYellow':'dyzxhGreen']" :title="item.organizationName">
                       <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
                       {{ item.organizationName }}
                     </div>
@@ -62,7 +62,6 @@
   </div>
 </template>
 <script>
-import { requestGet } from "@/js/dai/request";
 export default {
   props: ["nodeConfig"],
   data() {
@@ -109,29 +108,8 @@ export default {
         }
       }
     },
-   async getChildrenData(item, idx, arr) {
+    getChildrenData(item, idx, arr) {
-      if(item.level === "building_chief"){
+      arr.forEach((element, index) => {
-        let url = '/gov/org/organizational/neighborhood/getUnitGridOrgTreeList'
-        let parm = {
-          bulidingId:item.id
-        }
-        const {data,code,msg} = await requestGet(url,parm)
-        if(code === 0){
-          arr.forEach((element, index) => {
-        if (index === idx) {
-          if (element.children) {
-            element._children = data;
-            element.children = null;
-          } else {
-            element.children = data;
-          }
-        } else {
-          element.children = null;
-        }
-      });
-        }
-      }else{
-        arr.forEach((element, index) => {
         if (index === idx) {
           if (element.children) {
             element._children = element.children;
@@ -143,7 +121,6 @@ export default {
           element.children = null;
         }
       });
-      }
     },
     gotoPersonnel(item) {
       const grandPid = this.findParentParentId(this.nodeConfig, item.pid);

src/components/JwTree/nodeWrap.vue

@@ -18,29 +18,28 @@
                 <div class="auto-judge">
                   <div v-if="getOnerSixLevelFlag(item)">
                     <div :class="[item.children && item.children.length > 0 ? 'wgdzbHover' : 'wgdzb']">
-                      <nameSplit :item="item" areaName="organizationName" peopleName="name" />
+                      <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
                     </div>
-                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if=" item.zkFlag" :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
                   <div v-if="item.level === 'building_chief'">
                     <div :class="[item.children && item.children.length > 0 ? 'lydxzHover' : 'lydxz']">
-                      <nameSplit :item="item" areaName="organizationName" peopleName="name" />
+                      <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
                     </div>
-                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if=" item.zkFlag " :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
-                  <div v-if="item.level === 'unit_chief'|| item.level === 'public_welfare_post'">
+                  <div v-if="item.level === 'unit_chief' || item.level === 'public_welfare_post'">
-                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" :class="[item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh', 'gotoDesc']" :title="item.organizationName">
-                      <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
+                      {{ spliceNameFun(item.organizationName, 3) }}
-                      {{ item.organizationName }}
                     </div>
-                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if=" item.zkFlag" :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
@@ -62,7 +61,6 @@
   </div>
 </template>
 <script>
-import { requestGet } from "@/js/dai/request";
 export default {
   props: ["nodeConfig"],
   data() {
@@ -71,9 +69,7 @@ export default {
       sixLevelArr: ["province", "city", "district", "street", "community", "grid_manager"],
     };
   },
-  mounted() {
+  mounted() {},
-   
-  },
   computed: {},
   watch: {},
   methods: {
@@ -88,54 +84,19 @@ export default {
       return this.sixLevelArr.includes(item.level);
     },
 
-    async getChildrenData(item, idx, arr) {
+    getChildrenData(item, idx, arr) {
-      if(item.level != "street"){
+      arr.forEach((element, index) => {
-        let url = '/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeListByLevel'
-        let parm = {
-          orgId:item.id,
-          level:item.level
-        }
-        const {data,code,msg} = await requestGet(url,parm)
-        if(code === 0){
-          this.$EventBus.$emit('handelClickJWNode',data)
-          data.forEach(item=>{
-            item.zkFlag = !item.childCount>0
-            item.children = null
-          })
-          arr.forEach((element, index) => {
-          if (index === idx) {
-            if (element.children) {
-              console.log(item);
-              element.zkFlag = false;
-              element.children = null;
-            } else {
-              element.zkFlag = true;
-              element.children = data;
-            }
-          } else {
-            element.children = null;
-            element.zkFlag = false;
-          }
-        });
-        }
-      }else{
-        arr.forEach((element, index) => {
         if (index === idx) {
           if (element.children) {
-            element.zkFlag = false;
+            element._children = element.children;
-            element._children = element.children
             element.children = null;
           } else {
-            element.zkFlag = true;
             element.children = element._children;
           }
         } else {
           element.children = null;
-          element.zkFlag = false;
         }
       });
-      }
-  
     },
 
     gotoPersonnel(id, name) {

src/components/NameSplit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="node-com">
-    <div v-if="!flag" class="nodeTitle" >{{ getAllName(item[areaName]) }}</div>
+    <div v-if="!flag" class="nodeTitle" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 7) }}</div>
     <div class="name_more peoName" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
     <div class="name_more" v-if="item[peopleName] && item[peopleName].includes(',')">
       <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId.split(',')[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>

src/views/components/editResi.vue

@@ -828,10 +828,6 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" destroy-on-close width="1028px">
-            <add-expand ref="addExpand" @submitExpand="submitExpandAdd" @hideExpand="hideExpand"
-                :operationType="'add'"></add-expand>
-        </el-dialog>
     </div>
   </div>
 </template>
@@ -856,14 +852,11 @@ import {
 } from "@/js/columns/constants";
 import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
 import resiExpand from "./resiExpand/editExpand.vue";
-import addExpand from "./resiExpand/index.vue";
-
 export default {
   data() {
     return {
       loading: false,
-      dialogTitle:null,
+
-      dialogVisible:false,
       houseType: true,
       formList: [],
       orgOptions: [],
@@ -1655,7 +1648,7 @@ export default {
                   key === "partyFlag")
               ) {
                 const formId = key === "partyFlag" ? "parymemberInfoDto" : key;
-                this.loadExpand({ index: key, value: formId }, true);
+                this.showDialog({ index: key, value: formId }, true);
                 for (let i in this.footerInputList) {
                   const incidenceFormId = this.incidence[formId].formId;
                   if (this.footerInputList[i].id === incidenceFormId) {
@@ -2093,7 +2086,7 @@ export default {
       }
     },
 
-    loadExpand({ index, value }, event,) {
+    showDialog({ index, value }, event) {
       // 设置 partyFlag
       if (value === 1 || value === 0 || value === 2) {
         this.form.baseInfoDto.categoryInfo.partyFlag = value;
@@ -2164,83 +2157,7 @@ export default {
         }
       }
     },
-    showDialog({ index, value }, event) {
-            if (value === 1) {
-                value = 'parymemberInfoDto'
-                this.form.baseInfoDto.categoryInfo.partyFlag = 1;
-            } else if (value === 0) {
-                value = 'parymemberInfoDto'
-                this.form.baseInfoDto.categoryInfo.partyFlag = 0;
-            } else if (value === 2) {
-                value = 'parymemberInfoDto'
-                this.form.baseInfoDto.categoryInfo.partyFlag = 2;
-            }
-            if (index != 3 && index) {
-                this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
-
-            } else if (index == 3) {
-                if (event) {
-                    this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
-                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
-                        this.form.baseInfoDto.categoryInfo[value] = 1
-                    }
-                    this.form.specialDto.specialCategoryCodes.push(value);
-                } else {
-                    this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value);
-                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
-                        this.form.baseInfoDto.categoryInfo[value] = 0
-                    }
-                }
-            }
-            const map = {
-                'parymemberInfoDto': { formId: 'parymemberInfoDto', formType: 'parymemberInfoDto', title: '党员信息' },
-                'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
-                'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
-                'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
-                'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
-                'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
-                'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
-                'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
-                'ensureHouseFlag': { formId: 'ensureHouseDto', formType: 'ensureHouseDto', title: '保障性住房信息' },
-                'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
-                'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
-                'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
-            };
-      if (map[value] && event == true) {
-        this.dialogTitle = map[value].title;
-        this.dialogVisible = (event == true || value == "parymemberInfoDto") && this.dialogTitle != "";
-          this.$nextTick(() => {
-            this.$refs["addExpand"].formList = [
-              this.footerInputList.find((item) => item.id === map[value].formId),
-            ];
-            this.$refs["addExpand"].formType = map[value].formType;
-            this.$refs["addExpand"].showForm();
-          });
-      }else{
-        this.$refs["resiExpand"].formList = this.$refs[
-            "resiExpand"
-          ].formList.filter(
-            (item) => item.formId !== this.incidence[value].formId
-          );
 
-          this.footerInputList.forEach((item) => {
-            if (item.id === this.incidence[value].formId) {
-              item.children.forEach((child) => {
-                child.value = child.itemType === "checkbox" ? [] : null;
-              });
-            }
-          });
-          delete this.form[this.incidence[value].formType];
-      }
-    },
-    submitExpandAdd(form, formType) {
-      this.form[formType] = form[formType];
-      this.dialogVisible = false;
-    },
-    hideExpand(formType) {
-      delete this.form[formType];
-      this.dialogVisible = false;
-    },
     // 提交扩展信息
     submitExpand(_form, { changId, changPid, changType }) {
       if (changType == "checkbox") {
@@ -2268,7 +2185,7 @@ export default {
       }
     },
   },
-  components: { stafftag, resiExpand ,addExpand},
+  components: { stafftag, resiExpand },
   computed: {},
   watch: {},
 };

src/views/components/resiExpand/editExpand.vue

@@ -70,7 +70,6 @@
                                 <el-cascader v-model.trim="form[itemj.id].partyOrgId" :props="casProps"
                                     :options="itemk.opction" class="list_item_width_1" clearable size="small"
                                     @change="handlePartyOrgCascadarChange" ></el-cascader>
-                                    <!-- {{form[itemj.id].partyOrgId}} -->
                             </template>
 
                             <template v-else-if="itemk.itemType == 'number'">
@@ -96,7 +95,6 @@ export default {
         return {
             formType: null,
             formList: [],
-            treeCheckKeyList:[],
             form: {
                 // 党员信息
                 parymemberInfoDto: {
@@ -190,12 +188,21 @@ export default {
                 lazyLoad: (node, resolve) => {
                     this.handleNextOrgTreeClick(node, resolve)
                 },
+                isLeaf: (data, node) => {
+                    console.log(data);
+                    //根据后台返回的数据判断是否还有下级 是否显示箭头图标
+                    //el-tree懒加载无子级数据时去掉下拉箭头
+                    if (data.partyOrgLevel == 7 || data.childrenQty == 0) {
+                        return true
+                    }
+                },
                 checkStrictly: true,
                 multiple: false,
             },
             changId:null,
             changPid:null,
             changType:null,
+            partyOrgIdPath:null
         };
     },
     props: {
@@ -237,8 +244,9 @@ export default {
                             if (item.itemType == 'checkbox') {
                                 this.form[item.pformName][item.formName] = item.value || []
                             } else if (item.itemType == 'cascader1' && item.orgPath) {
+                                this.partyOrgIdPath = item.orgPath.split(':')[0]
                                 await this.getOrgTree()
-                                this.form[item.pformName][item.formName] = item.orgPath.split(':') || null
+                                this.form[item.pformName][item.formName] = item.value || null
                             } else{
                                 this.form[item.pformName][item.formName] = item.value != null?item.value:null;
                             }
@@ -281,7 +289,7 @@ export default {
             await this.getTreeChildenList(node, resolve)
         },
         async getTreeChildenList(node, resolve) {
-            if (node.data.partyOrgLevel == 7) {
+            if (node.data.partyOrgLevel <= 8) {
                 resolve(null);
                 return;
             }

src/views/components/resiSearch.vue

@@ -19,15 +19,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关注人群">
-          <el-cascader
+          <el-select v-model.trim="form.attentionCrowds" collapse-tags multiple class="u-item-width-normal" clearable
-          size="small"
+            size="small">
-          class="u-item-width-normal"
+            <template v-for="item in resiClass">
-          v-model.trim="form.attentionCrowds" 
+              <el-option :label='item.label' :value='item.value'> </el-option>
-          :options="resiClass"
+            </template>
-          :props="{ multiple: true,checkStrictly: true}"
+          </el-select>
-          collapse-tags
-          clearable
-          ></el-cascader>
         </el-form-item>
         <el-form-item label="特殊人群">
           <el-select v-model.trim="form.specialCategoryCodes" class="u-item-width-normal" clearable size="small" collapse-tags
@@ -271,55 +268,7 @@ export default {
       nation: [],
       nationalityList: [],
       household: [],
-      resiClass: [
+      resiClass: [],
-   
-    {
-        "label": "老年人",
-        "value": "OLD_PEOPLE_FLAG",
-        "children": [
-        {
-        "label": "失能老人",
-        "value": "DISABLED_FLAG",
-        "children": null
-    }, {
-        "label": "空巢老人",
-        "value": "EMPTY_NESTER_FLAG",
-        "children": null
-    },
-    {
-        "label": "失智老人",
-        "value": "DEMENTED_FLAG",
-        "children": null
-    },
-        ]
-    },
-    {
-        "label": "低保人员",
-        "value": "SUBSISTENCE_ALLOWANCE_FLAG",
-        "children": null
-    },
-   
-    {
-        "label": "保障房人员",
-        "value": "ENSURE_HOUSE_FLAG",
-        "children": null
-    },
-    {
-        "label": "退役军人",
-        "value": "VETERAN_FLAG",
-        "children": null
-    },
-    {
-        "label": "育龄妇女",
-        "value": "FERTILE_WOMAN_FLAG",
-        "children": null
-    },
-    {
-        "label": "特扶人员",
-        "value": "SPECIAL_SUPPORT_FLAG",
-        "children": null
-    }
-],
       itemList,
       fixedList: [],
       constForm,
@@ -653,12 +602,12 @@ export default {
     this.getValiheList()
     this.getDictList()
     this.getHousehold()
+    this.getResident()
     this.getNationality()
     this.getCareerStatus()
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
- 
     handleSmartSearch() {
       this.showSmartSearchForm = !this.showSmartSearchForm
     },
@@ -1048,7 +997,14 @@ export default {
         console.log(error, '获取人户状况字典');
       }
     },
-  
+    async getResident() {
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'attention_crowd' })
+        this.resiClass = data.data
+      } catch (error) {
+        console.log(error, '获取居民类别字典');
+      }
+    },
     computedBirth(age) {
       let now = new Date();
       let nowYear = now.getFullYear();

src/views/dataBoard/cpts/details/jmxq.vue

@@ -190,7 +190,7 @@ export default {
 }
 
 .eventWrap {
-  // width: 1094px;
+  width: 1094px;
   height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/smyd.vue

@@ -207,7 +207,7 @@ export default {
 }
 
 .eventWrap {
-  // width: 1094px;
+  width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/xqwmz.vue

@@ -291,7 +291,7 @@ export default {
 }
 
 .eventWrap {
-  // width: 1094px;
+  width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/yxwxfw.vue

@@ -30,8 +30,7 @@
             </div>
             <div class="eventItem">
               <span>所属组织：</span>
-              <span v-if="formData.gridIdList &&formData.gridIdList.length!=0 ">{{ formData.gridIdList[0].objectName }}</span>
+              <span>{{ formData.principalName }}</span>
-              <span v-else> -- </span>
             </div>
             <div class="eventItem">
               <span>服务类型：</span>
@@ -100,7 +99,7 @@ export default {
       item: {},
       loading: false,
       loading1: false,
-      // activities: [],
+      activities: [],
       zuziTypes: {
         community_org: "社区自组织",
         ic_user_volunteer: "志愿者",
@@ -181,16 +180,16 @@ export default {
             this.$message.error(msg);
           }
         });
-      // this.$http
+      this.$http
-      //   .post("/governance/icEvent/process", { icEventId: id })
+        .post("/governance/icEvent/process", { icEventId: id })
-      //   .then((res) => {
+        .then((res) => {
-      //     const { code, data, msg } = res.data;
+          const { code, data, msg } = res.data;
-      //     if (code === 0) {
+          if (code === 0) {
-      //       this.activities = data;
+            this.activities = data;
-      //     } else {
+          } else {
-      //       this.$message.error(msg);
+            this.$message.error(msg);
-      //     }
+          }
-      //   });
+        });
     },
   },
 };
@@ -226,6 +225,7 @@ export default {
   font-size: 14px !important;
 }
 .eventWrap {
+  width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/event-details.vue

@@ -221,10 +221,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    formType: {
-      type: String,
-      default: false,
-    },
   },
 
   data() {
@@ -271,7 +267,7 @@ export default {
     getDetailsData(id) {
       this.loading = true;
       this.$http
-          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/detail`, {icEventId: id})
+          .post("/governance/icEvent/detail", {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {
@@ -283,9 +279,10 @@ export default {
             }
           });
     },
+
     getProcessData(id) {
       this.$http
-          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/process`, {icEventId: id})
+          .post("/governance/icEvent/process", {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {

src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue

@@ -17,7 +17,7 @@
       <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
       <div style="color: #fff">暂无数据</div>
     </div>
-    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" :formType="'12345'" />
+    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" />
     <Pagination
       v-show="total > 0"
       :total="total"

src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue

@@ -23,7 +23,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <eventDetails :showDialog="showDialog" :formType="'event'" :id="this.rowId" @close="close" />
+    <eventDetails :showDialog="showDialog" :id="this.rowId" @close="close" />
   </div>
 </template>
 
@@ -45,7 +45,6 @@ export default {
       total: 0,
       rowId: null,
       showDialog: false,
-      
     };
   },
   created() {},

src/views/dataBoard/organizational/index.vue

@@ -42,15 +42,424 @@ export default {
           path: "/organizational/jwTree",
         },
         {
-          name: "网格架构",
+          name: "微网格治理",
           key: "3",
           path: "/organizational/gridTree",
         },
       ],
-      cardList: [],
+      cardList: [
+        {
+          title: "社区党委",
+          key: "1",
+          name: "南昌路社区党委 （党委书记：解书记）",
+          children: [
+            {
+              title: "网格党支部",
+              name: "第一网格党支部(支部书记：王艺发)",
+              key: "1",
+              children: [
+                {
+                  title: "楼院党小组",
+                  name: "第一楼院党小组 （组长：韩文国）",
+                  key: "1",
+                },
+                {
+                  title: "楼院党小组",
+                  name: "第二楼院党小组 （组长：褚丽兰）",
+                  key: "2",
+                },
+              ],
+            },
+            {
+              title: "网格党支部",
+              name: "第二网格党支部 （支部书记：尤芬紫）",
+              key: "2",
+              children: [
+                {
+                  title: "楼院党小组",
+                  name: "第一楼院党小组 （组长：韩文国）",
+                  key: "1",
+                },
+                {
+                  title: "楼院党小组",
+                  name: "第二楼院党小组 （组长：褚丽兰）",
+                  key: "2",
+                },
+              ],
+            },
+            {
+              title: "网格党支部",
+              name: "第三网格党支部 （支部书记：凤桥强）",
+              key: "3",
+              children: [
+                {
+                  title: "楼院党小组",
+                  name: "第一楼院党小组 （组长：韩文国）",
+                  key: "1",
+                },
+                {
+                  title: "楼院党小组",
+                  name: "第二楼院党小组 （组长：褚丽兰）",
+                  key: "2",
+                },
+                {
+                  title: "楼院党小组",
+                  name: "第三楼院党小组 （组长：王丽丽）",
+                  key: "3",
+                },
+              ],
+            },
+          ],
+        },
+      ],
       nowVal: 100,
 
-      nodeConfig: {},
+      nodeConfig: {
+        partyOrgName: "市北区委",
+        partyOrgLevel: 1,
+        partyOrgPid: "0",
+        principalName: "栾秀杰",
+        laneLevel: 1,
+        children: [
+          {
+            partyOrgName: "市北区委",
+            partyOrgLevel: 2,
+            partyOrgPid: "0",
+            principalName: "栾秀杰",
+            laneLevel: 2,
+            children: [
+              {
+                partyOrgName: "市北区委",
+                partyOrgLevel: 3,
+                partyOrgPid: "0",
+                principalName: "栾秀杰",
+                laneLevel: 3,
+                children: [
+                  {
+                    partyOrgName: "市北区委",
+                    partyOrgLevel: 4,
+                    partyOrgPid: "0",
+                    principalName: "栾秀杰",
+                    laneLevel: 4,
+                    children: [
+                      {
+                        partyOrgName: "市北区委",
+                        partyOrgLevel: 5,
+                        partyOrgPid: "0",
+                        principalName: "栾秀杰",
+                        laneLevel: 5,
+                        children: [
+                          {
+                            partyOrgName: "市北区委",
+                            partyOrgLevel: 6,
+                            partyOrgPid: "0",
+                            principalName: "栾秀杰",
+                            laneLevel: 6,
+                            children: [
+                              {
+                                partyOrgName: "市北区委",
+                                partyOrgLevel: 7,
+                                partyOrgPid: "0",
+                                principalName: "栾秀杰",
+                                laneLevel: 7,
+                                children: [
+                                  {
+                                    partyOrgName: "市北区委",
+                                    partyOrgLevel: 8,
+                                    partyOrgPid: "0",
+                                    principalName: "栾秀杰",
+                                    laneLevel: 8,
+                                    children: [
+                                      {
+                                        partyOrgName: "市北区委",
+                                        partyOrgLevel: 9,
+                                        partyOrgPid: "0",
+                                        principalName: "栾秀杰",
+                                        laneLevel: 9,
+                                        children: [
+                                          {
+                                            partyOrgName: "市北区委",
+                                            partyOrgLevel: 10,
+                                            partyOrgPid: "0",
+                                            principalName: "栾秀杰",
+                                            laneLevel: 10,
+                                          },
+                                        ],
+                                      },
+                                    ],
+                                  },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+
+        // title: "社区党委",
+        // name: "南昌路社区党委(党委书记：解书记)",
+        // key: "1",
+        // children: [
+        //   {
+        //     title: "网格党支部",
+        //     name: "第一网格党支部 （支部书记：王艺发）",
+        //     type: 2,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        //   {
+        //     title: "网格党支部",
+        //     name: "第二网格党支部 （支部书记：尤芬紫）",
+        //     type: 3,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //             children: [
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "王宇",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "刘冰冰",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "杨飞宇",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "齐天",
+        //               },
+        //             ],
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        //   {
+        //     title: "网格党支部",
+        //     name: "第三网格党支部 （支部书记：凤桥强）",
+        //     type: 3,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第三楼院党小组 （组长：王丽丽）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        // ],
+      },
     };
   },
   computed: {},

src/views/dataBoard/organizational/jwTree/index.vue

@@ -1,4 +1,3 @@
-<!-- 调用树组件 -->
 <template>
   <div class="wrap">
     <!-- v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'" -->
@@ -11,8 +10,8 @@
           <div class="contentList"></div>
         </el-col>
         <el-col :span="21">
-          <div class="dingflow-design overflow-hidden" :style="{ height: treeHeight + 'px' }" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+          <div class="dingflow-design" :style="{ height: treeHeight + 'px' }" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
-            <nodeWrapJw :nodeConfig.sync="nodeConfig" ></nodeWrapJw>
+            <nodeWrapJw :nodeConfig.sync="nodeConfig"></nodeWrapJw>
           </div>
         </el-col>
       </el-row>
@@ -47,12 +46,6 @@ export default {
     // if (orgId) {
     //   this.getTreeData();
     // }
-    this.$EventBus.$on('handelClickJWNode', (val) => {
-       this.levelArr.push(val[0].level)
-      const myArray = [...new Set(this.levelArr)];
-      this.treeHeight = myArray.length * 180 + 220;
-      this.levelArr = this.getLevelArrNum(myArray);
-    })
     this.getTreeData();
   },
   methods: {
@@ -80,6 +73,7 @@ export default {
       }
       return arr;
     },
+
     //获取背景层级
     getDataPLevel(data) {
       data.forEach((item) => {
@@ -88,7 +82,7 @@ export default {
           this.getDataPLevel(item.children);
         }
       });
-      const myArray = [...new Set(this.levelArr)].filter(item=>item!='village');
+      const myArray = [...new Set(this.levelArr)];
       this.treeHeight = myArray.length * 180 + 220;
       this.levelArr = this.getLevelArrNum(myArray);
     },
@@ -286,7 +280,7 @@ export default {
     .flowLevel-5 {
       top: 775px;
       height: 180px !important;
-      line-height: 180px;
+      line-height: 130px;
 
       div {
         padding-left: 80px;
@@ -407,7 +401,4 @@ export default {
     }
   }
 }
-.overflow-hidden{
-  overflow-y: hidden;
-}
 </style>

src/views/dataBoard/overview/components/Bmysxxq.vue

@@ -177,7 +177,6 @@
     <ResourceScheduling
         ref="ResourceScheduling"
         :currentLevelData="currentLevelData"
-        :demandRecDetail="detail"
         @handle="dispatchOrder"
     />
 

src/views/dataBoard/overview/components/EventDetail.vue

@@ -198,7 +198,8 @@
           </el-col>
         </el-row>
 
-        <div class="btn-group" v-if="(item.status === 'processing')">
+        <div class="btn-group" v-if="(item.status === 'processing' && item.operationId) || (item.status === 'closed_case' &&
+                (item.satisfactionName || (!item.satisfactionName && user.id != item.createdUserId)))">
           <el-button class="green" plain round type="success" @click="handleDispatch">资源调度</el-button>
           <el-button class="orange" plain round type="warning" @click="handleSupervision">催办督办</el-button>
         </div>

src/views/dataBoard/overview/components/ResourceInfo.vue

@@ -109,37 +109,37 @@
 
             <div class="items">
               <div class="label">姓名：</div>
-              <div class="value">{{ rowData.name }}</div>
+              <div class="value">{{ detail.name }}</div>
             </div>
 
             <div class="items">
               <div class="label">联系电话：</div>
-              <div class="value">{{ rowData.mobile }}</div>
+              <div class="value">{{ detail.mobile }}</div>
               <CallPhone icon="el-icon-phone"/>
             </div>
 
             <div class="items">
               <div class="label">年龄：</div>
-              <div class="value">{{ rowData.longitude||'--' }}</div>
+              <div class="value">{{ detail.birthday?getAgeByDateOfBirth(detail.birthday):'未知' }}</div>
             </div>
-            <!-- <div class="items">
+            <div class="items">
               <div class="label">学历：</div>
               <div class="value">{{ education?education.cultureLevelName:'' }}</div>
-            </div> -->
+            </div>
 
             <!--            <div class="items">
                           <div class="label">状态：</div>
                           <div class="value">巡查中</div>
                         </div>-->
 
-            <!-- <div class="items">
+            <div class="items">
               <div class="label">所在位置：</div>
               <div class="value">{{ detail.houseInfo?detail.houseInfo.homeName: '' }}</div>
             </div>
             <div class="items">
               <div class="label">兴趣爱好：</div>
               <div class="value">{{ hobby?hobby.hobbyRemark:'' }}</div>
-            </div> -->
+            </div>
           </template>
           <div class="btn-group">
             <el-button class="sure" plain round type="warning" @click="handleSure">派单</el-button>

src/views/dataBoard/overview/components/ResourceScheduling.vue

@@ -41,11 +41,11 @@
                       }}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="所属组织" min-width="180"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="所属组织" min-width="180"
                                    prop="orgName"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="姓名/名称" min-width="120"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="姓名/名称" min-width="120"
                                    prop="name"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="联系电话" min-width="120"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="联系电话" min-width="120"
                                    prop="mobile">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
@@ -62,15 +62,11 @@
                     </template>
                   </el-table-column>
 
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织" min-width="180" prop="agencyName">
+                  <el-table-column v-if="peopleType === '5'" label="所属组织" min-width="180" prop="agencyName"/>
-                    <template scope-row="row">
+                  <el-table-column v-if="peopleType === '5'" label="联系人" min-width="120" prop="contact"/>
-                        {{this.$store.state.user.agencyName}}
+                  <el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
-                    </template>
-                  </el-table-column>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人" min-width="120" prop="name"/>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话" min-width="120" prop="mobile">
                     <template slot-scope="scope">
-                      {{ $sensitive(scope.row.mobile, 3, 7) }}
+                      {{ $sensitive(scope.row.contactMobile, 3, 7) }}
                     </template>
                   </el-table-column>
 
@@ -114,12 +110,7 @@ export default {
       type: Object,
       default: () => {
       },
-    },
+    }
-    demandRecDetail: {
-      type: Object,
-      default: () => {
-      },
-    },
   },
   data() {
     return {
@@ -249,28 +240,13 @@ export default {
         console.log(data);
         if (this.peopleType === '4') {
           this.getZzzList();
-        } else if (this.peopleType === '5' ) {
+        } else if (this.peopleType === '5') {
           this.getLjdwList();
-        }  else if (this.peopleType === 'publicWelfareNum' || this.peopleType === 'volunteer') {
-          this.getServerOrgNewTask();
         } else {
           this.getList()
         }
       }
     },
-    getServerOrgNewTask() {
-      let {parentCategoryCode,categoryCode} = this.demandRecDetail;
-      this.loading = true;
-      this.$http.post('/actual/base/serviceitem/listServerOrgNewTask', {
-        serverOrgType: this.peopleType == 'publicWelfareNum'?'publicWelfare':'ic_user_volunteer',
-        serverParentOrgCategoryCode:parentCategoryCode,
-        serverOrgCategoryCode:categoryCode
-      }).then(res => {
-        this.loading = false;
-        this.list = res.data.data;
-      })
-    },
-    
     handleHandle(data) {
       this.handleClose()
       this.$emit('handle', data);

src/views/dataBoard/overview/components/ServiceDetails.vue

@@ -172,7 +172,7 @@
         </div>
       </div>
     </el-dialog>
-    <ResourceScheduling ref="ResourceScheduling"  :demandRecDetail="detail" :currentLevelData="currentLevelData" @handle="dispatchOrder"/>
+    <ResourceScheduling ref="ResourceScheduling" :currentLevelData="currentLevelData" @handle="dispatchOrder"/>
     <Supervision ref="supervision" :currentLevelData="currentLevelData"/>
   </div>
 </template>

src/views/dataBoard/renfang/cpts/rkfx.vue

@@ -397,7 +397,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-left: 25px;
+    margin-left: 15px;
 
     .legend {
       // flex: 0 0 140px;

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

@@ -76,13 +76,6 @@
                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="居住人数" prop="resiNumber">
-              <el-select v-model.trim="resiNumber" class="u-item-width-normal" placeholder="请选择" size="small" clearable>
-                <el-option v-for="(item,index) in 7" :key="index" :label="index"
-                  :value="index">
-                </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="remark" class="u-item-width-normal" size="small" clearable placeholder="请输入备注">
               </el-input>
@@ -197,7 +190,7 @@
         <room-table v-if="showRoomTable || selTreeObj.level === 'building'" :staffAgencyId="staffAgencyId"
           :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag"
           :purpose="purpose" :neighborHoodId="neighborHoodId" :buildingId="buildingId" :buildingUnitId="buildingUnitId"
-          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate" :resiNumber="resiNumber"
+          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate"
           ref="ref_buildingTable" @refreshTree="refreshTree"></room-table>
 
         <community-table v-if="selTreeObj.level !== 'building' &&
@@ -313,7 +306,6 @@ export default {
       remark: "",
       updateStartDate: "",
       updateEndDate: "",
-      resiNumber:"",
       showRoomTable: false,
       selObj: {},
       purposeArr: [
@@ -624,7 +616,7 @@ export default {
       this.buildingId = "";
       this.buildingUnitId = "";
       this.houseId = "";
-      this.resiNumber ="";
+
       this.pageSize = 10;
       this.pageNo = 1;
 

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

@@ -104,8 +104,6 @@
         </el-table-column>
         <el-table-column prop="ownerIdCard" label="证件号" header-align="left" align="left" width="170">
         </el-table-column>
-        <el-table-column prop="resiNumber" label="居住人数" header-align="left" align="left" width="100">
-        </el-table-column>
         <el-table-column prop="remark" label="备注" header-align="left" align="left" width="170">
         </el-table-column>
 
@@ -387,6 +385,7 @@ export default {
       //   this.agencyObj = treeObj
       // }
       // 接口在这里
+      console.log(this.buildingId, '1111');
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -404,7 +403,6 @@ export default {
         buildingId: this.buildingId,
         buildingUnitId: this.buildingUnitId,
         houseId: this.houseId,
-        resiNumber:this.resiNumber
       };
       const url = "/actual/base/communityHouse/listHouses";
 
@@ -999,10 +997,6 @@ export default {
       type: String,
       default: "",
     },
-    resiNumber:{
-      type: Number,
-      default: "",
-    }
   },
 };
 </script>

src/views/modules/base/resi.vue

@@ -503,7 +503,6 @@ export default {
       const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form;
       // 深复制对象
       let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
-      _obj.attentionCrowds = _obj.attentionCrowds.flat()
       console.log('213', _obj)
       switch (this.valueb) {
         case '党员':
@@ -602,7 +601,7 @@ export default {
           this.$refs.myResiSearch.form.categoryKey = categoryKey;
           this.$refs.myResiSearch.form.agencyId = agencyId;
       }
-      
+      // //呵呵呵哒
       // if (this.valueb == '党员') {
       //   _obj.partyFlag = 1
       //   this.getTableData(_obj);
@@ -969,36 +968,16 @@ export default {
         }
       );
     },
-    async handelCLickShowCheckPassword(row) {
+    handelCLickShowCheckPassword(row) {
-      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
+      this.editUserId = row.resiId;
-      const { data, code, msg } = await requestPost(url);
+      this.showCheckPassword = true;
-      if(code==0){
-          if(data==true){
-            this.editUserId = row.resiId;
-            this.saveCheckPassword()
-          }
-          else{
-            this.editUserId = row.resiId;
-            this.showCheckPassword = true;
-          }
-      }
-      else{
-        this.$message.error(msg);
-      }
     },
     handelClickCheckPassword() {
-      this.$refs.checkPasswordFrom.validate((vali) => {
+      this.$refs.checkPasswordFrom.validate(async (vali) => {
         if (vali) {
-          this.saveCheckPassword(this.checkPasswordFrom.password);
+          const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveCheckPassword(password){
-      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
           let parm = {
-            password,
+            password: this.checkPasswordFrom.password,
           };
           const { data, code, msg } = await requestPost(url, parm);
           if (code === 0) {
@@ -1012,7 +991,12 @@ export default {
           } else {
             this.$message.error(msg);
           }
+        } else {
+          return false;
+        }
+      });
     },
+
      handleAdd() {
       this.$router.push({ name: "add-resi" });
     },
@@ -1193,9 +1177,9 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) {
+        if (newVal.name == "base-resi") {
           this.$nextTick(() => {
-              this.$refs.myResiSearch.form.attentionCrowds = [];
+            this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
               this.$refs.myResiSearch.form.specialCategoryCodes = [];
               this.$refs.myResiSearch.form.partyFlag=null;
@@ -1212,7 +1196,7 @@ export default {
             }else if(newVal.params.category === 'PARTY_FLAG'){
               this.$refs.myResiSearch.form.partyFlag =1;
             }
-          this.handleSearchFrom();
+            this.handleSearchFrom();
           });
         }
       },

src/views/modules/base/smartImport/cpts/completeTask.vue

@@ -42,11 +42,12 @@
           >查看</el-button
         >
         <i class="el-icon-download" style="margin-left: 16px;"></i>
-        <el-button
+        <a
-        v-if="this.importFailNum>0"
+        v-if="resultDescFile"
-              type="text"
+        :href="resultDescFile"
-              @click="handelClickDownFile"
+              target="_blank"
-              >下载导入失败数据</el-button
+              style="color: #ff4d4f; cursor: pointer"
+              >下载导入失败数据</a
             >
       </el-col>
     </el-row>
@@ -91,7 +92,6 @@
 </template>
       <script>
 import { requestPost } from "@/js/dai/request";
-import axios from "axios";
 export default {
   data() {
     return {
@@ -105,9 +105,7 @@ export default {
       pageNo:1,
       pageSize:20,
       total:0,
-      tableType:null,
+      tableType:null
-      resultDescFilePath:null,
-      originFileName:null,
     };
   },
   props: {
@@ -171,39 +169,6 @@ export default {
     },
     handelClickBackList() {
       this.$emit("handelClickBack");
-    },
-     handelClickDownFile(){
-      const url = "/actual/base/intelligentImportData/downloadFailExcel";
-      let parm = {
-        originFileName:this.originFileName,
-        resultDescFilePath :this.resultDescFilePath,
-      };
-      axios({
-        url: window.SITE_CONFIG["apiURL"] + url,
-        method: "post",
-        data:parm,
-        responseType: "blob",
-      })
-        .then((res) => {
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          return this.$message.error("网络错误");
-        });
     },
     async getTaskInfo() {
       let url = "/actual/base/intelligentImportData/getTaskInfo";
@@ -216,8 +181,7 @@ export default {
         this.importFailNum = data.importFailNum.toString();
         this.importSuccessNum = data.importSuccessNum.toString();
         this.importCategory = data.importCategory;
-        this.originFileName = data.originFileName;
+        this.resultDescFile = data.resultDescFile;
-        this.resultDescFilePath = data.resultDescFile;
         this.$emit("updateoperatorName", {
           operatorName: data.operatorName,
           createdTime: data.createdTime,

src/views/modules/base/smartImport/index.vue

@@ -43,8 +43,18 @@
 
           <el-table-column prop="taskName" align="center"  label="任务名称" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="importCategoryName" align="center" width="150" label="任务类型" :show-overflow-tooltip="true">
+          <el-table-column prop="importCategory" align="center" width="100" label="任务类型" :show-overflow-tooltip="true">
-           
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.importCategory
+                ? scope.row.importCategory == "1"
+                  ? "导入房屋信息"
+                  : scope.row.importCategory == "2"
+                    ? "导入居民信息"
+                    : "--"
+                : "--"
+              }}</span>
+            </template>
           </el-table-column>
 
           <el-table-column prop="processStatus" align="center" width="200" label="状态" :show-overflow-tooltip="true">

src/views/modules/home/index.vue

@@ -22,7 +22,7 @@
                     <img src="@/assets/img/shequ/close.png" />
                   </div>
                 </div>
-                <div class="btn" @click="handleClickSearchBtn">查询</div>
+                <div class="btn" @click="handleClickSearchBtn">查一下</div>
               </div>
             </div>
           </div>
@@ -82,11 +82,16 @@
             </div>
           </div>
         </div>
-        <div class="m-pan">
+        <div class="m-pan m-box">
-          <div class="m-box flex_box m-pan">
+          <!-- <div class="header">
+            <img src="@/assets/images/index/title-icon-sqzl.png" />
+            <span>组织总览</span>
+          </div> -->
+          <div class="flex_box">
             <div class="header">
               <div class="newqsa"><span>居民分类信息不完整数量统计</span></div>
               <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
+
             </div>
             <div class="cnt">
               <!-- 树状图 -->
@@ -97,13 +102,15 @@
         </div>
 
         <div class="m-box m-tb">
+          <div class="wrap">
             <div class="header">
               <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
               <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
             </div>
+          </div>
           <!-- <div class="more">更多></div> -->
           <div class="cnt">
-            <div id="my_chart" style="width: 100%; height: 170px;"></div>
+            <div id="my_chart" style="width: 100%; height: 230px; position: relative; top: -30px"></div>
           </div>
         </div>
 
@@ -144,11 +151,11 @@
         </div>
 
         <div class="m-box m-tx" style="position: relative;">
-          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
+          <div class="noe-text"> <span style="margin-top: 10px;">居民分类更新情况</span> <span class="update-settings"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</div>
+              style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()"><img referrerpolicy="no-referrer"
+                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span>
           </div>
-          <div style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box" >
+          <el-table :data="tableList" style="width: 100%;margin-top:26px;overflow-y: scroll;" :height="maxTableHeight"
-            <el-table :data="tableList" 
             border :cell-style="columnbackgroundStyle" class="m-table-item">
             <el-table-column label="居民类别" align="center" width="105">
               <template slot-scope="scope">
@@ -157,20 +164,14 @@
             </el-table-column>
             <el-table-column label="总人数" width="105" align="center">
               <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
+                  <span style="color:#006fd6" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
               </template>
             </el-table-column>
             <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
+                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'nonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="拓展不完整数" align="center" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'extNonIntegrity')">{{scope.row.extNonIntegratedNum}}</span>
-              </template>
-            </el-table-column>
-            
             <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
               <template slot-scope="scope">
                   <span style="color:#989898;">{{scope.row.userName}}</span>
@@ -189,7 +190,6 @@
               </template>
             </el-table-column>
           </el-table>
-          </div>
         </div>
       </div>
     </div>
@@ -254,37 +254,17 @@ export default {
       myChart: {},
       myBarchart: {},
       agencyLevel: '',
-      yData: [
+      yData: [],
-        // {
-        //   value: 720,
-        //   itemStyle: {
-        //     color: {
-        //       type: 'linear',
-        //       x: 0,
-        //       y: 0,
-        //       x2: 0,
-        //       y2: 1,
-        //       colorStops: [{
-        //         offset: 0, color: '#2D7DF2' // 上部颜色
-        //       }, {
-        //         offset: 0.45, color: '#7EB1FE' // 中部颜色
-        //       }, {
-        //         offset: 0.45, color: '#EFB632' // 中部颜色
-        //       }, {
-        //         offset: 1, color: '#FDD77D' // 下部颜色
-        //       }],
-        //       global: false // 默认为 false
-        //     },
-        //     shadowColor: "#91cc75",
-        //     borderType: "dashed",
-        //     // opacity: 0.5
-        //   }
-        // },725,165,765,742,710,720,730,735,762,754
-      ],
       myChartStyle: { float: "left", width: "140%", height: "100%" },
     }
   },
-  computed: {},
+  computed: {
+    maxTableHeight() {
+      const _h = this.clientHeight - 610;
+      return _h;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
   watch: {
     "searchData.searchKey": function (val) {
       if (val == "") {
@@ -352,7 +332,7 @@ export default {
           },
           legend: {
             data: data.series.map((item) => item.name),
-            bottom: 0,
+            bottom: "-5",
             icon: "rect",
             itemWidth: 20,
             itemHeight: 5,
@@ -361,8 +341,7 @@ export default {
           grid: {
             left: "3%",
             right: "4%",
-            bottom: "13%",
+            bottom: "15%",
-            top:'5',
             containLabel: true,
           },
           toolbox: {
@@ -417,7 +396,7 @@ export default {
     handleWindowResize() {
       if (this.myChart) {
         this.myChart.resize();
-        this.myBarchart.resize();
+        this.myBarChart.resize();
       }
     },
     searchDataTab(str) {
@@ -719,21 +698,16 @@ export default {
               type: 'shadow'
             }
           },
-
           legend: {
             x: 'center',
             bottom: '8%',
-            data: ['分类信息完整数', '分类信息不完整数'],
+            data: ['分类信息完整数', '分类信息不完整数']
-            icon: "rect",
-            itemWidth: 20,
-            itemHeight: 5,
-            itemGap: 20,
           },
           grid: { //图表的位置
-            top: '3%',
+            top: '5%',
             left: '3%',
             right: '4%',
-            bottom: '10%',
+            bottom: '20%',
             containLabel: true
           },
           yAxis: [{
@@ -766,6 +740,7 @@ export default {
             name: '分类信息不完整数',
             type: 'bar',
             stack: '总量',
+            barWidth: '30px',
             data: data.categoryStatsDatas.map((item, index) => ({
               value: item.nonIntegratedNum,
               extraProperty: item.resiCategory
@@ -783,7 +758,7 @@ export default {
           this.$router.push({
             path: "/main/base-nonIntResi",
             query: {
-              type:'cateNonIntegrity',
+              type:'nonIntegrity',
               resiCategory: e.data.extraProperty,
             }
           });
@@ -799,8 +774,3 @@ export default {
 </script>
 
 <style lang="scss" src="@/assets/scss/modules/index.scss" scoped></style>
-<style lang="scss" scoped>
-.z-on{
-  margin-left: 0 !important;
-}
-</style>

src/views/modules/portrayal/jumin/index.vue

@@ -21,7 +21,7 @@
         <div class="list">
           <div
             :class="{ item: true, active: index == active }"
-            v-for="(item, index) in menuList" :key="index"
+            v-for="(item, index) in menuList"
             @click="handelCLickMenu(item.id, index)"
           >
             <span>{{ item.name }}</span
@@ -1048,7 +1048,7 @@ export default {
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
       incidence: {
-        partyFlag: {
+        parymemberInfoDto: {
           formId: "parymemberInfoDto",
           formType: "parymemberInfoDto",
           title: "党员信息",
@@ -1161,6 +1161,7 @@ export default {
               business_record:'业务记录',
               update_record:'更新记录'
             };
+          
             const keysWithValueOne = [];
             for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) {
                 if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key]) {
@@ -1264,28 +1265,10 @@ export default {
           console.log(err);
         });
     },
-    // async handleSaveTuomin1() {
+
-    //   const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
+    handelClickJumpEdit() {
-    //   let parm = {
+      this.checkType = "edit";
-    //     password,
+      this.showCheckPassword = true;
-    //   };
-    //   const { data, code, msg } = await requestPost(url, parm);
-    // },
-   async  handelClickJumpEdit() {
-      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
-      const { data, code, msg } = await requestPost(url);
-      if(code==0){
-          if(data==true){
-            this.handleSaveTuomin()
-          }
-          else{
-            this.checkType = "edit";
-            this.showCheckPassword = true;
-          }
-      }
-      else{
-        this.$message.error(msg);
-      }
     },
     async getDictName(url, params, value, itemType, opction) {
       try {