zhaozhipeng 3 years ago
parent
commit
8142e41e15
5 changed files with 44 additions and 41 deletions
  1. 34 34
      src/components/leftnav.vue
  2. 2 1
      src/components/navcon.vue
  3. 1 1
      src/main.js
  4. 4 4
      src/utils/request.js
  5. 3 1
      src/views/task/addTask.vue

+ 34 - 34
src/components/leftnav.vue

@@ -63,40 +63,40 @@ export default {
               menus: null
               menus: null
             }
             }
           ]
           ]
-        }, {
-          menu_id: 2,
-          icon: 'el-icon-tickets',
-          menu_name: '计划',
-          url: null,
-          menus: [
-            {
-              menu_id: 21,
-              menu_name: '计划管理',
-              icon: 'el-icon-tickets',
-              url: 'plan',
-              menus: null
-            },
-          ]
-        }, {
-          menu_id: 3,
-          icon: 'el-icon-tickets',
-          menu_name: '问题',
-          url: null,
-          menus: [
-            {
-              menu_id: 31,
-              menu_name: '质量问题',
-              icon: 'el-icon-tickets',
-              url: 'question',
-              menus: null
-            },{
-              menu_id: 32,
-              menu_name: '停机问题',
-              icon: 'el-icon-tickets',
-              url: 'stop',
-              menus: null
-            }
-          ]
+        // }, {
+        //   menu_id: 2,
+        //   icon: 'el-icon-tickets',
+        //   menu_name: '计划',
+        //   url: null,
+        //   menus: [
+        //     {
+        //       menu_id: 21,
+        //       menu_name: '计划管理',
+        //       icon: 'el-icon-tickets',
+        //       url: 'plan',
+        //       menus: null
+        //     },
+        //   ]
+        // }, {
+        //   menu_id: 3,
+        //   icon: 'el-icon-tickets',
+        //   menu_name: '问题',
+        //   url: null,
+        //   menus: [
+        //     {
+        //       menu_id: 31,
+        //       menu_name: '质量问题',
+        //       icon: 'el-icon-tickets',
+        //       url: 'question',
+        //       menus: null
+        //     },{
+        //       menu_id: 32,
+        //       menu_name: '停机问题',
+        //       icon: 'el-icon-tickets',
+        //       url: 'stop',
+        //       menus: null
+        //     }
+        //   ]
         }
         }
       ],
       ],
       msg: 'success'
       msg: 'success'

+ 2 - 1
src/components/navcon.vue

@@ -39,7 +39,8 @@ export default {
      })
      })
     },
     },
     exit() {
     exit() {
-    	window.location.href = `http://39.100.230.190:30043/planWeb/#/choose?token=${getStore({'name':'token','type':'','debug':''})}`
+    	// window.location.href = `http://39.100.230.190:30043/planWeb/#/choose?token=${getStore({'name':'token','type':'','debug':''})}`
+    	window.location.href = `http://81.70.84.72:30043/planWeb/#/choose?token=${getStore({'name':'token','type':'','debug':''})}`
     }
     }
     // // 退出登录
     // // 退出登录
     // exit() {
     // exit() {

+ 1 - 1
src/main.js

@@ -19,7 +19,7 @@ Vue.config.productionTip = false;
 
 
 // 文件上传域名
 // 文件上传域名
 // Vue.prototype.$imgUrl = "http://81.70.84.72:30045/file/uploadOne"
 // Vue.prototype.$imgUrl = "http://81.70.84.72:30045/file/uploadOne"
-Vue.prototype.$imgUrl = "http://39.100.230.190:30045/file/uploadOne"
+Vue.prototype.$imgUrl = "http://81.70.84.72:30045/file/uploadOne"
 
 
 // 使用element UI
 // 使用element UI
 Vue.use(ElementUI);
 Vue.use(ElementUI);

+ 4 - 4
src/utils/request.js

@@ -11,8 +11,8 @@ import debounce from './debounce.js'
 const request = axios.create({
 const request = axios.create({
   // baseURL: process.env.BASE_API,
   // baseURL: process.env.BASE_API,
   // baseURL: '/api',
   // baseURL: '/api',
- // baseURL: 'http://81.70.84.72:30048/',
-  baseURL: 'http://39.100.230.190:30048/',
+  baseURL: 'http://81.70.84.72:30048/',
+  // baseURL: 'http://39.100.230.190:30048/',
   timeout: process.env.TIME_OUT,
   timeout: process.env.TIME_OUT,
   method: "post",
   method: "post",
   type: "JSON"
   type: "JSON"
@@ -84,7 +84,7 @@ request.interceptors.response.use(
           Message.error('凭证过期,请重新登录')
           Message.error('凭证过期,请重新登录')
         })
         })
         setTimeout(()=> {
         setTimeout(()=> {
-          window.location.href = 'http://39.100.230.190:8081/baseWeb/login'
+          window.location.href = 'http://81.70.84.72:8081/baseWeb/login'
          },1000)
          },1000)
        }
        }
     return response.data
     return response.data
@@ -99,7 +99,7 @@ request.interceptors.response.use(
       if (response.data.status == '401' && response.status == 401) {
       if (response.data.status == '401' && response.status == 401) {
         Message.error('凭证过期,请重新登录')
         Message.error('凭证过期,请重新登录')
         setTimeout(()=> {
         setTimeout(()=> {
-          window.location.href = 'http://39.100.230.190:8081/baseWeb/login'
+          window.location.href = 'http://81.70.84.72:8081/baseWeb/login'
          },1000)
          },1000)
       } else if (response.status == 502) {
       } else if (response.status == 502) {
         Message.error('网络错误,请检查网络')
         Message.error('网络错误,请检查网络')

+ 3 - 1
src/views/task/addTask.vue

@@ -1263,7 +1263,9 @@
           if(res.status === '20000') {
           if(res.status === '20000') {
             this.periodHourList = res.data
             this.periodHourList = res.data
             this.timeQuantumStatus = false
             this.timeQuantumStatus = false
-          }
+          } else {
+			  this.$message.error(res.message)
+		  }
         })
         })
       },
       },
       // 不生成任务条件 /////////////////////////////////////
       // 不生成任务条件 /////////////////////////////////////