样式修改

万物墙后台/src/assets/style/public.css

@@ -101,8 +101,9 @@
 }
 
 .theme{
-  background:url('~@/assets/img/bg1.png') no-repeat center center!important;
-  background-size: cover;
+  background-color: #f2ecde;
+  /* background:url('~@/assets/img/bg1.png') no-repeat center center!important;
+  background-size: cover; */
 }
 
 .theme-color{

万物墙后台/src/components/nums/index.vue

@@ -23,7 +23,7 @@ export default {
     height: 100px;
     border-radius: 50%;
     background-color: #DDCC92;
-    color: #0B4362;
+    color: #b8741a;
     /* background-color: rgba(255, 255, 255, 0.05); */
     position: relative;
   }

万物墙后台/src/pages/cultural-relic/index.vue

@@ -7,43 +7,91 @@
         <div class="info-top">
           <div class="info-left">
             <span>按文物类别查看：</span>
-            <el-select style="width:100px;" v-model="typeId" placeholder="请选择">
+            <el-select
+              style="width: 100px"
+              v-model="typeId"
+              placeholder="请选择"
+            >
               <el-option label="全部" value=""></el-option>
-              <el-option v-for="(item,i) in plist" :key="i" :label="item.name" :value="item.id"></el-option>
+              <el-option
+                v-for="(item, i) in plist"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
             </el-select>
-            <span style="margin-left:20px;">按文物年代查看：</span>
-            <el-select style="width:180px; text-align:center;" v-model="timeId" placeholder="请选择">
+            <span style="margin-left: 20px">按文物年代查看：</span>
+            <el-select
+              style="width: 180px; text-align: center"
+              v-model="timeId"
+              placeholder="请选择"
+            >
               <el-option label="全部" value=""></el-option>
-              <el-option v-for="(item,i) in tlist" :key="i" :label="item.name" :value="item.id"></el-option>
+              <el-option
+                v-for="(item, i) in tlist"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
             </el-select>
-            <el-input style="width:220px;margin:0 20px;" v-model="inputKey" placeholder="请输入文物名称搜索"></el-input>
+            <el-input
+              style="width: 220px; margin: 0 20px"
+              v-model="inputKey"
+              placeholder="请输入文物名称搜索"
+            ></el-input>
             <el-button type="primary" @click="getInformation">查找</el-button>
-            <el-button @click="inputKey=''">重置</el-button>
-            <el-select style="margin-left:20px;" @change="piliang" :value="'批量导入 '" placeholder="请选择" v-if="0">
-              <el-option
-                label="模板下载"
-                value="模板下载">
-              </el-option>
-              <el-option
-                label="批量导入"
-                value="批量导入">
-              </el-option>
+            <el-button @click="reset">重置</el-button>
+            <el-select
+              style="margin-left: 20px"
+              @change="piliang"
+              :value="'批量导入 '"
+              placeholder="请选择"
+              v-if="0"
+            >
+              <el-option label="模板下载" value="模板下载"> </el-option>
+              <el-option label="批量导入" value="批量导入"> </el-option>
             </el-select>
-            <input @change="uploadChange" class="upload-btn" ref="upload" type="file">
+            <input
+              @change="uploadChange"
+              class="upload-btn"
+              ref="upload"
+              type="file"
+            />
           </div>
           <div class="info-right">
-            <el-button type="primary" @click="$router.push({name:'edit-cultural-relic',params:{type:0}})">新增文物</el-button>
+            <el-button
+              type="primary"
+              @click="
+                $router.push({
+                  name: 'edit-cultural-relic',
+                  params: { type: 0 },
+                })
+              "
+              >新增文物</el-button
+            >
           </div>
         </div>
         <div class="collection-con">
           <ul>
-            <li class="theme-color" @click="gotoShow(item)" v-for="(item,i) in tableData" :key="i">
+            <li
+              class="theme-color"
+              @click="gotoShow(item)"
+              v-for="(item, i) in tableData"
+              :key="i"
+            >
               <div class="li-img">
-                <el-image :fit="'cover'" style="width:100%;height:100%;" :src="item.pic"></el-image>
+                <el-image
+                  :fit="'cover'"
+                  style="width: 100%; height: 100%"
+                  :src="item.pic"
+                ></el-image>
                 <!-- <div class="liulan"><span>浏览量: {{Math.round(Math.random()*100000)}}</span> 点赞数: {{Math.round(Math.random()*1000)}}</div> -->
               </div>
-              <div>{{item.timeName}} {{item.typeName}} <span @click.stop="del(item)" class="del">删除</span></div>
-              <p>{{item.name}}</p>
+              <div>
+                {{ item.timeName }} {{ item.typeName }}
+                <span @click.stop="del(item)" class="del">删除</span>
+              </div>
+              <p>{{ item.name }}</p>
             </li>
           </ul>
         </div>
@@ -101,10 +149,10 @@ export default {
     },
     size () {
       this.refresh()
-    },
-    inputKey () {
-      this.refresh()
     }
+    // inputKey () {
+    //   this.refresh()
+    // }
   },
   mounted () {
     this.getPositionList()
@@ -112,6 +160,13 @@ export default {
     this.refresh()
   },
   methods: {
+    // 点击重置
+    reset () {
+      this.inputKey = this.typeId = this.timeId = ''
+      this.currentPage = 1
+      this.size = 20
+      this.refresh()
+    },
     del (item) {
       let data = {
         id: item.id
@@ -120,29 +175,31 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.$http.post('/collection/deleteCollection', data).then(res => {
-          if (res.code === 0) {
-            this.$notify.success({
-              title: '提示',
-              message: '删除成功',
-              duration: 2000
-            })
-            this.refresh()
-          } else {
-            this.$notify.error({
-              title: '错误',
-              message: res.msg,
-              duration: 2000
-            })
-          }
+      })
+        .then(() => {
+          this.$http.post('/collection/deleteCollection', data).then((res) => {
+            if (res.code === 0) {
+              this.$notify.success({
+                title: '提示',
+                message: '删除成功',
+                duration: 2000
+              })
+              this.refresh()
+            } else {
+              this.$notify.error({
+                title: '错误',
+                message: res.msg,
+                duration: 2000
+              })
+            }
+          })
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      })
     },
     async uploadChange (e) {
       let file = e.target.files[0]
@@ -151,18 +208,19 @@ export default {
       const res = await this.$http.post(
         '/collection/importCollection',
         formData,
-        {'Content-Type': 'multipart/form-data'})
+        { 'Content-Type': 'multipart/form-data' }
+      )
       if (res.code === 0) {
         this.$alert(`上传成功`, '提示', {
           confirmButtonText: '确定',
-          callback: action => {
+          callback: (action) => {
             this.refresh()
           }
         })
       } else {
         this.$alert(`上传失败，${res.msg}`, '提示', {
           confirmButtonText: '确定',
-          callback: action => {
+          callback: (action) => {
             this.refresh()
           }
         })
@@ -195,7 +253,10 @@ export default {
       this.tlist = result.data
     },
     gotoShow (item) {
-      this.$router.push({ name: 'show-cultural-relic', params: { id: item.id } })
+      this.$router.push({
+        name: 'show-cultural-relic',
+        params: { id: item.id }
+      })
     },
     goto (item) {
       window.localStorage.setItem('editCollection', JSON.stringify(item))

万物墙后台/src/pages/layout/aside.vue

@@ -100,7 +100,7 @@ export default {
   color: rgba(0, 0, 0, 1);
 }
 .aside-item div:not(:first-child):hover{
-  background-color: #0B4362;
+  background-color: #b8741a;
   border-radius: 80px;
   color: #fff;
 }
@@ -120,7 +120,7 @@ export default {
 }
 
 .aside-item .active{
-  background-color: #0B4362;
+  background-color: #b8741a;
   border-radius: 80px;
   position: relative;
   color: #fff!important;

万物墙后台/src/pages/layout/head.vue

@@ -2,8 +2,8 @@
 <template>
 <div class='header'>
   <div class="header-title">
-    <img src="@/assets/img/4dage-logo.png" alt="">
-    <!-- <span>大屏后台管理系统</span> -->
+    <!-- <img src="@/assets/img/4dage-logo.png" alt=""> -->
+    <span>吴忠博物馆万物墙管理后台</span>
   </div>
   <div class="header-user">
     <div class="1">
@@ -77,17 +77,13 @@ export default {
   padding: 0 1.875rem;
   box-sizing: border-box;
   color: #fff;
-  background-color: #0B4362;
+  background-color: #b8741a;
   /* background: url('~@/assets/img/bar.png') no-repeat center center; */
 }
 
 .header-title {
-  /* color: #b9b47f; */
-  width: 147px;
-  height: 41px;
-  /* font-size: 1.25rem; */
-  text-align: center;
-  vertical-align: middle;
+  font-weight: 700;
+  font-size: 24px;
 }
 .header-title img{
   width: 100%;
@@ -96,10 +92,7 @@ export default {
   height: 50px;
   margin-right: 30px; */
 }
-.header-title span{
-  vertical-align: middle;
-  display: inline-block;
-}
+
 .header-user {
   display: flex;
   align-items: center;

万物墙后台/src/pages/login/style.css

@@ -49,7 +49,7 @@
 }
 .middle-title{
   margin-bottom: 2rem;
-  color: #0B4362;
+  color: #b8741a;
   font-size: 28px;
   line-height: 45px;
   font-weight: bold;

万物墙后台/src/pages/work-log/index.vue

@@ -17,14 +17,14 @@
             <span style="margin-left:20px;">按操作模块查看：</span>
             <el-select style="width:120px;" v-model="params.type" placeholder="请选择">
               <el-option label="全部" value=""></el-option>
-              <el-option label="展览管理" value="展览管理"></el-option>
+              <!-- <el-option label="展览管理" value="展览管理"></el-option> -->
               <el-option label="文物库" value="文物库"></el-option>
               <el-option label="日志管理" value="日志管理"></el-option>
-              <el-option label="用户管理" value="用户管理"></el-option>
+              <!-- <el-option label="用户管理" value="用户管理"></el-option> -->
             </el-select>
             <el-input style="width:220px;margin:0 20px;" v-model="params.description" placeholder="请输入操作事件内容"></el-input>
             <el-button type="primary" @click="handleSearchBtnClick">查找</el-button>
-            <el-button>重置</el-button>
+            <el-button @click="reset">重置</el-button>
           </div>
         </div>
         <el-table :data="tableData" style="width: 100%">
@@ -113,6 +113,16 @@ export default {
     this.getLogs()
   },
   methods: {
+    // 点击重置
+    reset () {
+      this.params = {
+        pageNum: 1,
+        description: '',
+        pageSize: 20,
+        type: ''
+      }
+      this.getLogs()
+    },
     getModuleList () {
       this.$http.post('/resource/find').then(res => {
         console.log(res, '/resource/find')

万物墙后台/src/router/index.js

@@ -116,12 +116,14 @@ export default new Router({
           name: 'edit-questionnaire',
           component: editQuestionnaire,
           meta: {index: 5}
-        }, {
-          path: '/user',
-          name: 'user',
-          component: User,
-          meta: {index: 6}
-        }, {
+        },
+        // {
+        //   path: '/user',
+        //   name: 'user',
+        //   component: User,
+        //   meta: {index: 6}
+        // },
+        {
           path: '/work-log',
           name: 'work-log',
           component: WorkLog,
@@ -146,45 +148,45 @@ export default new Router({
           name: 'device',
           component: Device,
           meta: {index: 10}
-        },
-        // 场景管理
-        {
-          path: '/scene',
-          name: 'scene',
-          component: Scene,
-          meta: {index: 11}
-        },
-        {
-          path: '/scene/addScene',
-          name: 'addScene',
-          component: AddScene,
-          meta: {index: 11}
-        },
-        {
-          path: '/scene/editScene/:id',
-          name: 'editScene',
-          component: EditScene,
-          meta: {index: 11}
-        },
-        // 视频管理
-        {
-          path: '/video',
-          name: 'video',
-          component: Video,
-          meta: {index: 12}
-        },
-        {
-          path: '/video/addVideo',
-          name: 'addVideo',
-          component: AddVideo,
-          meta: {index: 12}
-        },
-        {
-          path: '/video/editVideo/:id',
-          name: 'editVideo',
-          component: EditVideo,
-          meta: {index: 12}
         }
+        // // 场景管理
+        // {
+        //   path: '/scene',
+        //   name: 'scene',
+        //   component: Scene,
+        //   meta: {index: 11}
+        // },
+        // {
+        //   path: '/scene/addScene',
+        //   name: 'addScene',
+        //   component: AddScene,
+        //   meta: {index: 11}
+        // },
+        // {
+        //   path: '/scene/editScene/:id',
+        //   name: 'editScene',
+        //   component: EditScene,
+        //   meta: {index: 11}
+        // },
+        // // 视频管理
+        // {
+        //   path: '/video',
+        //   name: 'video',
+        //   component: Video,
+        //   meta: {index: 12}
+        // },
+        // {
+        //   path: '/video/addVideo',
+        //   name: 'addVideo',
+        //   component: AddVideo,
+        //   meta: {index: 12}
+        // },
+        // {
+        //   path: '/video/editVideo/:id',
+        //   name: 'editVideo',
+        //   component: EditVideo,
+        //   meta: {index: 12}
+        // }
       ]
     },
     {