From a6eb5882460b737b01c6a993054aaf310ddd56ff Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 28 Sep 2023 15:10:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=AC=E7=9B=8A=E5=B2=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publicWelfarePost/addForm.vue             | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
index 45e85cd8f..cfc999ab8 100644
--- a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
@@ -105,7 +105,7 @@
                         <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
                             <el-select v-model="formData.idType" clearable>
                                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label"
-                                    :value="item.value">
+                                    :A="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -152,7 +152,7 @@
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
                             <span class="info-title-2">岗位类型: </span>
-                            <span>{{ formData.postTypes }}</span>
+                            <span>{{ formData.postTypeNames || '--' }}</span>
                         </div>
                         <el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else>
                             <el-select v-model="formData.postTypes" multiple collapse-tags clearable>
@@ -193,7 +193,7 @@
                     <el-col :span="24">
                         <div class="info-prop" v-if="formType == 'detail'">
                             <span class="info-title-2">兴趣特长: </span>
-                            <span>{{ formData.hobbyCodes || "--" }}</span>
+                            <span>{{ formData.hobbyNames || "--" }}</span>
                         </div>
 
                         <el-form-item label-width="100px" label="兴趣特长" v-else class="wd-wr">
@@ -235,11 +235,11 @@
                     <el-col :span="24">
                         <div class="info-prop" v-if="formType == 'detail'">
                             <span class="info-title-2">管理范围: </span>
-                            <span>{{ formData.manageScopes || "--" }}</span>
+                            <span>{{ formData.manageScopesName || "--" }}</span>
                         </div>
                         <el-form-item label="管理范围" prop="agencyId" label-width="100px" v-else>
                             <el-cascader class="u-item-width-normal" ref="myCascader" v-model="formData.manageScopes"
-                                :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" clearable>
+                                :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeManageScopes" clearable>
                             </el-cascader>
                         </el-form-item>
                     </el-col>
@@ -334,6 +334,7 @@ export default {
                 SPECIAL_SKILL: [],
                 idCard_type: []
             },
+            selArr:[],
         };
     },
 
@@ -356,10 +357,11 @@ export default {
             await this.getDetail(this.scopeId);
         },
         async getDetail(categorizedResiId) {
-            const url = `/actual/base/publicWelfarePost/detail/${categorizedResiId}`;
+            const url = `/actual/base/resiCategorized/publicWelfarePost/detail/${categorizedResiId}`;
             const { data, code, msg } = await requestGet(url);
             if (code === 0) {
                 this.formData = { ...data };
+                this.formData.manageScopes = data.manageScopes[0].scopeId
                 await this.setAgencyIdFromLastLayerId(data.agencyId)
                 console.log(this.agencyIdTemp);
             } else {
@@ -375,7 +377,7 @@ export default {
                     this.formType === "edit"
                         ? "/actual/base/resiCategorized/publicWelfarePost/update"
                         : "/actual/base/resiCategorized/publicWelfarePost/create";
-
+                this.formData.manageScopes = this.selArr
                 const { data, code, msg } = await requestPost(url, this.formData);
                 if (code === 0) {
                     this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功');
@@ -386,6 +388,11 @@ export default {
                 }
             });
         },
+        handleChangeManageScopes(val){
+            let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+            console.log(obj);
+            this.selArr = [{scopeType:obj.level,scopeId:obj.agencyId}]
+        },
         async getDicts() {
             try {
                 const requests = [

From 52993240a50d02b67f64d4fe9ad69d2496f377f3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sat, 7 Oct 2023 11:21:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=9C=81=E6=BB=A1=E6=84=8F=E5=BA=A6,?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5=E4=B8=8B=E6=8B=89=E8=B0=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E9=A6=96=E9=A1=B5=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=9C=80=E5=B0=8F=E5=AE=BD=E5=BA=A670?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/index.scss                     |  2 +-
 .../satisfaction/communitySelfInsp/formList.vue        | 10 +++++-----
 .../satisfaction/satisfactionProvince/formList.vue     |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss
index bcf4c4bb1..1c8f54e0d 100644
--- a/src/assets/scss/modules/index.scss
+++ b/src/assets/scss/modules/index.scss
@@ -299,7 +299,7 @@
                     }
 
                     .item-per {
-                        width: 90px;
+                        min-width: 70px;
                     }
 
                     .item-progress {
diff --git a/src/views/modules/satisfaction/communitySelfInsp/formList.vue b/src/views/modules/satisfaction/communitySelfInsp/formList.vue
index 3b2a833dc..1bf04332e 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/formList.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/formList.vue
@@ -3,22 +3,22 @@
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
             <el-form-item label="不满意类目" prop="startTime">
                 <el-select v-model="formData.satisfactionCategory" placeholder="请输入" size="small"
-                    class="u-item-width-normal" clearable>
+                    class="u-item-width-normal"  @change="handleSearch" clearable>
                     <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
-                        :value="item.value">
+                        :value="item.value" >
                     </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="不满意等级" prop="startTime">
                 <el-select v-model="formData.satisfactionLevel" placeholder="请输入" size="small" class="u-item-width-normal"
-                    clearable>
+                    clearable  @change="handleSearch">
                     <el-option v-for="item in dicts.satisfaction_level" :key="item.value" :label="item.label"
                         :value="item.value">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-button size="small" type="primary "
-                            @click="handleSearch">查询</el-button>
+            <!-- <el-button size="small" type="primary "
+                            @click="handleSearch">查询</el-button> -->
         </el-form>
        
 
diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue
index a6d375413..3edf8d915 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue
@@ -1,8 +1,8 @@
 <template>
     <div style="margin-top:10px">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
-            <el-form-item label="不满意类目" prop="startTime">
-                <el-select v-model="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-form-item label="不满意类目" prop="startTime" >
+                <el-select v-model="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" @change="getTableData" clearable>
                     <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
                         :value="item.value">
                     </el-option>

From c9a461d2915c1b0c0226f0b075737f058c90757c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Sat, 7 Oct 2023 14:07:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoardMain/main-navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index 234e0d13b..02889d62d 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -6,7 +6,7 @@
     <div class="title">{{ customerName }}数据智能分析平台</div>
     <div class="selectArea" v-if="$route.path == '/dataBoard/satisfactionEval/index'">
       <el-select @change="setSelectName" v-model="value" popper-class="selectPopClass">
-        <el-option v-for="(item, index) in options" v-if="item.agencyLevel === 'grid'" :key="item.value" :label="item.label" :value="item.value"/>
+        <el-option v-for="(item, index) in options" v-if="item.agencyLevel !== 'grid'" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
     </div>
     <!-- <div class="btn-back" @click="toPage('/')">

From e42f84dfe16e3271be6269af18477614883491a2 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Sat, 7 Oct 2023 16:44:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A6=82=E8=A7=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=A0=E7=BC=9D=E6=BB=9A=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/dataBoard/overview/index.scss | 26 +++++++-------
 .../dataBoard/overview/components/sq12345.vue | 35 ++++++++++++++-----
 .../dataBoard/overview/components/sqrfph.vue  | 34 +++++++++++++-----
 3 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss
index c4537482c..b9978fd06 100644
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@@ -44,19 +44,19 @@
 	overflow-y: hidden;
 }
 
-.animation {
-	animation: move 10s linear infinite;
-}
-
-@keyframes move {
-	0% {
-		transform: translateY(0px);
-	}
-
-	100% {
-		transform: translateY(-320px);
-	}
-}
+// .animation {
+// 	animation: move 10s linear infinite;
+// }
+
+// @keyframes move {
+// 	0% {
+// 		transform: translateY(0px);
+// 	}
+
+// 	100% {
+// 		transform: translateY(-320px);
+// 	}
+// }
 
 .m-jdjs {
 	height: 318px;
diff --git a/src/views/dataBoard/overview/components/sq12345.vue b/src/views/dataBoard/overview/components/sq12345.vue
index a70babc86..449391f4b 100644
--- a/src/views/dataBoard/overview/components/sq12345.vue
+++ b/src/views/dataBoard/overview/components/sq12345.vue
@@ -9,7 +9,7 @@
         <div class="th">已办结</div>
       </div>
       <div style="overflow: hidden">
-        <div class="animation">
+        <div ref="animation">
           <div class="tr" v-for="(item, index) in pmList" :key="index">
             <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
               {{ index - 0 + 1 }}
@@ -20,14 +20,16 @@
             <div class="td td-gr">{{ item.closedNum }}</div>
           </div>
           <!-- 无缝滚动 -->
-          <div class="tr" v-for="(item, index) in pmList" :key="index">
-            <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
-              {{ index - 0 + 1 }}
+          <div v-if="pmList.length > 7">
+            <div class="tr" v-for="(item, index) in pmList" :key="index">
+              <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
+                {{ index - 0 + 1 }}
+              </div>
+              <div class="td">{{ item.orgName }}</div>
+              <div class="td">{{ item.sumNum }}</div>
+              <div class="td td-or">{{ item.processNum }}</div>
+              <div class="td td-gr">{{ item.closedNum }}</div>
             </div>
-            <div class="td">{{ item.orgName }}</div>
-            <div class="td">{{ item.sumNum }}</div>
-            <div class="td td-or">{{ item.processNum }}</div>
-            <div class="td td-gr">{{ item.closedNum }}</div>
           </div>
         </div>
       </div>
@@ -72,6 +74,23 @@ export default {
     getList(item) {
       this.$http.get("/actual/base/streetOverview/eventAgencyGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => {
         this.pmList = data;
+        if (this.pmList.length > 7) {
+          this.$nextTick(() => {
+            const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length;
+            console.log(aniHeight);
+            this.$refs.animation.style.animation = "move 10s linear infinite";
+            document.styleSheets[0].insertRule(
+              `@keyframes move{0% {
+		transform: translateY(0px);
+	}
+
+	100% {
+		transform: translateY(-${aniHeight}px);
+	}`,
+              0
+            );
+          });
+        }
       });
     },
   },
diff --git a/src/views/dataBoard/overview/components/sqrfph.vue b/src/views/dataBoard/overview/components/sqrfph.vue
index 18b4478b2..569e9cb5f 100644
--- a/src/views/dataBoard/overview/components/sqrfph.vue
+++ b/src/views/dataBoard/overview/components/sqrfph.vue
@@ -9,7 +9,7 @@
         <div class="th">人房更新总数</div>
       </div>
       <div style="overflow: hidden">
-        <div class="animation">
+        <div ref="animation">
           <div class="tr" v-for="(item, index) in pmList" :key="index">
             <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
               {{ index - 0 + 1 }}
@@ -20,14 +20,16 @@
             <div class="td">{{ item.sumNum }}</div>
           </div>
           <!-- 无缝滚动 -->
-          <div class="tr" v-for="(item, index) in pmList" :key="index">
-            <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
-              {{ index - 0 + 1 }}
+          <div v-if="pmList.length > 7">
+            <div class="tr" v-for="(item, index) in pmList" :key="index">
+              <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
+                {{ index - 0 + 1 }}
+              </div>
+              <div class="td">{{ item.orgName }}</div>
+              <div class="td">{{ item.houseNum }}</div>
+              <div class="td">{{ item.residentNum }}</div>
+              <div class="td">{{ item.sumNum }}</div>
             </div>
-            <div class="td">{{ item.orgName }}</div>
-            <div class="td">{{ item.houseNum }}</div>
-            <div class="td">{{ item.residentNum }}</div>
-            <div class="td">{{ item.sumNum }}</div>
           </div>
         </div>
       </div>
@@ -72,6 +74,22 @@ export default {
     getList(item) {
       this.$http.get("/actual/base/streetOverview/residentHouseUpdateGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => {
         this.pmList = data;
+        if (this.pmList.length > 7) {
+          this.$nextTick(() => {
+            const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length;
+            this.$refs.animation.style.animation = "move 10s linear infinite";
+            document.styleSheets[0].insertRule(
+              `@keyframes move{0% {
+		transform: translateY(0px);
+	}
+
+	100% {
+		transform: translateY(-${aniHeight}px);
+	}`,
+              0
+            );
+          });
+        }
       });
     },
   },