更新7-11

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 # 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://tmrwatch.cn/'
 
@@ -18,7 +18,11 @@ VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 陈文强
 # VUE_APP_BASE_API = 'http://192.168.1.87:8081/'
 # 白少杰
+<<<<<<< HEAD
 # VUE_APP_BASE_API = 'http://192.168.1.89:8081/'
+=======
+VUE_APP_BASE_API = 'http://192.168.1.89:8081/'
+>>>>>>> 63ce8c0319c1ba9f742fea6e6fe1bab17931e17c
 
 #=====
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

src/api/common.js

@@ -276,6 +276,7 @@ export function DownloadExcel(data, filename) {
 //   return parseInt(f * m, 10) / m;
 // }
 export function formatNum(value, n) {
+<<<<<<< HEAD
   console.log(value, n,'====')
   var f = Math.round(value*Math.pow(10,n))/Math.pow(10,n);
   var s = f.toString();
@@ -286,6 +287,13 @@ export function formatNum(value, n) {
     }else{
       s += '.';
     }
+=======
+  var f = Math.round(value*Math.pow(10,n))/Math.pow(10,n);
+  var s = f.toString();
+  var rs = s.indexOf('.');   
+  if(rs < 0) {     
+    s += '.';   
+>>>>>>> 63ce8c0319c1ba9f742fea6e6fe1bab17931e17c
   }
   for(var i = s.length - s.indexOf('.'); i <= n; i++){
     s += "0";

src/views/formulationPlan/recipeTemplate/index.vue

@@ -2491,7 +2491,10 @@ export default {
             return false
           }
           console.log(row.fweight,'row.fweight')
+<<<<<<< HEAD
           let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+=======
+>>>>>>> 63ce8c0319c1ba9f742fea6e6fe1bab17931e17c
           this.requestParam.common = { 'returnmap': '0' }
           this.requestParam.createdate = dateTime
           this.requestParam.data = []

src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -674,7 +674,11 @@
             <el-input-number :controls="false" :precision="2" v-model="tab2.table.getdataListParm.parammaps.hlzql2" placeholder="混料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
           <el-checkbox v-model="tab2.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
+<<<<<<< HEAD
 
+=======
+          
+>>>>>>> 63ce8c0319c1ba9f742fea6e6fe1bab17931e17c
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch2">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
           <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
@@ -1715,7 +1719,10 @@ export default {
         tableKey2: 0, total2: 0, listLoading2: false, list2: [],
         temp1:{},
         temp2:{},
+<<<<<<< HEAD
         lastdate:'',currentdate:'',
+=======
+>>>>>>> 63ce8c0319c1ba9f742fea6e6fe1bab17931e17c
       },
     }
   },