Merge branch 'dev-fangyi' into test

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -124,6 +124,7 @@
       </div>
 
       <el-table class="table"
+                ref="ref_table"
                 :data="tableData"
                 border
                 :height="tableHeight"
@@ -174,12 +175,12 @@
                          label="检测结果"
                          width="100">
         </el-table-column>
-        <el-table-column v-if="formData.orgType==='current'"
+        <el-table-column v-if="isResiUser"
                          prop="isResiUserShow"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="是否本辖区居民"
+                         label="本辖区居民"
                          width="120">
         </el-table-column>
 
@@ -196,29 +197,29 @@
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
 
-            <el-button v-if="formData.orgType==='all'"
+            <el-button v-if="!isResiUser"
                        type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleAttention(scope.row)">同步</el-button>
 
-            <el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--delete "
                        size="small"
-                       @click="handleDelete(scope.row,'delete')">删除</el-button>
+                       @click="handleDelete(scope.row)">删除</el-button>
 
-            <el-button v-if="formData.orgType==='current'&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
+            <el-button v-if="isResiUser&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--delete "
                        size="small"
-                       @click="handleDelete(scope.row,'attention')">取消同步</el-button>
+                       @click="handleCancelAttention(scope.row)">取消同步</el-button>
 
           </template>
         </el-table-column>
@@ -269,6 +270,7 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: false,
+      isResiUser: true,
 
       agencyId: '',
       orgTypeList: [
@@ -330,8 +332,16 @@ export default {
   },
 
   methods: {
-    handleSearch () {
+
-      this.loadTable()
+    async handleSearch () {
+      this.isResiUser = this.formData.orgType === 'current'
+
+      await this.loadTable()
+
+      this.$nextTick(() => {
+        this.$refs.ref_table.doLayout() // 解决表格错位
+      })
+
     },
 
     async loadTable () {
@@ -363,6 +373,10 @@ export default {
           }
 
         });
+
+
+
+
       } else {
         this.$message.error(msg)
       }
@@ -418,8 +432,8 @@ export default {
 
     },
 
-    async handleDelete (row, type) {
+    async handleDelete (row) {
-      let message = type === 'delete' ? '确认删除?' : '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？'
+      let message = '确认删除?'
 
       this.$confirm(message, "提示", {
         confirmButtonText: "确定",
@@ -456,6 +470,43 @@ export default {
       }
     },
 
+    async handleCancelAttention (row) {
+      let message = '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？'
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.cancelAttention(row)
+        })
+        .catch(err => {
+
+        });
+    },
+
+    async cancelAttention (row) {
+      const url = "/epmetuser/icNat/cancelsynchro"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
     async handleAttention (row) {
 
       this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
@@ -475,7 +526,7 @@ export default {
     },
 
     async attentionNat (row) {
-      const url = "/epmetuser/icNat/synchro"
+      const url = "/epmetuser/icNat/cancelsynchro"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {

src/views/modules/base/epidemic/travel.vue

@@ -225,20 +225,20 @@
                         style="margin-left:10px"
                         width="20"
                         trigger="click">
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
                            @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
                            @click="handleVisiteList(scope.row) ">随访记录</el-button>
               </div>
-              <div v-if="scope.row.userType != 'resi'" class="more-btn">
+              <div v-if="scope.row.userType != 'resi'" class="table-more-btn">
                 <el-button type="text"
                        class="div-table-button--delete--noline "
                        size="small"

src/views/modules/base/epidemic/travelForm.vue

@@ -99,13 +99,21 @@
                       prop="presentAddress"
                       style="display: block"
                       label-width="150px">
-          <el-input v-if="isFromResi" class="item_width_2"
+          <el-input  v-if="formType == 'detail'" class="item_width_2"
+                    placeholder="请输入现居地"
+                    clearable
+                    :disabled="isFromResi"
+                    :style="'width: ' + computedWd(formData.presentAddress)"
+                    v-model="formData.presentAddress" />
+          <template v-else>
+            <el-input v-if="isFromResi" class="item_width_2 mw180"
                     placeholder="请输入现居地"
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.presentAddress" />
             <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps" 
             v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          </template>
         </el-form-item>
         <el-form-item label="详细地址"
                       prop="detailAddress"
@@ -119,7 +127,14 @@
           </el-input>
         </el-form-item>
         <el-form-item label="来自地区" prop="sourceAddress" style="display: block" label-width="150px">
-          <el-cascader ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
+          <el-input v-if="formType == 'detail'" class="item_width_2"
+                    placeholder=""
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.sourceAddress"
+                    :style="'width: ' + computedWd(formData.sourceAddress)">
+          </el-input>
+          <el-cascader v-else ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
             @change="handleSourceArea" clearable></el-cascader>
         </el-form-item>
 
@@ -312,6 +327,14 @@ export default {
   },
 
   methods: {
+    computedWd(val) {
+      const len = val.length
+      const wd = len * 18
+      let w = ''
+      if (wd > 220) w = wd
+      else w = 220
+      return w + 'px'
+    },
     lzayLoadArea(node, resolve) {
       this.getArea(node, resolve)
       // setTimeout(() => {
@@ -632,6 +655,13 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+
 </style>
 
 <style lang='scss'>

src/views/modules/communityService/ninePlaces/inspect/inspect.vue

@@ -150,8 +150,8 @@
         <el-table-column prop="firstResult"
                          header-align="center"
                          align="center"
-                         label="首次检查结果"
+                         label="首次结果"
-                         width="110">
+                         width="80">
         </el-table-column>
         <el-table-column prop="reviewTime"
                          header-align="center"
@@ -174,7 +174,7 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="180"
+                         width="140"
                          header-align="center"
                          align="center"
                          class="operate">
@@ -186,7 +186,6 @@
             <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
-                       :disabled="true"
                        @click="handleEdit(scope.row)">修改</el-button>
 
             <el-popover popper-class="btn-popper"
@@ -454,7 +453,7 @@ export default {
       this.formTitle = '编辑'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row)
+        this.$refs.ref_form.initForm('edit', row.placePatrolRecordId)
       })
     },
 

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

@@ -251,7 +251,7 @@ const vueGis = {
   name: 'HomeMap',
   data () {
     return {
-      showAgencyList: true,
+      showAgencyList: false,
       agencyFadeIn: true,
       centerPoint: [],//中心点位置
       zoom: 14,//缩放范围：区14

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

@@ -3,7 +3,7 @@
     <div class="title">
       <div class="card-title">
         <img src="@/assets/img/shuju/title-tip.png" />
-        <span>项目分布分析</span>
+        <span>事件分布分析</span>
 
         <div class="second-title">
 

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

@@ -2,7 +2,7 @@
   <cpt-card>
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
-      <span>项目处理分析</span>
+      <span>事件处置分析</span>
 
       <div class="second-title">
         <div class="second-select cascader">
@@ -32,7 +32,7 @@
       <div class="g-l">
         <div class="l_top">
           <div class="g-count">
-            <div class="t_count">项目总数</div>
+            <div class="t_count">事件总数</div>
             <div class="c_count">{{projectTotal}}</div>
             <div class="t_yestoday">昨日
               <span class="c_yestoday">{{dateIncr}}</span>
@@ -70,7 +70,7 @@
 
         </div>
         <div class="l_bottom">
-          <div class="bottom_label">近12月新增项目数</div>
+          <div class="bottom_label">近12月新增事件数</div>
           <screen-echarts-frame v-if="!lineNoData&& !dataLoading"
                                 class="echart-line"
                                 @myChartMethod="lineInitOk"

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

@@ -2,7 +2,7 @@
   <cpt-card>
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
-      <span>居民热议</span>
+      <span>居民热议分析</span>
 
       <div class="second-select cascader">
 

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

@@ -2,7 +2,7 @@
   <cpt-card>
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
-      <span>项目分类分析</span>
+      <span>事件分类分析</span>
 
       <div class="second-select cascader">
 

src/views/modules/visual/communityParty/elegant.vue

@@ -5,7 +5,7 @@
         <img class="title-icon"
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          党员风采&nbsp;&nbsp;
+          党员风采榜&nbsp;&nbsp;
           <!-- <el-cascader v-model="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"

src/views/modules/visual/measure/service.vue

@@ -4,7 +4,7 @@
       <div class="card-title">
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          服务措施分析 &nbsp;&nbsp;
+          需求服务分析 &nbsp;&nbsp;
           <el-cascader 
             v-model="selectAgency"
             :options="propTree" 

src/views/modules/visual/measure/volunteer.vue

@@ -5,7 +5,7 @@
         <img class="title-icon"
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          志愿者服务分析&nbsp;&nbsp;
+          志愿服务分析&nbsp;&nbsp;
           <el-cascader v-model="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"

src/views/pages/caiji.vue

@@ -44,7 +44,7 @@
           </div>
           <div class="line"></div>
 
-          <mt-field v-if="selUnit && selUnit.value==='else'"
+          <mt-field v-if="selUnit && selUnit.value==='other'"
                     class="my-field"
                     :disableClear="true"
                     label="单元号"
@@ -52,7 +52,7 @@
                     v-model="unitContent"></mt-field>
           <div class="line"></div>
 
-          <div v-if="!selUnit || selUnit.value!=='else'"
+          <div v-if="!selUnit || selUnit.value!=='other'"
                @click="handelSel('room')">
             <mt-cell title="房屋"
                      is-link>
@@ -63,7 +63,7 @@
             <div class="line"></div>
           </div>
 
-          <mt-field v-if="(selUnit&&selUnit.value==='else')||(selHome&&selHome.value==='else')"
+          <mt-field v-if="(selUnit&&selUnit.value==='other')||(selHome&&selHome.value==='other')"
                     class="my-field"
                     :disableClear="true"
                     label="房屋"
@@ -248,6 +248,10 @@ export default {
         houseHolderName: '',//户主姓名	
         totalResi: 4,//居住成员人数	
         customerId: '',//customerId
+        villageName: '',//
+        buildName: '',//
+        unitName: '',//
+        homeName: '',//
 
       },
       showMessagsBox: false,//是否显示人员未填写提示弹出框
@@ -445,7 +449,7 @@ export default {
         this.unitList = data
         this.unitList.push({
           label: '其他',
-          value: 'else'
+          value: 'other'
         })
         let obj = {
           values: this.unitList
@@ -479,7 +483,7 @@ export default {
         this.roomList = data
         this.roomList.push({
           label: '其他',
-          value: 'else'
+          value: 'other'
         })
         let obj = {
           values: this.roomList
@@ -566,7 +570,6 @@ export default {
     async handleSubmit () {
       let message = this.validataFormData()
 
-
       if (message) {
         if (this.showMessagsBox) {
           MessageBox.confirm(message).then(action => {
@@ -588,20 +591,22 @@ export default {
 
       if (this.formData.origin === 'internal') {
 
-        this.formData.villageId = this.selVillage.value
+        if (this.selUnit.value === 'other') {
-        this.formData.buildId = this.selBuild.value
+          this.formData.homeId = 'other'
-        if (this.selUnit.value === 'else') {
+          this.formData.unitName = this.unitContent
-          this.formData.unitId = this.unitContent
+          this.formData.homeName = this.homeContent//没有选择房屋，不存在这个对象，直接赋值
-          this.formData.homeId = this.homeContent//没有选择房屋，不存在这个对象，直接赋值
         } else {
-          this.formData.unitId = this.selUnit.value
+
           this.unitContent = this.selUnit.label
+          this.formData.unitName = this.unitContent
+
+          if (this.selHome.value === 'other') {
 
-          if (this.selHome.value === 'else') {
+            this.formData.homeName = this.homeContent
-            this.formData.homeId = this.homeContent
           } else {
-            this.formData.homeId = this.selHome.value
+
             this.homeContent = this.selHome.label
+            this.formData.homeName = this.homeContent
           }
         }
 
@@ -609,6 +614,7 @@ export default {
         this.formData.address = this.selVillage.label + this.selBuild.label + this.unitContent + this.homeContent
       }
 
+
       this.formData.houseType = this.selHomeType.value
 
       let memberListTemp = []
@@ -632,6 +638,7 @@ export default {
       });
       this.formData.memberList = memberListTemp
       console.log(this.formData)
+
       this.btnDisabled = true
       this.startLoading()
       const url = "/epmetuser/icresicollect/save"
@@ -677,7 +684,7 @@ export default {
           return aletMessage
 
         } else {//选择了单元
-          if (this.selUnit.value === 'else') {//单元选择了其他
+          if (this.selUnit.value === 'other') {//单元选择了其他
             if (!this.unitContent) {
               aletMessage = '请填写单元号'
               return aletMessage
@@ -693,7 +700,7 @@ export default {
               aletMessage = '请选择房屋'
               return aletMessage
 
-            } else if (this.selHome.value === 'else' && !this.homeContent) {
+            } else if (this.selHome.value === 'other' && !this.homeContent) {
               aletMessage = '请填写房屋'
               return aletMessage
             }
@@ -725,7 +732,7 @@ export default {
         return aletMessage
       }
 
-      if (this.memberList[0].length > 1) {
+      if (this.memberList.length > 1) {
         for (let i = 1; i < this.memberList.length; i++) {
           let item = this.memberList[i]
 
@@ -751,28 +758,31 @@ export default {
     popupOk () {
       if (this.selType === 'community') {
         this.selVillage = this.selObj
+        this.formData.villageId = this.selObj.value
+        this.formData.villageName = this.selObj.label
         this.selBuild = null
         this.selUnit = null
         this.selHome = null
-        this.formData.unitContent = ''
+        this.unitContent = ''
-        this.formData.homeContent = ''
+        this.homeContent = ''
         this.loadBuild()
 
       }
       if (this.selType === 'building') {
         this.selBuild = this.selObj
-        this.formData.buildContent = this.selObj.label
         this.formData.buildId = this.selObj.value
+        this.formData.buildName = this.selObj.label
 
         this.selUnit = null
         this.selHome = null
-        this.formData.unitContent = ''
+        this.unitContent = ''
-        this.formData.homeContent = ''
+        this.homeContent = ''
         this.loadUnit()
 
       }
       if (this.selType === 'unit') {
         this.selUnit = this.selObj
+        this.formData.unitId = this.selObj.value
 
         this.selHome = null
         this.unitContent = ''
@@ -783,6 +793,7 @@ export default {
       }
       if (this.selType === 'room') {
         this.selHome = this.selObj
+        this.formData.homeId = this.selObj.value
         this.homeContent = ''
       }