zhangxin 2 роки тому
батько
коміт
c08ab2df3c

+ 1 - 0
src/assets/icons/svg/bfcbd9notice.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676165446991" class="icon" viewBox="0 0 1030 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5945" xmlns:xlink="http://www.w3.org/1999/xlink" width="201.171875" height="200"><path d="M748.8 281.6c-6.4-6.4-12.8-19.2-19.2-25.6-12.8-19.2-38.4-19.2-51.2-6.4-19.2 12.8-19.2 38.4-6.4 57.6 6.4 12.8 12.8 19.2 19.2 25.6 38.4 51.2 70.4 96 70.4 179.2s-32 134.4-70.4 185.6l-12.8 19.2c-12.8 19.2-6.4 44.8 6.4 57.6 6.4 6.4 12.8 6.4 19.2 6.4 12.8 0 25.6-6.4 32-19.2l12.8-19.2c38.4-57.6 89.6-128 89.6-236.8-6.4-102.4-44.8-166.4-89.6-224zM512 0c-25.6 0-51.2 12.8-83.2 44.8l-217.6 224h-96c-64 0-115.2 51.2-115.2 121.6v236.8c0 64 51.2 121.6 115.2 121.6h96l217.6 230.4c32 32 57.6 44.8 83.2 44.8s57.6-19.2 57.6-76.8v-876.8c0-51.2-32-70.4-57.6-70.4z m-19.2 934.4c-6.4 0-6.4-6.4-12.8-12.8l-230.4-236.8c-6.4-6.4-19.2-12.8-25.6-12.8h-115.2c-19.2 0-38.4-19.2-38.4-38.4v-236.8c0-19.2 19.2-38.4 38.4-38.4h115.2c12.8 0 19.2-6.4 25.6-12.8l230.4-236.8 12.8-12.8v838.4z" fill="#bfcbd9" p-id="5946"></path><path d="M864 121.6c-12.8-19.2-38.4-19.2-51.2-6.4s-19.2 38.4-6.4 57.6c76.8 89.6 147.2 198.4 147.2 339.2 0 147.2-70.4 249.6-147.2 339.2-12.8 19.2-12.8 38.4 6.4 57.6 6.4 6.4 12.8 12.8 25.6 12.8s19.2-6.4 25.6-12.8c83.2-96 166.4-224 166.4-390.4-6.4-179.2-89.6-300.8-166.4-396.8z" fill="#bfcbd9" p-id="5947"></path></svg>

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
src/assets/icons/svg/collection.svg


+ 1 - 0
src/assets/icons/svg/collectionadd.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676165263039" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3238" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M79.033 72.123h-8.891l-0.89 884.606 885.494-0.89V68.566L79.032 72.122z m793.033 804.591H148.381l0.89-724.575 723.685-0.89 1.778 726.354-2.666-0.891z" p-id="3239"></path><path d="M552.401 313.349h-81.239l-0.021 159.637H310.192v81.252h160.934l-0.022 160.667h81.35l-0.019-160.667h160.954v-81.252H552.426z" p-id="3240"></path></svg>

+ 1 - 0
src/assets/icons/svg/notice.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676165324283" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4200" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M694.368 117.28a67.957333 67.957333 0 0 1 10.336 36.021333v717.408a67.957333 67.957333 0 0 1-103.978667 57.632L326.026667 756.650667H180.48A95.146667 95.146667 0 0 1 85.333333 661.504V362.506667a95.146667 95.146667 0 0 1 95.146667-95.146667h145.546667L600.725333 95.68a67.957333 67.957333 0 0 1 93.653334 21.610667z m120.330667 133.525333a32 32 0 0 1 44.533333 8.042667 443.114667 443.114667 0 0 1 0.117333 506.133333 32 32 0 0 1-52.586666-36.458666 379.114667 379.114667 0 0 0-0.106667-433.184 32 32 0 0 1 8.042667-44.533334z" fill="#000000" p-id="4201"></path></svg>

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
src/assets/icons/svg/notice2.svg


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
src/assets/icons/svg/noticebright.svg


+ 28 - 3
src/router/index.js

@@ -93,19 +93,19 @@ export const constantRoutes = [
     path: '/noticeList',
     component: Layout,
     // redirect: '公告管理',
-    meta: { title: '公告管理', icon : "dashboard" },
+    meta: { title: '公告管理', icon : "bfcbd9notice" },
     children: [
       {
         path: 'noticeList',
         component: () => import('@/views/notice/noticeList'),
         name: 'noticeList',
-        meta: { title: '公告列表', icon: 'user' }
+        meta: { title: '公告列表', icon: 'list' }
       },
       {
         path: 'addnotice',
         component: () => import('@/views/notice/addNotice'),
         name: 'addNotice',
-        meta: { title: '创建公告', icon: 'user' }
+        meta: { title: '创建公告', icon: 'build' }
       },
       {
         path:'noticeDetails',
@@ -143,6 +143,31 @@ export const constantRoutes = [
       }
       // messageDetails
     ]
+  },
+  {
+    path: '/collectionList',
+    component: Layout,
+    meta: { title: '藏品管理', icon : "collection" },
+    children: [
+      {
+        path: 'seriesList',
+        component: () => import('@/views/collection/seriesList'),
+        name: 'seriesList',
+        meta: { title: '套系列表', icon: 'list' }
+      },
+      // {
+      //   path: 'collectionList',
+      //   component: () => import('@/views/collectionList/collectionList'),
+      //   name: 'collectionList',
+      //   meta: { title: '藏品列表', icon: 'list' }
+      // },
+      {
+        path: 'addCollection',
+        component: () => import('@/views/collection/addCollection'),
+        name: 'addCollection',
+        meta: { title: '创建套系', icon: 'collectionadd' }
+      }
+    ]
   }
   
 ]

+ 141 - 0
src/views/collection/addCollection.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="right" :style="{ height: height, width: width }">
+    1
+  </div>
+</template>
+<script>
+
+
+
+</script>
+
+<style scoped>
+.up {
+  width: 96%;
+  height: 170px;
+  margin-top: 20px;
+  margin-left: 2%;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+
+}
+
+.up-title {
+  font-size: 20px;
+  width: 20%;
+  margin-left: 20px;
+  margin-top: 20px;
+  float: left;
+}
+
+.btn {
+  float: right;
+  padding-right: 3%;
+  margin-top: 2.5%;
+}
+
+.up-input {
+  width: 250px;
+  margin-left: 15px;
+}
+
+.up-input-title {
+
+  margin-left: 40px;
+
+  float: left;
+}
+
+.up-input-right {
+  margin-left: 15px;
+  width: 500px;
+}
+
+.up-input-title-right {
+  width: 800px;
+  margin-left: 450px;
+
+
+}
+
+.left-up {
+  width: 80%;
+  float: left;
+  height: 37px;
+  margin-top: 50px;
+}
+
+.right-up {
+  width: 16%;
+  margin-top: 2%;
+  float: right;
+
+}
+
+.anniu {
+  padding-right: 5%;
+}
+
+.down {
+  margin-top: 40px;
+}
+
+.down-add {
+  padding: 10px;
+  margin: 0 27px;
+  border: 1px solid #ccc;
+  border-radius: 2px
+}
+
+.down-title {
+  padding-top: 10px;
+  color: #303133;
+}
+
+.down-table {
+  margin-top: 15px;
+  text-align: center;
+  margin: 35px 27px;
+}
+
+.el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  word-break: break-word;
+  /* background-color: #f8f8f9; */
+  color: #515a6e;
+  height: 40px;
+  font-size: 13px;
+  text-align: center;
+}
+
+.bottom-number {
+  padding-top: 5px;
+  color: #303133;
+  float: right;
+}
+
+.bottom-page {
+  float: right;
+}
+
+.el-icon-search {
+  padding-right: 10px;
+}
+
+.btn-delete {
+  margin-left: 20px;
+}
+
+/**
+自适应
+*/
+/* .demonstration{
+  width: 50%;
+} */
+.right {
+  float: none;
+  width: 100%;
+  height: 100%;
+  /* background-color: #9dc3e6; */
+}
+</style>

+ 141 - 0
src/views/collection/seriesList.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="right" :style="{ height: height, width: width }">
+    1
+  </div>
+</template>
+<script>
+
+
+
+</script>
+
+<style scoped>
+.up {
+  width: 96%;
+  height: 170px;
+  margin-top: 20px;
+  margin-left: 2%;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+
+}
+
+.up-title {
+  font-size: 20px;
+  width: 20%;
+  margin-left: 20px;
+  margin-top: 20px;
+  float: left;
+}
+
+.btn {
+  float: right;
+  padding-right: 3%;
+  margin-top: 2.5%;
+}
+
+.up-input {
+  width: 250px;
+  margin-left: 15px;
+}
+
+.up-input-title {
+
+  margin-left: 40px;
+
+  float: left;
+}
+
+.up-input-right {
+  margin-left: 15px;
+  width: 500px;
+}
+
+.up-input-title-right {
+  width: 800px;
+  margin-left: 450px;
+
+
+}
+
+.left-up {
+  width: 80%;
+  float: left;
+  height: 37px;
+  margin-top: 50px;
+}
+
+.right-up {
+  width: 16%;
+  margin-top: 2%;
+  float: right;
+
+}
+
+.anniu {
+  padding-right: 5%;
+}
+
+.down {
+  margin-top: 40px;
+}
+
+.down-add {
+  padding: 10px;
+  margin: 0 27px;
+  border: 1px solid #ccc;
+  border-radius: 2px
+}
+
+.down-title {
+  padding-top: 10px;
+  color: #303133;
+}
+
+.down-table {
+  margin-top: 15px;
+  text-align: center;
+  margin: 35px 27px;
+}
+
+.el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  word-break: break-word;
+  /* background-color: #f8f8f9; */
+  color: #515a6e;
+  height: 40px;
+  font-size: 13px;
+  text-align: center;
+}
+
+.bottom-number {
+  padding-top: 5px;
+  color: #303133;
+  float: right;
+}
+
+.bottom-page {
+  float: right;
+}
+
+.el-icon-search {
+  padding-right: 10px;
+}
+
+.btn-delete {
+  margin-left: 20px;
+}
+
+/**
+自适应
+*/
+/* .demonstration{
+  width: 50%;
+} */
+.right {
+  float: none;
+  width: 100%;
+  height: 100%;
+  /* background-color: #9dc3e6; */
+}
+</style>

+ 20 - 15
src/views/message/addMessage.vue

@@ -32,12 +32,16 @@
           <el-input type="textarea" :rows="2" placeholder="请导入用户" autosize v-model="message.receivedUsers"></el-input>
         </el-form-item>  
 
-        <el-form-item label="消息内容:" prop="messageContent">
+        <el-form-item label="消息内容:" prop="content">
           <quill-editor 
-            class="ql-editor"
-            v-model="message.content" 
-            ref="myQuillEditor" 
-            :options="editorOption" 
+          class="editor"
+          v-model="content"
+          ref="myQuillEditor"
+          :content="value"    
+          :options="editorOption"
+          @blur="onEditorBlur($event)"
+          @focus="onEditorFocus($event)"
+          @change="onEditorChange($event)"
             >
           </quill-editor>
         </el-form-item>
@@ -68,13 +72,7 @@ Font.whitelist = fonts
 Quill.register(Font, true)
 
  export default {
-    
-    props:['value'],
-    watch:{
-      value:function(){
-        this.message.content = this.value;
-      }
-    },
+  
     data() {
       return {
         
@@ -85,9 +83,9 @@ Quill.register(Font, true)
           date2:'',
           receivedUsers: '',
           content: 'lxx这是 vue-quill-editor 的内容',
-          
+          cnt : 1 
         },
-        
+        content: `11111111<p>这是 vue-quill-editor 的内容!</p>`, //双向数据绑定数据
         rules: {
           messageTitle: [
             { required: true, message: '请输入消息标题', trigger: 'blur' }
@@ -108,7 +106,7 @@ Quill.register(Font, true)
             { required: true, message: '请导入内容' , trigger: 'blur' }
           ]
         },
-        content: `<p>这是 vue-quill-editor 的内容!</p>`, //双向数据绑定数据
+        
         // 富文本编辑器配置
         editorOption: {
           modules: {
@@ -142,12 +140,19 @@ Quill.register(Font, true)
   methods: {
       change(){
         console.log(1);
+        this.cnt = this.cnt+ 1  
+        console.log(this.cnt);
+      },
+      onEditorChange() {
+      //内容改变事件
+        this.$emit("input", this.content);
       },
       submitForm(formName) {
         console.log( "-****title" , this.message.messageTitle);
         console.log( "-****date1" , this.message.date1);
         console.log( "-****date2" , this.message.date2);
         console.log( "-****content" , this.message.content);
+        console.log( "lxzhen-****content" , this.content);
         var dateTime = this.message.date1;
           function add0(m){return m<10?'0'+m:m }
             function format(shijianchuo)

Деякі файли не було показано, через те що забагато файлів було змінено