Merge branch 'feature/RecipeTemplate_volume' of duanxiaoduan/tmr-admin into master

.drone.yml

@@ -2,7 +2,18 @@ kind: pipeline
 type: docker
 name: tmp-admin
 
+clone:
+  depth: 1
+  disable: true
+
 steps:
+  - name: clone
+    image: alpine/git
+    commands:
+     - git clone -b develop http://192.168.1.8:3000/duanxiaoduan/tmr-admin.git
+     - pwd
+     - cp -R tmr-admin/* ./
+     - ls -l
   - name: build
     image: plugins/docker
     volumes:

.env.development

@@ -3,8 +3,10 @@ ENV = 'development'
 
 # base api
 # 测试线
-
-VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# 白少后台本地
+VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

.env.production

@@ -4,4 +4,5 @@ ENV = 'production'
 # base api
 # 正式线
 # VUE_APP_BASE_API = ':8081/'
-VUE_APP_BASE_API = 'http://192.168.1.70:8088/'
+# VUE_APP_BASE_API = 'http://192.168.1.70:8088/'
+VUE_APP_BASE_API = 'http://127.0.0.1:8081/'

src/api/common.js

@@ -116,7 +116,7 @@ export function GetAccount(data) {
 
 export function postJson(url,data) {
   return request({
-    url: process.env.VUE_APP_BASE_API + url,
+    url: url,
     method: 'post',
     timeout: 600000,
     data
@@ -134,7 +134,7 @@ export function postJson2(url,data) {
 
 export function getJson(url,data) {
   return request({
-    url: process.env.VUE_APP_BASE_API + url + data,
+    url: url + data,
     method: 'get'
   })
 }

src/utils/request.js

@@ -12,7 +12,7 @@ if (DoMainString) {
 console.log(URL,'===========URL')
 
 if(URL.indexOf('/')==0 && URL.length==1){
-  URL= window.location.protocol + "//"+window.location.host+aa
+  URL= window.location.protocol + "//"+window.location.host+URL
 }
 
 const service = axios.create({

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

@@ -149,6 +149,16 @@
             <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
           </el-form-item>
         </el-col> -->
+        <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-form-item>
+          </el-col>
         <el-col :span="12">
           <el-form-item label="tmr容量上限(%):" prop="tmrUpper">
             <el-input ref="tmrUpper" v-model="createTemp.tmrUpper" :disabled="isRoleEdit==false" class="filter-item" placeholder="tmr容量上限(%)" type="number" />

src/views/formulationPlan/recipeTemplate/index.vue

@@ -727,6 +727,11 @@
                 <span>{{ scope.row.source }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="容重(kg/m³)" min-width="130px" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.volume"  style="width:95%;padding:10px 0;" :disabled="detail.disabled" />
+              </template>
+            </el-table-column>
             <el-table-column label="备注" min-width="130px" align="center">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" :disabled="detail.disabled" />
@@ -2980,7 +2985,7 @@ export default {
                     this.detail.dialogFormVisible = true
                     this.detail.list = this.selectList2
                     this.detail.disabled = false
-                    this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1 }]
+                    this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
                     setTimeout(() => {
                       this.detail.listLoading = false
                     }, 100)
@@ -2990,7 +2995,7 @@ export default {
                   this.detail.dialogFormVisible = true
                   this.detail.list = this.selectList2
                   this.detail.disabled = false
-                  this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1 }]
+                  this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
                   setTimeout(() => {
                     this.detail.listLoading = false
                   }, 100)
@@ -3001,7 +3006,7 @@ export default {
                 this.detail.dialogFormVisible = true
                 this.detail.list = this.selectList2
                 this.detail.disabled = false
-                this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1 }]
+                this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
                 setTimeout(() => {
                   this.detail.listLoading = false
                 }, 100)
@@ -3012,7 +3017,7 @@ export default {
             this.detail.dialogFormVisible = true
             this.detail.list = this.selectList2
             this.detail.disabled = false
-            this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1 }]
+            this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
             setTimeout(() => {
               this.detail.listLoading = false
             }, 100)
@@ -3120,7 +3125,8 @@ export default {
           fttypeid: this.detail.list2[0].fttypeid,
           source: this.detail.list2[0].source,
           remark: this.detail.list2[0].remark,
-          enable: this.detail.list2[0].enable
+          enable: this.detail.list2[0].enable,
+          volume:this.detail.list2[0].volume
         }}
         this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.detail.list }}
         this.requestParam.data[1].children = []