Browse Source

git stash

000766 2 years ago
parent
commit
106cecaa60
3 changed files with 5 additions and 4 deletions
  1. 1 1
      src/views/monitor/job/index.vue
  2. 2 2
      src/views/monitor/job/log.vue
  3. 2 1
      vue.config.js

+ 1 - 1
src/views/monitor/job/index.vue

@@ -665,5 +665,5 @@ export default {
     }
   }
 };
-
+ 
 </script>

+ 2 - 2
src/views/monitor/job/log.vue

@@ -406,8 +406,8 @@ export default {
               60
             ).toFixed(2)+'h';
             const tqbbbb =
-              tqaaaa - duration > 0 ? `超时${tqaaaa - duration}h` : `未超时`;
-
+               tqaaaa - duration > 0 ? `超时${tqaaaa - duration}h` : `未超时`;
+               
             return {
               ...item,
               tqaaaa,

+ 2 - 1
vue.config.js

@@ -36,13 +36,14 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://test-sy.derom.com/drp-admin`, //测试
+        //target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
+           target: `http://172.16.13.77:8000/drp-admin`,  
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''