布展单元接口修改后的调整

src/api/museum.js

@@ -7,6 +7,14 @@ export function getMuseumTree(params) {
     params
   })
 }
+export function getMuseumTreeV1(params) {
+  return request({
+    url: '/sys/dept/v1/tree',
+    method: 'get',
+    params
+  })
+}
+
 export function addMuseum(data) {
   return request({
     url: '/sys/dept',

src/store/modules/org.js

 import {
-  getMuseumTree,
+  getMuseumTreeV1,
 } from '@/api/museum'
 
 const getDefaultState = () => {
@@ -29,7 +29,7 @@ const actions = {
       })
     } else {
       return new Promise((resolve, reject) => {
-        getMuseumTree({
+        getMuseumTreeV1({
           deptId
         }).then(response => {
           const {

src/utils/upload.js

@@ -9,7 +9,12 @@ var uploadUrl =
   "/api/sysFiles/upload" :
   process.env.NODE_ENV + "/sysFiles/upload"
 
-  
+var uploadV1Url =
+  process.env.NODE_ENV === "test" ||
+  process.env.NODE_ENV === "development" ?
+  "/api/sysFiles/v1/upload" :
+  process.env.NODE_ENV + "/sysFiles/v1/upload"
+
 /**
  * 封装上传文件的post方法
  * @param data
@@ -30,21 +35,21 @@ export function upload(data) {
   })
 }
 
+
 /**
- * 封装文件上传的put方法
- * @param url
+ * 封装上传文件方法 支持自定义Formdata 的key
  * @param data
  * @returns {Promise}
  */
-export function uploadPut(url, data) {
+export function uploadV1(data) {
   return new Promise((resolve, reject) => {
-    axios.put(url, data, {
+    axios.post(uploadV1Url, data, {
       headers: {
-        'Content-Type': 'multipart/form-data',
+        'Content-Type': 'multipart/form-data;boundary = ' + new Date().getTime(),
         'authorization': getToken(),
       }
     }).then(response => {
-      resolve(response)
+      resolve(response.data)
     }).catch(error => {
       reject(error)
     })

src/views/display/components/ExhibitionUnit.vue

@@ -78,12 +78,11 @@
               <div>单元图片：</div>
               <ManualUploader
                 :files="data.imagesVo"
-                v-model="data.imagesVo"
                 :fileLimit="6"
                 :fileSize="50"
                 :fileType="['jpeg', 'jpg', 'png']"
                 listType="picture-card"
-                ref="images"
+                :ref="'unit-images-' + data.id"
               />
             </el-col>
           </el-collapse-transition>
@@ -97,7 +96,7 @@
                 :fileSize="50"
                 :fileType="['mp4']"
                 listType="picture-card"
-                ref="videos"
+                :ref="'unit-videos-' + data.id"
               />
             </el-col>
           </el-collapse-transition>
@@ -108,6 +107,7 @@
 </template>
 
 <script>
+let id = 1000;
 import ManualUploader from "@/components/Uploader/ManualUploader.vue";
 export default {
   components: {
@@ -123,18 +123,31 @@ export default {
     exhibitionUnits: {
       handler: function (value) {
         if (value) {
-          let treeData = [...this.exhibitionUnits];
+          let treeData = [...value];
           treeData.map((item) => {
-            if (item.imagesVo && item.imagesVo.length > 0) {
-            } else {
+            if (!item.imagesVo || !item.imagesVo > 0) {
               item.imagesVo = [];
             }
-
-            if (item.videosVo && item.videosVo.length > 0) {
-            } else {
+            if (!item.videosVo || !item.videosVo > 0) {
               item.videosVo = [];
             }
           });
+          
+          // changeMediaData(treeData);
+          // function changeMediaData(arr) {
+          //   if (arr.length > 0) {
+          //     arr.map((item) => {
+          //       if (!item.imagesVo || !item.imagesVo > 0) {
+          //         item.imagesVo = [];
+          //       }
+          //       if (!item.videosVo || !item.videosVo > 0) {
+          //         item.videosVo = [];
+          //       }
+
+          //       changeMediaData(item.children);
+          //     });
+          //   }
+          // }
           this.treeData = treeData;
         }
       },
@@ -148,13 +161,15 @@ export default {
   },
   mounted() {},
   methods: {
-    getData() {
-      console.log("this.treeData", this.treeData);
-      return this.treeData;
-    },
+    // getData() {
+    //   console.log("this.treeData", this.treeData);
+    //   debugger
+    //   return this.treeData;
+    // },
     append(data) {
       // debugger;
       const newChild = {
+        id: id++,
         unit: "",
         title: "",
         intro: "",
@@ -166,10 +181,10 @@ export default {
         // videosVo: [],
         children: [],
       };
-      if (!data.children ) {
+      if (!data.children) {
         this.$set(data, "children", []);
       }
-      data.children.push(newChild);  
+      data.children.push(newChild);
     },
     remove(node, data) {
       const parent = node.parent;
@@ -180,9 +195,6 @@ export default {
 
     handleAddUnitImage(node, data) {
       this.$set(data, "showImageUploader", !data.showImageUploader);
-      // debugger
-      console.log("node", node);
-      console.log("data", data);
     },
     handleAddUnitVideo(node, data) {
       this.$set(data, "showVideoUploader", !data.showVideoUploader);

src/views/museum/index.vue

@@ -18,25 +18,42 @@
       :data="orgTreeData"
       border
       stripe
+      default-expand-all
+
     >
       <el-table-column
         align="center"
-        prop="label"
+        prop="name"
         label="名称"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="pidName"
-        label="所属部门"
+        prop="regionName"
+        label="归属地"
       ></el-table-column>
       <el-table-column align="center" prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-popconfirm
+            :title="getStatusTitle(scope.row.status)"
+            @confirm="handleChangeStatus(scope.row.status)"
+          >
+            <el-switch slot="reference" :value="scope.row.status"></el-switch>
+          </el-popconfirm>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="longitude" label="经度">
       </el-table-column>
       <el-table-column align="center" prop="latitude" label="纬度">
       </el-table-column>
+      <el-table-column align="center" prop="latitude" label="纬度">
+      </el-table-column>
       <el-table-column align="center" prop="intro" label="简介" />
-      <el-table-column align="center" label="操作"> </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="primary" size="mini" icon="el-icon-edit">编辑</el-button>
+          <el-button type="danger" size="mini" icon="el-icon-delete">删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <InfoEditDialog
       :visible="drawerVisible"
@@ -118,6 +135,9 @@ export default {
         this.dict = value;
       }
     },
+    // orgTreeData(value) {
+    //   console.log("123", value);
+    // },
   },
   computed: {
     tableTitle() {
@@ -139,7 +159,7 @@ export default {
       };
     },
   },
-  mounted() {
+  created() {
     this.loadData();
   },
   methods: {
@@ -166,7 +186,7 @@ export default {
     //   加载表格数据
     loadData() {
       this.$store.dispatch("org/getMuseumTreeData", "").then((res) => {
-        this.orgTreeData = res;
+        this.orgTreeData =res
       });
     },