修改首页和布展单元

package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "axios": "0.18.1",
     "core-js": "3.6.5",
+    "echarts": "^5.3.3",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",

src/components/Breadcrumb/index.vue

@@ -37,6 +37,8 @@ export default {
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+    
+      
     },
     isDashboard(route) {
       const name = route && route.name

src/components/Echarts/index.vue

+<template>
+    <div :id="id" :class="className" :style="{ height: height, width: width }" />
+  </template>
+  
+  <script>
+//   import tdTheme from './theme.json' // 引入默认主题
+  import resizeMixins from "@/utils/resizeMixin";
+//   import '../map/fujian.js'
+  
+  export default {
+    name: 'echart',
+    mixins: [resizeMixins],
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      id: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '2.5rem'
+      },
+      options: {
+        type: Object,
+        default: ()=>({})
+      }
+    },
+    data () {
+      return {
+        chart: null
+      }
+    },
+    watch: {
+      options: {
+        handler (options) {
+          // 设置true清空echart缓存
+          this.chart.setOption(options, true)
+        },
+        deep: true
+      }
+    },
+    mounted () {
+    //   this.$echarts.registerTheme('tdTheme', tdTheme); // 覆盖默认主题
+      this.initChart();
+    },
+    methods: {
+      initChart () {
+        // 初始化echart
+        this.chart = this.$echarts.init(this.$el)
+        this.$emit('myCharts', this.chart)  // 把实例丢出来
+        this.chart.setOption(this.options, true)
+      }
+    }
+  }
+  </script>
+  
+  <style>
+  </style>
+  
\ No newline at end of file

src/components/Uploader/ManualUploader.vue

@@ -43,7 +43,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 50,
     },
     // 文件类型, 例如["doc", "xls", "ppt", "txt", "pdf"]
     fileType: {

src/main.js

@@ -18,7 +18,11 @@ import {
   getFullUrl
 } from '@/utils/index'
 
+
+import * as echarts from 'echarts';
+
 Vue.prototype.$getFullUrl = getFullUrl
+Vue.prototype.$echarts = echarts
 
 Vue.use(ElementUI)
 

src/utils/resizeMixin.js

+// 混入代码 resize-mixins.js
+import { Debounce } from '@/utils';
+const resizeChartMethod = '$__resizeChartMethod';
+
+export default {
+  data() {
+    // 在组件内部将图表 init 的引用映射到 chart 属性上
+    return {
+      chart: null,
+    };
+  },
+  created() {
+    window.addEventListener('resize', this[resizeChartMethod], false);
+  },
+  activated() {
+    // 防止 keep-alive 之后图表变形
+    if (this.chart) {
+      this.chart.resize()
+    }
+  },
+  beforeDestroy() {
+    window.removeEventListener('reisze', this[resizeChartMethod]);
+  },
+  methods: {
+    // 防抖函数来控制 resize 的频率
+    [resizeChartMethod]: Debounce(function() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }, 300),
+  },
+};

src/views/display/components/ExhibitionUnit.vue

@@ -120,14 +120,14 @@
       v-if="!treeData.length > 0"
       type="primary"
       icon="el-icon-circle-plus-outline"
-      @click="handleAddUnit"
+      @click="handleAddUnit('manual')"
       size="small"
       >手动添加展览单元</el-button
     >
     <el-button
       v-if="!treeData.length > 0"
       type="success"
-      @click="handleAddUnit"
+      @click="handleAddUnit('word')"
       size="small"
     >
       <svg-icon icon-class="word"></svg-icon>
@@ -136,7 +136,7 @@
     <el-button
       v-if="!treeData.length > 0"
       type="success"
-      @click="handleAddUnit"
+      @click="handleAddUnit('excel')"
       size="small"
     >
       <svg-icon icon-class="excel"></svg-icon>
@@ -338,19 +338,26 @@ export default {
       children.splice(index, 1);
     },
 
-    handleAddUnit() {
-      let obj = {
-        euId: 1, //后期去掉
-        unit: "", //单元名称,如前言、第一单元，暂时忽略
-        title: "单元标题", //单元标题，类似主题名称
-        intro: "", //单元介绍
-        images: "", //图片id集合
-        videos: "", //视频id集合
-        crIds: [], //关联文物集合
-        // showMediaUploader: false,
-      };
-      this.$set(this.treeData, 0, obj);
-      this.currentData = this.treeData[0];
+    handleAddUnit(type) {
+      switch (type) {
+        case "manual":
+          let obj = {
+            euId: 1, //后期去掉
+            unit: "", //单元名称,如前言、第一单元，暂时忽略
+            title: "单元标题", //单元标题，类似主题名称
+            intro: "", //单元介绍
+            images: "", //图片id集合
+            videos: "", //视频id集合
+            crIds: [], //关联文物集合
+            // showMediaUploader: false,
+          };
+          this.$set(this.treeData, 0, obj);
+          this.currentData = this.treeData[0];
+          break;
+        default:
+          this.$message.info('该功能仍在开发中，敬请期待')
+          break;
+      }
     },
 
     //失去焦点事件
@@ -483,7 +490,7 @@ export default {
 .ql-snow .ql-tooltip[data-mode="video"]::before {
   content: "请输入视频地址:";
 }
-.ql-snow .ql-picker{
+.ql-snow .ql-picker {
   height: 40px;
 }
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,

src/views/display/components/InfoEditDialog.vue

@@ -82,7 +82,7 @@
               </el-input>
             </el-form-item>
             <el-form-item label="展览介绍" :label-width="formLabelWidth">
-              <el-input
+              <!-- <el-input
                 type="textarea"
                 placeholder="请输入展览介绍"
                 v-model="dialogForm.intro"
@@ -90,7 +90,13 @@
                 show-word-limit
                 rows="6"
               >
-              </el-input>
+              </el-input> -->
+              <quill-editor
+                ref="myQuillEditor"
+                v-model="dialogForm.intro"
+                :options="editorOption"
+                class=".editor"
+              />
             </el-form-item>
             <el-form-item label="展览封面" :label-width="formLabelWidth">
               <ManualUploader
@@ -229,11 +235,13 @@ import ExhibitionUnit from "./ExhibitionUnit.vue";
 import { upload, uploadV1 } from "@/utils/file";
 import { themeTypeOptions } from "../contants";
 import { deleteFiles } from "@/api/file";
+import { quillEditor } from "vue-quill-editor";
 export default {
   name: "InfoEditDialog",
   components: {
     ManualUploader,
     ExhibitionUnit,
+    quillEditor
     // PageSelect,
   },
   props: {
@@ -339,13 +347,25 @@ export default {
       immediate: true,
     },
   },
-  async created() {
-    await this.$store.dispatch("dict/getDictList", [
-      "display_type",
-      "display_character",
-    ]);
-  },
   data() {
+    // 工具栏配置
+    const toolbarOptions = [
+      ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 -----['bold', 'italic', 'underline', 'strike']
+      ["blockquote", "code-block"], // 引用  代码块-----['blockquote', 'code-block']
+      [{ header: 1 }, { header: 2 }], // 1、2 级标题-----[{ header: 1 }, { header: 2 }]
+      [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表-----[{ list: 'ordered' }, { list: 'bullet' }]
+      [{ script: "sub" }, { script: "super" }], // 上标/下标-----[{ script: 'sub' }, { script: 'super' }]
+      [{ indent: "-1" }, { indent: "+1" }], // 缩进-----[{ indent: '-1' }, { indent: '+1' }]
+      [{ direction: "rtl" }], // 文本方向-----[{'direction': 'rtl'}]
+      [{ size: ["small", false, "large", "huge"] }], // 字体大小-----[{ size: ['small', false, 'large', 'huge'] }]
+      [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题-----[{ header: [1, 2, 3, 4, 5, 6, false] }]
+      [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色-----[{ color: [] }, { background: [] }]
+      [{ font: [] }], // 字体种类-----[{ font: [] }]
+      [{ align: [] }], // 对齐方式-----[{ align: [] }]
+      ["clean"], // 清除文本格式-----['clean']
+      ["image", "video"], // 链接、图片、视频-----['link', 'image', 'video']
+    ];
+
     return {
       dialogForm: {
         ...this.form,
@@ -366,8 +386,26 @@ export default {
       videos: [],
       audios: [],
       pageSelectUrl: "/api/bizCulturalRelic/listByPage",
+      //富文本编辑器配置
+      editorOption: {
+        //  富文本编辑器配置
+        modules: {
+          //工具栏定义的
+          toolbar: toolbarOptions,
+        },
+        //主题
+        theme: "snow",
+        placeholder: "请输入单元介绍",
+      },
     };
   },
+  async created() {
+    await this.$store.dispatch("dict/getDictList", [
+      "display_type",
+      "display_character",
+    ]);
+  },
+
   methods: {
     // 关联文献查询
     searchLiterature(queryString) {
@@ -653,14 +691,18 @@ export default {
         params.status = this.dialogForm.status ? 1 : 0;
         params.crIds = this.crIds.join(",");
         params.displayCharacter = 1; //传布展
-        let res = await addDisplay(params);
-
-        if (res.code == 0) {
-          this.$message.success("提交成功！");
-          this.loading = false;
-          this.$emit("refresh");
-          this.reload();
-        }
+        addDisplay(params)
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success("提交成功！");
+              this.loading = false;
+              this.$emit("refresh");
+              this.reload();
+            }
+          })
+          .catch((err) => {
+            this.loading = false;
+          });
       } else {
         const {
           exhibitionId,
@@ -707,14 +749,25 @@ export default {
         };
 
         // return;
-        let res = await editDisplay(params);
-        let deleteRes = await deleteFiles(deleteFileArr);
-        if (res.code == 0 && deleteRes.code == 0) {
-          this.$message.success("提交成功！");
-          this.loading = false;
-          this.$emit("refresh");
-          this.reload();
-        }
+        editDisplay(params)
+          .then(async (res) => {
+            let deleteRes;
+            console.log(res);
+            // return
+            if (deleteFileArr.length > 0) {
+              await deleteFiles(deleteFileArr);
+            }
+            if (res.code == 0) {
+              this.$message.success("提交成功！");
+              this.$emit("refresh");
+              this.reload();
+              this.loading = false;
+            }
+          })
+          .catch((err) => {
+            console.log("err222222", err);
+            this.loading = false;
+          });
       }
 
       // }

src/views/home/config.js

+export const title = [{
+    prop: "name",
+    label: "名称",
+    columnAlign: 'center',
+    width:120
+  },
+  {
+    prop: "unit",
+    label: "馆藏单位/展览单位",
+    columnAlign: 'center',
+  },
+  {
+    prop: "regionName",
+    label: "所在地区",
+    columnAlign: 'center',
+  },
+  {
+    prop: "dj",
+    label: "点击量",
+    columnAlign: 'center',
+  },
+  {
+    prop: "dz",
+    label: "点赞量",
+    columnAlign: 'center',
+  },
+
+  {
+    prop: "sc",
+    label: "收藏量",
+    columnAlign: 'center',
+  },
+]

src/views/log/index.vue

@@ -27,7 +27,7 @@
 <script>
 import TablePage from "@/components/Table/TablePage.vue";
 import TableOperation from "@/components/Table/TableOperation.vue";
-import { title,operates  } from "./config";
+import { title  } from "./config";
 import { getLogList } from "@/api/log";
 
 import SearchBar from "@/components/SearchBar";

vue.config.js

@@ -31,7 +31,8 @@ module.exports = {
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {
-    host: '172.24.100.18',
+    // host: '172.24.100.18',
+    host:'127.0.0.1',
     port: port,
     open: true,
     overlay: {
@@ -40,15 +41,16 @@ module.exports = {
     },
     proxy: {
       '/api': {
-        target: 'http://192.168.1.230:9566/api',
-        // target:'http://222.85.214.245:9066/api',
+        // target: 'http://192.168.1.230:9566/api',
+        target:'http://222.85.214.245:9566/api',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''
         }
       },
       '/files': {
-        target: 'http://192.168.1.230:9563/files',
+        // target: 'http://192.168.1.230:9563/files',
+        target: 'http://222.85.214.245:9563/files',
         changeOrigin: true,
         pathRewrite: {
           '^/files': ''