修复bug

src/assets/css/reset.less

@@ -150,3 +150,12 @@ textarea{
 #div2 {
 	max-width: 1400px;
 }
+.el-upload-list__item .el-progress {
+	position: static !important;
+}
+.el-upload-list__item .el-progress__text{
+	top: -8px !important;
+}
+.el-button.el-picker-panel__link-btn.el-button--text.el-button--mini{
+	display: none;
+}

src/pages/exhibition/exhibitionEdit.vue

@@ -184,7 +184,7 @@ export default {
         thumb:''
       },
       rules: {
-        name: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        name: [{ required: true, message: "请输入标题", trigger: "blur" },{max:64,message: "不能超过64个字", trigger: "blur" }],
         startTime: [
           { required: true, message: "请输入开始时间", trigger: "blur" },
           { validator: startTimeRule, trigger: "blur" },

src/pages/news/bookEdit.vue

@@ -20,9 +20,9 @@
           <el-form-item label="出版时间" prop="pubDate">
             <el-date-picker
               v-model="ruleForm.pubDate"
-              type="date"
+              type="month"
               placeholder="选择出版时间"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM"
             >
             </el-date-picker>
           </el-form-item>
@@ -104,7 +104,7 @@ export default {
       ruleForm: {
         thumb:'',
         name:'',
-        pubDate:'',
+        pubDate:null,
         description:''
       },
       rules: {
@@ -224,6 +224,7 @@ export default {
   watch: {
     iframeData: {
       handler: function (newVal) {
+        // console.log(998,this.iframeData);
         if(newVal.source==='0') {
           console.log('我是新增');
         }else  this.ruleForm = this.iframeData;
@@ -238,6 +239,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-month-table td.today .cell{
+  color: #606266;
+  font-weight: 400;
+}
 .Root {
   width: 100%;
   padding: 50px;

src/pages/questionnaire/questionnaireEdit.vue

@@ -193,10 +193,20 @@ export default {
         return { ...item, answer: myAnswer };
       });
       let temp =false
+      let temp1 =false
+      let temp2 =false
+      console.log(998,questionData);
       questionData.forEach((v,i)=>{
         if(v.question.length>128) temp=true  
+        if(v.question.trim()==='') temp1=true
+        if(v.answer.length===0) temp2 =true
+        v.answer.forEach(p=>{
+          if(p.value.trim()==='') temp2 =true
+        })
       })
       if(temp) return common.tip("error", '题目过长，不能超过128个字');
+      if(temp1) return common.tip("error", '题目不能为空');
+      if(temp2) return common.tip("error", '选项不能为空');
       questionData = { question: questionData };
       let questionResult = await this.$http({
         method: "post",

src/pages/system/User.vue

@@ -68,7 +68,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="editTitle" :visible.sync="dialogFormVisible" width="40%">
+    <el-dialog :title="editTitle" :visible.sync="dialogFormVisible" width="40%" @close='btnX'>
       <div class="add-con">
         <div class="add-left">
           <el-form ref="userform" :rules="rules" :model="form">
@@ -138,7 +138,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="save">保 存</el-button>
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button @click="btnX">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -223,6 +223,12 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请输入用户账号", trigger: "blur" },
+          {
+            pattern: /^[0-9a-zA-Z_]*$/,
+            message: '仅能输入数字、字母',
+            trigger: 'blur'
+          },
+          {  max: 10, message: '不能超过10个字符', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "请输入用户昵称", trigger: "blur" },
@@ -274,7 +280,7 @@ export default {
             url:`/manage/user/resetPass/${item.id}`
           }).then((res) => {
             if (res.code === 0) {
-              this.$alert("重置成功", "提示", {
+              this.$alert("重置成功，默认密码123456", "提示", {
                 confirmButtonText: "确定",
                 callback: () => {},
               });
@@ -336,7 +342,12 @@ export default {
       }
       this.loading = this.$loading(this.loadOption)
     },
-
+  //点击取消
+  btnX(){
+    //清除表单验证
+    this.$refs.userform.resetFields()
+    this.dialogFormVisible = false
+  },
     async save() {
       this.$refs["userform"].validate(async (valid) => {
         if (valid) {
@@ -369,7 +380,7 @@ export default {
           });
 
           if (result.code === 0) {
-            this.$alert("操作成功", "提示", {
+            this.$alert("操作成功，默认密码123456", "提示", {
               confirmButtonText: "确定",
               callback: () => {
                 this.getInformation();