更新了一些报错提示

.env.development

@@ -3,9 +3,9 @@ ENV = 'development'
 
 # base api
 # 测试线
-VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
+# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # 沙巍
 # VUE_APP_BASE_API = 'http://192.168.1.56:8081/'

src/components/i18n.vue

@@ -24,7 +24,7 @@ export default {
         return this.$store.state.app.lang
       },
       set(value) {
-        this.$store.commit('app/SET_LANG', value)
+        // this.$store.commit('app/SET_LANG', value)
       }
     },
     langObj() {

src/main.js

@@ -54,7 +54,7 @@ if (process.env.NODE_ENV !== 'development') {
 }
 
 
-store.commit('app/SET_LANG', 'CN')
+// store.commit('app/SET_LANG', 'CN')
 Vue.use(VueRouter)
 Vue.use(pageCount)
 Vue.use(ElementUI, {

src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
-import Router from 'vue-router'
+import Router from 'vue-router'
+
 
 Vue.use(Router)
 
@@ -158,7 +159,10 @@ export function resetRouter() {
   const newRouter = createRouter()
   router.matcher = newRouter.matcher // reset router
 }
-
-
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location, onResolve, onReject) {
+  if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
+  return originalPush.call(this, location).catch(err => err)
+}
 
 export default router

src/views/basicData/feedTable/index.vue

@@ -65,7 +65,7 @@
     </div>
 
     <div class="table">
-      <el-table
+      <u-table
         id="table"
         :key="table.tableKey"
         v-loading="table.listLoading"
@@ -81,104 +81,100 @@
         row-key="id"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" align="center" width="50" fixed="left" />
-        <el-table-column label="序号" align="center" type="index" width="50px" fixed="left">
-          <template slot-scope="scope">
-            <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="饲料名称" min-width="80px" align="center" fixed="left">
+        <u-table-column type="selection" align="center" width="50" fixed="left" />
+        <u-table-column label="序号" type="index" align="center" width="50" fixed="left" />
+        <u-table-column label="饲料名称" min-width="80px" align="center" fixed="left">
           <template slot-scope="scope">
             <span>{{ scope.row.fname }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="饲料分类" min-width="80px" align="center" fixed="left">
+        </u-table-column>
+        <u-table-column label="饲料分类" min-width="80px" align="center" fixed="left">
           <template slot-scope="scope">
             <span>{{ scope.row.fclass }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="唯一编码" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="唯一编码" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.feedcode }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="饲料来源" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="饲料来源" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.source }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="计划类型" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column label="计划类型" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.printgroup }}</span>
           </template>
-        </el-table-column>
-        <el-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.smtmrname }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="允许误差数（kg）" min-width="85px" align="center">
+        </u-table-column>
+        <u-table-column label="允许误差数（kg）" min-width="85px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.allowratio }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="包装单位重量(kg)" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="包装单位重量(kg)" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.unitweight }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="单价" min-width="50px" align="center">
+        </u-table-column>
+        <u-table-column label="单价" min-width="50px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.uprice }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="跳转重量域(kg)" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column label="跳转重量域(kg)" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.autozone }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="跳转延时" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="跳转延时" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.autosecondname }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="确认开始" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="确认开始" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.confirmstartname }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="继电器位置" min-width="60px" align="center">
+        </u-table-column>
+        <u-table-column label="继电器位置" min-width="60px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.trgaddress }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="无上域" min-width="60px" align="center">
+        </u-table-column>
+        <u-table-column label="无上域" min-width="60px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.jmp == 0">否</span>
             <span v-else>是</span>
           </template>
-        </el-table-column>
-        <el-table-column label="备用字段01" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column label="备用字段01" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.backup1 }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="备用字段02" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column label="备用字段02" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.backup2 }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="备用字段03" min-width="90px" align="center">
+        </u-table-column>
+        <u-table-column label="备用字段03" min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.backup3 }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="是否启用" min-width="80px" align="center">
+        </u-table-column>
+        <u-table-column label="是否启用" min-width="80px" align="center">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+        </u-table-column>
+        <u-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <a class="correcting" @click="handleNutritive (row)">营养价值</a>
             <span class="centerSpan">|</span>
@@ -188,8 +184,8 @@
             <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
           </template>
-        </el-table-column>
-      </el-table>
+        </u-table-column>
+      </u-table>
 
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
 
@@ -768,7 +764,7 @@ export default {
           name: 'getFeedList',
           page: 1,
           offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
+          pagecount: '',
           returntype: 'Map',
           parammaps: {
             pastureid: Cookies.get('pastureid'),

src/views/basicData/groupColumn/index.vue

@@ -40,7 +40,7 @@
       </div>
     </div>
     <div class="table">
-      <el-table
+      <u-table
         id="table"
         :key="table.tableKey"
         ref="table"
@@ -58,12 +58,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" align="center" width="50" />
-        <el-table-column label="序号" align="center" type="index" width="50px">
-          <template slot-scope="scope">
-            <span v-if="table.pageNum">{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
-            <span v-else>1</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="序号" type="index" align="center" width="50" />
         <el-table-column label="栏舍名称" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.bname }}</span>
@@ -123,8 +118,8 @@
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
           </template>
         </el-table-column>
-      </el-table>
-      <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+      </u-table>
+      <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
   </div>
 
@@ -154,7 +149,7 @@ export default {
           name: 'getBarList',
           page: 1,
           offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
+          pagecount: '',
           returntype: 'Map',
           parammaps: {
             pastureid: Cookies.get('pastureid'),
@@ -573,8 +568,10 @@ export default {
         pastureid: '@insertSpotList.pastureid',
         sort: '@insertSpotList.sort'
       }}
+      this.table.listLoading = true
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('顺序切换保存发送参数', this.requestParam)
+        this.table.listLoading = false
         if (response.msg === 'fail') {
           this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
         } else {

src/views/dashboard/pasture/index.vue

@@ -331,10 +331,10 @@
               </el-table>
             </div>
 
-            
+
 
           </div>
-          
+
         </div>
         <div class="row3">
           <div class="row3-l" style="position: relative;">
@@ -911,9 +911,11 @@ export default {
         ]
       }
       this.row2.chart3.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row2.chart3.chartLine.resize()
-      }
+      setTimeout(()=> {
+        window.onresize = function() {
+          this.row2.chart3.chartLine.resize()
+        }
+      }, 100);
     },
     getCarLength() {
       this.row2.chart3.listLoading2 = true
@@ -1169,7 +1171,7 @@ export default {
       this.row3.chart2.listLoading = true
       GetReportform(this.row3.chart2.getdataListParm).then(response => {
         console.log('泌乳牛干物质采食量数据', response)
-        if (response.data !== null && response.data.list !== null) {
+        if (response.data !== null && response.data.list !== null && response.data.data !== null) {
           for (let i = 0; i < response.data.data.length; i++) {
             if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
               response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
@@ -1231,7 +1233,7 @@ export default {
       this.row4.chart1.table.listLoading = true
       this.row4.chart1.listLoading = true
       GetReportform(this.row4.chart1.getdataListParm).then(response => {
-        if (response.data !== null && response.data.list !== null) {
+        if (response.data !== null && response.data.list !== null && response.data.data !== null && response.data.data !== '') {
           console.log('成本统计数据', response.data.data)
           console.log('成本统计数据', response.data.list)
           for (let i = 0; i < response.data.data.length; i++) {
@@ -1287,9 +1289,11 @@ export default {
         }]
       }
       this.row4.chart1.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row4.chart1.chartLine.resize()
-      }
+      setTimeout(()=> {
+        window.onresize = function() {
+          this.row4.chart1.chartLine.resize()
+        }
+      }, 100);
     },
 
     // 混料实际重量统计

src/views/shedProduction/dungScores/index.vue

@@ -784,7 +784,7 @@ export default {
             }
           })
         }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
+          this.$message({ type: 'info', message: '已取消复制' })
         })
       } else {
         this.$message({ type: 'error', message: '请选择一条粪便评分', duration: 2000 })