tmr-group: 合并集团版本代码

.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # 测试线
-<<<<<<< HEAD
+
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
 
 #许义平本地
@@ -14,12 +14,11 @@ VUE_APP_BASE_API = 'http://192.168.1.96:8082/'
 # VUE_APP_BASE_API = 'http://kpttestnt.kptyun.com/'
 
 
-=======
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 # VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 南通测试线
 # VUE_APP_BASE_API = 'http://kpttestnt.kptyun.com/'
->>>>>>> master
+
 # VUE_APP_BASE_API = 'http://tmrwatch.cn/'
 # 测试线
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'

src/views/basicData/defaultParameter/function/index.vue

@@ -144,16 +144,6 @@
         </el-col>
       </el-row>
       <el-row>
-<<<<<<< HEAD
-        <el-col :span="12">
-          <el-form-item label="允许撒料时间误差(分钟):" prop="sprinkleFeedTimeAllow">
-            <el-input ref="sprinkleFeedTimeAllow" v-model="createTemp.sprinkleFeedTimeAllow" :disabled="isRoleEdit==false" class="filter-item" placeholder="允许撒料时间误差" type="text" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="集团端域名或IP:" prop="domain">
-            <el-input ref="domain" v-model="createTemp.domain" :disabled="isRoleEdit==false" class="filter-item" placeholder="集团端域名或IP" type="text" />
-=======
         <!-- <el-col :span="12">
           <el-form-item label="设备运转标准时间(分钟):" prop="remainOptRate">
             <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
@@ -167,7 +157,6 @@
         <el-col :span="12">
           <el-form-item label="tmr容量下限(%):" prop="tmrUnder">
               <el-input ref="tmrUnder" v-model="createTemp.tmrUnder" :disabled="isRoleEdit==false" class="filter-item" placeholder="tmr容量下限(%)" type="number" />
->>>>>>> master
           </el-form-item>
         </el-col>
       </el-row>
@@ -339,13 +328,10 @@ export default {
         isDataSync: this.createTemp.isDataSync,
         anyCar:this.createTemp.anyCar,
         accuracy:this.createTemp.accuracy,
-<<<<<<< HEAD
         sprinkleFeedTimeAllow:this.createTemp.sprinkleFeedTimeAllow,
-        domain:this.createTemp.domain
-=======
+        domain:this.createTemp.domain,
         tmrUpper:this.createTemp.tmrUpper,
         tmrUnder:this.createTemp.tmrUnder
->>>>>>> master
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
         pastureid: this.createTemp.pastureid