fix: 考试成绩合格结果规则修改

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/' //乌丹(合肥启程)新正式地址

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/', // 郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        FILEURL: 'http://192.168.34.221:9111/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: baseUrl ?
-        //     baseUrl :
+            baseUrl :
-        //     window.location.protocol + "//" + window.location.host + "/", //正式环境
+            window.location.protocol + "//" + window.location.host + "/", //正式环境
-        // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+        UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
-        // FILEURL: window.location.protocol + "//" + window.location.host + "/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',//鞍钢平台工作流地址

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">无风险</p>
-                  <p v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"><i
+                  <p v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                      v-if="WorkerInfo.safeScore < 80"
                       class="el-icon-warning"
                       :style="{ 'color': fontColor }"
                     ></i>低风险</p>
-                  <p v-if="WorkerInfo.safeScore < 80"><i
+                  <p v-if="WorkerInfo.safeScore < 60"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                      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"
+                v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"
-                :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"
                 :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"
       }