Merge branch '07/06musicArchives' into test

src/views/app/suggestion.vue

@@ -13,6 +13,20 @@
       :model.sync="searchForm"
       ref="searchForm"
     >
+      <el-form-item prop="clientType">
+        <el-select
+          clearable
+          v-model="searchForm.clientType"
+          placeholder="请选择客户端"
+        >
+          <el-option
+            v-for="(item, index) in clientList"
+            :key="index"
+            :value="item.value"
+            :label="item.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="timer">
         <el-date-picker
           v-model.trim="searchForm.timer"
@@ -70,25 +84,17 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-        align="center"
-        prop="url"
-        label="反馈图片"
-      >
-        <template slot-scope="scope">
-          <el-image
-            v-if="
-              scope.row.url
-            "
-            style="width: 60px; height: 60px"
-            fit="cover"
-            :src="scope.row.url.split(',')[0]"
-            :previewSrcList="
-              scope.row.url.split(',')
-            "
-          >
-          </el-image>
-        </template>
+        <el-table-column align="center" prop="url" label="反馈图片">
+          <template slot-scope="scope">
+            <el-image
+              v-if="scope.row.url"
+              style="width: 60px; height: 60px"
+              fit="cover"
+              :src="scope.row.url.split(',')[0]"
+              :previewSrcList="scope.row.url.split(',')"
+            >
+            </el-image>
+          </template>
         </el-table-column>
         <!-- <el-table-column align="center" prop="createTime" label="反馈时间">
         </el-table-column> -->
@@ -115,6 +121,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { sysSuggestionList } from "@/api/appTenant";
+import { clientList } from "@/utils/searchArray";
 import { getTimes } from "@/utils";
 import Tooltip from "@/components/Tooltip/index";
 export default {
@@ -122,6 +129,7 @@ export default {
   name: "chargesList",
   data() {
     return {
+      clientList,
       id: null,
       dataList: [],
       pageInfo: {
@@ -133,6 +141,7 @@ export default {
       },
       searchForm: {
         timer: [],
+        clientType:''
       },
     };
   },
@@ -149,6 +158,7 @@ export default {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: "APP",
+        ...rest,
         ...getTimes(timer, ["startTime", "endTime"]),
       };
       sysSuggestionList(params).then((res) => {