合并分支代码

src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue

@@ -1,33 +1,10 @@
 <template>
-  <div
+  <div class="personnel-portrait" v-loading="loading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0,0,0,0.5)">
-    class="personnel-portrait"
+    <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
-    v-loading="loading"
-    element-loading-text="加载中..."
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0,0,0,0.5)"
-  >
-    <Tabs
-      v-model="resultType"
-      :list="resultTypeList"
-      @changeVal="resultTypeChange"
-    />
     <div class="screen">
       <div class="txt">不满意人员画像</div>
-      <el-select
+      <el-select v-if="resultType == 'provinceAndSelf'" v-model="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass">
-        v-if="resultType == 'provinceAndSelf'"
+        <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-        v-model="typeCondition"
-        @change="getData"
-        placeholder="请选择"
-        class="select"
-        popper-class="selectPopClass"
-      >
-        <el-option
-          v-for="item in typeConditionList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
       </el-select>
     </div>
 
@@ -64,15 +41,7 @@
       </div>
       <div class="tag purple" v-if="gender">
         <div class="text">
-          {{
+          {{ gender === "1" ? "男" : gender === "2" ? "女" : gender === "0" ? "未知" : "" }}
-            gender === "1"
-              ? "男"
-              : gender === "2"
-              ? "女"
-              : gender === "0"
-              ? "未知"
-              : ""
-          }}
         </div>
       </div>
     </div>
@@ -154,18 +123,14 @@ export default {
       this.getData();
     },
     gotopage() {
-      this.$router.push(
+      this.$router.push("/dataBoard/satisfactionEval/dissatisfiedPersonnel?searchParams=" + this.searchParams);
-        "/dataBoard/satisfactionEval/dissatisfiedPersonnel?searchParams=" +
-          this.searchParams
-      );
     },
     getDisKey() {
-      this.$http
+      this.$http.post("/sys/dict/data/dictlist", { dictType: "satisfaction_category" }).then(({ data: { data } }) => {
-        .post("/sys/dict/data/dictlist", { dictType: "satisfaction_category" })
+        this.typeCondition = data[0].value;
-        .then(({ data: { data } }) => {
+        this.typeConditionList = data;
-          this.typeCondition = data[0].value;
+        this.getData();
-          this.typeConditionList = data;
+      });
-        });
     },
     getData() {
       this.loading = true;
@@ -173,26 +138,20 @@ export default {
         level: this.$store.state.chooseArea.chooseName.level,
         orgId: this.$store.state.chooseArea.chooseName.orgId,
         queryType: this.resultType,
-        category:
+        category: this.resultType == "provinceAndSelf" ? this.typeCondition : null,
-          this.resultType == "provinceAndSelf" ? this.typeCondition : null,
       };
-      this.$http
+      this.$http.get("/governance/satisfactionOverview/satisfactionCrowdPortrait?" + this.$paramsFormat(params)).then(({ data: { data } }) => {
-        .get(
+        this.gender = data.gender;
-          "/governance/satisfactionOverview/satisfactionCrowdPortrait?" +
+        this.marriageName = data.marriageName;
-            this.$paramsFormat(params)
+        this.ageClassification = data.ageClassification;
-        )
+        this.cultureName = data.cultureName;
-        .then(({ data: { data } }) => {
+        this.gridName = data.gridName;
-          this.gender = data.gender;
+        this.monthIncomeLevel = data.monthIncomeLevel;
-          this.marriageName = data.marriageName;
+        this.residentTagName = data.residentTagName;
-          this.ageClassification = data.ageClassification;
+        this.matchPeopleNum = data.matchPeopleNum;
-          this.cultureName = data.cultureName;
+        this.loading = false;
-          this.gridName = data.gridName;
+        this.searchParams = JSON.stringify({ ...data, ...params });
-          this.monthIncomeLevel = data.monthIncomeLevel;
+      });
-          this.residentTagName = data.residentTagName;
-          this.matchPeopleNum = data.matchPeopleNum;
-          this.loading = false;
-          this.searchParams = JSON.stringify({ ...data, ...params });
-        });
     },
   },
 };