Преглед изворни кода

修改了部分问题及准确性分析接口

duanxiaoduan пре 1 година
родитељ
комит
4087eb23fe

+ 2 - 2
src/layout/components/Navbar.vue

@@ -32,7 +32,7 @@
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <!-- <img src="@/assets/cow.jpg" class="user-avatar"> -->
-          <span style="font-size:12px;color: #fff;">欢迎您,{{ employename }}</span>
+          <span style="font-size:12px;color: #fff;">欢迎您,{{ name }}</span>
           <i class="el-icon-caret-bottom" style="color: #fff;" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
@@ -77,7 +77,7 @@ export default {
     ...mapGetters([
       'sidebar',
       'avatar',
-      'employename',
+      'name',
       'employeid',
       'pastureid',
       'departmentid',

+ 2 - 1
src/store/modules/user.js

@@ -31,6 +31,7 @@ const mutations = {
     state.username = username
     Cookies.set('pageCount', 50)
     Cookies.set('username', username)
+    Cookies.set('employename', username)
   },
   SET_AVATAR: (state, avatar) => {
     state.avatar = avatar
@@ -94,7 +95,7 @@ const actions = {
           commit('ST_DOWNLIST', response.data)
         })
         commit('SET_ROLES', roles)
-        commit('SET_NAME', username)
+        commit('SET_USERNAME', username)
         commit('SET_AVATAR', avatar)
         resolve(data)
       }).catch(error => {

+ 7 - 3
src/views/statisticalAnalysis/errorAnalysis/index.vue

@@ -699,7 +699,7 @@
             <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable label="车次" min-width="50px" align="center" prop="车次" />
             <u-table-column sortable label="班次" min-width="50px" align="center" prop="班次" />
-           <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
+           <!-- <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
@@ -708,7 +708,9 @@
               <template slot-scope="{row}">
                 <a @click="clickFeed2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.饲料 }}</a>
               </template>
-            </u-table-column>
+            </u-table-column> -->
+            <u-table-column sortable label="配方名称" min-width="55px" align="center" prop="配方名称" />
+            <u-table-column sortable label="饲料" min-width="55px" align="center" prop="饲料" />
             <u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable label="实际重量" min-width="55px" align="center" prop="实际重量" />
             <u-table-column sortable label="误差值" min-width="45px" align="center" prop="误差值" />
@@ -4773,7 +4775,7 @@ export default {
       data.start_time = this.tab.table.getdataListParm.parammaps.startTime
       data.end_time = this.tab.table.getdataListParm.parammaps.stopTime
       postJson(url,data).then(response => {
-        if(response.data.list !== null){
+        if(response.data !== null && response.data.list !== null){
           this.tab.TMRNameList = response.data.list
         }else{
           this.tab.TMRNameList =  []
@@ -4788,6 +4790,7 @@ export default {
       data.start_time = this.tab2.table.getdataListParm.parammaps.startTime
       data.end_time = this.tab2.table.getdataListParm.parammaps.stopTime
       postJson(url,data).then(response => {
+        this.tab2.table.listLoading = false
         if(response.data !== null){
           this.tab2.TMRNameList = response.data.list
         }else{
@@ -4803,6 +4806,7 @@ export default {
       data.start_time = this.tab3.table.getdataListParm.parammaps.startTime
       data.end_time = this.tab3.table.getdataListParm.parammaps.stopTime
       postJson(url,data).then(response => {
+        this.tab3.table.listLoading = false
         if(response.data.list !== null){
           this.tab3.TMRNameList = response.data.list
         }else{

+ 11 - 2
src/views/statisticalAnalysis/errorAnalysis/see.vue

@@ -121,7 +121,7 @@
 import * as echarts from 'echarts';
 require('echarts/theme/macarons')
 import Cookies from 'js-cookie'
-import { GetDataByName, GetReportform, formatNum } from '@/api/common'
+import { GetDataByName,postJson, GetReportform, formatNum } from '@/api/common'
 export default {
   name: 'See',
   props: {
@@ -266,7 +266,16 @@ export default {
       this.table1.getdataListParm.parammaps.pid = this.pid
       this.table1.getdataListParm.parammaps.error = this.error1
       this.table1.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
-      GetDataByName(this.table1.getdataListParm).then(response => {
+      let url = 'api/v1/ops/accuracy/data_by_name'
+      let data = {}
+      data.api_name = this.table1.getdataListParm.name
+      data.optdevice = this.table1.getdataListParm.parammaps.optdevice 
+      data.start_time = this.table1.getdataListParm.parammaps.startTime
+      data.end_time = this.table1.getdataListParm.parammaps.stopTime
+      data.pid = this.table1.getdataListParm.parammaps.pid
+      data.error = this.table1.getdataListParm.parammaps.error
+      data.pasture_id = this.table1.getdataListParm.parammaps.pastureid
+      postJson(url,data).then(response => {
         console.log('车次信息数据', response.data.list)
         if (response.data !== null && response.data.list !== null) {
           this.table1.list = response.data.list

+ 3 - 3
src/views/statisticalAnalysis/feedingEfficiency/index.vue

@@ -39,7 +39,7 @@
             class="elTable table-fixed"
             :max-height="myHeight"
           >
-            <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="feed_formula_name"" />
+            <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="feed_formula_name" />
             <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="bar_name" />
             <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="feed_formula_name" />
             <el-table-column v-if="tab.isLivestockType" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
@@ -1862,7 +1862,7 @@ export default {
       }
       let url = '/api/v1/ops/feed_efficiency/chart_statistics'
       postJson(url, data).then(response => {
-        if (response.data !== null && response.data.list !== null && response.data.data !== null) {
+        if (response.data !== null && response.data.list !== null && response.data.data !== null && response.data.data.length > 0) {
           console.log('泌乳牛干物质采食量图表数据', response.data.list)
           for (let i = 0; i < response.data.data.length; i++) {
             if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
@@ -1954,7 +1954,7 @@ export default {
       }
 
       postJson(url, data).then(response => {
-        if (response.data !== null && response.data.list !== null && response.data.data !== null) {
+        if (response.data !== null && response.data.list !== null && response.data.data !== null && response.data.data.length > 0) {
           console.log('牛栏剩料率图表数据', response.data.list)
           for (let i = 0; i < response.data.data.length; i++) {
             if (response.data.data[i].剩料量 !== '' && response.data.data[i].剩料量 !== undefined) {

+ 5 - 5
src/views/statisticalAnalysis/processAnalysis/index.vue

@@ -783,7 +783,7 @@ export default {
       }
       console.log(data,'===999')
       postJson(url, data).then(response => {
-        if (response.data.list !== null) {
+        if (response.data.list !== null && response.data.list.length > 0) {
           this.table.list = response.data.list
           this.table.total = response.data.total
           if (response.data.list[0].lpplantype == '预混计划') {
@@ -1237,7 +1237,7 @@ export default {
       }
       postJson(url, data).then(response => {
         console.log('过程详情table数据', response.data.list)
-        if (response.data.list !== null) {
+        if (response.data.list !== null && response.data.list.length > 0) {
           this.table2.list = response.data.list
         } else {
           this.table2.list = []
@@ -1310,7 +1310,7 @@ export default {
         }
         postJson(url, data).then(response => {
         console.log('混料详情table数据', response.data.list)
-        if (response.data.list !== null) {
+        if (response.data.list !== null && response.data.list.length > 0) {
           this.table3.list = response.data.list
           var sumlweight = 0
           var sumactualweightminus = 0
@@ -1400,7 +1400,7 @@ export default {
       }
       postJson(url, data).then(response => {
         console.log('撒料详情table数据', response.data.list)
-        if (response.data.list !== null) {
+        if (response.data.list !== null && response.data.list.length > 0) {
           this.table4.list = response.data.list
           var sumlweight = 0
           var sumactualweightminus = 0
@@ -1518,7 +1518,7 @@ export default {
       }
       postJson(url, data).then(response => {
       // GetReportform(this.chart1.getdataListParm).then(response => {
-        if (response.data.list !== null) {
+        if (response.data.list !== null && response.data.list.length > 0) {
           this.chart1.list = response.data.data
           console.log('实时监控', response.data.list)
           this.chart1.chartLine_data = response.data.list