区域&奶牛多页面添加字段&下拉框

.env.development

@@ -9,8 +9,8 @@ ENV = 'development'
 # 白少后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
-VUE_APP_BASE_API = 'http://8.130.17.8:8082/'
+# VUE_APP_BASE_API = 'http://8.130.17.8:8082'
+VUE_APP_BASE_API = '/api'
 
 #// 蒙牛
 

src/utils/request.js

@@ -3,19 +3,19 @@ import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 
-//获取当前url
+// 获取当前url
 
 var aa = process.env.VUE_APP_BASE_API
-//获取当前url
+// 获取当前url
 
-if(aa.indexOf('/')==0 && aa.length==1){
-  aa= window.location.protocol + "//"+window.location.host+aa
+if (aa.indexOf('/') == 0 && aa.length == 1) {
+  aa = window.location.protocol + '//' + window.location.host + aa
 }
-  const service = axios.create({
-    baseURL: aa, // url = base url + request url
-    withCredentials: true, // send cookies when cross-domain requests
-    timeout: 60000 ,// request timeout
-  })
+const service = axios.create({
+  baseURL: aa, // url = base url + request url
+  withCredentials: true, // send cookies when cross-domain requests
+  timeout: 60000 // request timeout
+})
 // request interceptor
 service.interceptors.request.use(
   config => {
@@ -99,7 +99,7 @@ service.interceptors.response.use(
   error => {
     console.log('err' + error) // for debug
     console.log('err' + error) // for debug
-    let config = error.config
+    const config = error.config
     if (!config) {
       Message({ message: error.message, type: 'error', duration: 5 * 1000 })
       return Promise.reject(error)
@@ -108,17 +108,16 @@ service.interceptors.response.use(
     console.log('config.__retryCount==>111111', config.__retryCount) // for debug
     // 设置请求超时次数
     config.__retryCount = config.__retryCount || 0
-   if (config.__retryCount >= 3) {
+    if (config.__retryCount >= 3) {
       // Message({ message:error.message, type: 'error', duration: 5 * 1000 })
       console.log('err' + error)
-      Message({ message:'请求超时', type: 'error', duration: 5 * 1000 })
+      Message({ message: '请求超时', type: 'error', duration: 5 * 1000 })
       // Message.error((error && error.data && error.data.msg) || '请求超时')
       return Promise.reject(error)
     }
     config.__retryCount += 1
 
-
-    let backoff = new Promise((resolve) => {
+    const backoff = new Promise((resolve) => {
       setTimeout(() => {
         resolve()
       }, config.retryDelay || 14000)

src/utils/request1.js

@@ -1,129 +0,0 @@
-import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-
-//获取当前url
-
-var aa = process.env.VUE_APP_BASE_API
-//获取当前url
-
-if(aa.indexOf('/')==0 && aa.length==1){
-  aa= window.location.protocol + "//"+window.location.host+aa
-}
-  const service = axios.create({
-    baseURL: aa, // url = base url + request url
-    withCredentials: true, // send cookies when cross-domain requests
-    timeout: 60000 ,// request timeout
-  })
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'  //此处是增加的代码，设置请求头的类型
-    if (process.env.VUE_APP_BASE_API !== '/dev-api') {
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
-      config.withCredentials = false
-    }
-
-    if (store.getters.token) {
-      // let each request carry token
-      // ['Authorization'] is a custom headers key
-      // please modify it according to the actual situation
-      if (process.env.VUE_APP_BASE_API === '/dev-api') {
-        config.headers['X-Token'] = getToken()
-      } else {
-        config.headers['token'] = getToken()
-      }
-    }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
-
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
-  response => {
-    const res = response.data
-
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 200) {
-      Message({
-        // message: res.msg + res.code,
-        message: '请求超时',
-        type: 'error',
-        duration: 5 * 1000
-      })
-
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        // to re-login
-        MessageBox.confirm('你已经注销登陆,你可以取消或重新登陆', '确认注销', {
-          confirmButtonText: '重新登陆',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
-      if (res.code === 20002) {
-        store.dispatch('user/resetToken').then(() => {
-          location.reload()
-        })
-      }
-      if (res.code === undefined) {
-        return res
-      } else {
-        return Promise.reject(new Error(res.message || 'Error'))
-      }
-    } else {
-      return res
-    }
-  },
-  error => {
-    console.log('err' + error) // for debug
-    console.log('err' + error) // for debug
-    let config = error.config
-    if (!config) {
-      Message({ message: error.message, type: 'error', duration: 5 * 1000 })
-      return Promise.reject(error)
-    }
-    console.log('config==>11111', config) // for debug
-    console.log('config.__retryCount==>111111', config.__retryCount) // for debug
-    // 设置请求超时次数
-    config.__retryCount = config.__retryCount || 0
-   if (config.__retryCount >= 3) {
-      // Message({ message:error.message, type: 'error', duration: 5 * 1000 })
-      Message({ message:'请求超时', type: 'error', duration: 5 * 1000 })
-      // Message.error((error && error.data && error.data.msg) || '请求超时')
-      return Promise.reject(error)
-    }
-    config.__retryCount += 1
-    let backoff = new Promise((resolve) => {
-      setTimeout(() => {
-        resolve()
-      }, config.retryDelay || 1000)
-    })
-    return backoff.then(() => {
-      return service(config)
-    })
-  }
-)
-
-export default service

src/views/asset/basics/index.vue

@@ -8,11 +8,11 @@
       <el-tab-pane v-if="isBasic" label="设备基础信息" name="first">
         <div class="filter-container">
           <!-- TODO: -->
-          <el-select v-model="getdataListParm.parammaps.area" placeholder="区域" class="filter-item" style="width: 120px;" @change="changePastureName">
-            <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+          <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" class="filter-item" clearable style="width: 120px;" @change="changePastureName">
+            <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
-          <el-select v-model="getdataListParm.parammaps.milk" placeholder="奶源部" class="filter-item" style="width: 120px;" @change="changePastureName">
-            <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+          <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" class="filter-item" clearable style="width: 120px;" @change="changePastureName">
+            <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
 
           <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
@@ -88,8 +88,16 @@
               </template>
             </el-table-column>
             <!-- TODO: -->
-            <el-table-column label="区域" align="center" prop="pastureName" />
-            <el-table-column label="奶源部" align="center" prop="eqClassName" />
+            <el-table-column
+              label="区域"
+              align="center"
+              prop="region"
+            />
+            <el-table-column
+              label="奶源部"
+              align="center"
+              prop="areaName"
+            />
 
             <el-table-column label="牧场" align="center" prop="pastureName" />
             <el-table-column label="设备类别" align="center" prop="eqClassName" />
@@ -169,11 +177,11 @@
       <el-tab-pane v-if="isBasicSH" label="审核设备" name="second">
         <div class="filter-container">
           <!-- TODO: -->
-          <el-select v-model="getdataListParmSH.parammaps.area" placeholder="区域" class="filter-item" style="width: 120px;" @change="changePastureName">
-            <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+          <el-select v-model="getdataListParmSH.parammaps.region" placeholder="区域" class="filter-item" clearable style="width: 120px;" @change="changePastureName">
+            <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
-          <el-select v-model="getdataListParmSH.parammaps.milk" placeholder="奶源部" class="filter-item" style="width: 120px;" @change="changePastureName">
-            <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+          <el-select v-model="getdataListParmSH.parammaps.areaName" placeholder="奶源部" class="filter-item" clearable style="width: 120px;" @change="changePastureName">
+            <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
 
           <el-select v-model="getdataListParmSH.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;">
@@ -217,8 +225,8 @@
               </template>
             </el-table-column>
             <!-- TODO: -->
-            <el-table-column label="区域" align="center" prop="pastureName" />
-            <el-table-column label="奶源部" align="center" prop="eqClassName" />
+            <el-table-column label="区域" align="center" prop="region" />
+            <el-table-column label="奶源部" align="center" prop="areaName" />
 
             <el-table-column label="牧场" align="center" prop="pastureName" />
             <el-table-column label="资产编号" align="center" prop="assetCode" />
@@ -1169,6 +1177,23 @@ export default {
   directives: { waves },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       isBasicsAdd: [], isBasicsCard: [], isBasicsUpdate: [], isBasicsDel: [], isBasicsDel2: [], isBasic: [], isBasicSH: [], isBasicExamine: [],
       rules: {
         // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
@@ -1261,13 +1286,13 @@ export default {
       // TODO:
       getdataListParm: {
         name: 'getAssetList', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
-        parammaps: { proId: '', brandId: '', assetCode: '', eqCode: '', eqName: '', departmentId: '', pastureId: Cookies.get('pastureid'), pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', inputDatetime2: '', startTime2: '', stopTime2: '', inputDatetime3: '', startTime3: '', stopTime3: '', warning: '', eqClassId: '' }
+        parammaps: { areaName: '', region: '', proId: '', brandId: '', assetCode: '', eqCode: '', eqName: '', departmentId: '', pastureId: Cookies.get('pastureid'), pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', inputDatetime2: '', startTime2: '', stopTime2: '', inputDatetime3: '', startTime3: '', stopTime3: '', warning: '', eqClassId: '' }
       },
       listSH: [], totalSH: 0, listLoadingSH: true, tabName: '',
       // TODO:
       getdataListParmSH: {
         name: 'getAssetListSH', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
-        parammaps: { eqCode: '', eqName: '', pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', SHStatus: '' }
+        parammaps: { areaName: '', region: '', eqCode: '', eqName: '', pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', SHStatus: '' }
       },
       textMap: { update: '编辑', create: '新增', card: '查看设备信息', examine: '审核', change: '批量变更' },
       dialogFormVisible: false,
@@ -1561,8 +1586,23 @@ export default {
     // Window.addEventListener('keyup', )
     this.keyupSubmit()
   },
+  mounted() {
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
+  },
   methods: {
-
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
     roleSet1(row) {
       var result = true
       if (row.pastureId == '18' || row.pastureId == Cookies.get('pastureid') || row.pastureId == '0') {

src/views/console/emp/index.vue

@@ -2,6 +2,14 @@
   <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
+        <!-- TODO: -->
+        <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+          <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+        <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+          <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+
         <el-select
           v-model="getdataListParm.parammaps.pastureName"
           placeholder="牧场"
@@ -46,6 +54,10 @@
             <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
           </template>
         </el-table-column>
+        <!-- TODO: -->
+        <el-table-column label="区域" align="center" prop="region" />
+        <el-table-column label="奶源部" align="center" prop="areaName" />
+
         <el-table-column label="姓名" min-width="110px" header-align="center" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.empname }}</span>
@@ -197,6 +209,23 @@ export default {
   directives: { waves, enterToNext },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       myHeight: document.documentElement.clientHeight - 85 - 150,
       isEmpAdd: [],
       isEmpUpdate: [],
@@ -239,6 +268,8 @@ export default {
         parammaps: {
           empname: '',
           empCode: '',
+          areaName: '',
+          region: '',
           pastureId: Cookies.get('pastureid'),
           pastureName: Cookies.get('pasturename')
         }
@@ -304,9 +335,23 @@ export default {
   created() {
     this.get_table_data()
     this.get_auto_buttons()
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
   },
 
   methods: {
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
     tableSort(column) {
       sortChange(column, this.list)
     },

src/views/maintenance/maintain/index.vue

@@ -2,11 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <!-- TODO: -->
-      <el-select v-model="getdataListParm.parammaps.area" placeholder="区域" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
-      <el-select v-model="getdataListParm.parammaps.milk" placeholder="奶源部" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
 
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
@@ -56,8 +56,8 @@
         </template>
       </el-table-column>
       <!-- TODO: -->
-      <el-table-column label="区域" align="center" prop="pastureName" />
-      <el-table-column label="奶源部" align="center" prop="eqClassName" />
+      <el-table-column label="区域" align="center" prop="region" />
+      <el-table-column label="奶源部" align="center" prop="areaName" />
 
       <el-table-column label="保养单号" min-width="140px" align="center">
         <template slot-scope="scope">
@@ -955,6 +955,23 @@ export default {
   directives: { waves },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       myHeight: document.documentElement.clientHeight - 85 - 250,
       active: 0,
       activeList: [],
@@ -1012,7 +1029,9 @@ export default {
           menu: 'Maintain',
           SHStatue: '',
           logindeptId: Cookies.get('departmentid'),
-          loginpastureId: Cookies.get('pastureid')
+          loginpastureId: Cookies.get('pastureid'),
+          areaName: '',
+          region: ''
         }
       },
       total: 0,
@@ -1178,11 +1197,27 @@ export default {
     this.get_table_data()
     this.getPendingList()
   },
+  mounted() {
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
+  },
   methods: {
     // handleCheck(row) {
     //   this.playvideo = row.hotVideoPath // 存储用户点击的视频播放链接
     //   this.playvideoName = row.hotVideoPath // 存储用户点击的视频播放链接
     // },
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
     tableSort(column) {
       if (this.activeName == 'second') {
         sortChange(column, this.listCollarUse)

src/views/maintenance/maintenancePlan/index.vue

@@ -2,11 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <!-- TODO: -->
-      <el-select v-model="getdataListParm.parammaps.area" placeholder="区域" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
-      <el-select v-model="getdataListParm.parammaps.milk" placeholder="奶源部" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
 
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
@@ -177,6 +177,23 @@ export default {
   directives: { waves },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       // ----------------------------------------------------
       myHeight: document.documentElement.clientHeight - 85 - 250,
       equipmentStatusList: [{ id: 1, name: '正常设备' }, { id: 2, name: '非正常设备' }, { id: '', name: '全部' }],
@@ -254,7 +271,10 @@ export default {
           eqName: '',
           typeCode: '',
           partName: '',
-          statue: 1
+          statue: 1,
+          areaName: '',
+          region: ''
+
         },
         month: parseTime(new Date(), '{y}-{m}')
       },
@@ -359,7 +379,24 @@ export default {
     })
     // 新增
   },
+  mounted() {
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
+  },
   methods: {
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
+
     get_auto_buttons() {
       // 复制
       const MaintenancePlanCopy = 'maintenance:maintenancePlan:copy'
@@ -436,7 +473,7 @@ export default {
         var month = temp[1]
         var d = new Date(year, month, 0)
         // TODO:
-        var table = [{ 'label': '序号', 'column_name': 'i' }, { 'label': '区域', 'column_name': 'i' }, { 'label': '奶源部', 'column_name': 'i' }, { 'label': '牧场', 'column_name': 'pastureName' }, { 'label': '部门', 'column_name': 'deptName' }, { 'label': '设备名称', 'column_name': 'eqName' }, { 'label': '设备内部编号', 'column_name': 'eqCode' }, { 'label': '品牌', 'column_name': 'brand' }]
+        var table = [{ 'label': '序号', 'column_name': 'i' }, { 'label': '区域', 'column_name': 'region' }, { 'label': '奶源部', 'column_name': 'areaName' }, { 'label': '牧场', 'column_name': 'pastureName' }, { 'label': '部门', 'column_name': 'deptName' }, { 'label': '设备名称', 'column_name': 'eqName' }, { 'label': '设备内部编号', 'column_name': 'eqCode' }, { 'label': '品牌', 'column_name': 'brand' }]
         for (let index = 1; index <= d.getDate(); index++) {
           // eslint-disable-next-line no-undef
           index = JSON.stringify(index)

src/views/maintenance/repair/index.vue

@@ -2,11 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <!-- TODO: -->
-      <el-select v-model="getdataListParm.parammaps.area" placeholder="区域" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
-      <el-select v-model="getdataListParm.parammaps.milk" placeholder="奶源部" class="filter-item" style="width: 120px;" @change="changePastureName">
-        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
 
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;">
@@ -71,8 +71,8 @@
         </template>
       </el-table-column>
       <!-- TODO: -->
-      <el-table-column label="区域" align="center" prop="pastureName" />
-      <el-table-column label="奶源部" align="center" prop="eqClassName" />
+      <el-table-column label="区域" align="center" prop="region" />
+      <el-table-column label="奶源部" align="center" prop="areaName" />
 
       <el-table-column label="报修单号" align="center">
         <template slot-scope="scope">
@@ -1609,6 +1609,23 @@ export default {
   directives: { waves },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       myHeight: document.documentElement.clientHeight - 85 - 200,
       dialogFormVisibleCont: false,
 
@@ -1685,7 +1702,8 @@ export default {
           SHStatue: '',
           inputDatetime: '',
           outsourcing: '',
-
+          areaName: '',
+          region: '',
           loginId: Cookies.get('employeid'),
           menu: 'Repair',
           logindeptId: Cookies.get('departmentid'),
@@ -2012,8 +2030,23 @@ export default {
       that.get_auto_buttons()
     })
   },
+  mounted() {
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
+  },
   methods: {
-
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
     roleSet1(row) {
       var result = true
       if (row.orderStatue == 0 && this.isReceipt) {

src/views/maintenance/spotCheck/index.vue

@@ -2,6 +2,13 @@
   <div class="app-container">
     <div class="filter-container">
       <!-- 搜索条件 -->
+      <el-select v-model="getdataListParm.parammaps.region" placeholder="区域" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.name" />
+      </el-select>
+      <el-select v-model="getdataListParm.parammaps.areaName" placeholder="奶源部" clearable class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in milkList" :key="item.id" :label="item.name" :value="item.name" />
+      </el-select>
+
       <el-select
         v-model="getdataListParm.parammaps.pastureName"
         placeholder="牧场"
@@ -94,6 +101,9 @@
           <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
         </template>
       </el-table-column>
+      <!-- TODO: -->
+      <el-table-column label="区域" align="center" prop="region" />
+      <el-table-column label="奶源部" align="center" prop="areaName" />
       <el-table-column label="牧场" align="center" width="150px" prop="pastureName" />
       <el-table-column label="设备内部编号" align="center" width="150px">
         <template slot-scope="scope">
@@ -317,6 +327,23 @@ export default {
   directives: { waves },
   data() {
     return {
+      getRegion: { name: 'getRegionData',
+        page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      regionList: [],
+      getMilk: { name: 'getMilkSource', page: 0,
+        offset: 0,
+        pagecount: 0,
+        returntype: '',
+        parammaps: {
+          name: ''
+        }},
+      milkList: [],
       myHeight: document.documentElement.clientHeight - 85 - 200,
       isSpotCheckAdd: [],
       isSpotCheckUpdate: [],
@@ -371,7 +398,9 @@ export default {
           assetNumber: '',
           assetName: '',
           startTime: '',
-          stopTime: ''
+          stopTime: '',
+          areaName: '',
+          region: ''
         }
       },
 
@@ -490,8 +519,23 @@ export default {
     this.get_select_list()
     this.get_table_data()
   },
-
+  mounted() {
+    this.getRegionList() // 区域数据
+    this.getmilkList() // 奶源部下拉列表
+  },
   methods: {
+    // 获取区域下拉列表
+    getRegionList() {
+      GetDataByName(this.getRegion).then((res) => {
+        this.regionList = res.data.list
+      })
+    },
+    // 获取奶源部下拉列表
+    getmilkList() {
+      GetDataByName(this.getMilk).then((res) => {
+        this.milkList = res.data.list
+      })
+    },
     get_auto_buttons() {
       // 点检
       const SpotCheckAdd = 'maintenance:spotCheck:add'

vue.config.js

@@ -36,16 +36,25 @@ module.exports = {
     },
     proxy: {
       // change xxx-api/login => mock/login
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:${port}/mock`,
+      // // detail: https://cli.vuejs.org/config/#devserver-proxy
+      // [process.env.VUE_APP_BASE_API]: {
+      //   target: `http://127.0.0.1:${port}/mock`,
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     ['^' + process.env.VUE_APP_BASE_API]: ''
+      //   }
+      // },
+
+      '/api': {
+        // 要访问的跨域的api的域名 蒙牛测试地址 白少本地服务
+        target: 'http://8.130.17.8:8082',
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+          '^/api': ''
         }
       }
-    },
-    after: require('./mock/mock-server.js')
+    }
+    // after: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that