Shan9312 hace 1 año
padre
commit
1c089ef13d

+ 2 - 2
.env.development

@@ -4,9 +4,9 @@ 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://kpttest.kptyun.com/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.56:80/'
+# VUE_APP_BASE_API = 'http://192.168.1.56:80/'
 # 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.

BIN
dist-tmr-测试2-20240619.zip


+ 26 - 18
src/views/basicData/defaultParameter/function/index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container" style="width: 90%;">
     <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" />
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
@@ -182,6 +182,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="剩料编码:" prop="excess">
+            <el-input ref="excess" v-model="createTemp.excess" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料编码:" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
       <el-button v-if="isRoleEdit" class="save" :disabled="isokDisable" @click="handleSave">保存</el-button>
@@ -228,16 +235,16 @@
         <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">关闭</el-button>
       </div>
     </el-dialog>
-  </div>
-</template>
-
+  </div>
+</template>
+
 <script>
-import { GetDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
+import { GetDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
 import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'DefaultParameter',
-  data() {
+import { MessageBox } from 'element-ui'
+export default {
+  name: 'DefaultParameter',
+  data() {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
@@ -256,8 +263,8 @@ export default {
       dataSynchronizationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用数据同步
       accuracyList: [{ id: '1', name: '排除允许误差准确率' }, { id: '0', name: '不排除允许误差准确率' }],  //混料准确率
       yhautosecondList:[{ id: '1', name: '禁用' }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
-      requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
+      requestParams: [
+        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
       getdataListParm: {
         name: 'getysoptList',
@@ -283,14 +290,14 @@ export default {
       isokDisable: false,
       requestParam: {}
 
-    }
-  },
+    }
+  },
   created() {
     this.getList()
     this.getButtons()
     this.getDownList()
-  },
-
+  },
+
   methods: {
     getButtons() {
       const Edit = 'DefaultParameter'
@@ -357,6 +364,7 @@ export default {
         tmrUnder:this.createTemp.tmrUnder,
         yhfeedtemplet:this.createTemp.yhfeedtemplet,
         yhautosecond:this.createTemp.yhautosecond,
+        excess:this.createTemp.excess
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
         pastureid: this.createTemp.pastureid
@@ -405,8 +413,8 @@ export default {
       this.description.dialogStatus = 'description'
       this.description.dialogFormVisible = true
     }
-  }
-}
+  }
+}
 </script>
 <style lang="scss" scoped>
   .app-description{
@@ -415,4 +423,4 @@ export default {
       display:flex;
     }
   }
-</style>
+</style>