修复布展单元无法删除图片问题

src/api/user.js

@@ -97,6 +97,14 @@ export function deleteUser(data) {
   })
 }
 
+// 获取用户赋予角色信息
+export function getUserOwnRoles(id) {
+  return request({
+    url: 'sys/user/roles/'+id,
+    method: 'get'
+  })
+}
+
 
 // 以用户行为统计排序分页查询资源
 export function getListByPageSort(data) {

src/components/Table/TableOperation.vue

@@ -45,7 +45,8 @@ export default {
         view: "el-icon-view",
         delete: "el-icon-delete",
         download:'el-icon-download',
-        dataPermission:"el-icon-key"
+        dataPermission:"el-icon-key",
+        editRole:"el-icon-user"
       },
     };
   },

src/components/Uploader/ManualUploader.vue

@@ -159,28 +159,24 @@ export default {
 
     // 文件列表移除文件时的钩子
     handleRemove(file, fileList) {
+      // debugger
+      // console.log("handleRemove", file, fileList);
       this.fileList.map(async (item, index) => {
         if (item.uid === file.uid) {
           this.fileList.splice(index, 1);
-          // TODO:调用删除接口
-          // const { fileId } = file;
-          // let res = await deleteFiles([fileId]);
-          // if (res.code == 0) {
-          //   this.$message.success("删除成功！");
-          // }
         }
       });
+      this.$emit("input", this.fileList);
     },
 
     handleChange(file, fileList) {
       let that = this;
-      // debugger
+      // console.log("handleChange", file, fileList);
       if (file.status === "ready") {
         this.handleBeforeUpload(file)
           .then((res) => {
             that.fileList.push(res);
             that.$emit("input", that.fileList);
-           
           })
           .catch((err) => {
             console.log("err", err);

src/views/culturalRelic/components/InfoEditDialog.vue

@@ -117,6 +117,7 @@
                 :options="orgTreeData"
                 :props="optionProps"
                 placeholder="请选择馆藏单位"
+                clearable
               >
               </el-cascader>
             </el-form-item>
@@ -278,9 +279,9 @@ export default {
     ...mapGetters(["userInfo", "dicts"]),
     title() {
       if (this.dialogForm.crId) {
-        return "修改信息";
+        return "修改文物信息";
       } else {
-        return "新增发布";
+        return "新增文物";
       }
     },
   },

src/views/display/components/ExhibitionUnit.vue

@@ -142,7 +142,7 @@
       size="small"
       >手动添加展览单元</el-button
     >
-    <el-button
+    <!-- <el-button
       v-if="!treeData.length > 0"
       type="success"
       @click="handleAddUnit('word')"
@@ -159,7 +159,7 @@
     >
       <svg-icon icon-class="excel"></svg-icon>
       Excel批量导入</el-button
-    >
+    > -->
   </div>
 </template>
 

src/views/display/components/InfoEditDialog.vue

@@ -240,7 +240,7 @@ export default {
   components: {
     ManualUploader,
     ExhibitionUnit,
-    VueQuillEditor
+    VueQuillEditor,
     // PageSelect,
   },
   props: {
@@ -487,10 +487,10 @@ export default {
       let deleteFileArr = [];
       // 添加布展本身的媒体文件至formData
       const mediaArr = ["faceImage", "images", "videos", "audios"];
-      let newFiles = {};
+      let newFiles = {}; //key：字段名或者单元id名, value:不同媒体或单元已经存在的文件id数组
       mediaArr.map((media) => {
         let files = [...this.$refs[media].getFiles()];
-        let fileIds = [];
+        let fileIds = []; //不同媒体或单元已经存在的文件id数组
         files.map((f) => {
           switch (f.status) {
             case "ready":
@@ -514,7 +514,6 @@ export default {
           let oldFileIdArr = this.dialogForm[media].split(",");
           oldFileIdArr.map((oldId) => {
             if (newFiles[media].indexOf(oldId) == -1) {
-              console.log(oldId + "已被删除");
               deleteFileArr.push(oldId);
             }
           });
@@ -526,23 +525,40 @@ export default {
       // debugger;
       // return
       // 批量添加image进入formdata
+
+      let newfileIdsArr = []; //不同媒体或单元已经存在的文件id数组
+      let oldFileIdsArr = []; //旧的ids集合
       addUnitImgToFormData(unitData);
       function addUnitImgToFormData(arr) {
         if (arr.length > 0) {
           arr.map((item) => {
-            // unitIds.push(item.euId);
             if (item.imagesVo && item.imagesVo.length > 0) {
               let imageFiles = item.imagesVo;
+              let unitOldIds = item.images.split(",");
+              oldFileIdsArr = oldFileIdsArr.concat(unitOldIds);
               imageFiles.map((imgFile) => {
-                if (imgFile.status === "ready") {
+                // switch (imgFile.status) {
+                //   case "ready":
+                //     formData.append(`unit-images-${item.euId}`, imgFile.raw);
+                //     break;
+                //   case "success":
+                //     if (successFilesObj[`unit-images-${item.euId}`]) {
+                //       successFilesObj[`unit-images-${item.euId}`].push(imgFile);
+                //     } else {
+                //       successFilesObj[`unit-images-${item.euId}`] = [imgFile];
+                //     }
+                //     newfileIdsArr.push(imgFile.fileId);
+                //     break;
+                // }
+                if (imgFile.status && imgFile.status == "ready") {
                   formData.append(`unit-images-${item.euId}`, imgFile.raw);
                 } else {
-                  //
                   if (successFilesObj[`unit-images-${item.euId}`]) {
                     successFilesObj[`unit-images-${item.euId}`].push(imgFile);
                   } else {
                     successFilesObj[`unit-images-${item.euId}`] = [imgFile];
                   }
+                  newfileIdsArr.push(imgFile.fileId);
                 }
               });
             }
@@ -552,7 +568,13 @@ export default {
           });
         }
       }
-
+      oldFileIdsArr.map((oldfileId) => {
+        // 如果旧的id在新的id集合中找不到，则代表该文件被删除
+        if (newfileIdsArr.indexOf(oldfileId) == -1) {
+          deleteFileArr.push(oldfileId);
+        }
+      });
+      // return;
       // addUnitIds(unitData); //添加unit的id作为上传文件的key
       // function addUnitIds(arr) {
       //   if (arr.length > 0) {
@@ -677,21 +699,6 @@ export default {
                 }
               }
             }
-            // 不管是否进行文件上传，都需要修改文物为Str和显示隐藏控制器,去除euid
-            // 编辑时关联文物id为字符串，新增时为数组，需要重新组成
-            // 新增时
-            // if (!that.dialogForm.exhibitionId) {
-            //   let crIdArr = unit.crIds;
-            //   unit.crIds = crIdArr.join(",");
-            //   var deleteArr = ["euId", "isEditing"];
-            //   deleteArr.forEach((i) => {
-            //     if (unit[i]) {
-            //       delete unit[i];
-            //     }
-            //   });
-            // } else {
-            // 编辑时
-            // console.log("修改时---unit.crIds ", unit.crIds);
             let crIdArr = unit.crIds;
             unit.crIds = crIdArr ? crIdArr.join(",") : "";
             var deleteArr = ["euId", "isEditing"];

src/views/museum/index.vue

@@ -27,16 +27,19 @@
         prop="regionName"
         label="归属地"
       ></el-table-column>
-      <!-- <el-table-column align="center" prop="status" label="状态">
+      <el-table-column align="center" prop="status" label="状态">
         <template slot-scope="scope">
           <el-popconfirm
             :title="getStatusTitle(scope.row.status)"
-            @confirm="handleChangeStatus(scope.row.status)"
+            @onConfirm="handleChangeStatus(scope.row)"
           >
-            <el-switch slot="reference" :value="scope.row.status"></el-switch>
+            <el-switch
+              slot="reference"
+              :value="Boolean(Number(scope.row.status))"
+            ></el-switch>
           </el-popconfirm>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column align="center" label="封面">
         <template slot-scope="scope">
           <img
@@ -51,7 +54,7 @@
       </el-table-column>
       <el-table-column align="center" prop="latitude" label="纬度">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         align="center"
         prop="intro"
         label="简介"
@@ -60,7 +63,7 @@
         <template slot-scope="scope">
           <span v-html="scope.row.intro"></span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
           <el-button
@@ -107,7 +110,7 @@ import TableOperation from "@/components/Table/TableOperation.vue";
 import { title, operates, operations } from "./config";
 import InfoEditDialog from "./components/InfoEditDialog";
 import SearchBar from "@/components/SearchBar";
-import { deleteMuseum } from "@/api/org";
+import { deleteMuseum, editMuseum } from "@/api/org";
 export default {
   components: {
     TablePage,
@@ -270,14 +273,17 @@ export default {
       }
     },
     async handleChangeStatus(row) {
-      console.log("status", row);
+      // debugger
+      
       const { status } = row;
-      let newStatus = status === "0" ? "1" : "0";
+      let newStatus = status ? "0" : "1";
       const params = {
         ...row,
         status: newStatus,
       };
-      let res = await editCulturalRelic(params);
+      // console.log(params);
+      //  return
+      let res = await editMuseum(params);
       if (res.code == 0) {
         this.loadData(true);
         this.$message.success("修改成功！");

src/views/user/components/EditRole.vue

+<template>
+  <el-dialog
+    :visible="dialogVisible"
+    width="40%"
+    style="height: 98%"
+    :before-close="handleClose"
+    top="5vh"
+    lock-scroll
+  >
+    <div class="title" slot="title">
+      <div class="divider"></div>
+      <div class="label">赋予角色</div>
+    </div>
+    <div class="dialog-content">
+      <el-transfer
+        v-model="roles"
+        :data="data"
+        :titles="['赋予角色', '拥有角色']"
+      ></el-transfer>
+    </div>
+    <div class="dialog-footer">
+      <el-button @click="cancelForm">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit"
+        >确定<i class="el-icon-right" style="margin-left: 5px"></i
+      ></el-button>
+    </div>
+  </el-dialog>
+</template>
+  
+  <script>
+export default {
+  name: "EditRole",
+  components: {},
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    currentRoleData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {},
+  watch: {
+    visible: {
+      handler: function (value) {
+        this.dialogVisible = value;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  data() {
+    return {
+      dialogForm: {},
+      formLabelWidth: "100px",
+      dialogVisible: false,
+      data: [{ value: 1, key: "测试" }],
+      roles: [],
+    };
+  },
+  methods: {
+    // 取消编辑
+    cancelForm() {
+      this.$emit("handleClose");
+    },
+
+    async handleSubmit() {},
+    reload() {
+      this.$emit("refresh");
+      this.$emit("handleClose");
+    },
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+          this.$emit("handleClose");
+          this.files = [];
+        })
+        .catch((_) => {});
+    },
+  },
+};
+</script>
+  
+  <style lang='scss' scoped>
+.title {
+  display: flex;
+  margin-bottom: 16px;
+  .divider {
+    width: 8px;
+    border-left: 4px solid #409eff;
+    margin-right: 8px;
+  }
+  .label {
+    font-weight: bold;
+  }
+}
+.dialog-content {
+  padding: 0 32px;
+  display: flex;
+  .basic-info {
+    flex: 1;
+    margin-right: 48px;
+  }
+}
+
+.dialog-footer {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
\ No newline at end of file

src/views/user/components/InfoEditDialog.vue

@@ -240,12 +240,6 @@ export default {
     };
   },
   methods: {
-    handlePreview({ type, file }) {
-      console.log(type, file);
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
     // 取消编辑
     cancelForm() {
       this.$emit("handleClose");
@@ -278,14 +272,12 @@ export default {
     reload() {
       this.$emit("refresh");
       this.$emit("handleClose");
-      this.files = [];
     },
     handleClose(done) {
       this.$confirm("确认关闭？")
         .then((_) => {
           done();
           this.$emit("handleClose");
-          this.files = [];
         })
         .catch((_) => {});
     },

src/views/user/config.js

@@ -36,18 +36,23 @@ export const title = [{
   label: "状态",
   columnAlign: 'center',
   isStatus: true,
+  width:80,
 },
 ]
 
 export const operates = {
   operate: true,
   label: "操作",
-  width: "190px",
+  width: "300px",
   titleAlign: "center",
   columnAlign: "center",
 }
 
 export const operations = [
+  {
+    type: 'editRole',
+    title: '赋予角色'
+  },
   {
     type: 'edit',
     title: '编辑'

src/views/user/index.vue

@@ -67,6 +67,7 @@
       @handleClose="handleClose"
       @refresh="loadListData"
     />
+    <EditRole :visible="editRoleVisible" :currentRoleData="currentRoleData" @handleClose="handleCloseEditRole" />
   </div>
 </template>
 
@@ -75,14 +76,21 @@ import TablePage from "@/components/Table/TablePage.vue";
 import TableOperation from "@/components/Table/TableOperation.vue";
 import SearchBar from "@/components/SearchBar";
 import { title, operates, operations } from "./config";
-import { getDeptTree, getUserList, deleteUser } from "@/api/user";
+import {
+  getDeptTree,
+  getUserList,
+  deleteUser,
+  getUserOwnRoles,
+} from "@/api/user";
 import InfoEditDialog from "./components/InfoEditDialog.vue";
+import EditRole from "./components/EditRole.vue";
 export default {
   components: {
     TablePage,
     TableOperation,
     SearchBar,
     InfoEditDialog,
+    EditRole,
   },
   computed: {
     tableTitle() {
@@ -141,6 +149,8 @@ export default {
         status: 1, //启用状态
       },
       dialogVisible: false,
+      editRoleVisible: false,
+      currentRoleData:{}
     };
   },
   mounted() {
@@ -220,6 +230,11 @@ export default {
             this.loadListData();
           }
           break;
+        case "editRole":
+          this.editRoleVisible = true;
+          let roleRes = await getUserOwnRoles(row.id);
+          this.currentRoleData = roleRes.data
+          break;
       }
     },
 
@@ -229,6 +244,9 @@ export default {
         status: 1,
       };
     },
+    handleCloseEditRole() {
+      this.editRoleVisible = false;
+    },
   },
 };
 </script>