From b9d90b02a6552a04480a7ec4136f41770c9f759c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 14 Jan 2022 11:13:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A418=E7=B1=BB=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=BD=91=E6=A0=BC=EF=BC=8C=E7=A0=94=E5=88=A4?=
 =?UTF-8?q?UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue         |  4 ++--
 src/views/components/resiForm.vue         | 11 +++++++++--
 src/views/modules/visual/cpts/analyse.vue |  9 ++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 27be335d..07d1a731 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -19,7 +19,7 @@
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select"
+                  clearable class="resi-cell-select" @change="handleChangeGrid"
                   >
                     <el-option
                       v-for="item in optionsG"
@@ -36,7 +36,7 @@
               <el-form-item prop="VILLAGE_ID" label="所属小区" required>
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
-                  clearable class="resi-cell-select"
+                  clearable class="resi-cell-select" @change="handleChangeV"
                   >
                     <el-option
                       v-for="item in optionsV"
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 25d55251..506c2265 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -330,13 +330,15 @@ export default {
     }
     let initForm = (obj, arr) => {
       let _form = {}
-      // console.log('formInfo', obj)
+      console.log('formInfo---arr', arr)
       if (Object.keys(obj).length > 0) {
         _form = { ...obj }
         return _form
       }
       arr.forEach(item => {
+
         if (item.multiSelect) _form[item.columnName] = []
+        else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
         else _form[item.columnName] = ''
 
         // if (item.optionSourceType === 'remote') {
@@ -371,7 +373,12 @@ export default {
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [ ...this.formList ].map(item => {
+      return {
+        ...item,
+        isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false
+      }
+    })
     let constForm = {
       ...form,
       GRID_ID: '',
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 6292ddc5..10c0c512 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -83,7 +83,7 @@
 
         <div class="analys-col analys-col-wr analys-col-more list-wr"
              id="scroll-wr">
-          <div class="cate-list cate-list-child">
+          <div class="cate-list cate-list-child" :style="'padding-top:' + computedPd(tempList)">
             <div v-for="(item, index) in tempList"
                  :key="index"
                  class="cate-row">
@@ -275,12 +275,19 @@ export default {
       }
       return statusObj[status]
     },
+    computedPd(list) {
+      if (this.sourceTab == 'group') return '60px'
+      if (list.length == 1) return '330px'
+      else if (list.length == 2) return '240px'
+      else return '60px'
+    },
     handleTabs (type) {
       if (type === 'group') this.tempList = [...this.singleList]
       else if (type === 'event') this.tempList = [...this.moreList]
       this.sourceTab = type
       const _dom = document.getElementById('scroll-wr')
       _dom.scrollTop = 0
+      this.computedPd(this.tempList)
     },
     handleProject (item) {
       this.$emit('project', item)

From 52f6fe2748fdb1d2ff756065435fefa8f4b05360 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 18 Jan 2022 10:21:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/cpt/issue-info.vue    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
index 6ebd7d49..c5f55a89 100644
--- a/src/views/modules/visual/communityGovern/cpt/issue-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
@@ -23,7 +23,8 @@
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题内容：</span>
               <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
@@ -43,7 +44,8 @@
               <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
@@ -51,11 +53,13 @@
               <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
@@ -181,8 +185,10 @@ export default {
       if (code === 0) {
         this.info = data
 
-        this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
+        if (this.info.topicInfo && this.info.topicInfo.publishedTime) {
+          this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
 
+        }
       } else {
         this.$message.error(msg);
       }