East 4 년 전
부모
커밋
a5f0ab602b
45개의 변경된 파일212개의 추가작업 그리고 76개의 파일을 삭제
  1. 2 2
      config/index.js
  2. 0 1
      src/views/modules/alarm/indoor.vue
  3. 0 1
      src/views/modules/alarm/meteo.vue
  4. 0 1
      src/views/modules/alarm/temp.vue
  5. 0 1
      src/views/modules/alarm/water.vue
  6. 0 1
      src/views/modules/basic/breed.vue
  7. 0 1
      src/views/modules/basic/feeder.vue
  8. 0 1
      src/views/modules/basic/pigsty.vue
  9. 0 1
      src/views/modules/basic/treat.vue
  10. 0 1
      src/views/modules/basic/unit.vue
  11. 4 3
      src/views/modules/basicdata/bperiod.vue
  12. 2 3
      src/views/modules/basicdata/bpighouse.vue
  13. 0 1
      src/views/modules/basicdata/branch.vue
  14. 4 3
      src/views/modules/basicdata/bunit.vue
  15. 0 1
      src/views/modules/breed/beartag.vue
  16. 0 1
      src/views/modules/breed/bfood.vue
  17. 0 1
      src/views/modules/envir/ealarm.vue
  18. 66 10
      src/views/modules/envir/eindoor.vue
  19. 61 2
      src/views/modules/envir/emeteo.vue
  20. 65 15
      src/views/modules/envir/ewater.vue
  21. 0 1
      src/views/modules/health/hdisease.vue
  22. 0 1
      src/views/modules/health/htreat.vue
  23. 0 1
      src/views/modules/health/hvaccine.vue
  24. 0 1
      src/views/modules/job/schedule.vue
  25. 0 1
      src/views/modules/oss/oss.vue
  26. 2 1
      src/views/modules/pigbasic/pbadopt-charts/statistics.vue
  27. 0 1
      src/views/modules/pigbasic/pbbasic.vue
  28. 2 1
      src/views/modules/pigbasic/pbbasicLeft.vue
  29. 0 1
      src/views/modules/pigbasic/pbentry.vue
  30. 0 1
      src/views/modules/pigbasic/pbexit.vue
  31. 0 1
      src/views/modules/pigbasic/pbpedigree.vue
  32. 0 1
      src/views/modules/pigbasic/pbzhong.vue
  33. 0 1
      src/views/modules/pigfarm/pfperson.vue
  34. 0 1
      src/views/modules/sys/api.vue
  35. 0 1
      src/views/modules/sys/config.vue
  36. 0 1
      src/views/modules/sys/department.vue
  37. 0 1
      src/views/modules/sys/job.vue
  38. 0 1
      src/views/modules/sys/menu.vue
  39. 0 1
      src/views/modules/sys/pasture.vue
  40. 0 1
      src/views/modules/sys/role.vue
  41. 0 1
      src/views/modules/sys/user.vue
  42. 1 1
      static/config/index-prod.js
  43. 1 1
      static/config/index-qa.js
  44. 1 1
      static/config/index-uat.js
  45. 1 1
      static/config/index.js

+ 2 - 2
config/index.js

@@ -23,8 +23,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.113',
-    //host: 'localhost', // can be overwritten by process.env.HOST
+    // host: '192.168.1.113',
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

+ 0 - 1
src/views/modules/alarm/indoor.vue

@@ -110,7 +110,6 @@
               label="报警时间">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/alarm/meteo.vue

@@ -100,7 +100,6 @@
               label="报警时间">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/alarm/temp.vue

@@ -139,7 +139,6 @@
               label="报警时间">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/alarm/water.vue

@@ -110,7 +110,6 @@
               label="报警时间">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/basic/breed.vue

@@ -56,7 +56,6 @@
           label="备注">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           label="操作">

+ 0 - 1
src/views/modules/basic/feeder.vue

@@ -93,7 +93,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/basic/pigsty.vue

@@ -85,7 +85,6 @@
               label="养殖员">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/basic/treat.vue

@@ -62,7 +62,6 @@
           label="描述">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           label="操作">

+ 0 - 1
src/views/modules/basic/unit.vue

@@ -115,7 +115,6 @@
               label="所属牧场">
             </el-table-column> -->
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 4 - 3
src/views/modules/basicdata/bperiod.vue

@@ -53,7 +53,6 @@
         label="所属牧场">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">
@@ -181,7 +180,8 @@ export default {
         // 获取所有猪舍
         let pighouseResult = await this.$http({
           url: this.$http.adornUrl('/management/pigsty/findAll'),
-          method: 'post'
+          method: 'post',
+          params: this.$http.adornParams({})
         })
         pighouseResult.data.all && (this.pighouseList = pighouseResult.data.all)
         if (data && data.code === 0) {
@@ -281,7 +281,8 @@ export default {
           // 获取猪舍
           let pighouseResult = await this.$http({
             url: this.$http.adornUrl('/management/pigsty/findAll'),
-            method: 'post'
+            method: 'get',
+            params: this.$http.adornParams({})
           })
           pighouseResult.data.all && (this.pighouseList = pighouseResult.data.all)
           this.phSelectedList = this.pighouseList

+ 2 - 3
src/views/modules/basicdata/bpighouse.vue

@@ -64,7 +64,6 @@
         label="养殖员">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">
@@ -207,7 +206,7 @@ export default {
         let employeeResult = await this.$http({
           url: this.$http.adornUrl("/management/employee/findAll"),
           method: "get",
-          params: this.$http.adornParams({}, false)
+          params: this.$http.adornParams({})
         });
         employeeResult.data.all && (this.employeeList = employeeResult.data.all)
         console.log(this.employeeList);
@@ -268,7 +267,7 @@ export default {
           let employeeResult = await this.$http({
             url: this.$http.adornUrl("/management/employee/findAll"),
             method: "get",
-            params: this.$http.adornParams({}, false)
+            params: this.$http.adornParams({})
           });
           employeeResult.data.all && (this.employeeList = employeeResult.data.all)
         }

+ 0 - 1
src/views/modules/basicdata/branch.vue

@@ -66,7 +66,6 @@
         width="150">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">

+ 4 - 3
src/views/modules/basicdata/bunit.vue

@@ -53,7 +53,6 @@
         label="所属牧场">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">
@@ -181,7 +180,8 @@ export default {
         // 获取所有猪舍
         let pighouseResult = await this.$http({
           url: this.$http.adornUrl('/management/pigsty/findAll'),
-          method: 'post'
+          method: 'get',
+          params: this.$http.adornParams({})
         })
         pighouseResult.data.all && (this.pighouseList = pighouseResult.data.all)
         if (data && data.code === 0) {
@@ -281,7 +281,8 @@ export default {
           // 获取猪舍
           let pighouseResult = await this.$http({
             url: this.$http.adornUrl('/management/pigsty/findAll'),
-            method: 'post'
+            method: 'get',
+            params: this.$http.adornParams({})
           })
           pighouseResult.data.all && (this.pighouseList = pighouseResult.data.all)
           this.phSelectedList = this.pighouseList

+ 0 - 1
src/views/modules/breed/beartag.vue

@@ -202,7 +202,6 @@
               label="栏期">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/breed/bfood.vue

@@ -83,7 +83,6 @@
           label="备注">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           label="操作">

+ 0 - 1
src/views/modules/envir/ealarm.vue

@@ -108,7 +108,6 @@
               label="阈值">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 66 - 10
src/views/modules/envir/eindoor.vue

@@ -5,11 +5,21 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 50px">
+            <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>
             <el-form-item style="width: 100px">
               <el-button type="warning" :disabled="abnormalStatus===true" @click="changeClick">异常</el-button>
+            </el-form-item> -->
+            <el-form-item style="width: 140px">
+              <el-select v-model="abnormalStatus">
+                <el-option 
+                  v-for="item in abnormalList" 
+                  :key="item.value" 
+                  :label="item.label" 
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item style="width: 140px">
               <el-select placeholder="猪舍" v-model="form.pigstyId">
@@ -53,6 +63,16 @@
       <!-- role表格 -->
       <el-main>
         <div class="rect rect-table">
+          <el-form inline size="mini">
+            <el-form-item>
+              <el-button 
+                icon="el-icon-download" 
+                type="danger" 
+                @click="exportExcel()">
+                导出Excel
+              </el-button>
+            </el-form-item>
+          </el-form>
           <el-table
             :data="dataList"
             border
@@ -60,7 +80,7 @@
             v-loading="dataListLoading"
             style="width: 100%;"
             size="mini"
-            height="578"
+            height="540"
             :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}" 
             :cell-style="{color: '#888',fontSize: '13px'}">
             <el-table-column
@@ -136,6 +156,16 @@
         // farmId: undefined,
         pigstyList: [], // 猪舍List
         labelPosition: 'right',
+        abnormalList: [
+          {
+            label: '正常',
+            value: false
+          },
+          {
+            label: '异常',
+            value: true
+          }
+        ],
         abnormalStatus: false,
         // pigsty: {
         //   farmId: '',
@@ -149,10 +179,6 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        // TODO: 真的没有做啊
-        // FIXME: 对猪舍没有查询
-        // this.farmId = parseInt(this.$cookie.get('formFarmId'))
-        // this.form.farmId = parseInt(this.$cookie.get('formFarmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/indoorEnvironment/list'),
@@ -195,11 +221,40 @@
           this.dataListLoading = false
         })
       },
-      // 切换正常异常状态
-      changeClick () {
-        this.abnormalStatus = !this.abnormalStatus
-        this.getDataList()
+      // 导出Excel
+      exportExcel () {
+        this.$http({
+          url: this.$http.adornUrl('/management/indoorEnvironment/exportXls'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'abnormalStatus': this.abnormalStatus,
+            'pigstyId': this.form.pigstyId || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'startTime': this.form.time[0] || undefined,
+            'endTime': this.form.time[1] || undefined
+          }),
+          responseType: 'blob'
+        }).then(({data}) => {
+          if (!data) {
+            this.$message.error('文件下载失败')
+            return
+          }
+          let url = window.URL.createObjectURL(new Blob([data], {type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '室内环境.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+          window.URL.revokeObjectURL(url)
+        })
       },
+      // // 切换正常异常状态
+      // changeClick () {
+      //   this.abnormalStatus = !this.abnormalStatus
+      //   this.getDataList()
+      // },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -215,6 +270,7 @@
         // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
+        this.abnormalStatus = false
         // this.pigstySelectedList = this.pigstyList
       },
       // 每页数

+ 61 - 2
src/views/modules/envir/emeteo.vue

@@ -5,11 +5,21 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 50px">
+            <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>
             <el-form-item style="width: 100px">
               <el-button type="warning" :disabled="abnormalStatus===true" @click="changeClick">异常</el-button>
+            </el-form-item> -->
+            <el-form-item style="width: 140px">
+              <el-select v-model="abnormalStatus">
+                <el-option 
+                  v-for="item in abnormalList" 
+                  :key="item.value" 
+                  :label="item.label" 
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
@@ -47,6 +57,16 @@
       <!-- role表格 -->
       <el-main>
         <div class="rect rect-table">
+          <el-form inline size="mini">
+            <el-form-item>
+              <el-button 
+                icon="el-icon-download" 
+                type="danger" 
+                @click="exportExcel()">
+                导出Excel
+              </el-button>
+            </el-form-item>
+          </el-form>
           <el-table
             :data="dataList"
             border
@@ -54,7 +74,7 @@
             v-loading="dataListLoading"
             style="width: 100%;"
             size="mini"
-            height="578"
+            height="540"
             :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}" 
             :cell-style="{color: '#888',fontSize: '13px'}">
             <el-table-column
@@ -129,6 +149,16 @@
         // farmId: undefined,
         farmList: [], // 牧场List
         labelPosition: 'right',
+        abnormalList: [
+          {
+            label: '正常',
+            value: false
+          },
+          {
+            label: '异常',
+            value: true
+          }
+        ],
         abnormalStatus: false
       }
     },
@@ -195,10 +225,39 @@
           this.$message.error('请勿选择超出现在的时刻')
         }
       },
+      // 导出Excel
+      exportExcel () {
+        this.$http({
+          url: this.$http.adornUrl('/management/outdoorEnvironment/exportXls'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'abnormalStatus': this.abnormalStatus,
+            // 'farmId': (this.form.farmId || this.farmId) || undefined,
+            'startTime': this.form.time[0] || undefined,
+            'endTime': this.form.time[1] || undefined
+          }),
+          responseType: 'blob'
+        }).then(({data}) => {
+          if (!data) {
+            this.$message.error('文件下载失败')
+            return
+          }
+          let url = window.URL.createObjectURL(new Blob([data], {type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '气象环境.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+          window.URL.revokeObjectURL(url)
+        })
+      },
       // form表单清空,单元SelectedList 和 栏期SelectedList重置
       clearAll () {
         // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.time = []
+        this.abnormalStatus = false
       },
       // 每页数
       sizeChangeHandle (val) {

+ 65 - 15
src/views/modules/envir/ewater.vue

@@ -5,22 +5,22 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 50px">
+            <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>
             <el-form-item style="width: 100px">
               <el-button type="warning" :disabled="abnormalStatus===true" @click="changeClick">异常</el-button>
-            </el-form-item>
-            <!-- <el-form-item style="width: 140px">
-              <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
-                <el-option
-                  v-for="item in farmList"
-                  :key="item.value"
-                  :label="item.label"
+            </el-form-item> -->
+            <el-form-item style="width: 140px">
+              <el-select v-model="abnormalStatus">
+                <el-option 
+                  v-for="item in abnormalList" 
+                  :key="item.value" 
+                  :label="item.label" 
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item style="width: 140px">
               <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
@@ -57,6 +57,16 @@
       <!-- role表格 -->
       <el-main>
         <div class="rect rect-table">
+          <el-form inline size="mini">
+            <el-form-item>
+              <el-button 
+                icon="el-icon-download" 
+                type="danger" 
+                @click="exportExcel()">
+                导出Excel
+              </el-button>
+            </el-form-item>
+          </el-form>
           <el-table
             :data="dataList"
             border
@@ -64,7 +74,7 @@
             v-loading="dataListLoading"
             style="width: 100%;"
             size="mini"
-            height="578"
+            height="540"
             :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}" 
             :cell-style="{color: '#888',fontSize: '13px'}">
             <el-table-column
@@ -132,6 +142,16 @@
         pigstyList: [], // 猪舍List
         // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
+        abnormalList: [
+          {
+            label: '正常',
+            value: false
+          },
+          {
+            label: '异常',
+            value: true
+          }
+        ],
         abnormalStatus: false,
         // pigsty: {
         //   farmId: '',
@@ -207,11 +227,11 @@
           this.dataListLoading = false
         })
       },
-      // 切换正常异常状态
-      changeClick () {
-        this.abnormalStatus = !this.abnormalStatus
-        this.getDataList()
-      },
+      // // 切换正常异常状态
+      // changeClick () {
+      //   this.abnormalStatus = !this.abnormalStatus
+      //   this.getDataList()
+      // },
       // 根据牧场选择限制猪舍
       // farmChange (val) {
       //   this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
@@ -232,6 +252,35 @@
       //   }
       //   this.farmChange(this.form.farmId)
       // },
+      // 导出Excel
+      exportExcel () {
+        this.$http({
+          url: this.$http.adornUrl('/management/drinkingWater/exportXls'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'abnormalStatus': this.abnormalStatus,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'pigstyId': this.form.pigstyId || undefined,
+            'startTime': this.form.time[0] || undefined,
+            'endTime': this.form.time[1] || undefined
+          }),
+          responseType: 'blob'
+        }).then(({data}) => {
+          if (!data) {
+            this.$message.error('文件下载失败')
+            return
+          }
+          let url = window.URL.createObjectURL(new Blob([data], {type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '饮用水环境.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+          window.URL.revokeObjectURL(url)
+        })
+      },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -247,6 +296,7 @@
         // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
+        this.abnormalStatus = false
         // this.pigstySelectedList = this.pigstyList
       },
       // 每页数

+ 0 - 1
src/views/modules/health/hdisease.vue

@@ -140,7 +140,6 @@
 <!--              </template>-->
 <!--            </el-table-column>-->
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作"

+ 0 - 1
src/views/modules/health/htreat.vue

@@ -150,7 +150,6 @@
 <!--                label="出栏时间">-->
 <!--            </el-table-column>-->
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/health/hvaccine.vue

@@ -87,7 +87,6 @@
                 label="操作人">
             </el-table-column>
             <el-table-column
-                fixed="right"
                 header-align="center"
                 align="center"
                 label="操作">

+ 0 - 1
src/views/modules/job/schedule.vue

@@ -68,7 +68,6 @@
         </template>
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         width="150"

+ 0 - 1
src/views/modules/oss/oss.vue

@@ -40,7 +40,6 @@
         label="创建时间">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         width="150"

+ 2 - 1
src/views/modules/pigbasic/pbadopt-charts/statistics.vue

@@ -94,7 +94,8 @@
               // backgroundColor: '#2c343c',
               'title': {
                 'text': '出栏统计折线图',
-                'x': 'center'
+                'x': 'center',
+                'subtext': '暂无数据'
               },
               'tooltip': {
                 'trigger': 'axis'

+ 0 - 1
src/views/modules/pigbasic/pbbasic.vue

@@ -204,7 +204,6 @@
               label="栏期">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 2 - 1
src/views/modules/pigbasic/pbbasicLeft.vue

@@ -92,7 +92,8 @@ export default {
         // 获取所有猪舍
         let pighouseResult = await this.$http({
           url: this.$http.adornUrl("/management/pigsty/findAll"),
-          method: "post",
+          method: "get",
+          params: this.$http.adornParams({})
         })
         let pighouseList = []
         pighouseResult.data.all && (pighouseList = pighouseResult.data.all)

+ 0 - 1
src/views/modules/pigbasic/pbentry.vue

@@ -224,7 +224,6 @@
               label="栏期">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/pigbasic/pbexit.vue

@@ -219,7 +219,6 @@
               label="栏期">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/pigbasic/pbpedigree.vue

@@ -214,7 +214,6 @@
               label="栏期">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作">

+ 0 - 1
src/views/modules/pigbasic/pbzhong.vue

@@ -215,7 +215,6 @@
               label="备注">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               label="操作"

+ 0 - 1
src/views/modules/pigfarm/pfperson.vue

@@ -66,7 +66,6 @@
         </template>
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">

+ 0 - 1
src/views/modules/sys/api.vue

@@ -17,7 +17,6 @@
         label="用途">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         label="操作">

+ 0 - 1
src/views/modules/sys/config.vue

@@ -48,7 +48,6 @@
         label="备注">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         width="150"

+ 0 - 1
src/views/modules/sys/department.vue

@@ -75,7 +75,6 @@
               label="部门负责人">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               width="150"

+ 0 - 1
src/views/modules/sys/job.vue

@@ -69,7 +69,6 @@
               label="岗位代码">
             </el-table-column>
             <el-table-column
-              fixed="right"
               header-align="center"
               align="center"
               width="150"

+ 0 - 1
src/views/modules/sys/menu.vue

@@ -75,7 +75,6 @@
           label="授权标识">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           width="150"

+ 0 - 1
src/views/modules/sys/pasture.vue

@@ -95,7 +95,6 @@
           width="150">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           label="操作">

+ 0 - 1
src/views/modules/sys/role.vue

@@ -74,7 +74,6 @@
           label="创建时间">
         </el-table-column>
         <el-table-column
-          fixed="right"
           header-align="center"
           align="center"
           width="150"

+ 0 - 1
src/views/modules/sys/user.vue

@@ -171,7 +171,6 @@
                 label="备注">
               </el-table-column>
               <el-table-column
-                fixed="right"
                 header-align="center"
                 align="center"
                 width="150"

+ 1 - 1
static/config/index-prod.js

@@ -6,7 +6,7 @@
 
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server';
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.57:88/api';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.44:88/api';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

+ 1 - 1
static/config/index-qa.js

@@ -6,7 +6,7 @@
 
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.57:88/api';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.44:88/api';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

+ 1 - 1
static/config/index-uat.js

@@ -6,7 +6,7 @@
 
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.57:88/api';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.44:88/api';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

+ 1 - 1
static/config/index.js

@@ -6,7 +6,7 @@
 
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.57:88/api';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.44:88/api';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名