提交

src/views/Content/index.vue

@@ -79,6 +79,23 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="来源">
+          <el-select
+            collapse-tags
+            clearable
+            v-model="form.client"
+            placeholder="请选择来源"
+          >
+            <el-option
+              v-for="item in client"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item style="float: right">
           <el-button type="primary" @click="onSubmit">查询</el-button>
         </el-form-item>
@@ -369,6 +386,7 @@ export default {
         version: [],
         date: [],
         content: "",
+        client: "",
       },
       match: "",
       cycle: [],
@@ -376,25 +394,45 @@ export default {
       version: [],
       content: [],
       top: [],
+      client: [],
     };
   },
   async mounted() {
     if (chart && chart.dispose) chart.dispose();
-    const { source, appV, contentV, appli, appVLi, contentli } =
-      await this.getAppListFunc();
+    const {
+      source,
+      appV,
+      contentV,
+      clentV,
+      appli,
+      appVLi,
+      contentli,
+      clentli,
+    } = await this.getAppListFunc();
     const keys = {
       value: "mname",
       label: "mname",
     };
+    let client = clentli.find(r => r.mdefault).mcode.toString();
     this.cycle = this.verifyList(appli, source, keys, false);
     this.version = this.verifyList(appVLi, appV, keys, true);
     this.content = this.verifyList(contentli, contentV, keys, true);
+    this.client = this.verifyList(
+      clentli,
+      clentV,
+      {
+        value: "mcode",
+        label: "mname",
+      },
+      true
+    );
     this.form = {
       //   app: (this.cycle[0] || { value: "" }).value,
       app: "起点新闻",
       version: [(this.version[0] || { value: "" }).value],
       content: -1,
       date: [new Date(Date.now() - 604800000), new Date(Date.now() - 86400000)],
+      client,
       page: 1,
       size: 20,
       sortBy: "",
@@ -440,6 +478,7 @@ export default {
         pageSize: this.form.size,
         match: this.match,
         sortBy: this.form.sortBy,
+        lib: this.form.client == -1 ? undefined : this.form.client,
       };
       getContentPage(this.lastParams).then(r => (this.table = r || {}));
       getContentTop10({
@@ -448,6 +487,7 @@ export default {
         end: this.FormData(this.form.date[1]),
         version: this.form.version == -1 ? undefined : this.form.version,
         contentType: this.form.content == -1 ? undefined : this.form.content,
+        lib: this.form.client == -1 ? undefined : this.form.client,
       })
         .then(r => {
           this.top = r || [];
@@ -456,6 +496,7 @@ export default {
             start: this.FormData(this.form.date[0]),
             end: this.FormData(this.form.date[1]),
             version: this.form.version == -1 ? undefined : this.form.version,
+            lib: this.form.client == -1 ? undefined : this.form.client,
             contentType:
               this.form.content == -1 ? undefined : this.form.content,
           }).then(resChart => {
@@ -482,7 +523,6 @@ export default {
         });
     },
     createImage(keyList, valueList, title) {
-      
       if (!chart) {
         chart = echarts.init(this.$refs.regionChart);
         window.onresize = chart.resize;
@@ -490,7 +530,7 @@ export default {
       chart.resize({
         height: (this.$refs.regionChart.offsetWidth * 4) / 16,
       });
-      console.log(keyList, valueList, title)
+      console.log(keyList, valueList, title);
       chart.setOption({
         tooltip: {
           trigger: "axis",
@@ -549,13 +589,16 @@ export default {
       });
     },
     async getAppListFunc() {
-      const { r, li, appVersion, contentList } = await this.getAppListOri();
+      const { r, li, appVersion, contentList, clientList } =
+        await this.getAppListOri();
       let source = { length: 0 },
         appli = [];
       let appV = { length: 0 },
         appVLi = [];
       let contentV = { length: 0 },
         contentli = [];
+      let clentV = { length: 0 },
+        clentli = [];
       let prvList = r.output.data.prvRolectrl || [];
       for (let i = 0; i < prvList.length; i++) {
         const v = prvList[i];
@@ -569,13 +612,16 @@ export default {
       if (li.status === "0") appli = li.output.data || [];
       if (appVersion.length) appVLi = appVersion || [];
       if (contentList.length) contentli = contentList || [];
+      if (clientList.length) clentli = clientList || [];
       return {
         source,
         appV,
         appli,
+        clentV,
         contentV,
         appVLi,
         contentli,
+        clentli,
       };
     },
     async getAppListOri() {
@@ -588,6 +634,12 @@ export default {
         menuid: 399,
         roleid,
       });
+      const defaultAppName = "起点新闻";
+      // 端列表
+      const clientList = await getSearchData({
+        gcode: "CLIENT_TYPE",
+        source: defaultAppName,
+      });
       //   应用列表
 
       const li = await getAppList({
@@ -596,7 +648,6 @@ export default {
         pageid: 1,
         pagesize: 1000,
       });
-      const defaultAppName = "起点新闻";
       //   应用版本列表
       const appVersion = await getSearchData({
         gcode: "APP_VERSION",
@@ -611,7 +662,7 @@ export default {
       });
       contentList =
         contentList.status == "0" ? contentList.output.data || [] : [];
-      return { r, li, appVersion, contentList };
+      return { r, li, appVersion, contentList, clientList };
     },
     disabledDate(time) {
       const first = new Date("2021-06-21 00:00:00");