111

src/store/index.js

@@ -10,7 +10,7 @@ export default new Vuex.Store({
     mode: true,
     // 按钮权限
     buttons: [],
-    ip: 'http://120.27.234.126:8010',
+    ip: 'http://192.168.1.165:8010',
     // 所选择的farmId
     farmId: '',
     farmList: [],

src/utils/api.js

@@ -475,7 +475,7 @@ export function getFaceGuard(data) {
 /** 每栋温湿度 **/
 export function getEnv(data) {
   return axios({
-    url: 'produce/room/getAllRoomEnvironment',
+    url: '/env/room/getAllRoomEnvironment',
     method: 'get',
     params: data
   })
@@ -484,7 +484,7 @@ export function getEnv(data) {
 /* 栋舍 */
 export function getSchool(data) {
   return axios({
-    url: '/produce/floor/list',
+    url: '/env/floor/list',
     method: 'get',
     params: data
   })
@@ -493,7 +493,7 @@ export function getSchool(data) {
 /* 楼层 */
 export function getByFloor(data) {
   return axios({
-    url: '/produce/box/listByFloor',
+    url: '/env/box/listByFloor',
     method: 'get',
     params: data
   })
@@ -502,7 +502,7 @@ export function getByFloor(data) {
 /** 单元 **/
 export function getUid(data) {
   return axios({
-    url: '/produce/room/listBy',
+    url: '/env/room/listBy',
     method: 'get',
     params: data
   })
@@ -511,7 +511,7 @@ export function getUid(data) {
 /* 环境查询 */
 export function getByRoom(data) {
   return axios({
-    url: '/produce/room/listByRoom',
+    url: '/env/room/listByRoom',
     method: 'post',
     data: data
   })
@@ -520,7 +520,7 @@ export function getByRoom(data) {
 /** 饮用水详情 **/
 export function getAllDayWater(data) {
   return axios({
-    url: '/produce/monthWater/getAllDayWater',
+    url: '/env/monthWater/getAllDayWater',
     method: 'get',
     params: data
   })
@@ -529,7 +529,7 @@ export function getAllDayWater(data) {
 /** 饮用水全部 **/
 export function getListAllWater(data) {
   return axios({
-    url: '/produce/dayWater/listAllWater',
+    url: '/env/dayWater/listAllWater',
     method: 'post',
     data: data
   })
@@ -538,7 +538,7 @@ export function getListAllWater(data) {
 /** 栋舍饮用水 **/
 export function getListWater(data) {
   return axios({
-    url: '/produce/dayWater/listWater',
+    url: '/env/dayWater/listWater',
     method: 'post',
     data: data
   })
@@ -547,7 +547,7 @@ export function getListWater(data) {
 /** 总用料量 **/
 export function getAllFodder(data) {
   return axios({
-    url: '/produce/sysFodder/getAllFodder',
+    url: '/env/sysFodder/getAllFodder',
     method: 'post',
     data: data
   })
@@ -557,7 +557,7 @@ export function getAllFodder(data) {
 
 export function getFodder(data) {
   return axios({
-    url: '/produce/sysFodder/getFodder',
+    url: '/env/sysFodder/getFodder',
     method: 'post',
     data: data
   })

src/utils/http.js

@@ -15,7 +15,7 @@ let removePending = (ever) => {
 // 创建axios实例
 var instance = axios.create({
   timeout: 1000 * 12,
-  baseURL: 'http://120.27.234.126:8010'
+  baseURL: 'http://192.168.1.165:8010'
 })
 
 // 请求拦截器

src/views/SystemAdmin/UserAdmin.vue

@@ -105,7 +105,7 @@
       <div>
         <el-form ref="form" :model="forms" label-width="80px" :rules="rules">
           <el-form-item label="登录名" prop="account">
-            <el-input v-model="forms.account" placeholder=""></el-input>
+            <el-input v-model="forms.account" :disabled="showType" placeholder=""></el-input>
           </el-form-item>
           <el-form-item label="密码" prop="password">
             <el-input type="password" v-model="forms.password" ></el-input>
@@ -269,6 +269,7 @@ export default {
     // 用户编辑
     edit(data) {
       this.forms =  {
+        userName: data.userName,
         account: data.account,
         password: data.password,
         remark: data.remark,