From 9b8e361ca046b351a703810b1e419a9dc85d0ae9 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 27 Jun 2024 16:02:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E7=BB=93=E6=9E=9C=E8=A7=84=E5=88=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                       |  4 +-
 src/store/index.js                          | 16 +++----
 src/views/projectFront/entryCode/myHome.vue | 50 ++++++++++-----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index be21d583..6bc6f760 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
     // 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.221:9111/"; //郭圣雄本地
     // 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/' //彭洁远程
@@ -185,7 +185,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://8.136.222.164:8808/' //中科安信正式地址
     // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
     // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
diff --git a/src/store/index.js b/src/store/index.js
index af094574..f170e937 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,19 +52,19 @@ export default new Vuex.Store({
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
+        // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
         // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
         // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
         // FILEURL:'http://42.180.188.17:11211/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/", //正式环境
+        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',//鞍钢平台工作流地址
diff --git a/src/views/projectFront/entryCode/myHome.vue b/src/views/projectFront/entryCode/myHome.vue
index b8c3b597..af1c8f6e 100644
--- a/src/views/projectFront/entryCode/myHome.vue
+++ b/src/views/projectFront/entryCode/myHome.vue
@@ -58,14 +58,14 @@
                   :style="{ 'color': fontColor, fontSize: backimgFontSize * 0.9 + 'px' }"
                 >
 
-                  <p v-if="WorkerInfo.safeScore >= 90">无风险</p>
-                  <p v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                  <p v-if="WorkerInfo.safeScore >= 80">无风险</p>
+                  <p v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"><i
+                      v-if="WorkerInfo.safeScore < 80"
                       class="el-icon-warning"
                       :style="{ 'color': fontColor }"
                     ></i>低风险</p>
-                  <p v-if="WorkerInfo.safeScore < 80"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                  <p v-if="WorkerInfo.safeScore < 60"><i
+                      v-if="WorkerInfo.safeScore < 80"
                       class="el-icon-warning"
                       :style="{ 'color': fontColor }"
                     ></i>高风险</p>
@@ -101,7 +101,7 @@
 
               <div
                 class="text"
-                v-if="WorkerInfo.safeScore >= 90 && backimgwidth != 0"
+                v-if="WorkerInfo.safeScore >= 80 && backimgwidth != 0"
                 :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px' }"
               >
                 通过后台查询到，您无扣分风险
@@ -109,7 +109,7 @@
 
               <div
                 class="text2"
-                v-if="WorkerInfo.safeScore < 90 && backimgwidth != 0"
+                v-if="WorkerInfo.safeScore < 80 && backimgwidth != 0"
                 :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', paddingBottom: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px', width: backimgFontSize * 13.35 + 'px' }"
               >
                 <div
@@ -134,25 +134,25 @@
               </div>
               <div
                 class="foot"
-                v-if="WorkerInfo.safeScore >= 90"
+                v-if="WorkerInfo.safeScore >= 80"
                 :style="{ 'color': fontColor, 'left': '40%', paddingTop: backimgFontSize * 0.4 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
               >
                 可通行
               </div>
               <div
                 class="foot"
-                v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"
-                :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
-              >
-                安全分已经低于90分
-              </div>
-              <div
-                class="foot"
-                v-if="WorkerInfo.safeScore < 80"
+                v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"
                 :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
               >
                 安全分已经低于80分
               </div>
+              <div
+                class="foot"
+                v-if="WorkerInfo.safeScore < 60"
+                :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
+              >
+                安全分已经低于60分
+              </div>
             </div>
           </div>
 
@@ -323,33 +323,33 @@ export default {
       this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
     },
     setImg (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
         this.srcImgUrl = this.imgUrl.img1;
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
         this.srcImgUrl = this.imgUrl.img2;
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
         this.srcImgUrl = this.imgUrl.img3;
       }
     },
 
     setColor (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
         this.fontColor = "green";
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
         // this.fontColor = "rgb(255, 230, 0)";
         this.fontColor = "#D47300"
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
         // this.fontColor = "red";
         this.fontColor = "#EA3941"
       }
     },
     setCodeColor (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
         this.codeColor = "green";
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
         // this.fontColor = "rgb(255, 230, 0)";
         this.codeColor = "#F7C409"
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
         // this.fontColor = "red";
         this.codeColor = "#F0212A"
       }

From 420bcfde8f2b248bb360d641f6421d35e9430d23 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Thu, 27 Jun 2024 16:37:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=9C=A8=E5=90=8E=E5=8F=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E6=A8=A1=E5=9D=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectAdmin/projectIndex.vue | 66 ++++++++++---------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue
index 637359cb..cc51898b 100644
--- a/src/views/projectAdmin/projectIndex.vue
+++ b/src/views/projectAdmin/projectIndex.vue
@@ -12,26 +12,10 @@
           >
             <!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
             <div class="projectIndex" id="projectIndex">
-            <template 
-                v-for="(item, index) in list">
-              <div
-                style="width: 100%;height: 1px;"
-                v-if="
-                  index == 0 ||
-                    (index > 0 && list[index - 1].labelName != item.labelName)
-                "
-              ></div>
-              <div
-                class="moduleBox"
-                v-if="item.operation"
-              >
-                <div
-                  class="module_title"
-                  v-if="
-                    index == 0 ||
-                      (index > 0 && list[index - 1].labelName != item.labelName)
-                  "
-                >
+            <template v-for="(item, index) in list">
+              <div style="width: 100%;height: 1px;" v-if="index == 0 || (index > 0 && list[index - 1].labelName != item.labelName)"></div>
+              <div class="moduleBox" v-if="item.operation" >
+                <div class="module_title" v-if=" index == 0 || (index > 0 && list[index - 1].labelName != item.labelName)">
                   {{ item.labelName }}
                 </div>
                 <div
@@ -341,26 +325,27 @@ export default {
       // 新用户功能模块
       if(this.$store.state.userInfo.accountType == 10){
         getNewUserAllModulePageApi({
-        projectSn: this.projectSn,
-        userId: this.$store.state.userInfo.userId,
-        moduleType: 2,
-      }).then((res) => {
-        if (res.success) {
-          var all = res.result.moduleList;
-          console.log("all", all);
-          all.forEach((element, index) => {
-            all[index].operation = false;
-            res.result.menuList.forEach((element2) => {
-              console.log(element2,77888)
-              if (element2.moduleId == element.moduleId) {
-                all[index].operation = true;
-              }
+          projectSn: this.projectSn,
+          userId: this.$store.state.userInfo.userId,
+          moduleType: 2,
+        }).then((res) => {
+          if (res.success) {
+            var all = res.result.moduleList;
+            console.log("all", all);
+            all.forEach((element, index) => {
+              all[index].operation = false;
+              res.result.menuList.forEach((element2) => {
+                console.log(element2,77888)
+                if (element2.moduleId == element.moduleId) {
+                  all[index].operation = true;
+                }
+              });
             });
-          });
-          console.log("all111", all);
-          this.list = all;
-        }
-      });
+            console.log("all111", all);
+            // this.list = all;
+            this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块
+          }
+        });
       } else {
         getAllModuleApi({
         moduleType: 2,
@@ -378,7 +363,8 @@ export default {
               }
             });
           });
-          this.list = all;
+          // this.list = all;
+          this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块
         }
       });
       }

From 2b9a626fef8951dfb1f35ad130df20f89f6e7ac8 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 27 Jun 2024 18:42:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=80=83=E8=AF=95=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                                         | 4 ++--
 .../projectFront/safetyEducation/securityRiskAnalysis.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 6bc6f760..be21d583 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
     // 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.221:9111/"; //郭圣雄本地
     // 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/' //彭洁远程
@@ -185,7 +185,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://8.136.222.164:8808/' //中科安信正式地址
     // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
     // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
diff --git a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
index a883797e..5f44d6c2 100644
--- a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
+++ b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
@@ -83,7 +83,7 @@
                                     infinite-scroll-disabled="disabled">
                                     <el-row class="tablelist-box" v-for="(ele, index) in workerList" :key="index">
                                         <el-col v-for="item in ele" :key="item.id"
-                                            :class="{ 'bg-ecf': item.safeScore >= 90, 'bg-fcf': item.safeScore >= 80, 'bg-ffe': item.safeScore < 80 }"
+                                            :class="{ 'bg-ecf': item.safeScore >= 80, 'bg-fcf': item.safeScore >= 60, 'bg-ffe': item.safeScore < 60 }"
                                             @click.native="onDeductScore(item)" :span="4">{{ item.workerName }}</el-col>
                                     </el-row>
                                     <!-- <el-row class="tablelist-box">