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

src/router/index.js

@@ -313,11 +313,11 @@ router.beforeEach((to, from, next) => {
           name: "事件处理分析",
           id: "shijianchulifenxi",
         },
-        {
+        // {
-          url: "visual/communityGovern/processAnalyze",
+        //   url: "visual/communityGovern/processAnalyze",
-          name: "事件处置分析",
+        //   name: "事件处置分析",
-          id: "processAnalyze",
+        //   id: "processAnalyze",
-        },
+        // },
         {
           url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi",
           name: "事件分类分析",
@@ -333,16 +333,16 @@ router.beforeEach((to, from, next) => {
         //   name: "事件分类分析",
         //   id: "typeAnalyze",
         // },
-        {
+        // {
-          url: "/visual/communityGovern/resibuzz",
+        //   url: "/visual/communityGovern/resibuzz",
-          name: "居民热议分析",
+        //   name: "居民热议分析",
-          id: "resibuzz",
+        //   id: "resibuzz",
-        },
+        // },
-        {
+        // {
-          url: "/visual/communityGovern/distributionAnalyze",
+        //   url: "/visual/communityGovern/distributionAnalyze",
-          name: "事件分布分析",
+        //   name: "事件分布分析",
-          id: "distributionAnalyze",
+        //   id: "distributionAnalyze",
-        },
+        // },
       ],
     },
   

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

@@ -210,7 +210,7 @@ export default {
         this.showRoomTable = true
 
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
         })
       } else {
         this.$message.warning('请输入查询条件')

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

@@ -209,9 +209,7 @@ export default {
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
-      ownerName: '',
+
-      ownerPhone: '',
-      rentFlag: '',
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
       selection: [],
@@ -262,13 +260,13 @@ export default {
       return index + 1;
     },
     handleSortOrderChange (value) {
-      console.log(value.column, value.prop, value.order)
+
       this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
       this.loadTable()
 
     },
     handleSortChange (value) {
-      console.log(value.column, value.prop, value.order)
+
       this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
       this.loadTable()
 
@@ -283,7 +281,7 @@ export default {
 
     async handleChangeSort (row, index) {
       // row.isChange = false
-      console.log(row.sort)
+
       let params = {
         id: row.houseId,
         sort: row.sort,
@@ -323,7 +321,7 @@ export default {
 
     },
 
-    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
+    async loadTable (source, treeObj) {
 
       this.source = source
       this.tableLoading = true
@@ -331,14 +329,10 @@ export default {
       if (source === 'tree') {//来源于tree，查询数据清空
         this.sortType = 'asc'
         this.agencyObj = treeObj
-        this.ownerName = null
+
-        this.ownerPhone = null
-        this.rentFlag = null
       } else if (source === 'search') {//来源于查询
         this.agencyObj = treeObj
-        this.ownerName = ownerName
+
-        this.ownerPhone = ownerPhone
-        this.rentFlag = rentFlag
       }
 
       // if (fromTree) {
@@ -403,7 +397,7 @@ export default {
       this.formTitle = '新增房屋'
       this.formShow = true
       this.$nextTick(() => {
-        console.log(this.agencyObj)
+
         this.$refs.ref_form.initForm('add', null, this.agencyObj)
       })
     },
@@ -618,16 +612,39 @@ export default {
       let url = "/gov/org/house/exportHouseUser"
 
 
+
       let params = {
         agencyId: '',
         gridId: '',
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
-        buildingId: this.agencyObj.id
+        buildingId: '',
+        neighborHoodId: ''
       }
 
+      if (this.agencyObj.level === 'grid') {
+        params.gridId = this.agencyObj.id
+        params.agencyId = ''
+        params.buildingId = ''
+        params.neighborHoodId = ''
+      } else if (this.agencyObj.level === 'neighborHood') {
+        params.neighborHoodId = this.agencyObj.id
+        params.agencyId = ''
+        params.buildingId = ''
+        params.gridId = ''
+      } else if (this.agencyObj.level === 'building') {
+        params.buildingId = this.agencyObj.id
+        params.agencyId = ''
+        params.neighborHoodId = ''
+        params.gridId = ''
+      } else {
 
+        params.agencyId = this.agencyObj.id
+        params.buildingId = ''
+        params.neighborHoodId = ''
+        params.gridId = ''
+      }
 
       app.ajax.exportFilePost(
         url,

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

@@ -142,14 +142,23 @@
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0" :disabled="formType === 'edit'"
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0">享受福利</el-checkbox>
-            >享受福利</el-checkbox
+          <template v-if="formType === 'edit'">
-          >
+            <el-checkbox
+              v-model="fmData.isCheck"
+              true-label="1"
+              false-label="0"
+              :disabled="initCheck == 1"
+              @change="checkResiAvailable"
+              >补充居民信息</el-checkbox
+            >
+          </template>
+          
           <el-checkbox
+            v-else
             v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
-            :disabled="formType === 'edit'"
             @change="checkResiAvailable"
             >补充居民信息</el-checkbox
           >
@@ -421,7 +430,8 @@ export default {
         lazy: true,
         lazyLoad: this.lzayLoadArea
       },
-      userInfo: {}
+      userInfo: {},
+      initCheck: null
     }
   },
   components: {},
@@ -777,6 +787,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.fmData = { ...data }
+        this.initCheck = data.isCheck
         this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
       } else this.$message.error(msg)
     },

src/views/modules/shequzhili/event/cpts/event-detail.vue

@@ -31,9 +31,9 @@
                class="info-prop">
             <span class="info-title-2">语音：</span>
             <audio controls>
-              <source :src="item.url"
+              <source :src="item"
                       type=""
-                      :key="item.url"
+                      :key="item"
                       v-for="item in info.voiceList" />
             </audio>
           </div>

src/views/modules/shequzhili/event/cpts/process-form.vue

@@ -12,7 +12,8 @@
                       prop="operationType">
           <el-radio-group v-model="operationType"
                           @change="handleChangeOperationType">
-            <el-radio label="">暂不处理</el-radio>
+            <el-radio v-if="!eventId"
+                      label="">暂不处理</el-radio>
             <el-radio label="0">回复</el-radio>
             <el-radio label="1">立项</el-radio>
             <el-radio label="2">转服务</el-radio>

src/views/modules/shequzhili/event/eventList.vue

@@ -169,7 +169,8 @@
                            width="80"
                            label="音频">
             <template slot-scope="scope">
-              <img class="img-voice"
+              <img @click="handleShowVoice(scope.row.voiceList[0])"
+                   class="img-voice"
                    v-if="scope.row.voiceList&&scope.row.voiceList.length>0"
                    src="@/assets/img/icon-voice.png" />
 
@@ -261,7 +262,7 @@
                          @click="handleWatch(scope.row)"
                          type="text"
                          size="small">查看</el-button>
-              <!-- ="scope.row.status==='closed_case' && scope.row.satisfactionName" -->
+
             </template>
           </el-table-column>
         </el-table>
@@ -290,6 +291,30 @@
                   @dialogOk="handleEditSuccess" />
     </div>
 
+    <el-dialog :title="'播放语音'"
+               :visible.sync="showVoice"
+               width="40%"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false">
+      <div class="dialog-h-content scroll-h">
+        <div style="display:flex;justify-content:center;margin:50px">
+
+          <audio controls>
+            <source :src="selVoiceUrl"
+                    type="" />
+          </audio>
+        </div>
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="showVoice=false">取消</el-button>
+
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -384,7 +409,8 @@ export default {
       eventDetailData: {},
 
 
-
+      showVoice: false,
+      selVoiceUrl: '',
     };
   },
   computed: {
@@ -518,6 +544,11 @@ export default {
       }
     },
 
+    //显示语音窗口
+    handleShowVoice (url) {
+      this.selVoiceUrl = url
+      this.showVoice = true
+    },
 
     handleClose () {
       this.pageType = "list";

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue

@@ -23,10 +23,7 @@
           </div>
           <div class="list right-list">
             <template v-if="info.content">
-              <div class="item-title">需求内容</div>
+              <!-- <div class="item-title">需求内容</div> -->
-              <div class="item">
-                <div>{{ info.content }}</div>
-              </div>
               <div class="item">
                 <span class="item-field">所属网格：</span>
                 <span>{{ info.gridName }}</span>
@@ -35,10 +32,10 @@
                 <span class="item-field">需求类型：</span>
                 <span>{{ info.categoryName }}</span>
               </div>
-              <div class="item">
+              <!-- <div class="item">
                 <span class="item-field">需求状态：</span>
                 <span>{{ info.statusName }}</span>
-              </div>
+              </div> -->
               <div class="item">
                 <span class="item-field">上报类型：</span>
                 <span>{{ info.reportTypeName }}</span>
@@ -55,10 +52,18 @@
                 <span class="item-field">上报时间	：</span>
                 <span>{{ info.reportTime }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">需求人	：</span>
+                <span>{{ info.demandUserName }}</span>
+              </div>
               <div class="item">
                 <span class="item-field">服务时间	：</span>
                 <span>{{ info.wantServiceTime }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">需求内容：</span>
+                <div>{{ info.content }}</div>
+              </div>
               <div class="item">
                 <span class="item-field">服务方	：</span>
                 <span>{{ info.serviceShowName }}</span>
@@ -67,10 +72,10 @@
                 <span class="item-field">实际服务时间	：</span>
                 <span>{{ info.serviceStartTime }} 至 {{ info.serviceEndTime }}</span>
               </div>
-              <div class="item">
+              <!-- <div class="item">
                 <span class="item-field">完成情况	：</span>
                 <span>{{ info.finishDesc }}</span>
-              </div>
+              </div> -->
               <div class="item">
                 <span class="item-field">评价	：</span>
                 <span>

src/views/modules/visual/communityGovern/shijianchuli/event-info.vue

@@ -147,7 +147,9 @@
                        :singleList="yanPan.singleList"
                        :hasEvent="yanPan.hasEvent"
                        :bcLimit="yanPan.resiReportEventCount"
-                       @user="toUserInfo" />
+                       :isUserClick="true"
+                       @user="toUserInfo"
+                       @toMiddleUserInfo="toMiddleUserInfo" />
               <div v-else
                    class="m-hint">
                 <img src="@/assets/img/modules/visual/noData.png"
@@ -342,12 +344,10 @@ export default {
           item.icUserName = item.name;
         });
 
-
         //楼院小组、居民上报都存在是，研判分析显示两个分支
-        this.yanPan.singleTitle = data.categoryName;
+        this.yanPan.singleTitle = data.sourceTypeName;
         this.yanPan.hasEvent = false;
 
-
         this.yanPan = { ...this.yanPan, ...data };
         console.log(this.yanPan);
 
@@ -357,6 +357,9 @@ export default {
     },
     //加载组织数据
     async getYanPanList () {
+      if (!this.yanPan.categoryPids) {
+        return false
+      }
       const url = "/gov/project/icEvent/processAnalysis/categoryEventList";
       // const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList";
 
@@ -374,8 +377,8 @@ export default {
       this.yanPan.loading = true;
       if (code === 0) {
         let oneData = {
-          // categoryCode: 111,
+          categoryCode: this.yanPan.categoryCode,
-          // categoryName: 111,
+          categoryName: this.yanPan.categoryName,
           showItem: true,
           addressList: data.list.map((subItem) => {
             return {
@@ -391,8 +394,6 @@ export default {
           singleList: [oneData]
         }
 
-
-
         this.yanPan = { ...this.yanPan, ...aaa };
         console.log(this.yanPan);
 
@@ -407,6 +408,16 @@ export default {
         path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
       });
     },
+    toMiddleUserInfo () {
+      console.log(this.yanPan)
+      if (this.yanPan.reportorResiId) {
+
+        this.$router.push({
+          path: `/main-shuju/visual-basicinfo-people/${this.yanPan.reportorResiId}`,
+        });
+      }
+
+    },
 
 
   },

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -267,7 +267,7 @@ export default {
             width: "10%",
           },
         ],
-        header: ["序号", "所属网格", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
+        header: ["序号", "所属组织", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,

src/views/modules/visual/cpts/analyse.vue

@@ -2,7 +2,8 @@
   <div class="analyse-container">
     <div class="analyse-wr list-wr">
 
-      <div class="analys-col">
+      <div v-if="userList&&userList.length>0"
+           class="analys-col">
         <div class="analys-family">
           <div class="family-title">(家属)</div>
           <div v-for="(item, index) in userList"
@@ -13,26 +14,27 @@
         </div>
       </div>
 
-      <div class="analys-col">
+      <div v-if="userList&&userList.length>0"
+           class="analys-col">
         <img class="analys-arrow"
              src="../../../../assets/img/shuju/measure/zuo@2x.png" />
       </div>
 
       <div class="analys-col">
         <div v-if="bcLimit>31||bcLimit==31"
-             class="analys-person_red">
+             class="analys-person analys-person_red">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
         </div>
         <div v-else-if="bcLimit<31&&(bcLimit>21||bcLimit==21)"
-             class="analys-person_orange">
+             class="analys-person analys-person_orange">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
         </div>
         <div v-else-if="bcLimit<21&&(bcLimit>11||bcLimit==11)"
-             class="analys-person_yellow">
+             class="analys-person analys-person_yellow">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
@@ -170,7 +172,8 @@
           </div>
         </div>
 
-        <div class="analys-col">
+        <div v-if="tempList.length&&tempList.length.length>0"
+             class="analys-col">
           <img v-if="tempList.length > 1"
                class="analys-up"
                src="../../../../assets/img/shuju/measure/up-right.png" />
@@ -304,6 +307,7 @@ export default {
   },
   created () {
     this.tempList = [...this.singleList]
+    console.log(this.tempList)
 
   },
   methods: {
@@ -419,17 +423,20 @@ export default {
         }
       }
 
-      .analys-person-orange {
+      .analys-person_orange {
         background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png")
           no-repeat center;
+        background-size: cover;
       }
-      .analys-person-yellow {
+      .analys-person_yellow {
         background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png")
           no-repeat center;
+        background-size: cover;
       }
-      .analys-person-red {
+      .analys-person_red {
         background: url("../../../../assets/img/shuju/measure/zhuhu_red.png")
           no-repeat center;
+        background-size: cover;
       }
 
       .analys-cate {
@@ -494,6 +501,10 @@ export default {
               margin: 0 auto;
             }
           }
+
+          // .cate-col {
+          //   width: 250px;
+          // }
           .cate-col-w100 {
             width: 230px;
             .cate-list-w0 {