Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/kaohe/pingce/index.vue

@@ -1096,8 +1096,6 @@ export default {
           pcSetUpList.push(item);
         })
         this.pcSetUpList = pcSetUpList;
-
-        console.log(this.pcSetUpList,'pcSetUpList');
       })
     },
     // 评测规则设置
@@ -1377,8 +1375,20 @@ export default {
         id: row.templateId,
         pingceId: row.id,
       }).then(response => {
-        this.scpfzh.itemsOtions = response.data.items
-        this.scpfzh.open = true;
+        let flag = true;
+        response.data.items.forEach( item =>{
+          if(!item.vote){
+            flag = false
+          }
+        })
+        if(flag){
+          this.scpfzh.itemsOtions = response.data.items
+          this.scpfzh.open = true;
+        }else {
+          this.$alert(`还有未发布评分规则考核项，请发布评分规则都完成后再生成评分账号`, `提示`, {
+            type: 'Danger'
+          })
+        }
       })
     },
     // 查看评分账号

ruoyi-ui/src/views/login.vue

@@ -162,6 +162,10 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
+
+        this.day = localStorage.getItem('licenseWarning')||null;
+        console.log('day',this.day);
+
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
         if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.img