Skip to content

B
BCDH-APP
Commit 21214680 authored by 13841799530's avatar 13841799530
Browse files
Options

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

parents da9fcc50 fc0e1ef7
Pipeline #8860 passed with stage
    in 5 minutes and 5 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 248 additions and 120 deletions
    src/views/messageCenter/waitEvent/index.vue
    View file @ 21214680
    ...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
    <div class="message-content"> <div class="message-content">
    {{ item.content }},{{ item.createBy }} {{ item.content }},{{ item.createBy }}
    </div> </div>
    <div class="bot_but"> <div class="bot_but" v-if=" item.theme != '检查'">
    <van-button color="#33CCFF" size="mini">{{ <van-button color="#33CCFF" size="mini">{{
    item.status == 0 ? "立即处理" : "待办事项" item.status == 0 ? "立即处理" : "待办事项"
    }}</van-button> }}</van-button>
    ...@@ -179,6 +179,9 @@ export default { ...@@ -179,6 +179,9 @@ export default {
    }, },
    touchstart(index, item) { touchstart(index, item) {
    console.log(item) console.log(item)
    if(item.theme == "检查"){
    return
    }
    if(item.appUrl){ if(item.appUrl){
    this.$router.push({ this.$router.push({
    // name: item.appUrl, // name: item.appUrl,
    ......
    src/views/my/resetPas.vue
    View file @ 21214680
    <template> <template>
    <div> <div>
    <!-- 修改密码页面 --> <!-- 修改密码页面 -->
    <!-- 头部标签 --> <!-- 头部标签 -->
    <LHeader :text="$route.meta.title"></LHeader> <LHeader :text="$route.meta.title"></LHeader>
    <van-form <van-form
    @submit="onSubmit" @submit="onSubmit"
    :scroll-to-error="true" :scroll-to-error="true"
    :show-error="false" :show-error="false"
    validate-trigger="onSubmit" validate-trigger="onSubmit"
    > >
    <van-field <van-field
    v-model="form.oldPassword" v-model="form.oldPassword"
    required required
    type="text" type="text"
    name="oldPassword" name="oldPassword"
    label="旧密码" label="旧密码"
    placeholder="请输入旧密码" placeholder="请输入旧密码"
    :rules="[{ required: true, message: '请填写密码' }]" :rules="[{ required: true, message: '请填写密码' }]"
    /> />
    <van-field <van-field
    required required
    v-model="form.newPassword" v-model="form.newPassword"
    type="password" type="password"
    name="newPassword" name="newPassword"
    label="新密码" label="新密码"
    placeholder="请输入新密码" @input="checkPassword()"
    :rules="[ placeholder="请输入新密码"
    { required: true, message: '请填写密码' }, :rules="[
    { { required: true, message: '请填写密码' },
    message: '密码必须大于6个字符小于20个字符', {
    validator: (val) => { message: '密码必须大于8个字符小于30个字符',
    return val['length'] >= 6 && val['length'] < 20; validator: (val) => {
    }, return val['length'] >= 8 && val['length'] < 30;
    }, },
    ]" },
    /> ]"
    <van-field />
    required <!-- 密码等级提示 -->
    v-model="form.confirm" <van-cell-group>
    type="password" <div class="intensity">
    name="confirm" <div style="width: 8.2em;"></div>
    label="再次输入" <div>
    placeholder="再次输入新密码" <div class="pass-level">
    :rules="[ <span class="psdText">密码强度</span>
    { validator, required: true, message: '二次密码输入不一致' }, <span class="line" :class="[level.includes('low') ? 'low' : '']"></span>
    { <span class="line" :class="[level.includes('middle') ? 'middle' : '']" ></span>
    message: '密码必须大于等于6个字符小于20个字符', <span class="line" :class="[level.includes('high') ? 'high' : '']" ></span>
    validator: (val) => {
    return val['length'] >= 6 && val['length'] < 20;
    },
    },
    ]"
    />
    <div style="margin: 16px">
    <van-button round block type="info" native-type="submit"
    >提交
    </van-button>
    </div> </div>
    </van-form> </div>
    </div> </div>
    </van-cell-group>
    <van-field
    required
    v-model="form.confirm"
    type="password"
    name="confirm"
    label="再次输入"
    placeholder="再次输入新密码"
    :rules="[
    { validator, required: true, message: '二次密码输入不一致' },
    {
    message: '密码必须大于等于8个字符小于30个字符',
    validator: (val) => {
    return val['length'] >= 8 && val['length'] < 30;
    },
    },
    ]"
    />
    <div style="margin: 16px">
    <van-button round block type="info" native-type="submit"
    >提交
    </van-button>
    </div>
    </van-form>
    </div>
    </template> </template>
    <script> <script>
    ...@@ -69,54 +84,133 @@ import { getFun, postFun } from "@/service/table.js"; ...@@ -69,54 +84,133 @@ import { getFun, postFun } from "@/service/table.js";
    import { getUserInfo } from "@/utils/userInfo"; import { getUserInfo } from "@/utils/userInfo";
    import { removeToken } from "@/utils/auth"; // get token from cookie import { removeToken } from "@/utils/auth"; // get token from cookie
    export default { export default {
    components: { components: {
    LHeader, LHeader,
    },
    data() {
    return {
    form: {
    oldPassword: "",
    newPassword: "",
    confirm: "",
    },
    level : []
    };
    },
    mounted() {
    console.log(getUserInfo());
    },
    methods: {
    validator(val) {
    return this.form.newPassword == val;
    }, },
    data() { onSubmit(val) {
    return { // 判断level数组是否含有middle
    form: { let isMiddleLevel = this.level.includes('middle')
    oldPassword: "", if(!isMiddleLevel){
    newPassword: "", this.$toast.fail("密码等级较低")
    confirm: "", return
    }, }
    }; this.$toast.loading({
    message: "请求中...",
    forbidClick: true,
    loadingType: "spinner",
    duration: 0,
    });
    postFun("/mobile/resetPwd", this.obj2formdata(val)).then((data) => {
    if (data.code == 0) {
    this.$toast.clear();
    this.$toast.success("密码修改成功!");
    this.$router.back();
    }
    });
    }, },
    mounted() { obj2formdata(data) {
    console.log(getUserInfo()); console.log(data, "fasfasdfsd");
    let fd = new FormData();
    for (let k in data) {
    if (data[k]) {
    fd.append(k, data[k]);
    }
    }
    return fd;
    }, },
    methods: {
    validator(val) { // 密码等级校验
    return this.form.newPassword == val; checkPassword() {
    }, this.level = [];
    onSubmit(val) { // 校验是数字
    this.$toast.loading({ const regex1 = /^\d+$/;
    message: "请求中...", // 校验字母
    forbidClick: true, const regex2 = /^[A-Za-z]+$/;
    loadingType: "spinner", // 校验符号
    duration: 0, const regex3 =
    }); /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]+$/;
    postFun("/mobile/resetPwd", this.obj2formdata(val))
    .then((data) => { if (regex1.test(this.form.newPassword)) {
    if (data.code == 0) { this.level.push("low");
    this.$toast.clear(); } else if (regex2.test(this.form.newPassword)) {
    this.$toast.success('密码修改成功!'); this.level.push("low");
    this.$router.back() } 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");
    obj2formdata(data) { this.level.push("middle");
    console.log(data, "fasfasdfsd"); } else if (
    let fd = new FormData(); /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、\d]+$/.test(
    for (let k in data) { this.form.newPassword
    if (data[k]) { )
    fd.append(k, data[k]); ) {
    } this.level.push("low");
    } this.level.push("middle");
    return fd; } 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> </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> </style>
    \ No newline at end of file
    src/views/risk/riskAdd/index.vue
    View file @ 21214680
    ...@@ -499,10 +499,10 @@ export default { ...@@ -499,10 +499,10 @@ export default {
    (this.riskRank = ""), // 风险等级 (this.riskRank = ""), // 风险等级
    (this.showRiskRank = false), (this.showRiskRank = false),
    (this.columnsRiskRank = [ (this.columnsRiskRank = [
    "重大风险",
    "较大风险",
    "一般风险", "一般风险",
    "较小风险", "较小风险",
    "较大风险",
    "重大风险",
    ]), ]),
    (this.setRankMode = ""), // 定级方式文字 (this.setRankMode = ""), // 定级方式文字
    (this.setRankModeImg = []), // 定级方式图片 (this.setRankModeImg = []), // 定级方式图片
    ...@@ -552,7 +552,7 @@ export default { ...@@ -552,7 +552,7 @@ export default {
    columnsSetRank: ["矩阵式定级", "其他定级方式"], columnsSetRank: ["矩阵式定级", "其他定级方式"],
    riskRank: "", // 风险等级 riskRank: "", // 风险等级
    showRiskRank: false, showRiskRank: false,
    columnsRiskRank: ["一般风险", "较小风险", "较大风险", "重大风险"], columnsRiskRank: ["重大风险", "较大风险", "一般风险", "较小风险" ],
    showSetRankMode: false, // 是否显示定级方式 showSetRankMode: false, // 是否显示定级方式
    setRankMode: "", // 定级方式文字 setRankMode: "", // 定级方式文字
    setRankModeImg: [], // 定级方式图片 setRankModeImg: [], // 定级方式图片
    ......
    src/views/saveWorkbench/index.vue
    View file @ 21214680
    ...@@ -70,6 +70,20 @@ ...@@ -70,6 +70,20 @@
    /> />
    </van-grid> </van-grid>
    </van-cell-group> </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> </div>
    <!-- tanBar --> <!-- tanBar -->
    ...@@ -259,29 +273,32 @@ export default { ...@@ -259,29 +273,32 @@ export default {
    path: "/checked-confirm", path: "/checked-confirm",
    imgUrl: require("@/assets/workbench/ehcek-record.png"), imgUrl: require("@/assets/workbench/ehcek-record.png"),
    text: "整改确认", text: "整改确认",
    }
    ],
    safeEducationList:[
    // 安全教育培训
    {
    key: "1",
    path: "/scan",
    imgUrl: require("@/assets/workbench/inspect-plane.png"),
    text: "培训签到",
    }, },
    ],
    alertReminderRecord:[
    // 预警提醒记录
    { {
    key: "9", key: "1",
    path: "/warning", path: "/warning",
    imgUrl: require("@/assets/workbench/warn-tip.png"), imgUrl: require("@/assets/workbench/warn-tip.png"),
    text: "预警提醒", text: "预警提醒",
    }, },
    { {
    key: "10", key: "2",
    path: "/warningNote", path: "/warningNote",
    imgUrl: require("@/assets/workbench/warn-record.png"), imgUrl: require("@/assets/workbench/warn-record.png"),
    text: "预警记录", text: "预警记录",
    }, },
    ], ],
    safeEducationList:[
    // 安全教育培训
    {
    key: "1",
    path: "/scan",
    imgUrl: require("@/assets/workbench/inspect-plane.png"),
    text: "培训签到",
    },
    ],
    // 后台给的数据权限对象 // 后台给的数据权限对象
    powerObj: {}, powerObj: {},
    ...@@ -290,7 +307,8 @@ export default { ...@@ -290,7 +307,8 @@ export default {
    finalRiskList: [], finalRiskList: [],
    finalDangerList: [], finalDangerList: [],
    finalSafetyCheckList: [], finalSafetyCheckList: [],
    finalSafeEducationList: [] finalSafeEducationList: [],
    finalAlertReminderRecord: []
    }; };
    }, },
    created() { created() {
    ...@@ -413,6 +431,19 @@ export default { ...@@ -413,6 +431,19 @@ export default {
    } else { } else {
    this.finalSafetyCheckList = []; 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; this.finalNewsCenterList = this.newsCenterList;
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment