Merge branch 'feature/cicd-test' of duanxiaoduan/tmr-group-admin into develop

src/utils/request.js

@@ -6,11 +6,6 @@ import { getToken } from '@/utils/auth'
 //获取当前url
 
 var aa = process.env.VUE_APP_BASE_API
-// console.log(process.env.VUE_APP_BASE_API)
-// console.log(process.env.VUE_APP_BASE_API1)
-// console.log(process.env.VUE_APP_BASE_API2)
-// console.log(process.env.VUE_APP_BASE_API3)
-// console.log(process.env.VUE_APP_BASE_API4)
 //获取当前url
 if(aa.indexOf('/')==0 && aa.length==1){
   aa= window.location.protocol + "//"+window.location.host+aa

src/views/rangeManagement/feedClassification/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-select v-model="table.parammaps.parent_name" filterable placeholder="饲料大类" class="filter-item"
+      <el-select v-model="table.parammaps.parent_id" filterable placeholder="饲料大类" class="filter-item"
         style="width: 120px;" clearable>
-        <el-option v-for="item in feedCategoryList" :key="item.value" :label="item.label" :value="item.label" />
+        <el-option v-for="item in feedCategoryList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-input v-model="table.parammaps.name" placeholder="饲料分类名称" style="width: 180px;" class="filter-item"
         clearable />
@@ -101,7 +101,7 @@
           total: 0,
           listLoading: true,
           parammaps: {
-            parent_name: '',
+            parent_id: '',
             name: '',
             number: ''
           },
@@ -145,7 +145,7 @@
         let page_size = this.table.page_size
         let url = 'api/v1/ops/forage/category/list' + '?page=' + page + '&page_size=' + page_size
         let data = {
-          "parent_name": this.table.parammaps.parent_name,
+          "parent_id": this.table.parammaps.parent_id,
           "name": this.table.parammaps.name,
           "number": this.table.parammaps.number
         }
@@ -200,7 +200,7 @@
       },
       handleRefresh() {
         console.log('点击了重置')
-        this.table.parammaps.parent_name = ''
+        this.table.parammaps.parent_id = ''
         this.table.parammaps.name = ''
         this.table.parammaps.number = ''
         this.table.parammaps.is_show = ''

src/views/rangeManagement/pastureList/index.vue

@@ -101,6 +101,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="域名或IP地址:" prop="domain">
+                  <el-input ref="domain" v-model="edit.temp.domain" placeholder="请联系技术人员索要牧场端域名或者服务器IP地址" />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
@@ -170,6 +177,11 @@ export default {
           message: '必填',
           trigger: 'blur'
         }],
+        domain: [{
+          required: true,
+          message: '必填',
+          trigger: 'blur'
+        }],
       },
       create:{
         dialogStatus:'',
@@ -277,7 +289,8 @@ export default {
         username:'',
         manager_user:'',
         manager_phone:'',
-        address:''
+        address:'',
+        domain:''
       }
     },
     createData(){
@@ -295,6 +308,7 @@ export default {
             "manager_phone": this.edit.temp.manager_phone,
             "address": this.edit.temp.address,
             "is_show": this.edit.temp.is_show,
+            "domain":this.edit.temp.domain,
             // "create_user": Cookies.get('username')
           }
           console.log(data)
@@ -333,7 +347,8 @@ export default {
             "manager_user": this.edit.temp.manager_user,
             "address": this.edit.temp.address,
             "manager_phone": this.edit.temp.manager_phone,
-            "account": this.edit.temp.account
+            "account": this.edit.temp.account,
+            "domain":this.edit.temp.domain,
           }
           postJson(url, data).then(response => {
             if (response.code == 200) {