fix:修改开课时间搜索

src/api/config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-08 15:47:05
+ * @LastEditTime: 2022-12-09 10:04:32
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);

src/views/courselibrary/CoursewareManage.vue

@@ -221,7 +221,7 @@
                 </div>
               </a-radio-group>
             </div>
-            
+
             <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
               <div class="ofmb_items">
                 <div class="signbox">
@@ -231,7 +231,7 @@
                       alt=""
                     />
                   </div>
-                
+
                   <span>是否设置目录</span>
                 </div>
                 <a-radio-group v-model:value="valueE2">
@@ -257,7 +257,7 @@
                   </div>
                 </a-radio-group>
               </div>
-            </div> 
+            </div>
             <div class="b_footer">
               <div class="btn btn5" @click="of_exit1">
                 <div class="btnText">取消</div>
@@ -1548,7 +1548,7 @@
       <div class="modalMain">
         <div class="schooltime" :style="{ display: stm_hs ? 'block' : 'none' }">
           <div class="st_main">
-            <div class="stm_inputbtn">
+            <div class="stm_inputbtn" style="width: 100%">
               <a-input
                 v-model:value="kk_inputV1"
                 style="
@@ -1570,11 +1570,22 @@
                 placeholder="请输入教师名称"
               />
               <div class="select">
-                <a-date-picker
+                <!-- <a-date-picker
                   v-model:value="selectTime"
                   type="date"
                   placeholder="创建时间"
                   style="width: 270px; margin-right: 14px"
+                /> -->
+                <a-range-picker
+                  v-model:value="selectTime"
+                  type="date"
+                  style="width: 270px; margin-right: 14px"
+                  :show-time="{
+                    defaultValue: [
+                      moment('00:00:00', 'HH:mm:ss'),
+                      moment('23:59:59', 'HH:mm:ss'),
+                    ],
+                  }"
                 />
               </div>
               <div class="stm_btn btn1" @click="handleSearchTable">
@@ -1585,11 +1596,15 @@
                 <div class="reset"></div>
                 <div class="btnText">重置</div>
               </div>
-              <div class="stm_btn3 btn3" @click="createkk">
+            </div>
-                <div class="add"></div>
+            <div
-                <div class="btnText">
+              class="stm_btn3 btn3"
-                  <span style="color: #ffffff">新建开课</span>
+              @click="createkk"
-                </div>
+              style="margin-bottom: 10px"
+            >
+              <div class="add"></div>
+              <div class="btnText">
+                <span style="color: #ffffff">新建开课</span>
               </div>
             </div>
             <!-- 无数据样式 -->
@@ -2713,7 +2728,7 @@ import SeeModal from "./components/seeModal.vue";
 import CourseModal from "./courseModal.vue";
 import * as moment from "moment";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
-import { codeUrl } from "../../api/method";
+import { codeUrl, toDate } from "../../api/method";
 //列表表格
 const columns1 = [
   {
@@ -2979,7 +2994,7 @@ const columns6 = [
       return index + 1 + pageNum;
     },
   },
-    {
+  {
     title: "课程名称",
     dataIndex: "organization",
     key: "organization",
@@ -2990,7 +3005,7 @@ const columns6 = [
       return text ? text : "-";
     },
   },
-    {
+  {
     title: "场地",
     dataIndex: "address",
     key: "saddress",
@@ -3001,7 +3016,7 @@ const columns6 = [
       return text ? text : "-";
     },
   },
-    {
+  {
     title: "教师名称",
     dataIndex: "teacher",
     key: "teacher",
@@ -3013,9 +3028,6 @@ const columns6 = [
     },
   },
 
-
-
-
   {
     title: "开始时间",
     dataIndex: "starttime",
@@ -3040,7 +3052,7 @@ const columns6 = [
       return text ? text : "-";
     },
   },
-    {
+  {
     title: "创建人",
     dataIndex: "createName",
     key: "createName",
@@ -4111,15 +4123,30 @@ export default defineComponent({
     // 渲染开课操作
     const getTableDate3 = async () => {
       // let datas = state.tableData6;
+      let beginTime = "";
+      let endTime = "";
+      if (state.selectTime) {
+        // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
+        // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
+        beginTime = toDate(
+          new Date(state.selectTime[0].$d).getTime() / 1000,
+          "Y-M-D h:m:s"
+        );
+        endTime = toDate(
+          new Date(state.selectTime[1].$d).getTime() / 1000,
+          "Y-M-D h:m:s"
+        );
+      }
       let obj = {
         pageNo: state.currentPage222,
         pageSize: state.pageSize222,
         createName: state.kk_inputV1,
         teacher: state.kk_inputV2,
-        beginTime: parseInt(new Date(state.selectTime).getTime() / 1000),
+        beginTime: beginTime,
+        endTime: endTime,
         offcourseId: state.offcourseId,
       };
-      console.log("获取开课", obj);
+      console.log("获取开obj", obj, state.selectTime);
       let res = await planList(obj);
       console.log("开课res", res);
       const { rows, total, pageNo } = res.data.data;
@@ -4745,7 +4772,7 @@ export default defineComponent({
             completeType: item.completeType,
             endTime: new Date(item.endTime) / 1000,
             evalFlag: item.evalFlag,
-            name: item.name+'1',
+            name: item.name + "1",
             signFlag: item.signFlag, //是否允许未报名的签到:1是0否
             //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
             teacherId: item.teacherId,
@@ -4769,7 +4796,7 @@ export default defineComponent({
           });
           const postData = {
             offcourseId: null, //不传代表新增
-            name: item.name+'1',
+            name: item.name + "1",
             picUrl: item.picUrl,
             targetUser: item.targetUser,
             meaning: item.meaning,

src/views/learningpath/LevelAdd.vue

@@ -1462,6 +1462,7 @@ export default {
       codevisible: false, //二维码是否显示
       codeInfo: null, //二维码内容
 
+      levelTotal: 0, //设置基本信息需判断的关卡总数
       previewSelect: 0,
       studySelect: 0,
       previewStartNum: 0,
@@ -2057,6 +2058,10 @@ export default {
           //获取设置信息
           if (res.data.code === 200) {
             //previewSetting studySetting
+            if (res.data.data.chapterList) {
+              state.levelTotal = res.data.data.chapterList.length;
+            }
+
             state.previewSelect = res.data.data.routerInfo.enablePreview;
             state.studySelect = res.data.data.routerInfo.enableStudy;
             if (res.data.data.routerInfo.previewSetting) {
@@ -2231,7 +2236,7 @@ export default {
           message.warning("删除失败");
         });
     };
-    // 设置------------------------------------------------------
+    // 设置start------------------------------------------------------
     //编辑基本信息
     const editLearnInfo = () => {
       let obj = {
@@ -2241,6 +2246,13 @@ export default {
         previewSetting: state.previewStartNum + "," + state.previewEndNum,
         studySetting: state.studyStartNum + "," + state.studyEndNum,
       };
+      if (
+        state.previewStartNum > state.levelTotal ||
+        state.previewEndNum > state.levelTotal ||
+        state.studyStartNum > state.levelTotal ||
+        state.studyEndNum > state.levelTotal
+      )
+        return message.warning("关卡数超过范围");
       console.log("编辑设置基本信息obj", obj);
       api
         .editLearnInfo(obj)
@@ -2248,13 +2260,14 @@ export default {
           console.log("编辑设置基本信息成功", res);
           if (res.data.code === 200) {
             message.success("修改成功");
+            closebtn();
           }
         })
         .catch((err) => {
           console.log("编辑设置基本信息失败", err);
         });
     };
-    // 设置-----------------------------------------------------
+    // 设置end-----------------------------------------------------
     //添加学员
     watch(
       () => state.addAuthList,
@@ -2312,12 +2325,14 @@ export default {
     //清空所选的学员
     const clearChooseStu = () => {
       Modal.confirm({
-        title: '确定清空所有学员吗？', onOk: async () => {
+        title: "确定清空所有学员吗？",
-          state.addAuthList = []
+        onOk: async () => {
+          state.addAuthList = [];
           // student.studentDelAll({id: state.routerId, type: 2})
           // state.tabledata = []
           // state.tableDataTotal = 0;
-        }, bodyStyle: 'margin-top:70%'
+        },
+        bodyStyle: "margin-top:70%",
       });
     };
 

src/views/projectcenter/LibraryAdd.vue

@@ -56,7 +56,10 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
-              <router-link class="edit" :to="{ path: `/temTask`, query: { projectId: projectId } }">
+              <router-link
+                class="edit"
+                :to="{ path: `/temTask`, query: { projectId: projectId } }"
+              >
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -147,7 +150,9 @@
                       </div>
                       <div>
                         <div class="iconame">「{{ item.course }}」</div>
-                        <div class="icontext">{{ item.name }}</div>
+                        <div class="icontext" :title="item.name">
+                          {{ item.name }}
+                        </div>
                       </div>
                     </div>
                     <div class="type">
@@ -279,52 +284,47 @@
                 <div class="ntc_body">
                   <div class="ntc_switch">
                     <a-switch
-                        size="small"
+                      size="small"
-                        v-model:checked="checked"
+                      v-model:checked="checked"
-                        @click="changeopclo"
+                      @click="changeopclo"
                     />
-                    <div v-if="(checked==true)" 
+                    <div v-if="checked == true" class="opclo">
-                      class="opclo">
                       <span>关闭</span>
                     </div>
-                    <div v-if="(checked==false)" 
+                    <div v-if="checked == false" class="opclo">
-                      class="opclo" >
                       <span>开启</span>
                     </div>
                   </div>
-                  <div v-if="(checked==true)"
+                  <div v-if="checked == true" class="ntc_content">
-                    class="ntc_content">
+                    <div class="ntcc_tit">当前公告内容：</div>
-                  <div class="ntcc_tit">当前公告内容：</div>
                     <div class="textarea">
-                    {{noticeContent==""?"暂无公告":noticeContent}}
+                      {{ noticeContent == "" ? "暂无公告" : noticeContent }}
-                    <div v-if="(editFlag == false)" class="btnarea" >
+                      <div v-if="editFlag == false" class="btnarea">
                         <div>&nbsp;</div>
                         <div class="area_btn" @click="editNotice">
-                       
                           <div class="btnText">编辑</div>
                         </div>
                       </div>
-                   
                     </div>
-              
+
-                    <template v-if="(editFlag==true)">
+                    <template v-if="editFlag == true">
-                    <div>&nbsp;</div>
+                      <div>&nbsp;</div>
-                    <div class="ntcc_tit" >编辑公告：</div>
+                      <div class="ntcc_tit">编辑公告：</div>
-                    <div class="textarea">
+                      <div class="textarea">
-                      <a-textarea
+                        <a-textarea
                           v-model:value="projectInfo.notice"
                           placeholder="公告信息最多输入150个字。"
                           :maxlength="textnum"
                           allow-clear
-                      />
+                        />
-                      <div class="btnarea">
+                        <div class="btnarea">
-                        <div>&nbsp;</div>
+                          <div>&nbsp;</div>
-                        <div class="area_btn" @click="addNotice">
+                          <div class="area_btn" @click="addNotice">
-                          <div class="pub"></div>
+                            <div class="pub"></div>
-                          <div class="btnText">发布</div>
+                            <div class="btnText">发布</div>
+                          </div>
                         </div>
                       </div>
-                      </div>
                     </template>
                   </div>
                 </div>
@@ -592,7 +592,10 @@
                       <div class="box"></div>
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
-                        <a-switch v-model:checked="attachSwitch" @change="checkedClose"></a-switch>
+                        <a-switch
+                          v-model:checked="attachSwitch"
+                          @change="checkedClose"
+                        ></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
@@ -844,8 +847,8 @@ export default defineComponent({
       seven1: null,
       seven2: null,
       edit: true,
-      fileList:[],
+      fileList: [],
-      attachSwitch:true,
+      attachSwitch: true,
       // 共享文档列表
       docList: [
         {
@@ -863,17 +866,17 @@ export default defineComponent({
       ],
       isEdit: false, // 是否处于编辑状态
       // 基本信息
-      projectInfo: { },
+      projectInfo: {},
-      noticeContent:"",
+      noticeContent: "",
-      editFlag:false,
+      editFlag: false,
     });
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
     const changeopclo = () => {
-      state.projectInfo.noticeFlag = state.checked?1:0;
+      state.projectInfo.noticeFlag = state.checked ? 1 : 0;
       api
-        .templateEdit( state.projectInfo)
+        .templateEdit(state.projectInfo)
         .then((res) => {
           console.log(res);
         })
@@ -913,9 +916,9 @@ export default defineComponent({
       state.isEdit = false;
       getDetail();
     };
-    const editNotice =()=>{
+    const editNotice = () => {
-      state.editFlag = true ;
+      state.editFlag = true;
-    }
+    };
 
     const checkType = (type) => {
       let typeRules = [
@@ -944,30 +947,39 @@ export default defineComponent({
       api
         .templateDetail(localStorage.getItem("projectTemplateId"))
         .then((res) => {
-            console.log("get model list ----->", res, res.data.data.stageList);
+          console.log("get model list ----->", res, res.data.data.stageList);
 
           state.taskSyllabus = [];
           console.log(res);
           state.projectInfo = res.data.data.projectTemplateInfo;
-     
-          state.noticeContent = state.projectInfo.notice;
-          state.checked = state.projectInfo.noticeFlag==1?true:false;
-          console.log("res.data.data.projectTemplateInfo",res.data.data.projectTemplateInfo);
 
-          try{
+          state.noticeContent = state.projectInfo.notice;
-            state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
+          state.checked = state.projectInfo.noticeFlag == 1 ? true : false;
-          }catch{
+          console.log(
+            "res.data.data.projectTemplateInfo",
+            res.data.data.projectTemplateInfo
+          );
+
+          try {
+            state.fileList = JSON.parse(
+              res.data.data.projectTemplateInfo.attach
+            );
+          } catch {
             state.fileList = [];
           }
-          state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false
+          state.attachSwitch =
+            res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false;
           let data = res.data.data.stageList;
           console.log("data=====", data);
           for (let i in data) {
             console.log("what ------ > ", i, data);
-            if(data[i].taskList.length!==0){
+            if (data[i].taskList.length !== 0) {
-              state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
+              state.taskSyllabus.push({
+                text: data[i].name ? data[i].name : "无阶段任务",
+                children: [],
+              });
             }
-            
+
             for (let j in data[i].taskList) {
               state.taskSyllabus[i].children.push({
                 course: checkType(data[i].taskList[j].type),
@@ -987,14 +999,14 @@ export default defineComponent({
         });
     };
 
-       // 发布公告
+    // 发布公告
-      const addNotice = () => {
+    const addNotice = () => {
-     // state.projectInfo.notice=
+      // state.projectInfo.notice=
-     if(!state.projectInfo.notice){
+      if (!state.projectInfo.notice) {
-      return message.warning("请输入公告内容");
+        return message.warning("请输入公告内容");
-     }
+      }
       api
-        .templateEdit( state.projectInfo)
+        .templateEdit(state.projectInfo)
         .then((res) => {
           state.noticeContent = state.projectInfo.notice;
           message.success("公告发布成功");
@@ -1004,7 +1016,7 @@ export default defineComponent({
           message.error("公告发布失败" + err);
           console.log(err);
         });
-        state.editFlag =false;
+      state.editFlag = false;
     };
 
     // 删除阶段
@@ -1043,7 +1055,6 @@ export default defineComponent({
       });
     };
 
-
     // 新建或编辑阶段
     const stateEdit = () => {
       let obj = {
@@ -1124,23 +1135,23 @@ export default defineComponent({
         let str = JSON.stringify(fileList);
         console.log("str", str);
         console.table({
-            name: state.projectInfo.name,
+          name: state.projectInfo.name,
-            category: state.projectInfo.category,
+          category: state.projectInfo.category,
-            picUrl: state.projectInfo.picUrl,
+          picUrl: state.projectInfo.picUrl,
-            manager: state.projectInfo.manager,
+          manager: state.projectInfo.manager,
-            managerId: state.projectInfo.managerId || 0,
+          managerId: state.projectInfo.managerId || 0,
-            sourceBelongId: state.projectInfo.sourceBelongId,
+          sourceBelongId: state.projectInfo.sourceBelongId,
-            level: state.projectInfo.level,
+          level: state.projectInfo.level,
-            systemId: state.projectInfo.systemId,
+          systemId: state.projectInfo.systemId,
-            boeFlag: state.projectInfo.boeFlag ? 1 : 0,
+          boeFlag: state.projectInfo.boeFlag ? 1 : 0,
-            courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
+          courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
-            notice: state.projectInfo.notice,
+          notice: state.projectInfo.notice,
-            noticeFlag: state.projectInfo.noticeFlag,
+          noticeFlag: state.projectInfo.noticeFlag,
-            projectTemplateId: localStorage.getItem("projectTemplateId"),
+          projectTemplateId: localStorage.getItem("projectTemplateId"),
-            remark: state.projectInfo.remark,
+          remark: state.projectInfo.remark,
-            status: state.projectInfo.status,
+          status: state.projectInfo.status,
-            attach: str,
+          attach: str,
-          });
+        });
         //要编辑项目
         api
           .templateEdit({
@@ -1183,17 +1194,17 @@ export default defineComponent({
 
       // 更新开关状态
       api
-          .templateEdit({
+        .templateEdit({
-            sourceBelongId: state.projectInfo.sourceBelongId,
+          sourceBelongId: state.projectInfo.sourceBelongId,
-            projectTemplateId: localStorage.getItem("projectTemplateId"),
+          projectTemplateId: localStorage.getItem("projectTemplateId"),
-            attachSwitch: state.attachSwitch?1:-1
+          attachSwitch: state.attachSwitch ? 1 : -1,
-          })
+        })
-          .then((res) => {
+        .then((res) => {
-            console.log("开关更新成功", res);
+          console.log("开关更新成功", res);
-          })
+        })
-          .catch((err) => {
+        .catch((err) => {
-            console.log("开关更新失败", err);
+          console.log("开关更新失败", err);
-          });
+        });
     };
 
     //设置积分规则
@@ -1277,7 +1288,7 @@ export default defineComponent({
       handleChange2,
       scoresum,
       checkedClose,
-      editNotice
+      editNotice,
     };
   },
 });