bug

shanXiPlatform/src/icons/svg/chukusel.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M17.4,0H2.6L0,4.4v13.1h20l0-13.3L17.4,0z M4.3,1.7h11.3l1.7,3.5H2.6L4.3,1.7z M11.3,14.8H8.7v-3.5H6.1l3.5-3.5h0.9l3.5,3.5
+	h-2.6L11.3,14.8L11.3,14.8z"/>
+</svg>

shanXiPlatform/src/icons/svg/kucunsel.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M4.5,14.4V20h4.8v-5.6H8.1V16H5.8v-1.7H4.5z M11.2,14.4V20H16v-5.6h-1.2V16h-2.3v-1.7H11.2z M7.6,7.8v4.8h4.8V7.8h-1.2v1.4
+	H8.9V7.8H7.6z"/>
+<path d="M9.7,0L0.1,5.9v13.9h2.2v-7.2h3.1v-7h9.3v7h3v7.2h2.2V5.9L9.7,0z"/>
+</svg>

shanXiPlatform/src/router/index.js

@@ -587,7 +587,7 @@ export const constantRoutes = [
         component: storeTabs,
         name: 'inventory',
         redirect: 'inventory/inventoryQuality',
-        meta: { title: '库存质量管理', icon: 'kucun', affix: false , relation: 'house', istable: true },
+        meta: { title: '库存质量管理', icon: 'kucunsel', affix: false , relation: 'house', istable: true },
         resourceCode:175,
         children: [
           //库存
@@ -621,7 +621,7 @@ export const constantRoutes = [
         component: delstoreTabs,
         name: 'delivery',
         redirect: 'delivery/deliveryQuality',
-        meta: { title: '出库质量管理', icon: 'chuku', affix: false , relation: 'house', istable: true },
+        meta: { title: '出库质量管理', icon: 'chukusel', affix: false , relation: 'house', istable: true },
         resourceCode:176,
         children: [
           //库存
@@ -665,7 +665,7 @@ export const constantRoutes = [
         component: reservesTabs,
         name: 'GrainCheck',
         redirect: 'grainCheck/newGrain',
-        meta: { title: '粮情检测', icon: 'liangqing', affix: false, relation: 'house', istable: true },
+        meta: { title: '粮情检查', icon: 'liangqing', affix: false, relation: 'house', istable: true },
         resourceCode:128,
 
         children: [

shanXiPlatform/src/views/basicInformation/personnelStructure.vue

@@ -38,8 +38,8 @@
                     :index="indexMethod"
                   >
                   </el-table-column>
-                  <el-table-column prop="uname" label="姓名" align="center">
-                  </el-table-column>
+                  <!--  <el-table-column prop="uname" label="姓名" align="center">
+                  </el-table-column> -->
                   <el-table-column
                     prop="usex"
                     label="性别"
@@ -270,76 +270,80 @@ export default {
       xAxisdata: [],
       seriesdata: [],
       // chart 数据设置
-      option : {
-          title: {
-            // text: "仓储、质检人员职业资格情况",
-            textStyle: {
-              color: "#7d7d7d",
-              fontStyle: "normal",
-              fontWeight: "900",
-              fontSize: "14"
-            },
-            left: "center"
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow" // 默认设置为直线，可选为 'line' | 'shadow'
-            }
-          },
-          grid: {
-            y2: 60
+      option: {
+        title: {
+          // text: "仓储、质检人员职业资格情况",
+          textStyle: {
+            color: "#7d7d7d",
+            fontStyle: "normal",
+            fontWeight: "900",
+            fontSize: "14"
           },
-          /* legend:{
+          left: "center"
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow" // 默认设置为直线，可选为 'line' | 'shadow'
+          }
+        },
+        grid: {
+          y2: 60
+        },
+        /* legend:{
           data:['初级','中级','高级','技师','高级技师']
         }, */
-          /*         grid:{
+        /*         grid:{
           left:'3%',
           right:'4%',
           bottom:'3%',
           containLabel:true
         }, */
-          xAxis: {
-            type: "category",
-            data: this.xAxisdata,
-            // data: ["初级", "中级", "高级", "技师", "高级技师"],
-            // data: this.xAxisdata,
-            axisTick: {
-              alignWithLabel: true
-            },
-            axisLabel: {
-              rotate: 60
-            }
-          },
-          yAxis: {
-            type: "value",
-            min: 3
+        xAxis: {
+          type: "category",
+          data: this.xAxisdata,
+          // data: ["初级", "中级", "高级", "技师", "高级技师"],
+          // data: this.xAxisdata,
+          max: "10",
+          min: ["初级", "中级", "高级", "技师", "高级技师"],
+          axisTick: {
+            alignWithLabel: true
           },
-          series: [
-            {
-              name: "人数",
-              barWidth: "40%",
-              data: this.seriesdata,
-              // data: [1, 2, 1, 1, 1, 1, null, null],
-              type: "bar",
-              //修改第一组柱子的颜色
-              itemStyle: {
-                // barBorderRadius:20,
-                color: function(p) {
-                  var color = [
-                    "#F1DE34",
-                    "#58CEFF",
-                    "#8CCF23",
-                    "#FEBB46",
-                    "#4FC5BB"
-                  ]
-                  return color[p.dataIndex]
-                }
+          axisLabel: {
+            rotate: 60
+          }
+        },
+        yAxis: {
+          type: "value",
+
+          max: "10",
+          min: "2"
+        },
+        series: [
+          {
+            name: "人数",
+            barWidth: "40%",
+            data: this.seriesdata,
+            // data: [1, 2, 1, 1, 1, 1, null, null],
+            type: "bar",
+            //修改第一组柱子的颜色
+            itemStyle: {
+              // barBorderRadius:20,
+              color: function(p) {
+                var color = [
+                  "#F1DE34",
+                  "#58CEFF",
+                  "#8CCF23",
+                  "#FEBB46",
+                  "#4FC5BB"
+                ]
+                return color[p.dataIndex]
               }
             }
-          ]
-        }
+          }
+        ]
+      }
     }
   },
 
@@ -432,34 +436,50 @@ export default {
         pageIndex: this.listQuery.page,
         pageSize: this.listQuery.limit
       }
+      //设置图表数据
+      var myChart = echarts.init(document.querySelector("#chartProfession"))
+      myChart.showLoading()
       getAllPersonInfo(data)
         .then(res => {
-          // console.log(res, "职业资格")
+          console.log(res, "职业资格")
           // console.log(res.data, "1212111")
           /* res.data.forEach(item => {
             this.grainname.push(item.grainVarieties)
             this.grainvalue.push(item.count)
             console.log(item, "98765432")
           }) */
-          // console.log(res.data, "res.data---echarts....................")
+          console.log(
+            res.data.pageResult.total,
+            "res.data---echarts...................."
+          )
           this.xAxisdata = res.data.xAxis
           this.seriesdata = res.data.series
           console.log(this.xAxisdata, "this.xAxisdata1111....")
           console.log(this.seriesdata, "this.seriesdata222....")
-          //设置图表数据
-          var myChart = echarts.init(document.querySelector("#chartProfession"))
-          myChart.setOption({
-            xAxis: {
-              data: res.data.xAxis
-            },
-            series: [
-              {
-                // 根据名字对应到相应的系列
-                name: "人数",
-                data: res.data.series
-              }
-            ]
-          })
+
+          if (res.data.xAxis == undefined || res.data.series == undefined) {
+            myChart.showLoading({
+              text: "暂无数据",
+              color: "#ffffff",
+              textColor: "#8a8e91",
+              maskColor: "rgba(255, 255, 255, 0.8)"
+            })
+          } else {
+            myChart.hideLoading()
+            myChart.setOption({
+              xAxis: {
+                data: res.data.xAxis
+              },
+              series: [
+                {
+                  // 根据名字对应到相应的系列
+                  name: "人数",
+                  data: res.data.series
+                }
+              ]
+            })
+          }
+
           if (res.code == 200) {
             this.tableData = res.data.pageResult.records
             this.loading = false
@@ -536,7 +556,81 @@ export default {
       } else {
 
       } */
-      myChart.setOption(this.option)
+      myChart.setOption({
+        /* noDataLoadingOption: {
+          text: "暂无数据",
+          effect: "bubble",
+          effectOption: {
+            effect: {
+              n: 0
+            }
+          }
+        }, */
+        title: {
+          text: "仓储、质检人员职业资格情况",
+          show: false,
+          textStyle: {
+            color: "#7d7d7d",
+            fontStyle: "normal",
+            fontWeight: "900",
+            fontSize: "14"
+          },
+          left: "center"
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow" // 默认设置为直线，可选为 'line' | 'shadow'
+          }
+        },
+        grid: {
+          y2: 60
+        },
+        xAxis: {
+          type: "category",
+          data: this.xAxisdata,
+          // data: ["初级", "中级", "高级", "技师", "高级技师"],
+          // data: this.xAxisdata,
+          max: "10",
+          min: ["初级", "中级", "高级", "技师", "高级技师"],
+          axisTick: {
+            alignWithLabel: true
+          },
+          axisLabel: {
+            rotate: 60
+          }
+        },
+        yAxis: {
+          type: "value",
+
+          max: "10",
+          min: "2"
+        },
+        series: [
+          {
+            name: "人数",
+            barWidth: "40%",
+            data: this.seriesdata,
+            // data: [1, 2, 1, 1, 1, 1, null, null],
+            type: "bar",
+            //修改第一组柱子的颜色
+            itemStyle: {
+              // barBorderRadius:20,
+              color: function(p) {
+                var color = [
+                  "#F1DE34",
+                  "#58CEFF",
+                  "#8CCF23",
+                  "#FEBB46",
+                  "#4FC5BB"
+                ]
+                return color[p.dataIndex]
+              }
+            }
+          }
+        ]
+      })
     },
     // 筛选科室
     handleClick(tab, event) {

shanXiPlatform/src/views/countQuality/warehouseInformation.vue

@@ -221,7 +221,7 @@
                   <img src="@/assets/images/touxiang.jpg" alt="保管员图片" />
                 </div>
                 <p class="info_name">
-                  <span>{{ branKeeper.uname || "" }}</span>
+                  <span>{{ branKeeper.uname || ''}}</span>
                 </p>
               </div>
             </div>
@@ -376,6 +376,17 @@ export default {
       formInfo: [],
       branData: {},
       branKeeper: {}, // 仓房保管员信息
+      branKeeper1:{
+        usex:'',
+        uname:'',
+        uphone:'',
+        puniversityGraduated:'',
+        pworkYears:'',
+        ppoliticalOutlook:'',
+        pmajorThree:'',
+        pacademicDegree:'',
+        umail:''
+      },
       birthday:'',// 格式化后的出生日期
       age:'', // 计算后的年龄
       imageName: "",
@@ -482,14 +493,18 @@ export default {
           // console.log(this.branKeeper, "保管员111")
           if (res.code == 200) {
             // console.log(res, "保管员信息111")
-
-            this.branKeeper = res.data
-            console.log(this.branKeeper, "保管员222")
+            if(res.data ==null){
+              this.branKeeper = this.branKeeper1
+            }else{
+              this.branKeeper = res.data
+            console.log(this.branKeeper, "保管员")
             this.imageName = this.branKeeper.pheadPortrait
+            }
+
             if(res.data.ubirthday !==null ){
               this.birthday = rTime(this.branKeeper.ubirthday)// 格式化显示出生年月
-              console.log(this.branKeeper.ubirthday,'this.branKeeper.ubirthday...')
-              console.log(this.branKeeper.ubirthday.toLocaleString(),'this.branKeeper.ubirthday.toLocaleString()...')
+              // console.log(this.branKeeper.ubirthday,'this.branKeeper.ubirthday...')
+              // console.log(this.branKeeper.ubirthday.toLocaleString(),'this.branKeeper.ubirthday.toLocaleString()...')
             // var birthday1 = this.branKeeper.ubirthday // 原始时间戳
             this.age = computeAge(this.branKeeper.ubirthday) //根据时间戳计算年龄
             }

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

@@ -50,7 +50,7 @@
                                                     String(this.model.grainWork)!=''&& 
                                                     String(this.model.keepLog)!=''&&  
                                                     String(this.model.grainAnalysi)!='' &&
-                                                      this.$route.query.state =='edit' " @click="editinfo()">修改</el-button>
+                                                      this.$route.query.state =='edit' " @click="editinfo()">保存</el-button>
                     <el-button type="savebtn" v-if="String(this.model.printGrainResults)!='' &&
                                                     String(this.model.onLight)!=''&&  
                                                     String(this.model.doubleEntry)!=''&& 

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

@@ -38,7 +38,7 @@
                                                     String(this.model.fillReport)!=''&&
                                                     String(this.model.problemElimination)!=''&&  
                                                     String(this.model.registerAccount)!=''&&  
-                                                      this.$route.query.state =='edit' " @click="editinfo()">修改</el-button>
+                                                      this.$route.query.state =='edit' " @click="editinfo()">保存</el-button>
                     <el-button type="savebtn" v-if="String(this.model.safetyOfficer)!='' &&
                                                     String(this.model.safetyArchive)!=''&&  
                                                     String(this.model.dailyInspection)!=''&& 

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

@@ -50,7 +50,7 @@
                                                     String(this.model.grainWork)!=''&& 
                                                     String(this.model.keepLog)!=''&&  
                                                     String(this.model.grainAnalysi)!='' &&
-                                                      this.$route.query.state =='edit' " @click="editinfo()">修改</el-button>
+                                                      this.$route.query.state =='edit' " @click="editinfo()">保存</el-button>
                     <el-button type="savebtn" v-if="String(this.model.printGrainResults)!='' &&
                                                     String(this.model.onLight)!=''&&  
                                                     String(this.model.doubleEntry)!=''&& 

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

@@ -38,7 +38,7 @@
                                                     String(this.model.fillReport)!=''&&
                                                     String(this.model.problemElimination)!=''&&  
                                                     String(this.model.registerAccount)!=''&&  
-                                                      this.$route.query.state =='edit' " @click="editinfo()">修改</el-button>
+                                                      this.$route.query.state =='edit' " @click="editinfo()">保存</el-button>
                     <el-button type="savebtn" v-if="String(this.model.safetyOfficer)!='' &&
                                                     String(this.model.safetyArchive)!=''&&  
                                                     String(this.model.dailyInspection)!=''&& 

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/addNewGrain.vue

@@ -69,7 +69,7 @@
       </div>
 
       <div class="btns">
-        <el-button type="cancel" @click="cancel()">取消</el-button>
+        <el-button type="cancel" @click="cancel()"> 返回 </el-button>
 
         <el-button
           type="savebtn"
@@ -537,8 +537,7 @@ export default {
           .then(res => {
             console.log(this.data3, "this.data3")
             console.log(res,'res222111...')
-            if (res.code == 200) {
-              console.log('新增成功........')
+            console.log('新增成功........')
               this.loading = false
               this.$message({
               message: "新增成功！",
@@ -547,6 +546,8 @@ export default {
             this.$router.push({
               path: "/reservesManagement/grainCheck/newGrain"
             })
+            if (res.code == 200) {
+
               if (!(JSON.stringify(this.data2) == {})) {
                 if (
                   Object.getOwnPropertyNames(

shanXiPlatform/vue.config.js

@@ -39,7 +39,8 @@ module.exports = {
 
     proxy: {  //配置跨域
       '/': {
-        target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        // target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
         // target:'http://172.16.0.02:9601',
         changOrigin: true,  //允许跨域