增加布展性质

src/router/index.js

@@ -64,7 +64,7 @@ export const constantRoutes = [{
       name: 'Display',
       component: () => import('@/views/display/index'),
       meta: {
-        title: '布展管理',
+        title: '展览管理',
         icon: 'display'
       }
     }]

src/store/modules/dict.js

@@ -6,9 +6,7 @@ import {
   getCulturalRelicList
 } from '@/api/culturalRelic'
 import {
-  getLiteratureList
-} from '@/api/literature'
-import {
+  getLiteratureList,
   getLtListPer
 } from '@/api/literature'
 
@@ -25,7 +23,13 @@ const mutations = {
   },
   SET_CR_LIST(state, crList) {
     state.crList = crList
-  }
+  },
+  // SET_DICTS_2(state, obj) {
+  //   state.dicts = {
+  //     ...state.dicts,
+  //     ...obj
+  //   };
+  // }
 };
 
 const actions = {
@@ -34,18 +38,18 @@ const actions = {
    * @param {Array} data 字典的key集合
    * @returns {Promise}
    */
-  getDictList({
-    commit
-  }, data) {
+  getDictList(context, data) {
     let dicts = {}
     let requestDicts = []
+    // debugger
     data.forEach(i => {
-      if (!state.dicts[i]) {
+      if (!context.state.dicts[i]) {
         requestDicts.push(i)
       } else {
-        dicts[i] = state.dicts[i]
+        dicts[i] = context.state.dicts[i]
       }
     });
+
     if (requestDicts.length > 0) {
       return new Promise((resolve, reject) => {
         getDictCode(requestDicts).then(res => {
@@ -57,10 +61,11 @@ const actions = {
                   obj[item.value] = item.label
                 }
               })
-              dicts[reqDict] = Object.freeze(obj)
-              commit('SET_DICTS', {
+              dicts[reqDict] = obj
+              // console.log('dicts',dicts);
+              context.commit('SET_DICTS', {
                 label: reqDict,
-                value: Object.freeze(obj)
+                value: obj
               })
             }
           })
@@ -76,6 +81,47 @@ const actions = {
     }
   },
 
+  // /**
+  //  * 获取普通list结构(非树结构)的字典
+  //  * @param {type} data 字典的key集合或者字符串
+  //  * @returns {Promise}
+  //  */
+  // async getDictsByTypes(context, type) {
+  //   let dicts = context.state.dicts;
+  //   let types = [];
+  //   if (typeof type === "string") {
+  //     types.push(type);
+  //   } else if (Array.isArray(type)) {
+  //     types = type;
+  //   }
+
+  //   let dataArr = [];
+  //   let serverTypes = [];
+  //   types.forEach((n, i) => {
+  //     let curData = dicts[n];
+  //     if (curData) {
+  //       dataArr[i] = curData;
+  //     } else {
+  //       dataArr[i] = n;
+  //       serverTypes.push(n);
+  //     }
+  //   });
+
+  //   if (serverTypes.length > 0) {
+  //     const res = await getDictCode(serverTypes);
+
+  //     let obj = {};
+  //     serverTypes.forEach((n, i) => {
+  //       let j = dataArr.indexOf(n);
+  //       dataArr[j] = res[i];
+  //       obj[n] = res[i];
+  //     });
+  //     context.commit("SET_DICTS_2", obj);
+  //   }
+
+  //   return dataArr;
+  // },
+
   /**
    * 获取树形结构的字典树，如文物年代、文物质地
    * @param {Array} data 字典的key集合

src/views/display/components/InfoEditDialog.vue

@@ -37,6 +37,21 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="展览性质" :label-width="formLabelWidth">
+              <el-select
+                v-model="dialogForm.displayCharacter"
+                placeholder="请选择展览性质"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(value, key) in dicts.display_character"
+                  :key="key"
+                  :label="value"
+                  :value="key"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="模板主题" :label-width="formLabelWidth">
               <el-select
                 v-model="dialogForm.themeType"
@@ -187,21 +202,7 @@
           </el-form-item>
         </el-row>
         <!-- 
-            <el-form-item label="展览性质" :label-width="formLabelWidth" style="display:none">
-              <el-select
-                v-model="dialogForm.displayCharacter"
-                placeholder="请选择展览性质"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in dict.display_character"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item> -->
+             -->
         <!-- <el-form-item label="展览单位" :label-width="formLabelWidth">
                 <el-input
                   v-model="dialogForm.dep_id"
@@ -226,7 +227,6 @@
 </template>
 
 <script>
-import { getLiteratureList } from "@/api/literature";
 import { addDisplay, editDisplay } from "@/api/display";
 import { mapGetters } from "vuex";
 // import ManualUploader from "@/components/Uploader/ManualUploader.vue";
@@ -237,6 +237,7 @@ const VideoUploader = () => import("@/components/Uploader/ManualUploader.vue");
 const AudioUploader = () => import("@/components/Uploader/ManualUploader.vue");
 import ExhibitionUnit from "./ExhibitionUnit.vue";
 import { upload, uploadV1 } from "@/utils/file";
+import { themeTypeOptions } from "../contants";
 export default {
   name: "InfoEditDialog",
   components: {
@@ -272,6 +273,9 @@ export default {
         return "新增发布";
       }
     },
+    themeTypeOptions() {
+      return themeTypeOptions;
+    },
   },
   watch: {
     form: {
@@ -371,9 +375,11 @@ export default {
     },
   },
   async created() {
-    await this.$store.dispatch("dict/getDictList", ["display_type"]);
+    await this.$store.dispatch("dict/getDictList", [
+      "display_type",
+      "display_character",
+    ]);
   },
-  // dicts: ["display_character", "display_type", "literature"],
   data() {
     return {
       dialogForm: {
@@ -383,11 +389,6 @@ export default {
       loading: false,
       upLoadAddress: process.env.VUE_APP_BASE_API + "/sysFiles/upload",
       typeOptions: [{ label: "展览类型", value: 1 }], //后期从vuex中取
-      themeTypeOptions: [
-        { label: "模板主题1", value: "主题一" },
-        { label: "模板主题2", value: "主题二" },
-        { label: "模板主题3", value: "主题三" },
-      ],
       disabled: false,
       exhibitionUnits: [],
       literatureList: [], //文献列表
@@ -424,7 +425,7 @@ export default {
         //   this.$message.error(res.msg);
         // }
         const res = await this.$store.dispatch("dict/getLtList", {
-          hasPer:false,
+          hasPer: false,
           params,
         });
         if (res.code == 0) {
@@ -497,7 +498,6 @@ export default {
               }
               break;
           }
-          // 只有待上传的才需要添加至formdata
         });
       });
 
@@ -551,7 +551,6 @@ export default {
             if (videoFile.status === "ready") {
               formData.append(`unit-videos-${euId}`, videoFile.raw);
             } else {
-              // successFilesObj[`unit-videos-${euId}`] = imgFile;
               if (successFilesObj[`unit-videos-${euId}`]) {
                 successFilesObj[`unit-videos-${euId}`].push(videoFiles);
               } else {
@@ -671,11 +670,10 @@ export default {
           deptId,
           regionCode,
         };
-        // params.displayCharacter = 1;//展览类型传布展
         params.literature = this.literatureValues.join(",");
         params.status = this.dialogForm.status ? 1 : 0;
         params.crIds = this.crIds.join(",");
-        console.log("新增参数-----------", params);
+        params.displayCharacter = 1; //传布展
         let res = await addDisplay(params);
 
         if (res.code == 0) {
@@ -700,6 +698,7 @@ export default {
           videos,
           regionCode,
           deptId,
+          displayCharacter,
         } = this.dialogForm;
 
         let literature = this.literatureValues.join(",");
@@ -724,6 +723,7 @@ export default {
           status,
           literature,
           crIds,
+          displayCharacter,
           exhibitionUnits: unitData,
         };
         console.log("修改参数-----------", params);

src/views/display/contants.js

+export const themeTypeOptions = [{
+    label: "中国风",
+    value: "1"
+  },
+  {
+    label: "模板主题二",
+    value: "2"
+  },
+  {
+    label: "模板主题三",
+    value: "3"
+  },
+]

src/views/display/index.vue

@@ -167,7 +167,7 @@ export default {
       form: {
         title: "", //标题
         type: "", //	类别(待定)--枚举值（社会、生活等）
-        displayCharacter: 1, //展览性质(精品展2、布展1、文物展3)--此处填写布展类别
+        displayCharacter: '1', //展览性质(精品展2、布展1、文物展3)--此处填写布展类别
         keyword: "", //	关键词
         deptId: "", //展览单位id--暂填入用户自己的单位
         regionCode: "", //	所在地域--暂填入用户自己的地区