Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

 src/view/index.vue

@@ -225,8 +225,8 @@

   .component_view {
      height: calc(100vh - 84px);
      width: calc(100% - 52px);
      padding: 0 26px;
      width: calc(100% - 40px);
      padding: 0 20px;
      background: rgb(245, 247, 251);
   }

@@ -393,7 +393,7 @@
        <el-button type="primary" @click="handleEdit">确 定</el-button>
      </span>
    </el-dialog>
    <notice ref="notice" />
    <notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
   </div>
</template>

@@ -435,6 +435,15 @@
      },
      created() {
         this.menu = menus.menu
      if (this.PROJECT !== '装备电缆') { // 检测中心暂无'原材料检验下单'功能
        const index = this.menu.findIndex(item => item.v === '业务管理')
        if (index > -1) {
          const index2 = this.menu[index].c.findIndex(obj => obj.v === '原材料检验下单')
          if (index2 > -1) {
            this.menu[index].c.splice(index2, 1)
          }
        }
      }
      },
      mounted() {
         this.userName = JSON.parse(localStorage.getItem("user")).name;
@@ -462,6 +471,7 @@
         }
         this.getPower()
      this.timer&&clearInterval(this.timer);
      this.checkForUnreadData()
      this.timer = setInterval(()=>{
        this.checkForUnreadData()
      },30000)
@@ -599,13 +609,21 @@
        this.editVisible = true;
      },
      handleEdit(){
        const reg2 =
          /^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
        if (!this.query.oldPassword) {
          this.$message.error('请填写旧密码')
          return
        }else if (!reg2.test(this.query.oldPassword)) {
          this.$message.error('密码必须包括数字、大小写字母以及特殊字符')
            return
        }
        if (!this.query.newPassWord) {
          this.$message.error('请填写旧密码')
          return
        }else if (!reg2.test(this.query.newPassWord)) {
          this.$message.error('密码必须包括数字、大小写字母以及特殊字符')
            return
        }
        this.$axios.post(this.$api.user.upUserPassword, {...this.query}).then(res => {
            if (res.code == 201) {