修复bug

src/apis/holding3.js

@@ -3,7 +3,7 @@ import axios from '../utils/request'
 export const getHolding3List = (data) => {
   return axios({
     method: 'post',
-    url: '/cms/goods/pass/list',
+    url: '/cms/ledger/list',
     data
   })
 }

src/views/collect/collect0.vue

@@ -33,7 +33,13 @@
               >
               </el-option>
             </el-select>
-            <span>藏品名称/质地：</span>
+            <span>搜索：</span>
+                <el-select v-model="mydata.searchType" placeholder="请选择" style="width:108px">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="藏品名称" value="name"></el-option>
+                  <el-option label="藏品年代" value="age"></el-option>
+                  <el-option label="藏品质地" value="texture"></el-option>
+                </el-select>
             <el-input
               v-model="mydata.searchKey"
               placeholder="请输入"
@@ -166,6 +172,7 @@ export default {
       baseURL: '',
       // 请求藏品总账参数
       mydata: {
+        searchType: '', // 搜索类型， name:名称， age:年代， texture：质地
         goodsTypeId: '', // 藏品类型id
         pageNum: 1, // 起始页码，默认1为第一页
         pageSize: 10, // 每页数量

src/views/holding/holding0.vue

@@ -413,6 +413,7 @@ export default {
 
   display: flex;
   .right {
+    max-width: 1723px;
     width: 100%;
     height: 868px;
     .top {

src/views/holding/holding3.vue

@@ -33,7 +33,13 @@
               >
               </el-option>
             </el-select>
-            <span>藏品名称/质地：</span>
+            <span>搜索：</span>
+                <el-select v-model="mydata.searchType" placeholder="请选择" style="width:108px">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="藏品名称" value="name"></el-option>
+                  <el-option label="藏品年代" value="age"></el-option>
+                  <el-option label="藏品质地" value="texture"></el-option>
+                </el-select>
             <el-input
               v-model="mydata.searchKey"
               placeholder="请输入"
@@ -167,6 +173,7 @@ export default {
       baseURL: '',
       // 请求藏品总账参数
       mydata: {
+        searchType: '', // 搜索类型， name:名称， age:年代， texture：质地
         goodsTypeId: '', // 藏品类型id
         pageNum: 1, // 起始页码，默认1为第一页
         pageSize: 10, // 每页数量

src/views/home/index.vue

@@ -51,22 +51,15 @@
       </div>
     </div>
     <div class="conten">
-      <div class="letf letfHome"></div>
+      <!-- <div class="letf letfHome"></div> -->
       <!-- <div class="right rightHome"></div> -->
-      <div class="letf" v-if="0">
+      <div class="letf" >
         <div class="title">
-          <h3>最新动态</h3>
-          <el-button @click="$router.push('homeNews/1')">查看更多</el-button>
+          <h3>馆藏统计</h3>
+          <el-button @click="$router.push('/layout/statistics1')">查看更多</el-button>
         </div>
-       <div class="none" v-if="0">暂无数据</div>
-        <ul class="txt" v-else>
-          <li v-for="i in 20" :key="i">
-            <span class="time">8月10日 18：01</span>
-            <div class="dian" v-if="1"></div>
-            <div class="dianX" v-else></div>
-            <span>Admin1 保存了 入藏管理 待办事项</span>
-          </li>
-        </ul>
+       <!-- <div class="none" v-if="0">暂无数据</div> -->
+          <div class="echarts"></div>
       </div>
       <div class="right"  >
         <div class="title">
@@ -83,12 +76,20 @@
 </template>
 
 <script>
+// ---------------------echarts
+import * as echarts from 'echarts/core'
+import { TooltipComponent } from 'echarts/components'
+import { PieChart } from 'echarts/charts'
+import { LabelLayout } from 'echarts/features'
+import { CanvasRenderer } from 'echarts/renderers'
+
 import { getList as collect2 } from '@/apis/collect2'
 import { getList as collect1 } from '@/apis/collect1'
 import { getList as getList5 } from '@/apis/holding5'
 import { getList as getList2 } from '@/apis/holding2'
 import { getList as getList1 } from '@/apis/holding1'
 import { getList } from '@/apis/holding'
+echarts.use([TooltipComponent, PieChart, CanvasRenderer, LabelLayout])
 export default {
   name: 'Home',
   components: {},
@@ -176,6 +177,34 @@ export default {
     col2.data.list.forEach(v => {
       if (v.status === 1 || v.status === 0) this.dingdong[5].inoc++
     })
+    // 图表
+    const chartDom = document.querySelector('.echarts')
+    const myChart = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item'
+      },
+
+      series: [
+        {
+          type: 'pie',
+          radius: ['40%', '70%'],
+          data: [
+            { value: 1048, name: '陶瓷 10.00%' },
+            { value: 735, name: '青铜 10.00%' },
+            { value: 580, name: '铁 10.00%' }
+          ],
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        }
+      ]
+    }
+    option && myChart.setOption(option)
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前
@@ -306,31 +335,19 @@ export default {
       background-size: 100% 100%;
     }
     .letf {
-      position: relative;
-      overflow: hidden;
-      overflow: auto;
-      .txt {
-        .time {
-          color: #999;
-        }
-        li {
-          cursor: pointer;
-          align-items: center;
-          display: flex;
-          color: black;
-          margin: 28px;
-          div {
-            margin: 0 10px 0 18px;
-            border: 3px solid #1890ff;
-            width: 12px;
-            height: 12px;
-            border-radius: 50%;
-          }
-          .dianX {
-            border: 3px solid #ccc;
-          }
-        }
+      .echarts{
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        height: 80%;
+
+      }
+      .title{
+        border-bottom: 1px solid #ccc;
       }
+      position: relative;
+
     }
     .right {
       position: relative;
@@ -356,7 +373,7 @@ export default {
         align-items: center;
         justify-content: center;
         flex-direction: column;
-        height: 100px;
+        height: 118px;
         float: left;
         width: 50%;
         border: 1px solid #ccc;

src/views/layout/index.vue

@@ -223,7 +223,7 @@ export default {
       this.$nextTick(() => {
         setTimeout(() => {
           if (name === '藏品总账' || name === '征集品总账') location.reload(true)
-        }, 200)
+        }, 500)
       })
     },
     toHome (index) {

src/views/statistics/statistics0.vue

@@ -242,7 +242,7 @@ export default {
       this.popupOneName = ''
       this.getTreeList()
       this.myId = null
-      this.$message.success('新增库区成功')
+      this.$message.success('库区操作成功')
     },
     // 点击第二层+号
     delTow () {
@@ -302,7 +302,7 @@ export default {
       this.popupTowNum = ''
       this.getTreeList()
       this.myId = null
-      this.$message.success('新增仓库成功')
+      this.$message.success('仓库操作成功')
     },
     // 点击第三层
     delThree (id) {
@@ -365,7 +365,7 @@ export default {
       this.popupThreeTxt = ''
       this.getTreeList()
       this.myId = null
-      this.$message.success('新增货架成功')
+      this.$message.success('货架操作成功')
       // 刷新页面
       this.$nextTick(() => {
         setTimeout(() => {

src/views/statistics/statistics1.vue

@@ -83,7 +83,8 @@ import * as echarts from 'echarts/core'
 import { TooltipComponent } from 'echarts/components'
 import { PieChart } from 'echarts/charts'
 import { LabelLayout } from 'echarts/features'
-import { CanvasRenderer } from 'echarts/renderers'; import TabList from '@/components/tabLeft3.vue'
+import { CanvasRenderer } from 'echarts/renderers'
+import TabList from '@/components/tabLeft3.vue'
 echarts.use([TooltipComponent, PieChart, CanvasRenderer, LabelLayout])
 export default {
   name: 'statistics1',