Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/system/user.js

@@ -11,7 +11,7 @@ export function listUser(query) {
 }
 export function listAllUser(query) {
   return request({
-    url: '/system/user/allUserList',
+    url: '/system/user/selectAllUser',
     method: 'get',
     params: query
   })

src/views/core/drill/task/index.vue

@@ -288,7 +288,7 @@ export default {
     },
     canEvaluate(row){
       //仅行社安全保卫管理人员进入且演练任务处于待评价状态才显示
-      return row.planStatus==2 && this.$store.getters.roleList.some(item=>item.roleId==120);
+      return row.status==2 && this.$store.getters.roleList.some(item=>item.roleId==120)&&this.isNotOverOrUnStart(row);
     },
     canPerform(row) {
       // return true;
@@ -309,17 +309,8 @@ export default {
     isNotOverOrUnStart(row) {
       const currentTime = dayjs().startOf('day'); // 获取当前时间，并将时分秒部分设置为00时00分00秒
       const startDate = dayjs(row.startDate).startOf('day'); // 转换开始时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
-
       const endDate = dayjs(row.endDate).startOf('day'); // 转换结束时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
-      // 判断开始时间和结束时间是否是同一天
-      const isSameDay = startDate.isSame(endDate, 'day');
       console.log("isOverOrUnStart", currentTime, startDate, endDate);
-      // 如果是同一天，则判断当前时间是否在开始时间和结束时间之间（包括开始和结束时间）
-      // if (isSameDay) {
-      //   return dayjs(currentTime).isBetween(startDate, endDate, null, '[]');
-      // }
-
-      // 如果不是同一天，则判断当前时间是否早于开始时间或晚于结束时间
       return !(currentTime < startDate || currentTime > endDate);
     },
     async onDown(pdfUrl) {

src/views/core/edu/task/index.vue

@@ -310,7 +310,7 @@ export default {
 
       const endDate = dayjs(row.endDate).startOf('day'); // 转换结束时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
       // 判断开始时间和结束时间是否是同一天
-      const isSameDay = startDate.isSame(endDate, 'day');
+      //const isSameDay = startDate.isSame(endDate, 'day');
       // console.log("isOverOrUnStart",currentTime,startDate,endDate);
       // 如果是同一天，则判断当前时间是否在开始时间和结束时间之间（包括开始和结束时间）
       // if (isSameDay) {

src/views/information/configuration/index.vue

@@ -12,8 +12,8 @@
             <el-form-item label="营业前提醒：" prop="front">
 
               <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              分钟
+                :max="24" label="描述文字"></el-input-number>
+              点提醒
 
 
             </el-form-item>
@@ -21,23 +21,23 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业中提醒：" prop="centre">
               <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              分钟
+                :max="24" label="描述文字"></el-input-number>
+              点提醒
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业后提醒：" prop="after">
               <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              分钟
+                :max="24" label="描述文字"></el-input-number>
+                点提醒
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="全天提醒：" prop="allDay">
               <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              分钟
+                :max="24" label="描述文字"></el-input-number>
+                点提醒
             </el-form-item>
           </el-col>
         </el-row>
@@ -57,8 +57,12 @@
             <el-form-item label="提前" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
                 :max="100" label="描述文字"></el-input-number>
-              分钟提醒
+              <!-- <el-date-picker v-model="timeValue" format="yyyy-MM-dd HH" value-format="yyyy-MM-dd HH" type="datetime">
+    </el-date-picker> -->
+              天提醒
             </el-form-item>
+
+
           </el-col>
         </el-row>
       </div>
@@ -153,7 +157,8 @@ export default {
       coreResumptionConfigurationDTO: [],
       num: 1,
       day: {
-        resumptionCycle: 1,
+        id:null,
+        resumptionCycle: 2,
         front: null,
         centre: null,
         after: null,
@@ -161,27 +166,32 @@ export default {
         timeUnit: 1,
       },
       week: {
-        resumptionCycle: 2,
+        id:null,
+        resumptionCycle: 3,
         allDay: null,
         timeUnit: 2
       },
       month: {
-        resumptionCycle: 3,
+        id:null,
+        resumptionCycle: 4,
         allDay: null,
         timeUnit: 2
       },
       season: {
-        resumptionCycle: 4,
+        id:null,
+        resumptionCycle: 5,
         allDay: null,
         timeUnit: 2
       },
       halfYear: {
-        resumptionCycle: 5,
+        id:null,
+        resumptionCycle: 6,
         allDay: null,
         timeUnit: 2
       },
       year: {
-        resumptionCycle: 6,
+        id:null,
+        resumptionCycle: 7,
         allDay: null,
         timeUnit: 2
       },
@@ -284,7 +294,7 @@ export default {
     checkForm(form) {
       let val
       this.$refs[form].validate(valid => {
-        console.log(valid, 'valid')
+        
         val = valid
       });
       return val;
@@ -295,20 +305,21 @@ export default {
       arr.forEach(v => {
         flags.push(this.checkForm(v));
       });
-      console.log(flags, 'flags')
+     
       let flag = flags.every(v => {
-        console.log(v, 'valid')
+      
         return v == true;
       })
-      console.log(flag, 'flag')
+    
       if (!flag) return;
       let data = {
+      
         coreResumptionConfiguration: [this.day, this.week, this.month, this.season, this.halfYear, this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("新增成功");
         this.open = false;
-
+      this.  selectInfo();
       })
     }
   },

src/views/information/send/index.vue

@@ -78,15 +78,13 @@
         </el-form-item>
 
         <el-form-item label="发送目标" prop="sendUser">
-          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
-            <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
-          </el-select>
-
           <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
-
-
+          
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
+            <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="发送时间" prop="sendTimeType">
           <el-radio-group v-model="form.sendTimeType">