bug

shanXiPlatform/src/layoutt/index.vue

@@ -40,7 +40,7 @@
     </div>
     <div class="breadcrubox" v-show="isShow">
       <span class="myspan">当前所在位置: 首页></span>
-      <!-- <span v-if="!this.$store.state.isnavigation">{{this.$store.state.depotName}}></span> -->
+      <span class="myspan" v-if="this.$store.state.isshowLibrary">{{this.$store.state.depotName}}></span>
       <breadcrumb id="breadcrumb-container" style="height:54px;line-height:54px; " class="breadcrumb-container" />
     </div>
     <app-main></app-main>

shanXiPlatform/src/permission.js

@@ -60,6 +60,17 @@ router.beforeEach(async(to, from, next) => {
       istable: false
     })
   }
+  if(to.meta.isshowLibrary){
+    store.commit({
+      type:'changeisshowLibrary',
+      isshowLibrary: true
+    })
+  }else{
+    store.commit({
+      type:'changeisshowLibrary',
+      isshowLibrary: false
+    })
+  }
 
   // start progress bar
   NProgress.start()

shanXiPlatform/src/router/index.js

@@ -319,9 +319,27 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: '修改密码', icon: 'dashboard', affix: true },
       },
-
-
-
+      {
+        path: 'storageStatusTable',
+        component: () => import('@/views/home/storageStatusTable'),
+        name: 'storageStatusTable',
+        hidden: true,
+        meta: { title: '储存状态', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
+      {
+        path: 'typesOfGrainTable',
+        component: () => import('@/views/home/storageStatusTable'),
+        name: 'typesOfGrainTable',
+        hidden: true,
+        meta: { title: '粮食种类', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
+      {
+        path: 'houseStatusTable',
+        component: () => import('@/views/home/storageStatusTable'),
+        name: 'houseStatusTable',
+        hidden: true,
+        meta: { title: '仓房状态', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
     ]
 
   },

shanXiPlatform/src/store/index.js

@@ -40,6 +40,7 @@ const state = {
   informNum:'', //首页右上角通知数量
   numberOnline: 0, //系统在线人数
   areacodes: '', //地图区域编码
+  isshowLibrary: false, //控制库主任首页左侧echart详情页面包屑是否显示库
 }
 
 const mutations = {
@@ -103,7 +104,9 @@ const mutations = {
   changeareacode(state,payload) {
     state.areacodes = payload.areacodes
   },
-  
+  changeisshowLibrary(state,payload) {
+    state.isshowLibrary = payload.isshowLibrary
+  },
 
   
 }

shanXiPlatform/src/views/home/branchOffice.vue

@@ -7,18 +7,21 @@
                     <div class="one">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 储存状态
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(1)">更多>></span>
                         </p>
                         <div id="myCharttwo" class="oneo"></div>
                     </div>
                     <div class="two">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 粮食种类
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(2)">更多>></span>
                         </p>
                         <div id="myChartone" class="twot"></div>
                     </div>
                     <div class="thi">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 仓房状态
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(3)">更多>></span>
                         </p>
                         <div id="myChartthi" class="thit"></div>
                     </div>
@@ -1279,7 +1282,16 @@ export default {
                     }
                 })
             }
-        }
+        },
+        leftboxsMore(type) {
+            if(type == 1){
+                this.$router.push({ name: "storageStatusTable" })
+            }else if(type == 2){
+                this.$router.push({ name: "typesOfGrainTable" })
+            }else if(type == 3){
+                this.$router.push({ name: "houseStatusTable" })
+            }
+        },
     }
 }
 </script>
@@ -1594,4 +1606,11 @@ export default {
         }
     }
 }
+.echartSpan {
+    float:right;
+    font-size:14px;
+    margin-top:2px;
+    color:#999999;
+    cursor:pointer
+}
 </style>

shanXiPlatform/src/views/home/storageStatusTable.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="global">
+    <div class="contentContainerGg">
+        <div class="container">
+          <el-table  border  :data="tableList"  highlight-current-row  style="width:100%"  :header-cell-style="{background:'#f8f8f8'}">
+            <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
+            <el-table-column prop="warnName" label="仓房" align="center" />
+            <el-table-column prop="warnName" label="所属公司" align="center" />
+            <el-table-column prop="warnName" label="储存状态(个)" align="center" />
+            <el-table-column prop="warnName" label="粮食种类(个)" align="center" />
+            <el-table-column prop="warnName" label="仓房状态(个)" align="center" />
+          </el-table>
+          <div class="pagination-container">
+            <el-pagination
+              class="right"
+              background
+              :current-page.sync="listQuery.page"
+              :page-size="listQuery.limit"
+              :page-sizes="[10,20,30,40]"
+              :total="total"
+              @size-change="sizeChange"
+              @current-change="pageChange"
+              layout="total, sizes, prev, pager, next, jumper"
+            ></el-pagination>
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getList } from '@/api/system/earlyWarningManagement'
+export default {
+  data() {
+    return {
+      // 列表数据
+      tableList: [],
+      // 分页
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 10,
+      },
+      roleList:[]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      let data = {
+        pageIndex: this.listQuery.page,
+        pageSize: this.listQuery.limit
+      }
+      getList(data).then((res) => {
+          if (res.code == 200) {
+            this.tableList = res.data.records
+            this.listQuery.limit = res.data.size
+            this.total = res.data.total
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.msg
+            })
+          }
+      }).catch((err) => {
+          console.log(err)
+        })
+    },
+    sizeChange(v) {
+      this.listQuery.limit = v;
+      this.getList();
+    },
+    pageChange(v) {
+      this.listQuery.page = v;
+      this.getList();
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  height: 40px;
+  line-height: 40px;
+  border-bottom: 1px solid #ccc;
+}
+.container {
+  padding: 10px;
+}
+.pagination-container {
+  margin-top:10px;
+  margin-right:20px;
+  text-align: right;
+}
+</style>

shanXiPlatform/src/views/outsideHouse/Emanage/sInspectiondetail.vue

@@ -203,7 +203,7 @@ export default {
                     .then(res => {
                         if (res.code == 200) {
                             this.$router.push({
-                                name: "gRenthouse"
+                                name: "sInspection"
                             })
                         } else {
                             this.$message({
@@ -221,7 +221,7 @@ export default {
                     .then(res => {
                         if (res.code == 200) {
                             this.$router.push({
-                                name: "gRenthouse"
+                                name: "sInspection"
                             })
                         } else {
                             this.$message({

shanXiPlatform/src/views/outsideHouse/rentWarehouse/sRenthousedetail.vue

@@ -202,7 +202,7 @@ export default {
                     .then(res => {
                         if (res.code == 200) {
                             this.$router.push({
-                                name: "gRenthouse"
+                                name: "sRenthouse"
                             })
                         } else {
                             this.$message({
@@ -220,7 +220,7 @@ export default {
                     .then(res => {
                         if (res.code == 200) {
                             this.$router.push({
-                                name: "gRenthouse"
+                                name: "sRenthouse"
                             })
                         } else {
                             this.$message({

shanXiPlatform/src/views/systemManagement/userManagement/approverManagement/index.vue

@@ -1,6 +1,20 @@
 <template>
-  <div class="container">
-    <div class="select">
+  <div class="container treebox">
+    <el-tree 
+      id="mainLeft"
+      class="filter-tree"
+      :data="treeData"
+      :props="defaultProps"
+      @node-click="handTreeClick"
+      :highlight-current="true"
+      node-key="depotCode"
+      default-expand-all
+      ref="userManageTree"
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+    ></el-tree>
+     <div id="mainRight">
+       <div class="select">
       <el-form>
         <el-form-item label="选择具体的审批流程">
           <el-select v-model="type" @change="headChange()">
@@ -46,6 +60,9 @@
     <div class="btns">
       <el-button type="savebtn" @click="btnSave()" :loading="loading">保存</el-button>
     </div>
+
+     </div>
+    
   </div>
 </template>
 <script>
@@ -56,10 +73,18 @@ import {
   approverSubmit,
   checkList,
 } from "@/api/system/userManagement/approver"
+import { findbyTreeData } from "@/api/branchoff/index.js"
 export default {
   name: "ApproverManagement",
   data() {
     return {
+        defaultProps: {
+        children: "children",
+        label: "depotName",
+        value: "depotCode"
+      },
+      treetotal:[],
+      treeData:[],
         //进度条
       loading:false,
       //存储用户信息
@@ -491,6 +516,23 @@ export default {
   },
 
   methods: {
+      //点击左侧树时
+    handTreeClick(data) {
+    
+    },
+      filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+     gettotaltree() {
+        let depotId = JSON.parse(getUser()).depotId
+      findbyTreeData(depotId).then(res => {
+        this.treeData = res.data
+        this.$nextTick(() => {
+          this.$refs.userManageTree.setCurrentKey(JSON.parse(getUser()).depotId)
+        })
+      })
+    },
     //根据库id,角色查询用户下拉选
     getRoleSelect() {
       var params = {
@@ -633,7 +675,9 @@ export default {
         })
     },
   },
-  created() {},
+  created() {
+    this.gettotaltree()
+  },
 
   mounted() {
     //获取当前缓存的登录用户信息
@@ -649,10 +693,23 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
+// .container {
+//   width: 100%;
 
-  padding: 10px;
+//   padding: 10px;
+// }
+.container {
+  height: 100%;
+  display: flex;
+  #mainLeft {
+    width: 300px;
+    height: calc(100vh - 200px);
+    border: 1px solid #e6e6e6;
+  }
+  #mainRight {
+    margin-left: 20px;
+    width: calc(100% - 320px);
+  }
 }
 
 .table {