From 6d481a4239922723ddf6331e575ddb980ca87b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Sat, 25 May 2024 19:50:17 +0800
Subject: [PATCH] 1

---
 src/assets/js/http.js                         |  4 +--
 src/store/index.js                            | 26 +++++++++----------
 .../projectProgressDetail.vue                 |  8 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 4486d203..08e97487 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
-  // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+  axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
   // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-  axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
+  // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 
 } else if (process.env.NODE_ENV == 'debug') {
diff --git a/src/store/index.js b/src/store/index.js
index cce3faef..df83963c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -62,19 +62,19 @@ export default new Vuex.Store({
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    BASEURL: baseUrl
-      ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
-    // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
-    // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
-    // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
-    WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
+    // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
+    // // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
+    // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
diff --git a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue b/src/views/projectFront/progressManagementAg/projectProgressDetail.vue
index fd7a5666..f0ddd66d 100644
--- a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue
+++ b/src/views/projectFront/progressManagementAg/projectProgressDetail.vue
@@ -143,12 +143,12 @@
       </div>
       <div class="plan_wrap whiteBlock" style="position: relative;">
         <div class="pageTitle">进度记录</div>
-        <!-- v-if="
+       
+        <div
+        v-if="
             itemForm.dutyUserId &&
               itemForm.dutyUserId === $store.state.userInfo.userId
-          " -->
-        <div
-         
+          "
         >
        
           <el-button