Merge branch 'dev_ren' into 'dev'

Dev ren

See merge request !55

src/api/website/imageLibrary/index.js

@@ -39,3 +39,12 @@ export function getDetail(query) {
     method: 'get'
   });
 }
+
+// /api/website/imageImgStorage/getDetail/{id}
+export function imgmoreUpdata(query) {
+  return fetch({
+    url: '/api/website/imageImgStorage/updateBatch',
+    method: 'post',
+    data: query
+  });
+}

src/views/archiveDataManagement/dataList/index.vue

@@ -60,7 +60,7 @@
         align="center"
       >
       </el-table-column>
-      <el-table-column prop="imageResolution" label="分辨率" align="center">
+      <el-table-column prop="imageResolutionStr" label="分辨率" align="center">
       </el-table-column>
       <el-table-column prop="imageTakeTimeStr" label="拍摄时间" align="center">
       </el-table-column>
@@ -142,7 +142,9 @@ export default {
         if (res.status == 200) {
           this.total = res.data.totalCount;
           this.list = res.data.data;
+
           this.list.map((item) => {
+            item.imageResolutionStr = item.imageResolution.join("m,") + "m";
             item.imageTakeTimeStr = timestamp2DateAuto(
               item.imageTakeTime,
               "yyyy-MM-dd hh:mm:ss"

src/views/webSiteManagement/imageLibrary/list.vue

@@ -38,6 +38,9 @@
             <el-button type="primary" plain @click="clearFilterData"
               >清除搜索</el-button
             >
+            <el-button type="text" @click="moreUp">批量上架</el-button>
+            <el-button type="text" @click="moreDown">批量下架</el-button>
+            <el-button type="text" @click="moreDel">批量删除</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -46,9 +49,12 @@
         v-loading.body="listLoading"
         border
         fit
+        @selection-change="handleSelectionChange"
         highlight-current-row
         style="width: 100%"
       >
+        <el-table-column type="selection" width="40" align="center">
+        </el-table-column>
         <el-table-column
           align="center"
           label="序号"
@@ -126,7 +132,12 @@
 
 <script>
 import { satelliteIntroduction } from "@/utils/formDatas.js";
-import { page, update, updateStatus } from "@/api/website/imageLibrary";
+import {
+  page,
+  update,
+  updateStatus,
+  imgmoreUpdata,
+} from "@/api/website/imageLibrary";
 
 export default {
   name: "satelliteIntroduction",
@@ -163,12 +174,17 @@ export default {
       },
       dialogVisible: false,
       dialogTitle: "新增卫星",
+      multipleSelection: [],
     };
   },
   mounted() {
     this.getList();
   },
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+      console.log(this.multipleSelection);
+    },
     handleSizeChange(val) {
       this.listQuery.limit = val;
 
@@ -178,6 +194,88 @@ export default {
       // this.listQuery = page;
       this.$emit("recordPageInfo", page);
     },
+    //批量上架
+    moreUp() {
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("批量上架操作, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          //1
+          let list = [];
+          this.multipleSelection.forEach((item) => {
+            list.push(item.id);
+          });
+          imgmoreUpdata({ ids: list.join(","), status: 1 }).then((res) => {
+            if (res.status == 200) {
+              this.$message.success("操作成功");
+              this.getList();
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    moreDown() {
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("批量下架操作, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          //2
+          let list = [];
+          this.multipleSelection.forEach((item) => {
+            list.push(item.id);
+          });
+          imgmoreUpdata({ ids: list.join(","), status: 2 }).then((res) => {
+            if (res.status == 200) {
+              this.$message.success("操作成功");
+              this.getList();
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    moreDel() {
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("批量删除操作, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          //3
+          let list = [];
+          this.multipleSelection.forEach((item) => {
+            list.push(item.id);
+          });
+          imgmoreUpdata({ ids: list.join(","), isDel: 1 }).then((res) => {
+            if (res.status == 200) {
+              this.$message.success("操作成功");
+              this.getList();
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
+        })
+        .catch(() => {});
+    },
     //搜索按钮
     search() {
       this.listQuery = {

src/views/webSiteManagement/industryApplication/applicationCate/index.vue

@@ -163,13 +163,14 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="父级" align="center">
+
+        <!-- <el-table-column label="父级" align="center">
           <template slot-scope="scope">
             <span class="typelevel">{{
-              getFatherTypeName(scope.row.pid)
+              getFatherTypeName(scope.row.pid) 
             }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="排序" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
@@ -529,9 +530,12 @@ export default {
             }
           });
         }
-        this.tableData.forEach((obj,index)=> {
-          obj.index = ((this.typePagination.currentPage-1)*this.typePagination.pageSize)+(++index)
-        })
+        this.tableData.forEach((obj, index) => {
+          obj.index =
+            (this.typePagination.currentPage - 1) *
+              this.typePagination.pageSize +
+            ++index;
+        });
       }
     },
     // 删除类型

src/views/webSiteManagement/satelliteIntroduction/list.vue

@@ -9,28 +9,68 @@
         <el-form :inline="true" :model="searchForm" class="demo-form-inline">
           <el-form-item label="所有状态">
             <el-select v-model="searchForm.status" clearable>
-              <el-option v-for="(item, index) in bannerStatus" :key="index" :label="item" :value="~~index"></el-option>
+              <el-option label="全部" :value="null"></el-option>
+
+              <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-input v-model="searchForm.name" placeholder="请输入卫星名称"></el-input>
+            <el-input
+              v-model="searchForm.name"
+              placeholder="请输入卫星名称"
+            ></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" plain @click="search">搜索</el-button>
-            <el-button type="primary" plain @click="clearFilterData">清除搜索</el-button>
+            <el-button type="primary" plain @click="clearFilterData"
+              >清除搜索</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="list" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
-        <el-table-column align="center" label="序号" prop="index" width="65"></el-table-column>
-        <el-table-column align="center" label="卫星名称" prop="name"></el-table-column>
+      <el-table
+        :data="list"
+        v-loading.body="listLoading"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%"
+      >
+        <el-table-column
+          align="center"
+          label="序号"
+          prop="index"
+          width="65"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="卫星名称"
+          prop="name"
+        ></el-table-column>
         <el-table-column align="center" label="缩略图">
           <template slot-scope="scope">
-            <img class="cover" :src="scope.row.coverImg"  @click.stop="showPreview(scope.row.coverImg)"/>
+            <img
+              class="cover"
+              :src="scope.row.coverImg"
+              @click.stop="showPreview(scope.row.coverImg)"
+            />
           </template>
         </el-table-column>
-        <el-table-column align="center" label="分辨率" prop="resolution"></el-table-column>
-        <el-table-column align="center" label="排序" prop="rank"></el-table-column>
+        <el-table-column
+          align="center"
+          label="分辨率"
+          prop="resolution"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="排序"
+          prop="rank"
+        ></el-table-column>
         <el-table-column align="center" label="状态">
           <template slot-scope="scope">
             {{ getStatus(scope.row.status) }}
@@ -38,9 +78,21 @@
         </el-table-column>
         <el-table-column align="center" label="操作" width="250">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="edit(scope.row)">编辑</el-button>
-            <el-button :type="scope.row.status === 1 ? 'info': 'warning'" size="mini" @click="changeParams(scope.row, 'status')">{{scope.row.status === 1 ? '下架': '上架'}}</el-button>
-            <el-button type="danger" size="mini" @click="changeParams(scope.row, 'isDel')">删除</el-button>
+            <el-button type="primary" size="mini" @click="edit(scope.row)"
+              >编辑</el-button
+            >
+            <el-button
+              :type="scope.row.status === 1 ? 'info' : 'warning'"
+              size="mini"
+              @click="changeParams(scope.row, 'status')"
+              >{{ scope.row.status === 1 ? "下架" : "上架" }}</el-button
+            >
+            <el-button
+              type="danger"
+              size="mini"
+              @click="changeParams(scope.row, 'isDel')"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -58,7 +110,8 @@
           :page-sizes="[10, 20, 30, 40]"
           :page-size="listQuery.limit"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="~~total">
+          :total="~~total"
+        >
         </el-pagination>
         <!-- <el-pagination
           background
@@ -69,57 +122,56 @@
         </el-pagination> -->
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-import { satelliteIntroduction } from "@/utils/formDatas.js"
-import { page, update } from "@/api/website/satelliteIntroduction"
+import { satelliteIntroduction } from "@/utils/formDatas.js";
+import { page, update } from "@/api/website/satelliteIntroduction";
 
 export default {
   name: "satelliteIntroduction",
-  components:{
-    ElImageViewer
+  components: {
+    ElImageViewer,
   },
   data() {
     return {
-      currentIcon:{
+      currentIcon: {
         showPreview: false,
         url: "",
       },
-      data: null,//原数据
-      list: null,//赋值数据 | 过滤数据
+      data: null, //原数据
+      list: null, //赋值数据 | 过滤数据
       total: null,
-      listLoading: true,//请求加载状态
+      listLoading: true, //请求加载状态
       //请求参数。页码页数等
       listQuery: this.$parent.pageInfo,
       //搜索表单
       searchForm: {
-        status: this.$parent.pageInfo.status,
-        name: this.$parent.pageInfo.name
+        status: this.$parent.pageInfo.status || null,
+        name: this.$parent.pageInfo.name,
       },
       //添加banner与修改banner的form对象
-      editForm: satelliteIntroduction.init(),//提交的表单参数
-      editFormInfo: satelliteIntroduction.formInfo,//表单项。
-      editFormRules: satelliteIntroduction.rules,//表单规则
+      editForm: satelliteIntroduction.init(), //提交的表单参数
+      editFormInfo: satelliteIntroduction.formInfo, //表单项。
+      editFormRules: satelliteIntroduction.rules, //表单规则
       //是否启用，1、启用，2、禁用
       bannerStatus: {
         // 0: '全部',
-        1: '启用',
-        2: '禁用',
+        1: "启用",
+        2: "禁用",
       },
       dialogVisible: false,
-      dialogTitle: "新增卫星"
-    }
+      dialogTitle: "新增卫星",
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     handleSizeChange(val) {
-      this.listQuery.limit = val
+      this.listQuery.limit = val;
 
       this.getList();
     },
@@ -131,45 +183,45 @@ export default {
       this.currentIcon.showPreview = false;
     },
     changePageInfo(page) {
-      this.$emit('recordPageInfo', page)
+      this.$emit("recordPageInfo", page);
     },
     search() {
       this.listQuery = {
         status: this.searchForm.status || null,
         name: this.searchForm.name || null,
         page: 1,
-        limit: 10
-      }
-      this.changePageInfo(this.listQuery)
+        limit: 10,
+      };
+      this.changePageInfo(this.listQuery);
 
       this.getList();
     },
     //清除搜索
     clearFilterData() {
       this.searchForm = {
-        status: 0,
-        name: ""
-      }
+        status: null,
+        name: "",
+      };
 
       this.listQuery = {
         status: this.searchForm.status || null,
         name: this.searchForm.name || null,
         page: 1,
-        limit: 10
-      }
-      this.changePageInfo(this.listQuery)
-      this.getList()
+        limit: 10,
+      };
+      this.changePageInfo(this.listQuery);
+      this.getList();
     },
     //切换页码
     currentChange(val) {
       this.listQuery.page = val;
-      this.changePageInfo(this.listQuery)
+      this.changePageInfo(this.listQuery);
 
       this.getList();
     },
     //编辑
     edit(row) {
-      this.$emit('change', 'Edit', row)
+      this.$emit("change", "Edit", row);
     },
     //校验表单
     submitForm() {
@@ -178,21 +230,21 @@ export default {
         if (valid) {
           _this.updateFunc();
         } else {
-          console.log('error submit!!');
+          console.log("error submit!!");
           return false;
         }
       });
     },
     //更新方法
     updateFunc() {
-      update(this.editForm).then(res => {
-        if (res.status ==  200) {
+      update(this.editForm).then((res) => {
+        if (res.status == 200) {
           this.dialogVisible = false;
           this.getList();
         } else {
           this.$message.error(res.message);
         }
-      })
+      });
     },
     //取消表单
     resetForm() {
@@ -201,21 +253,21 @@ export default {
     },
     //新增banner
     addItem() {
-      this.$emit('change', 'edit')
+      this.$emit("change", "edit");
     },
     //获取状态
     getStatus(val) {
-      return this.bannerStatus[val]
+      return this.bannerStatus[val];
     },
     //上下架、删除更新
     changeParams(row, key) {
-      this.$confirm('确定继续执行该操作吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("确定继续执行该操作吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
         this.editForm = row;
-        if (key == 'isDel') {
+        if (key == "isDel") {
           this.editForm[key] = row[key] == 0 ? 1 : 0;
         } else {
           this.editForm[key] = row[key] == 1 ? 2 : 1;
@@ -223,25 +275,28 @@ export default {
 
         //更新专题
         this.updateFunc();
-      })
+      });
     },
     //获取banner列表
     getList() {
       this.listLoading = true;
-      page(this.listQuery).then(res => {
-        this.list = res.data.data
-        this.list.forEach((element,index) => {
-          element.index = ((this.listQuery.page-1)*this.listQuery.limit)+(index+1)
+      page(this.listQuery)
+        .then((res) => {
+          this.list = res.data.data;
+          this.list.forEach((element, index) => {
+            element.index =
+              (this.listQuery.page - 1) * this.listQuery.limit + (index + 1);
+          });
+          this.data = res.data.data;
+          this.total = res.data.totalCount;
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
         });
-        this.data = res.data.data
-        this.total = res.data.totalCount;
-        this.listLoading = false;
-      }).catch(err => {
-        this.listLoading = false;
-      })
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>