Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/messageCenter/waitEvent/index.vue

@@ -53,7 +53,7 @@
                 <div class="message-content">
                   {{ item.content }},{{ item.createBy }}
                 </div>
-                <div class="bot_but">
+                <div class="bot_but" v-if=" item.theme != '检查'">
                   <van-button color="#33CCFF" size="mini">{{
                     item.status == 0 ? "立即处理" : "待办事项"
                   }}</van-button>
@@ -179,6 +179,9 @@ export default {
     },
      touchstart(index, item) {
         console.log(item)
+      if(item.theme == "检查"){
+        return
+      }
       if(item.appUrl){
         this.$router.push({
         // name: item.appUrl,

src/views/my/resetPas.vue

@@ -25,17 +25,32 @@
         type="password"
         name="newPassword"
         label="新密码"
+        @input="checkPassword()"
         placeholder="请输入新密码"
         :rules="[
           { required: true, message: '请填写密码' },
           {
-                        message: '密码必须大于6个字符小于20个字符',
+            message: '密码必须大于8个字符小于30个字符',
             validator: (val) => {
-                            return val['length'] >= 6 && val['length'] < 20;
+              return val['length'] >= 8 && val['length'] < 30;
             },
           },
         ]"
       />
+      <!-- 密码等级提示 -->
+      <van-cell-group>
+        <div class="intensity">
+          <div style="width: 8.2em;"></div>
+          <div>
+            <div class="pass-level">
+                <span class="psdText">密码强度</span>
+                <span class="line" :class="[level.includes('low') ? 'low' : '']"></span>
+                <span class="line" :class="[level.includes('middle') ? 'middle' : '']" ></span>
+                <span class="line" :class="[level.includes('high') ? 'high' : '']" ></span>
+            </div>
+          </div>
+        </div>
+      </van-cell-group>
       <van-field
         required
         v-model="form.confirm"
@@ -46,9 +61,9 @@
         :rules="[
           { validator, required: true, message: '二次密码输入不一致' },
           {
-                        message: '密码必须大于等于6个字符小于20个字符',
+            message: '密码必须大于等于8个字符小于30个字符',
             validator: (val) => {
-                            return val['length'] >= 6 && val['length'] < 20;
+              return val['length'] >= 8 && val['length'] < 30;
             },
           },
         ]"
@@ -79,6 +94,7 @@ export default {
         newPassword: "",
         confirm: "",
       },
+      level : []
     };
   },
   mounted() {
@@ -89,20 +105,25 @@ export default {
       return this.form.newPassword == val;
     },
     onSubmit(val) {
+      // 判断level数组是否含有middle
+      let isMiddleLevel = this.level.includes('middle')
+      if(!isMiddleLevel){
+        this.$toast.fail("密码等级较低")
+        return
+      }
       this.$toast.loading({
         message: "请求中...",
         forbidClick: true,
         loadingType: "spinner",
         duration: 0,
       });
-            postFun("/mobile/resetPwd", this.obj2formdata(val))
-                .then((data) => {
+      postFun("/mobile/resetPwd", this.obj2formdata(val)).then((data) => {
         if (data.code == 0) {
           this.$toast.clear();
-                        this.$toast.success('密码修改成功!');
-                        this.$router.back()
+          this.$toast.success("密码修改成功!");
+          this.$router.back();
         }
-                })
+      });
     },
     obj2formdata(data) {
       console.log(data, "fasfasdfsd");
@@ -114,9 +135,82 @@ export default {
       }
       return fd;
     },
+
+    // 密码等级校验
+    checkPassword() {
+      this.level = [];
+      // 校验是数字
+      const regex1 = /^\d+$/;
+      // 校验字母
+      const regex2 = /^[A-Za-z]+$/;
+      // 校验符号
+      const regex3 =
+        /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]+$/;
+
+      if (regex1.test(this.form.newPassword)) {
+        this.level.push("low");
+      } else if (regex2.test(this.form.newPassword)) {
+        this.level.push("low");
+      } else if (regex3.test(this.form.newPassword)) {
+        this.level.push("low");
+      } else if (/^[A-Za-z\d]+$/.test(this.form.newPassword)) {
+        this.level.push("low");
+        this.level.push("middle");
+      } else if (
+        /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、\d]+$/.test(
+          this.form.newPassword
+        )
+      ) {
+        this.level.push("low");
+        this.level.push("middle");
+      } else if (
+        /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、A-Za-z]+$/.test(
+          this.form.newPassword
+        )
+      ) {
+        this.level.push("low");
+        this.level.push("middle");
+      } else if (
+        /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、A-Za-z\d]+$/.test(
+          this.form.newPassword
+        )
+      ) {
+        this.level.push("low");
+        this.level.push("middle");
+        this.level.push("high");
+      }
+    },
   },
 };
 </script>
 
-<style>
+<style lang="less" scoped>
+.intensity {
+  display: flex;
+  padding: 0.26667rem 0.42667rem;
+  line-height: 0.64rem;
+	.psdText {
+		font-size: 14px;
+		margin-right: 10px;
+	}
+
+	.line {
+		display: inline-block;
+		width: 48px;
+		height: 4px;
+		background: #d8d8d8;
+		border-radius: 3px;
+		margin-right: 8px;
+	}
+	.low {
+		background: #f4664a;
+	}
+	.middle {
+		background: #ffb700;
+	}
+	.high {
+		background: #2cbb79;
+	}
+}
+
 </style>
\ No newline at end of file

src/views/risk/riskAdd/index.vue

@@ -499,10 +499,10 @@ export default {
                 (this.riskRank = ""), // 风险等级
                 (this.showRiskRank = false),
                 (this.columnsRiskRank = [
+                    "重大风险",
+                    "较大风险",
                     "一般风险",
                     "较小风险",
-                    "较大风险",
-                    "重大风险",
                 ]),
                 (this.setRankMode = ""), // 定级方式文字
                 (this.setRankModeImg = []), // 定级方式图片
@@ -552,7 +552,7 @@ export default {
             columnsSetRank: ["矩阵式定级", "其他定级方式"],
             riskRank: "", // 风险等级
             showRiskRank: false,
-            columnsRiskRank: ["一般风险", "较小风险", "较大风险", "重大风险"],
+            columnsRiskRank: ["重大风险", "较大风险", "一般风险", "较小风险" ],
             showSetRankMode: false, // 是否显示定级方式
             setRankMode: "", // 定级方式文字
             setRankModeImg: [], // 定级方式图片

src/views/saveWorkbench/index.vue

@@ -70,6 +70,20 @@
                     />
                 </van-grid>
             </van-cell-group>
+
+             <!-- 预警提醒记录 -->
+            <van-cell-group inset v-if="finalAlertReminderRecord.length > 0">
+                <van-cell value="预警提醒记录" />
+                <van-grid :column-num="5">
+                    <van-grid-item
+                        @click="jump(item.path)"
+                        v-for="item in finalAlertReminderRecord"
+                        :key="item.key"
+                        :icon="item.imgUrl"
+                        :text="item.text"
+                    />
+                </van-grid>
+            </van-cell-group>
         </div>
 
         <!-- tanBar -->
@@ -259,29 +273,32 @@ export default {
                     path: "/checked-confirm",
                     imgUrl: require("@/assets/workbench/ehcek-record.png"),
                     text: "整改确认",
+                }
+            ],
+            safeEducationList:[
+                 // 安全教育培训
+                 {
+                    key: "1",
+                    path: "/scan",
+                    imgUrl: require("@/assets/workbench/inspect-plane.png"),
+                    text: "培训签到",
                 },
+            ],
+            alertReminderRecord:[
+                 // 预警提醒记录
                 {
-                    key: "9",
+                    key: "1",
                     path: "/warning",
                     imgUrl: require("@/assets/workbench/warn-tip.png"),
                     text: "预警提醒",
                 },   
                 {
-                    key: "10",
+                    key: "2",
                     path: "/warningNote",
                     imgUrl: require("@/assets/workbench/warn-record.png"),
                     text: "预警记录",
                 },
             ],
-            safeEducationList:[
-                 // 安全教育培训
-                 {
-                    key: "1",
-                    path: "/scan",
-                    imgUrl: require("@/assets/workbench/inspect-plane.png"),
-                    text: "培训签到",
-                },
-            ],
 
             // 后台给的数据权限对象
             powerObj: {},
@@ -290,7 +307,8 @@ export default {
             finalRiskList: [],
             finalDangerList: [],
             finalSafetyCheckList: [],
-            finalSafeEducationList: []
+            finalSafeEducationList: [],
+            finalAlertReminderRecord: []
         };
     },
     created() {
@@ -414,6 +432,19 @@ export default {
                         this.finalSafetyCheckList = [];
                     }
                     
+                    // 预警提醒记录 
+                    if (this.powerObj.预警提醒记录) {
+                        this.finalAlertReminderRecord = [
+                            ...this.alertReminderRecord,
+                        ].filter((x) =>
+                            [...this.powerObj.预警提醒记录].some(
+                                (y) => y.menuName === x.text
+                            )
+                        );
+                    } else {
+                        this.finalAlertReminderRecord = [];
+                    }
+
                     // 消息
                     this.finalNewsCenterList = this.newsCenterList;
                 } else {