feat:合并

src/api/index.js

@@ -38,34 +38,10 @@ import http from "./config";
 // 接口-请求
 
 // 创建编辑单层项目
-export const createProject = (obj) => http.post('/admin/project/edit', {
+export const createProject = (obj) => http.post('/admin/project/edit', obj)
-	"attach": obj.attach,
-	"beginTime": obj.beginTime,
-	"boeFlag": obj.boeFlag,
-	"category": obj.category,
-	"courseSyncFlag": obj.courseSyncFlag,
-	"endTime": obj.endTime,
-	"level": obj.level,
-	"manager": obj.manager,
-	"managerId": obj.managerId,
-	"name": obj.name,
-	"notice": obj.notice,
-	"noticeFlag": obj.noticeFlag,
-	"picUrl": obj.picUrl,
-	"remark": obj.remark,
-	"sourceBelongId": obj.sourceBelongId,
-	"status": obj.status,
-	"systemId": obj.systemId,
-	"templateId": obj.templateId,
-	"type": obj.type
-})
 
 // 创建多层项目
-export const createStoreyProject = () => http.post('/admin/project/edit', {
+export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj)
-
-})
 
 // 获取项目列表
-export const getProjectList = () => http.post('/admin/project/list', {
+export const getProjectList = (obj) => http.post('/admin/project/list', obj)
-
-})

src/api/index1.js

@@ -40,19 +40,11 @@ export const uploadFile = (obj) => http.post('/test/testRequest', qs.stringify({
 // 接口-请求
 
 //创建学习路径
-export const createLearnPath = (obj) => http.post('/admin/router/edit', obj, {
+export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
-	headers: {
-		'token': '123'
-	}
-});
 // 获取学习路径图列表
 export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
 //删除学习路径图
-export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj, {
+export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj);
-	headers: {
-		'token': '123'
-	}
-});
 
 //获取关卡
 export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });

src/components/drawers/AddActive.vue

@@ -354,6 +354,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddDiscuss.vue

@@ -169,6 +169,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddEval.vue

@@ -142,7 +142,6 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-
     //上传组件
     function getBase64(img, callback) {
 			const reader = new FileReader();
@@ -152,7 +151,7 @@ export default {
     
     const fileList = ref([]);
     const loading = ref(false);
-    const imageUrl = ref('');
+    const imageUrl = ref("");
 
 		const handleChange = (info) => {
 			if (info.file.status === 'uploading') {
@@ -375,6 +374,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -502,4 +502,3 @@ export default {
   }
 }
 </style>
-  

src/components/drawers/AddFaceteach.vue

@@ -380,6 +380,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddHomework.vue

@@ -16,56 +16,52 @@
           @click="closeDrawer"
         />
       </div>
+      <a-form
+
+            ref="formRef"
+            name="custom-validation"
+            :model="formState"
+            :rules="rules"
+            v-bind="layout"
+            @finish="handleFinish"
+            @validate="handleValidate"
+            @finishFailed="handleFinishFailed"
+          >
       <div class="contentMain">
         <div class="main_left">
+          
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">作业名称：</span>
-            </div>
             <div class="btnbox">
-              <a-input
+              <a-form-item has-feedback label="作业名称" name="workName">
-                v-model:value="inputV1"
+                <a-input v-model:value="formState.workName"
-                style="width: 424px; height: 32px"
+                style="width: 424px; height: 32px;margin-left: 35px;"
                 placeholder="请输入作业名称"
-                maxlength="20"
+                autocomplete="off" />
-              />
+              </a-form-item>
+             
             </div>
           </div>
           <div class="main_item2">
-            <div class="signbox">
+              <a-form-item has-feedback label="作业要求" name="workRequirement">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">作业要求：</span>
-            </div>
-            <div class="textarea">
               <a-textarea
-                v-model:value="textV1"
+                v-model:value="formState.workRequirement"
-                placeholder="请输入作业名称"
+                placeholder="请输入作业要求"
+                autocomplete="off"
                 allow-clear
+                style="margin-left: 35px"
                 maxlength="150"
               />
-            </div>
+              </a-form-item>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">提交时间：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="提交时间" name="choosedTime">
               <a-range-picker
-              style="width: 424px"
+              style="width: 424px;margin-left: 35px;"
-              v-model:value="choosedTime"
+              v-model:value="formState.choosedTime"
                 :placeholder="['      开始时间', '        结束时间']"
               />
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
@@ -83,7 +79,6 @@
                 v-model:file-list="fileList"
                 name="file"
                 action="/api/file/upload"
-                :headers="headers"
                 @change="handleChange"
               >
               <button class="xkbtn">上传附件</button>
@@ -100,14 +95,16 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <a-button class="btn1"  @click="closeDrawer">取消</a-button>
-        <button class="btn2" @click="addHomework">确定</button>
+        <a-button class="btn2" html-type="submit">确定</a-button>
       </div>
+    </a-form>
+
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
 import {createWorkTask} from "@/api/indexWork"
 import  dayjs from 'dayjs';
@@ -139,11 +136,75 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({
+    const formState = reactive({
-      inputV1: "",
+      workName: '',
-      textV1:"",
+      workRequirement: '',
-      choosedTime:[],
+      choosedTime: '',
     });
+    const formRef = ref();
+    let checkWorkName = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+
+    let checkWorkRequirement = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业要求");
+        return Promise.reject('请输入作业要求');
+      }
+    };
+
+    let checkTime = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择时间");
+        return Promise.reject('请选择时间');
+      }
+    };
+
+    const rules = {
+      workName: [{
+        required: true,
+        validator: checkWorkName,
+        trigger: 'change',
+      }],
+      workRequirement: [{
+        required: true,
+        validator: checkWorkRequirement,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkTime,
+        trigger: 'change',
+      }],
+    };
+    // const layout = {
+    //   labelCol: {
+    //     span: 4,
+    //   },
+    //   wrapperCol: {
+    //     span: 14,
+    //   },
+    // };
+    const handleFinish = values => {
+      console.log(values);
+      addHomework()
+    };
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
     const handleChange = info => {
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList);
@@ -158,49 +219,48 @@ export default {
 
     const fileList = ref([]);
     const closeDrawer = () => {
+      resetForm();
       ctx.emit("update:addhomeworkVisible", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
     const addHomework = () => {
-      if(state.choosedTime.length && state.inputV1 && state.textV1){
         createWorkTask({
           "createTime": "",
           "createUser": 0,
-          "submitEndTime": dayjs(state.choosedTime[1]).format("YYYY-MM-DD"),
+          "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-          "submitStartTime": dayjs(state.choosedTime[0]).format("YYYY-MM-DD"),
+          "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
           "updateTime": "",
           "updateUser": 0,
           "workEnclosureAddress": "",
           "workFlag": "",
           "workId": 0,
-          "workName": state.inputV1,
+          "workName": formState.workName,
-          "workRequirement": state.textV1,
+          "workRequirement": formState.workRequirement,
           "workTag": ""
           }).then((res)=>{
         message.success(`添加成功${res}`)
-        ctx.emit("update:addhomeworkVisible", false);
+        closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
     }
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
-    }
     return {
-      ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
       addHomework,
       handleChange,
       fileList,
-      headers: {
+      formState,
-        "token":"123"
+      handleFinish,
-      },
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
     };
   },
 };
@@ -217,6 +277,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -313,6 +374,7 @@ export default {
       }
     }
     .main_btns {
+      position: absolute;
       height: 72px;
       width: 100%;
       bottom: 0;
@@ -344,3 +406,4 @@ export default {
   }
 }
 </style>
+

src/components/drawers/AddLive.vue

@@ -634,6 +634,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddOnline.vue

@@ -295,6 +295,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        flex-shrink: 0;
         .headerTitle {
           font-size: 18px;
           font-weight: 600;

src/components/drawers/AddRef.vue

@@ -169,6 +169,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddTest.vue

@@ -16,154 +16,134 @@
           @click="closeDrawer"
         />
       </div>
+      <a-form
+            ref="formRef"
+            name="custom-validation"
+            :model="formState"
+            :rules="rules"
+            v-bind="layout"
+            @finish="handleFinish"
+            @validate="handleValidate"
+            @finishFailed="handleFinishFailed"
+          >
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试名称：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="作业名称" name="examinationName">
               <a-input
-                v-model:value="inputV1"
+                v-model:value="formState.examinationName"
-                style="width: 424px; height: 32px"
+                style="width: 424px; height: 32px;margin-left: 35px;"
+                autocomplete="off"
                 placeholder="请输入考试名称"
-                maxlength="20"
+                maxlength="20"/>
-              />
+              </a-form-item>
             </div>
           </div>
           <div class="main_item2">
-            <div class="signbox">
+            <a-form-item has-feedback label="考试说明" name="examinationExplain">
-              <span style="margin-right: 3px">考试说明：</span>
-            </div>
-            <div class="textarea">
               <a-textarea
-                v-model:value="testV1"
+                v-model:value="formState.examinationExplain"
                 placeholder="请输入考试说明"
                 allow-clear
+                style="margin-left: 35px;"
                 maxlength="150"
               />
-            </div>
+            </a-form-item>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">选择考试：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="选择考试" name="choosedTest">
               <a-select
                 dropdownClassName="dropdown-style"
-                style="width: 424px"
+                style="width: 424px;margin-left: 35px;"
                 placeholder="请输入考试名称"
                 :options="options1"
-                v-model:value="choosedTest"
+                v-model:value="formState.choosedTest"
                 allowClear
                 showSearch
               />
+            </a-form-item>
+ 
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时间：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时间" name="choosedTime">
+
               <a-range-picker
-              v-model:value="testTime"
+              v-model:value="formState.choosedTime"
-                style="width: 424px"
+                style="width: 424px;margin-left: 35px;"
                 :placeholder="['      开始时间', '        结束时间']"
               />
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时长：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时长" name="examinationDuration">
+
               <a-input
-                v-model:value="inputV2"
+                v-model:value="formState.examinationDuration"
-                style="width: 388px; height: 32px"
+                style="width: 388px; height: 32px;
+                margin-left: 35px;"
               />
               <span style="margin-left: 5px">分钟</span>
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试限制：</span>
-            </div>
             <div class="btnbox">
-              <span style="margin-right: 8px">允许重复考试</span>
+              <span style="margin-right: 43px">考试限制</span>
+              <a-form-item has-feedback label="允许重复考试" name="examinationLimit">
+
               <a-input-number
                 :min="-1" :precision="0"
-                v-model:value="inputV3"
+                v-model:value="formState.examinationLimit"
-                style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                style="width: 88px; height: 32px;
+                border-radius: 8px;overflow: hidden;"
               />
               <span style="margin-left: 8px">次</span>
               <span style="margin-left: 24px; color: #999999"
-                >-1表示无限制</span
+                >-1表示无限制</span>
-              >
+            </a-form-item>
+              
+              
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示答案：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV1">
+              <a-form-item has-feedback label="显示答案" name="showAnswers">
+
+              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnswers">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示解析：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV2">
+              <a-form-item has-feedback label="显示解析" name="showAnalysis">
+
+              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnalysis">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">评分模式：</span>
-            </div>
             <div class="btnbox">
-              <div class="btnbox">
+              <a-form-item has-feedback label="评分模式" name="scoringModel">
-                <a-radio-group v-model:value="radioV3">
+
+                <a-radio-group style="margin-left: 35px;" v-model:value="formState.scoringModel">
                   <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
                     >最高一次</a-radio
                   >
@@ -171,44 +151,47 @@
                     >最后一次</a-radio
                   >
                 </a-radio-group>
-              </div>
+              </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">及格线：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="及格线" name="passLine">
+
               <a-input
-                v-model:value="inputV4"
+                v-model:value="formState.passLine"
-                style="width: 88px; height: 32px"
+                style="width: 88px; height: 32px;margin-left: 35px;"
               />
+            </a-form-item>
+
               <span style="margin-left: 8px">分</span>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">试题排列：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV4">
+              <a-form-item has-feedback label="作业要求" name="questionArrangement">
+
+              <a-radio-group v-model:value="formState.questionArrangement">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
                 <a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <a-button class="btn1" @click="closeDrawer">取消</a-button>
-        <button class="btn2" @click="addTest">确定</button>
+        <a-button class="btn2" html-type="submit" >确定</a-button>
       </div>
+    </a-form>
     </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
 import {createExamination} from "@/api/indexExam"
 import  dayjs from 'dayjs';
@@ -239,19 +222,138 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({
+    const formState = reactive({
-      inputV1: "",
+      examinationName:'',
-      inputV2: "",
+      examinationDuration:"",
-      inputV3: "",
+      examinationLimit:"",
-      inputV4: "60",
+      passLine:60,
-      testV1: "",
+      examinationEndTime:"",
-      radioV1: "",
+      examinationExplain:"",
-      radioV2: "",
+      questionArrangement:1,
-      radioV3: "",
+      scoringModel:2,
-      radioV4: "",
+      showAnalysis:2,
-      choosedTest: "",
+      showAnswers:2,
-      testTime:"",
     });
+    const formRef = ref();
+    let checkExaminationName = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试名称");
+        return Promise.reject('请输入考试名称');
+      }
+    };
+    let checkExaminationExplain = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试说明");
+        return Promise.reject('请输入考试说明');
+      }
+    };
+    let checkChoosedTest = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择考试");
+        return Promise.reject('请选择考试');
+      }
+    };
+    let checkChoosedTime = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择时间");
+        return Promise.reject('请选择时间');
+      }
+    };
+    let checkExaminationDuration = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试时长");
+        return Promise.reject('请输入考试时长');
+      }
+    };
+    let checkLimit = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试限制");
+        return Promise.reject('请输入考试限制');
+      }
+    };
+    let checkShowAnswers = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkShowAnalysis = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkScoringModel = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkPassLine = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入及格线");
+        return Promise.reject('请输入及格线');
+      }
+    };
+    let checkQuestionArrangement = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    const rules = {
+      examinationName: [{
+        required: true,
+        validator: checkExaminationName,
+        trigger: 'change',
+      }],
+      examinationExplain: [{
+        validator: checkExaminationExplain,
+        trigger: 'change',
+      }],
+      choosedTest: [{
+        required: true,
+        validator: checkChoosedTest,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkChoosedTime,
+        trigger: 'change',
+      }],
+      examinationDuration: [{
+        required: true,
+        validator: checkExaminationDuration,
+        trigger: 'change',
+      }],
+      limit: [{
+        required: true,
+        validator: checkLimit,
+        trigger: 'change',
+      }],
+      showAnswers: [{
+        validator: checkShowAnswers,
+        trigger: 'change',
+      }],
+      showAnalysis: [{
+        validator: checkShowAnalysis,
+        trigger: 'change',
+      }],
+      scoringModel: [{
+        validator: checkScoringModel,
+        trigger: 'change',
+      }],
+      passLine: [{
+        required: true,
+        validator: checkPassLine,
+        trigger: 'change',
+      }],
+      questionArrangement: [{
+        validator: checkQuestionArrangement,
+        trigger: 'change',
+      }],
+    };
+
     const options1 = ref([
       {
         label:'math',
@@ -262,76 +364,82 @@ export default {
         value:'eng',
       },
     ])
+    const handleFinish = values => {
+      console.log(values);
+      addTest()
+    };
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
     const closeDrawer = () => {
+      resetForm();
       ctx.emit("update:addtestVisible", false);
-      state.radioV1 = "";
-        state.radioV2 = "";
-        state.radioV3 = "";
-        state.radioV4 = "";
     };
     const addTest = () => {
-      if(state.testTime.length
-      && state.inputV1&& state.inputV2&& state.inputV3&& state.inputV4
-      && state.radioV1&& state.radioV2&& state.radioV3
-      ){
         createExamination({
             "createTime": "",
             "createUser": 0,
-            "examinationDuration": state.inputV2,
+            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(state.testTime[1]).format("YYYY-MM-DD"),
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": state.testV1,
+            "examinationExplain": formState.examinationExplain,
             "examinationFlag": "",
             "examinationId": 0,
-            "examinationLimit": state.inputV3,
+            "examinationLimit": formState.examinationLimit,
-            "examinationName": state.inputV1,
+            "examinationName": formState.examinationName,
             "examinationPaperId": 0,
-            "examinationPaperName": state.choosedTest,
+            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(state.testTime[0]).format("YYYY-MM-DD"),
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
             "examinationTag": "",
-            "passLine": state.inputV4,
+            "passLine": formState.passLine,
-            "questionArrangement": state.radioV4,
+            "questionArrangement": formState.questionArrangement,
-            "scoringModel": state.radioV3,
+            "scoringModel": formState.scoringModel,
-            "showAnalysis": state.radioV2,
+            "showAnalysis": formState.showAnalysis,
-            "showAnswers": state.radioV1,
+            "showAnswers": formState.showAnswers,
             "updateTime": "",
             "updateUser": 0
           }).then((res)=>{
         message.success(`添加成功${res}`)
-        ctx.emit("update:addtestVisible", false);
+        closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
-      }
+      
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
     }
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+      console.log("formState", bool);
     };
     const cloradio1 = (value) => {
       if (value != "") {
-        state.radioV1 = "";
+        formState.showAnswers = "";
       }
     }
     const cloradio2 = (value) => {
       if (value != "") {
-        state.radioV2 = "";
+        formState.showAnalysis = "";
       }
     }
     const cloradio3 = (value) => {
       if (value != "") {
-        state.radioV3 = "";
+        formState.scoringModel = "";
       }
     }
     const cloradio4 = (value) => {
       if (value != "") {
-        state.radioV4 = "";
+        formState.questionArrangement = "";
       }
     }
     return {
-      ...toRefs(state),
+      formState,
       afterVisibleChange,
       closeDrawer,
       rowSelection,
@@ -341,6 +449,13 @@ export default {
       cloradio4,
       addTest,
       options1,
+      handleFinish,
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
     };
   },
 };
@@ -357,6 +472,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/components/drawers/AddVote.vue

@@ -177,6 +177,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;

src/views/learningpath/LearningPath.vue

@@ -4,25 +4,21 @@
     <!-- 搜索框及按钮 -->
     <div class="filter">
       <div class="filterItems">
-        <div class="select">
+        <div class="pathnameInp">
-          <a-select
+          <a-input
-            v-model:value="projectName"
+            v-model:value="pathnameSearch"
-            style="width: 270px"
+            style="width: 270px; height: 40px; border-radius: 8px"
             placeholder="请输入路径名称"
-            :options="projectNameList"
+          />
-            @change="selectProjectName"
-            allowClear
-            showSearch
-          ></a-select>
         </div>
 
         <div class="select">
           <a-select
-            v-model:value="projectName"
+            v-model:value="statusValue"
             style="width: 270px"
             placeholder="请选择状态"
-            :options="projectNameList"
+            :options="statusList"
-            @change="selectProjectName"
+            @change="selectStatusClassify"
             allowClear
             showSearch
           ></a-select>
@@ -35,19 +31,20 @@
             style="width: 270px"
           /> -->
           <a-range-picker
-            v-model:value="value2"
+            v-model:value="searchdate"
             separator="至"
             :placeholder="['      开始时间', '        结束时间']"
+            @change="searchTimeChange"
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1">
             <div class="search"></div>
-            <div class="btnText">搜索</div>
+            <div class="btnText" @click="searchLearnPath">搜索</div>
           </div>
           <div class="btnn btn2">
             <div class="search"></div>
-            <div class="btnText">重置</div>
+            <div class="btnText" @click="resetLearnPath">重置</div>
           </div>
         </div>
       </div>
@@ -613,28 +610,6 @@ export default {
   setup() {
     const router = useRouter();
     const state = reactive({
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
       out: false,
       out1: false,
       number: null,
@@ -692,6 +667,8 @@ export default {
 
       value1: "",
       value2: "",
+      //
+      //创建、编辑-------------------------
       pathName: "", //创建/编辑路径图名称
       organizationList: [
         {
@@ -722,6 +699,33 @@ export default {
       createLoading: false, //创建路径loading
       deletePathId: null, //删除路径id
       editPathId: null, //修改路径id
+      //搜索------------------------------
+      pathnameSearch: null, //搜索路径名称
+      statusList: [
+        {
+          id: 1,
+          value: "草稿",
+          label: "草稿",
+          classify: 0,
+        },
+        {
+          id: 2,
+          value: "已发布",
+          label: "已发布",
+          classify: 1,
+        },
+        {
+          id: 3,
+          value: "已停用",
+          label: "已停用",
+          classify: -1,
+        },
+      ],
+      statusValue: null, //状态
+      statusClassify: null, //选择状态类型
+      searchdate: null, //选择时间
+      startTime: null, //开始时间
+      endTime: null, //结束时间
     });
 
     const selectProjectName = (value, index) => {
@@ -976,7 +980,6 @@ export default {
                   <a-select
                     style="width: 50px;margin-top:2px;margin-left:25px"
                     value="授权"
-                    // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
                     <a-select-option value="权限名单" label="权限名单">
@@ -1022,7 +1025,6 @@ export default {
                     <a-select
                       style="width: 50px;margin-top:2px;margin-right:20px;"
                       value="更多"
-                      // options={state.projectNameList}
                       dropdownClassName="tabledropdown"
                     >
                       <a-select-option
@@ -1075,7 +1077,6 @@ export default {
                       <a-select
                         style="width: 50px;margin-top:2px;margin-right:20px;"
                         value="更多"
-                        // options={state.projectNameList}
                         dropdownClassName="tabledropdown"
                       >
                         <a-select-option
@@ -1115,7 +1116,6 @@ export default {
                       <a-select
                         style="width: 50px;margin-top:2px;margin-right:20px;"
                         value="更多"
-                        // options={state.projectNameList}
                         dropdownClassName="tabledropdown"
                       >
                         <a-select-option
@@ -1166,8 +1166,8 @@ export default {
     };
     //创建学习路径图
     const createLearnPath = () => {
-      if (!state.pathName) return message.info("请输入路径图名称");
+      if (!state.pathName) return message.warning("请输入路径图名称");
-      // if (!state.organizationSelectName) return message.info("请选择归属组织");
+      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
       // state.createLoading = true;
       let obj = {
         name: state.pathName,
@@ -1197,6 +1197,10 @@ export default {
       let obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
+        name: state.pathnameSearch,
+        status: state.statusClassify,
+        beginTime: state.startTime,
+        endTime: state.endTime,
       };
       api
         .getLearnPath(obj)
@@ -1219,31 +1223,6 @@ export default {
         .catch((err) => {
           console.log("获取学习路径失败", err);
         });
-      // let getChapterObj = {
-      //   routerId: 0,
-      // };
-      // api
-      //   .getChapter(getChapterObj)
-      //   .then((res) => {
-      //     console.log("获取关卡数据", res);
-      //   })
-      //   .catch((err) => {
-      //     console.log("获取关卡数据失败", err);
-      //   });
-
-      // let editChapterObj = {
-      //   name: "测试关卡",
-      //   remark: "这是测试关卡说明",
-      //   routerId: 0,
-      // };
-      // api
-      //   .editChapter(editChapterObj)
-      //   .then((res) => {
-      //     console.log("添加测试关卡数据", res);
-      //   })
-      //   .catch((err) => {
-      //     console.log("添加测试关卡数据失败", err);
-      // 	});
     };
     //翻页
     const changePagination = (page) => {
@@ -1271,8 +1250,8 @@ export default {
     };
     //编辑学习路径图
     const editLearnPath = () => {
-      if (!state.pathName) return message.info("请输入路径图名称");
+      if (!state.pathName) return message.warning("请输入路径图名称");
-      // if (!state.organizationSelectName) return message.info("请选择归属组织");
+      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
       // state.createLoading = true;
       let obj = {
         routerId: state.editPathId,
@@ -1299,6 +1278,43 @@ export default {
           // state.createLoading = false;
         });
     };
+    //选择状态
+    const selectStatusClassify = (e, v) => {
+      // console.log("eee", e, v);
+      state.statusValue = e;
+      state.statusClassify = v.classify;
+    };
+    //修改时间
+    const searchTimeChange = (e, date) => {
+      let startTime = date[0] + " 00:00:00";
+      let endTime = date[1] + " 23:59:59";
+      state.startTime = new Date(startTime).getTime() / 1000;
+      state.endTime = new Date(endTime).getTime() / 1000;
+      console.log("e", state.startTime, state.endTime);
+    };
+    //搜索学习路径
+    const searchLearnPath = () => {
+      state.currentPage = 1;
+      console.log(
+        "pathnameSearch",
+        state.pathnameSearch,
+        state.statusClassify,
+        state.startTime,
+        state.endTime
+      );
+      getLearnPath();
+    };
+    //重置学习路径
+    const resetLearnPath = () => {
+      state.currentPage = 1;
+      state.pathnameSearch = null;
+      state.statusValue = null;
+      state.statusClassify = null;
+      state.searchdate = null;
+      state.startTime = null;
+      state.endTime = null;
+      getLearnPath();
+    };
     onMounted(() => {
       // console.log("执行");
       getLearnPath();
@@ -1333,6 +1349,10 @@ export default {
       changePagination,
       deleteLearnPath,
       editLearnPath,
+      selectStatusClassify,
+      searchTimeChange,
+      searchLearnPath,
+      resetLearnPath,
     };
   },
 };
@@ -1837,6 +1857,10 @@ export default {
     .filterItems {
       display: flex;
       flex-wrap: wrap;
+      .pathnameInp {
+        margin-right: 20px;
+        margin-bottom: 20px;
+      }
       .select {
         margin-right: 20px;
         margin-bottom: 20px;

src/views/learningpath/LevelAddDetail.vue

@@ -60,6 +60,12 @@
       <div class="main">
         <div class="inma">
           <div class="name">
+            <div class="d" style="margin-top: 2px;margin-right:2px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
             <div class="fir">关卡名称：</div>
             <div class="input">
               <a-input
@@ -72,6 +78,8 @@
             <div class="co">{{ value1.length }}/20</div>
           </div>
           <div class="name">
+          <div class="d" style="width: 10px;height: 10px;margin-top: 2px;margin-right:2px">
+            </div>
             <div class="fir">关卡说明：</div>
             <div class="input">
               <a-textarea

src/views/projectcenter/ProjectAdd.vue

@@ -11,58 +11,34 @@
 			<div class="main">
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目名称</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-              v-model:value="projectName"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">分类</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="
-              :getPopupContainer="
 							(triggerNode) => {
 								return triggerNode.parentNode || document.body;
 							}
-              "
+						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-              v-model:value="classifySelect"
+							@change="classificationChange" allowClear showSearch>
-              placeholder="四个养成"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-            >
 						</a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">封面图</div>
 					</div>
-          <div
+					<div class="box" style="
-            class="box"
-            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -70,29 +46,15 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            "
+            ">
-          >
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
-            <a-upload
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
-              v-model:file-list="fileList"
+							<img style="
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              action="/api/file/upload"
-              :before-upload="beforeUpload"
-              @change="handleChange"
-            >
-              <img
-                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                "
+                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
-              />
 							<div v-else>
 								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
 								<!-- <plus-outlined v-else></plus-outlined> -->
@@ -105,55 +67,33 @@
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目时间</div>
 					</div>
 
 					<div class="in">
-            <a-range-picker
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']"
-              separator="至"
+							style="width: 100%; height: 40px; border-radius: 5px" show-time @change="onRangeChange" />
-              :placeholder="['      开始时间', '        结束时间']"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-              @change="onRangeChange"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目经理</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="
-              :getPopupContainer="
 							(triggerNode) => {
 								return triggerNode.parentNode || document.body;
 							}
-              "
+						" :value="classifySelect1" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-              :value="classifySelect1"
+							@change="classificationChange1" allowClear showSearch>
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-            >
 						</a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">资源归属</div>
 					</div>
 
@@ -166,13 +106,7 @@
 						<div class="inname" style="margin-top: 13px">项目说明</div>
 					</div>
 					<div class="in">
-            <a-textarea
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
 					</div>
 				</div>
 				<div class="name name2">
@@ -180,99 +114,57 @@
 						<div class="inname">同步学习记录</div>
 					</div>
 					<div class="in">
-            <a-radio @click="changeChecked" v-model:checked="checked"
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目级别</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE1" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE1"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">培训体系</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE2" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE2"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">是否BOEU实施</div>
 					</div>
 					<div class="in">
-            <a-radio @click="changeChecked1" v-model:checked="checked1"
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">BOEU实施</span></a-radio>
-                >BOEU实施</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">附件</div>
 					</div>
 					<div class="filebox">
 						<div>
-              <img
+							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-                v-if="fileList1.length < 6"
+							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
-                class="fileimg"
+								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
-                src="../../assets/images/projectadd/enclosure.png"
-              />
-              <a-upload
-                :disabled="fileList1.length > 5"
-                :before-upload="beforeUpload1"
-                v-model:file-list="fileList1"
-                @remove="removeFile"
-                name="file"
-                action="/api/file/upload"
-                :headers="headers"
-                @change="handleChange1"
-              >
 								<!-- <a-button> -->
 								<!-- <upload-outlined></upload-outlined> -->
-                <span v-if="fileList1.length > 5" class="filetext"
+								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
-                  >上传数量已经达到最大值</span
-                >
 								<span v-else class="filetext">上传附件</span>
 								<!-- </a-button> -->
 							</a-upload>
@@ -287,13 +179,7 @@
 				<div class="name">
 					<div class="inname" style="width: 50px">模板</div>
 					<div class="in select" style="margin-left: 2px">
-            <a-select
+						<a-select v-model:value="value1" placeholder="请选择模板" :size="size" style="width: 100%" :options="options">
-              v-model:value="value1"
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            >
 						</a-select>
 					</div>
 				</div>
@@ -301,9 +187,7 @@
 		</div>
 		<div class="footer">
 			<div class="btn">
-        <a-button v-on:click="createProject" type="primary" class="btn1"
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-          >确定</a-button
-        >
 				<a-button class="btn2">取消</a-button>
 			</div>
 		</div>
@@ -311,12 +195,14 @@
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
-import { message } from "ant-design-vue";
+import { message } from 'ant-design-vue';
+import { useRouter } from "vue-router";
 import * as api from "../../api/index";
 
 export default {
 	name: "projectAdd",
 	setup() {
+		const router = useRouter();
 		const state = reactive({
 			classifySelect: null,
 			classifySelectId: null,
@@ -324,15 +210,15 @@ export default {
 			checked1: false,
 			valueE: null,
 			valueE1: null,
-      valueE2: null,
+			valueE2: null
 		});
 
-    const projectName = ref("");
+		const projectName = ref('');
 
 		const classifyList = ref([
-      { value: 1, label: "管理者" },
+			{ value: 1, label: '管理者' },
-      { value: 2, label: "领军者" },
+			{ value: 2, label: '领军者' },
-      { value: 3, label: "产业人" },
+			{ value: 3, label: '产业人' },
 		]);
 
 		let projectType = "";
@@ -344,23 +230,23 @@ export default {
 
 		function getBase64(img, callback) {
 			const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
+			reader.addEventListener('load', () => callback(reader.result));
 			reader.readAsDataURL(img);
 		}
 
 		const fileList = ref([]);
 		const fileList1 = ref([]);
 		const loading = ref(false);
-    const imageUrl = ref("");
+		const imageUrl = ref('');
-    let picUrl = "";
+		let picUrl = '';
 
 		const handleChange = (info) => {
-      if (info.file.status === "uploading") {
+			if (info.file.status === 'uploading') {
 				loading.value = true;
 				return;
 			}
-      if (info.file.status === "done") {
+			if (info.file.status === 'done') {
-        console.log("上传图片返回的信息 %o", info);
+				console.log('上传图片返回的信息 %o', info)
 				picUrl = info.file.response.data;
 				// Get this url from response in real world.
 				getBase64(info.file.originFileObj, (base64Url) => {
@@ -368,9 +254,9 @@ export default {
 					loading.value = false;
 				});
 			}
-      if (info.file.status === "error") {
+			if (info.file.status === 'error') {
 				loading.value = false;
-        message.error("upload error");
+				message.error('upload error');
 			}
 		};
 
@@ -379,17 +265,12 @@ export default {
 		let attach = "";
 		let attachData = "";
 		const handleChange1 = (info) => {
-      if (info.file.status === "uploading") {
+			if (info.file.status === 'uploading') {
 				loading.value = true;
 				return;
 			}
-      if (info.file.status === "done") {
+			if (info.file.status === 'done') {
-        console.log(
+				console.log('上传附件返回的信息 %o', info, info.fileList.length, uplodaFileCount)
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
-        );
 
 				let attachStr = "";
 				attachData = info.fileList;
@@ -397,10 +278,10 @@ export default {
 					if (attachData.length - 1 == i) {
 						attachStr += attachData[i].response.data;
 					} else {
-            attachStr += attachData[i].response.data + ",";
+						attachStr += attachData[i].response.data + ',';
 					}
 				}
-        console.log(attachStr);
+				console.log(attachStr)
 				attach = attachStr;
 
 				if (info.fileList.length > 5) {
@@ -409,21 +290,20 @@ export default {
 					uplodaFileCount = false;
 				}
 			}
-      if (info.file.status === "error") {
+			if (info.file.status === 'error') {
 				loading.value = false;
-        message.error("upload error");
+				message.error('upload error');
 			}
 		};
 
 		const beforeUpload = (file) => {
-      const isJpgOrPng =
+			const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
-        file.type === "image/jpeg" || file.type === "image/png";
 			if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
+				message.error('You can only upload JPG file!');
 			}
 			const isLt2M = file.size / 1024 / 1024 < 1;
 			if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
+				message.error('Image must smaller than 1MB!');
 			}
 			return isJpgOrPng && isLt2M;
 		};
@@ -431,61 +311,59 @@ export default {
 		const beforeUpload1 = () => {
 			return new Promise((resovle, reject) => {
 				if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
+					message.info("上传文件数量已达最大数量")
 					return reject(false);
 				}
 				return resovle(true);
-      });
+			})
 		};
 
 		let beginTime = "";
 		let endTime = "";
 		const onRangeChange = (value, dateString) => {
-      console.log("Selected Time: ", value);
+			console.log('Selected Time: ', value);
 			// 项目时间选择函数
-      console.log("Formatted Selected Time: ", dateString);
+			console.log('Formatted Selected Time: ', dateString);
-      console.log(
+			console.log('Formatted Selected TimeStamp', new Date(dateString[0]).getTime())
-        "Formatted Selected TimeStamp",
+			beginTime = new Date(dateString[0]).getTime() / 1000;
-        new Date(dateString[0]).getTime()
+			endTime = new Date(dateString[1]).getTime() / 1000;
-      );
-      beginTime = new Date(dateString[0]).getTime();
-      endTime = new Date(dateString[1]).getTime();
 		};
 
+
 		// 项目经理 后续接口调用
 		const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
+			{ value: 1, label: '李俊国' },
-      { value: 2, label: "将小米" },
+			{ value: 2, label: '将小米' },
-      { value: 3, label: "刘孟君" },
+			{ value: 3, label: '刘孟君' },
 		]);
 
 		let manager = "";
 		let managerId = "";
 		const classificationChange1 = (key) => {
 			console.log(`selected ${key}`);
-      console.log(classifyList1.value[key - 1].label);
+			console.log(classifyList1.value[key - 1].label)
-      manager = String(classifyList1.value[key - 1].label);
+			manager = String(classifyList1.value[key - 1].label)
-      managerId = String(key);
+			managerId = String(key)
 		};
 
 		// 资源归属 sourceBelongId 后续给接口
 
 		// 项目说明
-    const remark = ref("");
+		const remark = ref('');
 
 		let courseSyncFlag = 0;
 		const changeChecked = () => {
-      console.log(state.checked);
+			console.log(state.checked)
-      state.checked ? (state.checked = false) : (state.checked = true);
+			state.checked ? state.checked = false : state.checked = true;
 			courseSyncFlag = state.checked ? 1 : 0;
-    };
+		}
 
 		let boeFlag = 0;
 		const changeChecked1 = () => {
-      console.log(state.checked1);
+			console.log(state.checked1)
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+			state.checked1 ? state.checked1 = false : state.checked1 = true;
 			boeFlag = state.checked1 ? 1 : 0;
-    };
+		}
 
 		const removeFile = (file) => {
 			const index = fileList1.value.indexOf(file);
@@ -498,72 +376,81 @@ export default {
 				attachStr = "";
 			}
 			for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
+				console.log(fileList1["value"][i].response.data)
 				if (fileList1["value"].length - 1 == i) {
 					attachStr += fileList1["value"][i].response.data;
 				} else {
-          attachStr += fileList1["value"][i].response.data + ",";
+					attachStr += fileList1["value"][i].response.data + ',';
 				}
 			}
 			attach = attachStr;
-    };
+		}
+
 
 		const errorMsgs = {
-      name: "请输入项目名称",
+			"name": "请输入项目名称",
-      type: "请选择项目分类",
+			"category": "请选择项目分类",
-      picUrl: "请上传项目封面图",
+			"picUrl": "请上传项目封面图",
-      beginTime: "请选择项目开始时间",
+			"beginTime": "请选择项目开始时间",
-      endTime: "请选择项目结束时间",
+			"endTime": "请选择项目结束时间",
-      manager: "请选择项目经理",
+			"manager": "请选择项目经理",
-      managerId: "请选择项目经理",
+			"managerId": "请选择项目经理",
-      sourceBelongId: "请选择资源归属",
+			"sourceBelongId": "请选择资源归属",
-      level: "请填写项目级别",
+			"level": "请填写项目级别",
-      systemId: "请填写项目培训体系",
+			"systemId": "请填写项目培训体系",
-      boeFlag: "请选择是否BOE实施",
+			"boeFlag": "请选择是否BOE实施",
-      attach: "请上传附件",
+			"attach": "请上传附件"
-    };
+		}
 
 		const createProject = () => {
 			let obj = {
-        name: projectName["value"],
+				"name": projectName["value"],
-        type: projectType,
+				"category": projectType,
-        picUrl: picUrl,
+				"picUrl": picUrl,
-        beginTime: beginTime,
+				"beginTime": beginTime,
-        endTime: endTime,
+				"endTime": endTime,
-        manager: manager,
+				"manager": manager,
-        managerId: managerId,
+				"managerId": managerId,
-        sourceBelongId: 11,
+				"sourceBelongId": 11,
-        remark: remark["value"],
+				"remark": remark["value"],
-        courseSyncFlag: courseSyncFlag,
+				"courseSyncFlag": courseSyncFlag,
-        level: 3,
+				"level": 3,
-        systemId: 4,
+				"systemId": 4,
-        boeFlag: boeFlag,
+				"boeFlag": boeFlag,
-        attach: attach,
+				"attach": attach,
-        templateId: 10,
+				"type": 3,
-
+				"templateId": 10,
-        category: 0,
+				"parentId": 0,
-        notice: "",
+				"notice": "",
-        noticeFlag: 0,
+				"noticeFlag": 0,
-        status: 0,
+				"status": 0
-      };
+			}
-      console.log("提交的数据格式 %o", obj);
+			console.log('提交的数据格式 %o', obj)
 			for (let i in errorMsgs) {
-        console.log(obj[i]);
+				console.log(obj[i])
-        if (obj[i] === "") {
+				if (obj[i] === "" || obj[i] === undefined) {
-          message.destroy();
+					message.destroy()
-          message.warning(errorMsgs[i]);
+					message.warning(errorMsgs[i])
-          return;
+					return
 				}
 			}
 
-      api
+			api.createProject(obj).then(res => {
-        .createProject(obj)
+				console.log(res)
-        .then((res) => {
+				if (res.status == 200 && res.data.code == 200) {
-          console.log(res);
+					router.push({
-        })
+						path: '/taskpage',
-        .catch((err) => {
+						query: { id: res.data.data.projectId }
-          console.log(err);
 					});
+				} else {
+					message.destroy();
+					message.error("创建失败，请检查当前网络状态。")
+				}
+			}).catch(err => {
+				console.log(err)
+				message.destroy();
+				message.error("创建失败，请检查当前网络状态。")
+			})
 		};
 
 		return {
@@ -587,9 +474,9 @@ export default {
 			changeChecked1,
 			uplodaFileCount,
 			createProject,
-      removeFile,
+			removeFile
 		};
-  },
+	}
 };
 </script>
 <style lang="scss">

src/views/projectcenter/TaskAdd.vue

@@ -540,7 +540,10 @@ import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
 import * as apiExternal from "../../api/indexExternalChain";
+import * as apidiscuss from "../../api/indexDiscuss";
+import * as apiactivity from "../../api/indexActivity";
 import * as apieval from "../../api/indexEval";
+import * as apiinvist from "../../api/indexInvist";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -858,6 +861,10 @@ export default {
       isActive: false,
       deleteLiveID: null, //删除直播id
       deleteExternalID: null, //删除外链id
+      deleteEvalID: null, //测评
+      deleteInvistID: null, //评估
+      deleteDiscussID: null, //删除讨论id
+      deleteActivityID: null, //删除活动id
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -966,7 +973,7 @@ export default {
           // width: 100,
           align: "center",
           scopedSlots: { customRender: "action" },
-          customRender: (text) => {
+          customRender: () => {
             return (
               <div class="opa">
                 <div class="opacation">
@@ -982,13 +989,8 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      {
+                      deleteEvalText();
-                        /* state.deleteLiveID = text.record.id; */
+                      deleteInvistText();
-                      }
-                      {
-                        /* deleteEvalText(); */
-                      }
-                      console.log(text.record.id);
                     }}
                   >
                     删除
@@ -1051,13 +1053,12 @@ export default {
         });
     };
 
-    //删除评估测试
+    const deleteDiscuss = () => {
-    const deleteEvalText = () => {
       let obj = {
-        evaluationId: state.deleteLiveID,
+        discussId: state.deleteDiscussID,
       };
-      apieval
+      apidiscuss
-        .deleteEvaluationById(obj)
+        .deleteDiscuss(obj)
         .then((res) => {
           console.log("删除成功", res);
           message.success("删除成功");
@@ -1069,6 +1070,98 @@ export default {
           console.log("删除失败", err);
         });
     };
+    //删除活动
+    const deleteActivity = () => {
+      let obj = {
+        activityId: state.deleteActivityID,
+      };
+      apiactivity
+        .deleteActivity(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          state.deleteModal = false;
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+    //删除测评测试
+    const deleteEvalText = () => {
+      let obj = {
+        evaluationId: state.deleteEvalID,
+      };
+      apieval
+        .deleteEvaluationById(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
+    //编辑测评信息
+    const editEvalPath = () => {
+      // if (!state.inputV1) return message.info("请输入测评名称");
+      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
+      // state.createLoading = true;
+      let obj = {
+        createTime: "",
+        createUser: 0,
+        evaluationEndTime: "",
+        evaluationFlag: "",
+        evaluationId: "",
+        evaluationName: "",
+        evaluationPictureAddress: "",
+        evaluationStartTime: "",
+        evaluationTag: "",
+        evaluationTypeId: 0,
+        evaluationTypeName: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      apieval
+        .updateEvaluation(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+            // state.createLoading = false;
+            // state.currentPage = 1;
+            // router.push("/leveladd");
+            // getLearnPath();
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("修改失败", err);
+          // state.createLoading = false;
+        });
+    };
+
+    //删除评估测试
+    const deleteInvistText = () => {
+      let obj = {
+        evaluationId: state.deleteInvistID,
+      };
+      apiinvist
+        .deleteAppraise(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1196,8 +1289,12 @@ export default {
       changebgc,
       getTask,
       deleteLiveBroadcast,
+      deleteDiscuss,
       deleteEvalText,
       deleteExternalChain,
+      deleteActivity,
+      editEvalPath,
+      deleteInvistText,
     };
   },
 };

src/views/system/SystemManage.vue

@@ -27,10 +27,12 @@
     <a-upload
       v-model:file-list="fileList"
       name="avatar"
+      action="/api/file/upload"
       list-type="picture-card"
       class="avatar-uploader"
       :show-upload-list="false"
       :before-upload="beforeUpload"
+      @change="handleChange"
     >
       <!-- <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
       <div v-else>
@@ -39,6 +41,27 @@
         <div class="ant-upload-text">Upload</div>
       </div> -->
     </a-upload>
+
+    <div
+      style="
+        width: 130px;
+        height: 40px;
+        background: #388be1;
+        border-radius: 8px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+      "
+      @click="golearningpath"
+    >
+      跳转
+    </div>
   </div>
 </template>
 <script>
@@ -52,6 +75,7 @@ import * as api from "../../api/index1";
 //   reader.addEventListener("load", () => callback(reader.result));
 //   reader.readAsDataURL(img);
 // }
+import { useRouter } from "vue-router";
 export default {
   name: "SystemManage",
   components: {
@@ -141,13 +165,17 @@ export default {
       }
       // return isJpgOrPng && isLt2M;
     };
-
+    const router = useRouter();
+    const golearningpath = () => {
+      router.push({ path: "/learningpath", params: { id: 1 } });
+    };
     return {
       ...toRefs(state),
       showDrawer,
       changeRadio,
       handleChange,
       beforeUpload,
+      golearningpath,
     };
   },
 };