修复若干bug

src/views/webSiteManagement/imageLibrary/edit.vue

@@ -78,7 +78,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="onSubmit">确定</el-button>
-          <el-button>取消</el-button>
+          <el-button @click="goBack">取消</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -286,19 +286,16 @@ export default {
     //点击编辑的时候，获取表格行数据，渲染edit页面
     renderData(val) {
       //获取详情
-      // getDetail(val.id).then(res => {
-      //   let val = res.data;
-        let afterFormat =  this.filterParams(val);
-        let data = JSON.parse(JSON.stringify(afterFormat));
 
-        data.paramJson = JSON.parse(data.paramJson);
-        data.imageInfoRelationList = data.imageInfoRelationList[0];
-        data.coverImg = data.coverImg || '';
-        this.ruleForm = data;
-        this.images.selects = this.ruleForm.relatedIds.split(',')//相似图片转为数组格式
+      let afterFormat =  this.filterParams(val);
+      let data = JSON.parse(JSON.stringify(afterFormat));
+
+      // data.paramJson = JSON.parse(data.paramJson);
+      data.imageInfoRelationList = data.imageInfoRelationList[0];
+      data.coverImg = data.coverImg || '';
+      this.ruleForm = data;
+      this.images.selects = this.ruleForm.relatedIds.split(',')//相似图片转为数组格式
 
-        // console.log('bus end', this.ruleForm);
-      // })
     },
     //返回上一页
     goBack() {

src/views/webSiteManagement/imageLibrary/list.vue

@@ -12,11 +12,16 @@
               <el-option v-for="(item, index) in bannerStatus" :key="index" :label="item" :value="~~index"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="影像分类">
+            <el-select v-model="searchForm.type">
+              <el-option v-for="(item, index) in imageTypes" :key="index" :label="item" :value="~~index"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="卫星名称">
             <el-input v-model="searchForm.title" placeholder="请输入卫星名称"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" plain @click="filterData">搜索</el-button>
+            <el-button type="primary" plain @click="search">搜索</el-button>
             <el-button type="primary" plain @click="clearFilterData">清除搜索</el-button>
           </el-form-item>
         </el-form>
@@ -24,7 +29,7 @@
       <el-table :data="list" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
         <el-table-column align="center" type="index" label="序号" width="65"></el-table-column>
         <el-table-column align="center" label="产品名称" prop="name"></el-table-column>
-        <el-table-column align="center" label="产品类型" prop="type"></el-table-column>
+        <el-table-column align="center" label="产品类型" prop="paramJson.productType"></el-table-column>
         <el-table-column align="center" label="尺寸" prop="imageInfoRelationList[0].fileWidth"></el-table-column>
         <el-table-column align="center" label="价格" prop="imageInfoRelationList[0].price"></el-table-column>
         <el-table-column align="center" label="状态">
@@ -70,11 +75,12 @@ export default {
       //请求参数。页码页数等
       listQuery: {
         page: 1,
-        limit: 20
+        limit: 10
       },
       //搜索表单
       searchForm: {
         status: 0,
+        type: 0,
         title: ""
       },
       //添加banner与修改banner的form对象
@@ -87,26 +93,31 @@ export default {
         1: '启用',
         2: '禁用',
       },
+      imageTypes: {
+        //1--影像美图 2--专题图 3--遥感成果图
+        0: '全部',
+        1: '影像美图',
+        2: '专题图',
+        3: '遥感成果图',
+      },
       dialogVisible: false,
-      dialogTitle: "新增卫星"
+      dialogTitle: "新增卫星",
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
-    //清除搜索
-    filterData() {
-      if (this.searchForm.status === 0 && this.searchForm.title === '') {
-        this.list = this.data;
-        return ;
-      }
-      let temp = this.data.filter(v => this.searchForm.status === 0 ? true: !!(this.searchForm.status === v.status))
-      if (!!this.searchForm.title) {
-        temp = temp.filter(v => v.name.includes(this.searchForm.title))
+    //搜索按钮
+    search() {
+      this.listQuery = {
+        status: this.searchForm.status || null,
+        type: this.searchForm.type || null,
+        name: this.searchForm.title,
+        page: 1,
+        limit: 10
       }
-
-      this.list = temp
+      this.getList();
     },
     //清除搜索
     clearFilterData() {
@@ -114,7 +125,15 @@ export default {
         status: 0,
         title: ""
       }
-      this.list = this.data;
+
+      this.listQuery = {
+        status: this.searchForm.status || null,
+        type: this.searchForm.type || null,
+        name: this.searchForm.title,
+        page: 1,
+        limit: 10
+      }
+      this.getList()
     },
     //切换页码
     currentChange(val) {
@@ -183,8 +202,13 @@ export default {
     getList() {
       this.listLoading = true;
       page(this.listQuery).then(res => {
-        this.list = res.data.data
-        this.data = res.data.data
+        this.list = res.data.data;
+        this.list = this.list.map(v => {
+          v.paramJson = JSON.parse(v.paramJson)
+          return v
+        })
+        console.log(222222, this.list)
+        this.data = res.data.data;
         this.total = res.data.totalCount;
         this.listLoading = false;
       }).catch(err => {