内网跳转

.env.development

@@ -3,9 +3,11 @@ ENV = 'development'
 
 # base api
 # 测试线
-VUE_APP_BASE_API = 'http://192.168.1.76: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.76:8082/'
+
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/utils/request.js

@@ -14,9 +14,11 @@ if (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"
-// }
+//  内网跳转公司需要加这块代码
+// 注意: 端口号后面加’/‘ 防止导出报错 如:‘:8081/’
+if (reg.test(browserUrl)){
+  URL = window.location.protocol +"//"+ browserUrl + ":80/"
+}
 
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

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

@@ -188,6 +188,13 @@
             <el-input ref="excess" v-model="createTemp.excess" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料编码：" type="text" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="预称重计划" prop="isConcentrate">
+              <el-select v-model="createTemp.isConcentrate" :disabled="isRoleEdit==false" filterable placeholder="预称重计划" class="filter-item" style="width:100%">
+                <el-option v-for="item in weightList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+           </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
@@ -246,6 +253,7 @@ export default {
   name: 'DefaultParameter',
   data() {
     return {
+      weightList:[{ id: '0', name: '手动' }, { id: '1', name: '自动' }],
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
       planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
@@ -363,7 +371,8 @@ export default {
         tmrUpper:this.createTemp.tmrUpper,
         tmrUnder:this.createTemp.tmrUnder,
         yhfeedtemplet:this.createTemp.yhfeedtemplet,
-        yhautosecond:this.createTemp.yhautosecond,
+        yhautosecond: this.createTemp.yhautosecond,
+        isConcentrate: this.createTemp.isConcentrate,
         excess:this.createTemp.excess
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {