bding 1 gadu atpakaļ
vecāks
revīzija
c8c0bff6e1

+ 5 - 22
src/views/custom_manage/points/RankingOverview.vue

@@ -14,17 +14,9 @@
         @change="changeHandle"
       >
       </el-cascader>
-      <el-cascader
-        style="width: 220px; margin: 0 20px"
-        v-model="valueLocation"
-        collapse-tags
-        :props="{ multiple: true, value: 'name', children: 'city', label: 'name' }"
-        clearable
-        :options="locationOptions"
-        placeholder="请选择城市"
-        @change="changeHandle"
-      >
-      </el-cascader>
+      <el-select style="width: 220px; margin: 0 20px" v-model="valueLocation" multiple placeholder="请选择城市" @change="changeHandle">
+        <el-option v-for="item in locationOptions" :key="item.name" :label="item.name" :value="item.name"> </el-option>
+      </el-select>
       <a :href="exportUser" download>
         <el-button type="primary" style="width: 80px">导出</el-button>
       </a>
@@ -56,7 +48,6 @@
 
 <script>
 import { customInterence, xClassCustomApi } from "@/api/api.js";
-import { locationOptions } from "../customList/location";
 
 export default {
   name: "",
@@ -76,12 +67,10 @@ export default {
       tableTheadColumns: [],
       datalist: [],
       listGroup: [],
+      locationOptions: [{ name: "北京市" }, { name: "上海市" }, { name: "深圳市" }],
     };
   },
   computed: {
-    locationOptions() {
-      return locationOptions;
-    },
     exportUser() {
       let baseUrl = process.env.API_ROOT + "/cygx/enterScore/rankingOverview";
       let token = localStorage.getItem("auth") || "";
@@ -117,7 +106,6 @@ export default {
       let params = this.paramsHandler();
       const res = await xClassCustomApi.enterScoreRankingOverview(params);
       if (res.Ret === 200) {
-        console.log(res, "\\");
         this.tableTheadColumns = res.Data.ListCompany || [];
         this.datalist = res.Data.ListQuarterDate || [];
       }
@@ -130,13 +118,8 @@ export default {
           return item[item.length - 1];
         });
       }
-      const cityArr = [];
-      this.valueLocation.forEach((item) => {
-        cityArr.push(item[1]);
-      });
-      let cityValue = cityArr.join(",");
       let params = {
-        City: cityValue,
+        City: this.valueLocation.join(","),
         AdminId: salesArr.join(","),
       };
       return params;

+ 19 - 42
src/views/custom_manage/points/RatingOverview.vue

@@ -7,17 +7,9 @@
           <el-option v-for="item in quarterOptions" :key="item.label" :label="item.label" :value="item.value"> </el-option>
         </el-select>
         <el-input style="width: 220px" placeholder="请输入券商名称" prefix-icon="el-icon-search" v-model="brokerName" @input="inputHandle"> </el-input>
-        <el-cascader
-          style="width: 220px; margin: 0 20px"
-          v-model="valueLocation"
-          collapse-tags
-          :props="{ multiple: true, value: 'name', children: 'city', label: 'name' }"
-          clearable
-          :options="locationOptions"
-          placeholder="请选择城市"
-          @change="changeHandle"
-        >
-        </el-cascader>
+        <el-select style="width: 220px; margin: 0 20px" v-model="valueLocation" multiple placeholder="请选择城市" @change="changeHandle">
+          <el-option v-for="item in locationOptions" :key="item.name" :label="item.name" :value="item.name"> </el-option>
+        </el-select>
         <a :href="exportUser" download>
           <el-button type="primary" style="width: 80px">导出</el-button>
         </a>
@@ -41,7 +33,7 @@
           <tbody v-for="(item, index) in datalist" :key="index">
             <tr>
               <td class="thead-rs">{{ item.ChartPermissionName }}</td>
-              <td v-for="key in item.ProportionListText" :key="key">{{key}}</td>
+              <td v-for="key in item.ProportionListText" :key="key">{{ key }}</td>
             </tr>
             <tr v-for="rs in item.List" :key="rs.RealName" class="content-ul">
               <td>{{ rs.RealName }}</td>
@@ -63,7 +55,6 @@
 </template>
 
 <script>
-import { locationOptions } from "../customList/location";
 import { customInterence, xClassCustomApi } from "@/api/api.js";
 
 export default {
@@ -98,30 +89,17 @@ export default {
       datalist: [],
       listGroup: [],
       enterScoreType: false,
+      locationOptions: [{ name: "北京市" }, { name: "上海市" }, { name: "深圳市" }],
     };
   },
   computed: {
-    locationOptions() {
-      return locationOptions;
-    },
     exportUser() {
       let baseUrl = process.env.API_ROOT + "/cygx/enterScore/scoreOverview";
       let token = localStorage.getItem("auth") || "";
       const cityArr = [];
-      this.valueLocation.forEach((item) => {
-        // 市
-        cityArr.push(item[1]);
-      });
-      let cityValue = cityArr.join(",");
       let paramStr = "";
-      let params = {
-        StartDate: this.yearValue + "-" + this.selectedQuarter[0],
-        EndDate: this.yearValue + "-" + this.selectedQuarter[1],
-        KeyWord: this.brokerName,
-        City: cityValue,
-        EnterScoreType: this.enterScoreType ? 2 : 1,
-        IsExport: true,
-      };
+      let params = this.paramsHandler();
+      params.IsExport = true;
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;
       }
@@ -181,19 +159,7 @@ export default {
       this.tableTheadColumns = [];
       this.datalist = [];
       this.listGroup = [];
-
-      const cityArr = [];
-      this.valueLocation.forEach((item) => {
-        cityArr.push(item[1]);
-      });
-      let cityValue = cityArr.join(",");
-      let params = {
-        StartDate: this.yearValue + "-" + this.selectedQuarter[0],
-        EndDate: this.yearValue + "-" + this.selectedQuarter[1],
-        KeyWord: this.brokerName,
-        City: cityValue,
-        EnterScoreType: this.enterScoreType ? 2 : 1,
-      };
+      let params = this.paramsHandler();
       const res = await xClassCustomApi.enterScoreScoreOverview(params);
       if (res.Ret === 200) {
         this.tableTheadColumns = res.Data.ListCompany || [];
@@ -201,6 +167,17 @@ export default {
         this.listGroup = res.Data.ListGroup || [];
       }
     },
+    // 处理数据, 获取数据
+    paramsHandler() {
+      let params = {
+        StartDate: this.yearValue + "-" + this.selectedQuarter[0],
+        EndDate: this.yearValue + "-" + this.selectedQuarter[1],
+        KeyWord: this.brokerName,
+        City: this.valueLocation.join(","),
+        EnterScoreType: this.enterScoreType ? 2 : 1,
+      };
+      return params;
+    },
   },
 };
 </script>