Shan9312 пре 1 дан
родитељ
комит
6b4b8ed074

+ 21 - 17
.env.development

@@ -1,18 +1,22 @@
-# just a flag
-ENV = 'development'
-
-# base api
-# 测试线
-# VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
+# just a flag
+ENV = 'development'
+
+# base api
+# 测试线
+# VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
 # VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
-# 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
-VUE_APP_BASE_API = 'http://192.168.1.93/'
-# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
-# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
-# It only does one thing by converting all import() to require().
-# This configuration can significantly increase the speed of hot updates,
-# when you have a large number of pages.
-# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
-
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 白少后台本地
+# VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
+# c测试地址
+# VUE_APP_BASE_API = 'http://192.168.1.93:8081/'
+# 正式地址
+VUE_APP_BASE_API ='http://nxnkhsp.kptyun.com/'
+# 'http://hbczzt.kptyun.com/'
+# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
+# It only does one thing by converting all import() to require().
+# This configuration can significantly increase the speed of hot updates,
+# when you have a large number of pages.
+# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
+
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

BIN
dist-tmr-肉牛-20240726-1.zip


BIN
dist-tmr-肉牛-20240726.zip


+ 146 - 146
src/utils/request.js

@@ -1,146 +1,146 @@
-import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import Cookies from 'js-cookie';
-
-//获取当前url
-const DoMainString = document.querySelector("html").getAttribute("domain");
-var URL = process.env.VUE_APP_BASE_API
-if (DoMainString) {
-  URL = DoMainString
-}
-
-var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
-var browserUrl = window.location.hostname
-console.log("========url===",reg.test(browserUrl))
-if (reg.test(browserUrl)){
-  // URL = window.location.protocol +"//"+ browserUrl + ":8082/"
-  URL = window.location.protocol +"//"+ browserUrl + ":8081/"
-}
-
-Cookies.set('url',URL)
-console.log(process.env.VUE_APP_BASE_API,'===========URL1111')
-console.log(URL,'===========URL')
-
-const service = axios.create({
-  baseURL: URL, // url = base url + request url
-  withCredentials: true, // send cookies when cross-domain requests
-  timeout: 60000 ,// request timeout
-})
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'  //此处是增加的代码,设置请求头的类型
-    if (process.env.VUE_APP_BASE_API !== '/dev-api') {
-      config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-      config.withCredentials = false
-    }
-
-    if (store.getters.token) {
-      // let each request carry token
-      // ['Authorization'] is a custom headers key
-      // please modify it according to the actual situation
-      if (process.env.VUE_APP_BASE_API === '/dev-api') {
-        config.headers['X-Token'] = getToken()
-      } else {
-        config.headers['token'] = getToken()
-      }
-    }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
-
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
-  response => {
-    const res = response.data
-
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 200) {
-      Message({
-        // message: res.msg + res.code,
-        message: '请求超时',
-        type: 'error',
-        duration: 5 * 1000
-      })
-
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        // to re-login
-        MessageBox.confirm('你已经注销登陆,你可以取消或重新登陆', '确认注销', {
-          confirmButtonText: '重新登陆',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
-      if (res.code === 20002) {
-        store.dispatch('user/resetToken').then(() => {
-          location.reload()
-        })
-      }
-      if (res.code === undefined) {
-        return res
-      } else {
-        return Promise.reject(new Error(res.message || 'Error'))
-      }
-    } else {
-      return res
-    }
-  },
-  error => {
-    console.log('err' + error) // for debug
-    let config = error.config
-    if (!config) {
-      Message({ message: error.message, type: 'error', duration: 5 * 1000 })
-      return Promise.reject(error)
-    }
-    console.log('config==>', config) // for debug
-    console.log('config.__retryCount==>', config.__retryCount) // for debug
-    // 设置请求超时次数
-    config.__retryCount = config.__retryCount || 0
-    if (config.__retryCount >= 3) {
-      // Message({ message:error.message, type: 'error', duration: 5 * 1000 })
-      Message({ message:'请求超时', type: 'error', duration: 5 * 1000 })
-      // Message.error((error && error.data && error.data.msg) || '请求超时')
-      return Promise.reject(error)
-    }
-    config.__retryCount += 1
-    let backoff = new Promise((resolve) => {
-      setTimeout(() => {
-        resolve()
-      }, config.retryDelay || 1000)
-    })
-    return backoff.then(() => {
-      return service(config)
-    })
-    // Message({
-    //   message: error.message,
-    //   type: 'error',
-    //   duration: 5 * 1000
-    // })
-    // return Promise.reject(error)
-  }
-)
-
-export default service
+import axios from 'axios'
+import { MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+import Cookies from 'js-cookie';
+
+//获取当前url
+const DoMainString = document.querySelector("html").getAttribute("domain");
+var URL = process.env.VUE_APP_BASE_API
+if (DoMainString) {
+  URL = DoMainString
+}
+
+var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
+var browserUrl = window.location.hostname
+console.log("========url===",reg.test(browserUrl))
+// if (reg.test(browserUrl)){
+//   // URL = window.location.protocol +"//"+ browserUrl + ":8082/"
+//   URL = window.location.protocol +"//"+ browserUrl + ":8081/"
+// }
+
+Cookies.set('url',URL)
+console.log(process.env.VUE_APP_BASE_API,'===========URL1111')
+console.log(URL,'===========URL')
+
+const service = axios.create({
+  baseURL: URL, // url = base url + request url
+  withCredentials: true, // send cookies when cross-domain requests
+  timeout: 60000 ,// request timeout
+})
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    // do something before request is sent
+    // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'  //此处是增加的代码,设置请求头的类型
+    if (process.env.VUE_APP_BASE_API !== '/dev-api') {
+      config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+      config.withCredentials = false
+    }
+
+    if (store.getters.token) {
+      // let each request carry token
+      // ['Authorization'] is a custom headers key
+      // please modify it according to the actual situation
+      if (process.env.VUE_APP_BASE_API === '/dev-api') {
+        config.headers['X-Token'] = getToken()
+      } else {
+        config.headers['token'] = getToken()
+      }
+    }
+    return config
+  },
+  error => {
+    // do something with request error
+    console.log(error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  /**
+   * If you want to get http information such as headers or status
+   * Please return  response => response
+  */
+
+  /**
+   * Determine the request status by custom code
+   * Here is just an example
+   * You can also judge the status by HTTP Status Code
+   */
+  response => {
+    const res = response.data
+
+    // if the custom code is not 20000, it is judged as an error.
+    if (res.code !== 200) {
+      Message({
+        // message: res.msg + res.code,
+        message: '请求超时',
+        type: 'error',
+        duration: 5 * 1000
+      })
+
+      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+        // to re-login
+        MessageBox.confirm('你已经注销登陆,你可以取消或重新登陆', '确认注销', {
+          confirmButtonText: '重新登陆',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          store.dispatch('user/resetToken').then(() => {
+            location.reload()
+          })
+        })
+      }
+      if (res.code === 20002) {
+        store.dispatch('user/resetToken').then(() => {
+          location.reload()
+        })
+      }
+      if (res.code === undefined) {
+        return res
+      } else {
+        return Promise.reject(new Error(res.message || 'Error'))
+      }
+    } else {
+      return res
+    }
+  },
+  error => {
+    console.log('err' + error) // for debug
+    let config = error.config
+    if (!config) {
+      Message({ message: error.message, type: 'error', duration: 5 * 1000 })
+      return Promise.reject(error)
+    }
+    console.log('config==>', config) // for debug
+    console.log('config.__retryCount==>', config.__retryCount) // for debug
+    // 设置请求超时次数
+    config.__retryCount = config.__retryCount || 0
+    if (config.__retryCount >= 3) {
+      // Message({ message:error.message, type: 'error', duration: 5 * 1000 })
+      Message({ message:'请求超时', type: 'error', duration: 5 * 1000 })
+      // Message.error((error && error.data && error.data.msg) || '请求超时')
+      return Promise.reject(error)
+    }
+    config.__retryCount += 1
+    let backoff = new Promise((resolve) => {
+      setTimeout(() => {
+        resolve()
+      }, config.retryDelay || 1000)
+    })
+    return backoff.then(() => {
+      return service(config)
+    })
+    // Message({
+    //   message: error.message,
+    //   type: 'error',
+    //   duration: 5 * 1000
+    // })
+    // return Promise.reject(error)
+  }
+)
+
+export default service

+ 12 - 11
src/views/dashboard/pasture/index.vue

@@ -166,7 +166,7 @@
             >
               <el-table-column label="日期" sortable min-width="110px" align="center" prop="日期" />
               <el-table-column label="单头牛饲料成本" sortable min-width="110px" align="center" prop="field2" />
-              <el-table-column label="公斤奶饲料成本(元)" sortable min-width="120px" align="center" prop="field1" />
+              <!-- <el-table-column label="公斤奶饲料成本(元)" sortable min-width="120px" align="center" prop="field1" /> -->
             </el-table>
           </div>
         </div>
@@ -336,7 +336,7 @@
           </div>
 
         </div>
-        <div class="row3">
+        <!-- <div class="row3">
           <div class="row3-l" style="position: relative;">
 
             <div class="title">
@@ -373,12 +373,11 @@
               </el-table>
             </div>
 
-          </div>
+          </div>-->
           <div class="row3-r">
             <div class="title">
               <div class="img-title" />
               <span class="content">库存预警</span>
-              <!-- <a style="float: right;color: #009C69;font-size: 12px;margin-right: 10px;" @click="handleMore">查看更多 &nbsp;>></a> -->
               <a style="float: right;color: #c88d42;font-size: 12px;margin-right: 10px;" @click="handleMore">查看更多 &nbsp;>></a>
             </div>
             <div id="table" style="height: 330px;background: #fff;">
@@ -1307,17 +1306,19 @@ export default {
         title: { text: chartLine_data.title, x: 'center', y: 'center', textStyle: { color: '#909399', fontWeight: 'normal', fontSize: 12 }},
         grid: { left: '10%', right: '12%', bottom: '3%', containLabel: true },
         tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
-        legend: { data: ['公斤奶饲料成本', '单头牛饲料成本'], itemHeight: 7, itemWidth: 15 },
+        legend: { data: [ '单头牛饲料成本'], itemHeight: 7, itemWidth: 15 }, //'公斤奶饲料成本',
         xAxis: [{ type: 'category', data: chartLine_data.data1, axisPointer: { type: 'shadow' }, name: '日期' }],
         yAxis: [{
-          splitLine: { show: false }, type: 'value', name: '公斤奶\n饲料成本(元)', axisLabel: { formatter: '{value}' }
+          splitLine: { show: false }, type: 'value', name: '单头牛\n饲料成本(元)', axisLabel: { formatter: '{value}' }
         }, {
           splitLine: { show: false }, type: 'value', name: '单头牛\n饲料成本(元)', axisLabel: { formatter: '{value}' }
         }
         ],
-        series: [{
-          name: '公斤奶饲料成本', type: 'bar', itemStyle: { normal: { color: '#1abd88' }}, data: chartLine_data.data2
-        }, {
+        series: [
+        //   {
+        //   name: '公斤奶饲料成本', type: 'bar', itemStyle: { normal: { color: '#1abd88' }}, data: chartLine_data.data2
+        // },
+          {
           name: '单头牛饲料成本', type: 'line', yAxisIndex: 1, itemStyle: { normal: { color: '#ff8d78' }}, data: chartLine_data.data3
         }]
       }
@@ -1438,8 +1439,8 @@ export default {
         console.log('成本统计')
         var excelDatasTabChart2 = [
           {
-            tHeader: ['日期', '单头牛饲料成本', '公斤奶饲料成本(元)'],
-            filterVal: ['日期', 'field1', 'field2'],
+            tHeader: ['日期', '单头牛饲料成本'], //'公斤奶饲料成本(元)'
+            filterVal: ['日期', 'field2'], // 'field1'
             tableDatas: this.row4.chart1.table.list,
             sheetName: '成本统计'
           }

Разлика између датотеке није приказан због своје велике величине
+ 864 - 147
src/views/formulationPlan/recipeTemplate/index.vue


+ 5 - 5
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -88,7 +88,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="10" class="dashboard-editor-container">
-            <el-col :span="12">
+            <el-col :span="12" v-if="false">
               <div class="grid-content">
                 <h4 style="text-align:center;">干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
@@ -146,7 +146,7 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <div class="grid-content">
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <div v-if="tab.chart2.isChart" class="button">
@@ -326,8 +326,8 @@
               </div>
             </el-col>
           </el-row>
-          <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
-            <el-col :span="24">
+          <el-row :gutter="10" v-if="false"  class="dashboard-editor-container" style="margin-bottom: 30px;">
+            <el-col :span="24" >
               <div class="grid-content">
                 <h4 style="text-align:center;">成本分析</h4>
                 <div v-if="tab.chart5.isChart" class="button">
@@ -1938,7 +1938,7 @@ export default {
       var option = {
         tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
         legend: { data: ['干物质采食量', '泌乳牛产奶量'], right: 10, show: true, type: 'scroll' },
-        grid: { top: '15%', left: '8%', right: '8%', containLabel: true },
+        grid: { top: '15%', left: '5%', right: '8%', containLabel: true },
         xAxis: [{ type: 'category', data: chartLine_data.data1 }],
         yAxis: [
           { splitLine: { show: false }, type: 'value', name: '泌乳牛干物质\n采食量', axisLabel: { formatter: '{value} ' }},

+ 34 - 34
src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -49,7 +49,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="产奶净能(MJ)" align="center">
+        <!-- <el-table-column label="产奶净能(MJ)" align="center">
           <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
             <template slot-scope="scope">
@@ -61,8 +61,8 @@
               <span>{{ (scope.row.Srate * scope.row.nm) | keepTreeNum }}</span>
             </template>
           </el-table-column>
-        </el-table-column>
-        <el-table-column label="奶牛能量单位(NND)" align="center">
+        </el-table-column> -->
+        <!-- <el-table-column label="奶牛能量单位(NND)" align="center">
           <el-table-column sortable prop="nuint" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
             <template slot-scope="scope">
@@ -74,7 +74,7 @@
               <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
             </template>
           </el-table-column>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="粗蛋白(g)" align="center">
           <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
           <el-table-column label="TMR料" min-width="65" align="center">
@@ -101,7 +101,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="产奶净能(MCal/DM)" align="center">
+        <!-- <el-table-column label="产奶净能(MCal/DM)" align="center">
           <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
             <template slot-scope="scope">
@@ -113,7 +113,7 @@
               <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
             </template>
           </el-table-column>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="粗蛋白(%DM)" align="center">
           <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
@@ -277,125 +277,125 @@
             </el-table-column>
             <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
             <el-table-column label="干物质(kg)" min-width="130px" align="center">
-              <el-table-column prop="dry-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="dry-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
-              <el-table-column prop="nm-nur" label="牛需要" min-width="70" align="center" />
+            <!-- <el-table-column label="产奶净能(M)" min-width="130px" align="center">
+              <el-table-column prop="nm-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
-              <el-table-column prop="nuint-nur" label="牛需要" min-width="70" align="center" />
+            </el-table-column> -->
+            <!-- <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
+              <el-table-column prop="nuint-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
-              <el-table-column prop="cp-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="cp-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(g)" min-width="130px" align="center">
-              <el-table-column prop="p-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="p-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
-              <el-table-column prop="nmd-nur" label="牛需要" min-width="70" align="center" />
+            <!-- <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
+              <el-table-column prop="nmd-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cpd-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="cpd-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
-              <el-table-column prop="fat-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="fat-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
-              <el-table-column prop="starch-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="starch-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="ndf-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="ndf-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cndf-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="cndf-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="ADF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="adf-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="adf-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="钙(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cad-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="cad-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(%DM)" min-width="130px" align="center">
-              <el-table-column prop="pd-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="pd-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans4f-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans4f-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans35f-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans35f-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="精粗比(%)" min-width="130px" align="center">
-              <el-table-column prop="jcrate-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="jcrate-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="日粮成本(元)" min-width="130px" align="center">
-              <el-table-column prop="uprice-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="uprice-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
-              <el-table-column prop="upriced-nur" label="牛需要" min-width="70" align="center" />
+              <el-table-column prop="upriced-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
-              <el-table-column prop="kprice-nur" label="牛需要" min-width="70" align="center" />
+            <!-- <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
+              <el-table-column prop="kprice-nur" label="牛需要" min-width="70" align="center" />
               <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
       </div>

Неке датотеке нису приказане због велике количине промена