Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/ImportStu.vue

@@ -24,12 +24,28 @@
         <div class="upload">
           <div class="text">上传：</div>
           <div class="right">
-            <div class="load">
+            <div style="height: 176px; margin-bottom: 20px">
+              <a-upload-dragger
+                v-model:fileList="fileList"
+                :action="importLeader"
+                name="uploadFile"
+                :multiple="true"
+                @change="handleChange"
+                :showUploadList="false"
+              >
+                <p class="ant-upload-drag-icon">
+                  <inbox-outlined></inbox-outlined>
+                </p>
+                <p class="ant-upload-text">点击或将文件拖拽到此处上传</p>
+                <p class="ant-upload-hint">支持扩展名：.xls/.xlsx</p>
+              </a-upload-dragger>
+            </div>
+            <!-- <div class="load">
               <div class="cloud"></div>
               <div class="tip">点击或将文件拖拽到此处上传</div>
               <div class="tipz">支持扩展名：.xls/.xlsx</div>
-            </div>
-            <div class="loadstate">
+            </div> -->
+            <!-- <div class="loadstate">
               <div class="loadborder">
                 <div class="content">
                   <div class="img"></div>
@@ -97,13 +113,135 @@
                 <div class="lefimg"></div>
                 <div class="tacl">20条数据导入成功，5条数据导入失败</div>
               </div>
+            </div> -->
+
+            <div class="loadstate">
+              <div
+                class="loadborder"
+                v-if="uploadpercent < 100 && uploadpercent !== -1"
+              >
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="stateloading">正在上传</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogloading"></div>
+                      </div> -->
+                  </div>
+                  <div class="curloading">
+                    <!-- <div class="cur">55%</div> -->
+                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  </div>
+                </div>
+              </div>
+              <div class="loadborder" v-if="uploadErr">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="statedefeat">上传失败</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogdefeat"></div>
+                      </div> -->
+                  </div>
+
+                  <div class="curloading">
+                    <!-- <div class="cur">55%</div> -->
+                    <div
+                      style="color: #387df7; margin-left: 20px; cursor: pointer"
+                    >
+                      下载失败数据
+                    </div>
+                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  </div>
+                  <div
+                    class="defeat"
+                    style="display: flex; align-items: center"
+                  >
+                    <div style="color: #ff7474">
+                      {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!--  v-if="uploadpercent === 100" -->
+              <div class="loadborder" v-if="uploadpercent === 100">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="statesucce">上传成功</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogsucce"></div>
+                      </div> -->
+                  </div>
+                  <div class="curloading">
+                    <!-- <div class="cur">100%</div> -->
+                    <div
+                      class="cancel"
+                      style="margin-left: 20px; cursor: pointer"
+                      @click="removeUpload"
+                    >
+                      删除
+                    </div>
+                  </div>
+                </div>
+                <div v-if="errNum">
+                  <div class="downloadErr" @click="downloadEeeorData">
+                    下载失败数据
+                  </div>
+                </div>
+              </div>
+              <div
+                v-if="uploadpercent === 100"
+                class="defeat"
+                style="
+                  display: flex;
+                  align-items: center;
+                  width: 500px;
+                  height: 40px;
+                "
+                :style="{
+                  background: errNum
+                    ? 'rgba(255, 116, 116, 0.1)'
+                    : 'rgba(53, 174, 105, 0.1)',
+                  border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
+                }"
+              >
+                <img
+                  style="width: 14px; height: 14px; margin-left: 16px"
+                  :src="
+                    errNum
+                      ? require('../../assets/images/err.png')
+                      : require('../../assets/images/success.png')
+                  "
+                />
+                <div
+                  style="margin-left: 8px"
+                  :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }"
+                >
+                  {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="closeDrawer">取消</button>
+        <button class="closeDrawer">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -111,6 +249,9 @@
 
 <script>
 import { reactive, toRefs } from "vue";
+import { message } from "ant-design-vue";
+import * as api from "../../api/index1";
+import { BATCH_IMPORT_SCORE } from "@/api/config";
 export default {
   name: "ImportStu",
   props: {
@@ -120,19 +261,176 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({});
+    console.log(1222)
+    const state = reactive({
+      fileType: ["xls", "xlsx"],
+      importLeader:
+        process.env.VUE_APP_BASE_API +
+        `/admin/studentGroup/importGroup/${props.projectId}`,
+      uploadpercent: -1,
+      uploadErr: false, //上传失败
+      addLoading: false,
+      fileList: [],
+      succNum: 0, //成功数据数
+      errNum: 0, //失败数据数
+      downloadErrUrl: null, //下载失败数据
+      fileName: "",
+      locationHref:
+        location.href.indexOf("http://") !== -1
+          ? "http://43.143.139.204:12016/"
+          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
+      template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
+    });
     const closeDrawer = () => {
-      ctx.emit("update:Importvisible", false);
+     
+      ctx.emit("closeDraw", true);
+      ctx.emit("update:TaskFaceImpStuvisible", false);
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
     };
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if (bool) {
+        console.log("当前是 1 项目 2 路径图", props.type);
+      }
     };
 
+    //上传文件
+    const handleChange = (info) => {
+      if (info) {
+        var FileExt = info.file.name.replace(/.+\./, "");
+        if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
+          state.fileList = [];
+          state.uploadpercent = -1;
+          message.destroy();
+          message.error("请上传正确的文件格式");
+          return;
+        }
+      }
+
+      state.addLoading = true;
+      state.uploadpercent = parseInt(info.file.percent);
+      console.log("我是文件上传的进度---------->", info.file.percent);
+      const status = info.file.status;
+      if (status !== "uploading") {
+        // console.log(info.file, info.fileList);
+      }
+      if (status === "done") {
+        state.fileName = info.file.name;
+        let i = 0;
+        let timeouts = setTimeout(() => {
+          clearInterval(timer);
+          state.addLoading = false;
+          message.destroy();
+          message.error(`文件导入超时`);
+        }, 30000);
+
+        let timer = setInterval(() => {
+          let uid = info.file.response.data;
+          api
+            .getImportStatus(uid)
+            .then((res) => {
+              console.log("查询导入状态", res);
+              if (res.data.code === 200) {
+                if (res.data.data.status !== "START") {
+                  i++;
+                  if (i === 1) {
+                    message.destroy();
+                    message.success(`${info.file.name}上传成功`);
+                    state.addLoading = false;
+                    props.searchTaskList && props.searchTaskList();
+                  }
+                  state.succNum = res.data.data.successNum;
+                  state.errNum = res.data.data.failedNum;
+                  state.downloadErrUrl = res.data.data.url;
+                  console.log("props.getStudent", props.getStudent);
+                  clearInterval(timer);
+                  clearTimeout(timeouts);
+                }
+              }
+            })
+            .catch((err) => {
+              state.addLoading = false;
+              clearInterval(timer);
+              clearTimeout(timeouts);
+              console.log("查询导入状态失败", err);
+            });
+        }, 500);
+      } else if (status === "error") {
+        state.uploadErr = true;
+        message.error(`${info.file.name}上传失败`);
+      }
+    };
+    const beforeUpload = (file) => {
+      return new Promise((resolve, reject) => {
+        // const isJpgOrPng =
+        //   file.name.indexOf(".xlsx") !== "-1" ||
+        //   file.name.indexOf(".xls") !== "-1";
+
+        // if (!isJpgOrPng) {
+        //   message.destroy();
+        //   message.error("仅支持xls、xlsx格式!");
+        //   return reject(false);
+        // }
+        const formData = new FormData();
+        formData.append("uploadFile", file);
+        // let progress = { percent: 1 };
+
+        // const intervalId = setInterval(() => {
+        //   if (progress.percent < 100) {
+        //     progress.percent++;
+        //     file.onProgress(progress);
+        //   } else {
+        //     clearInterval(intervalId);
+        //   }
+        // }, 100);
+        api.batchImportScore(formData).then((res) => {
+          if (res.data.code === 200) {
+            console.log("上传成功", res);
+            return reject(true);
+          }
+        });
+        return reject(false);
+      });
+    };
+    const handleUpload = (e) => {
+      console.log("handleUpload", e);
+    };
+
+    //删除
+    const removeUpload = () => {
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
+      state.succNum = 0;
+      state.errNum = 0;
+      state.downloadErrUrl = null;
+      state.addLoading = false;
+    };
+    // 下载失败数据
+    const downloadEeeorData = () => {
+      if (state.downloadErrUrl !== "") {
+        window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
+      }
+    };
+    function downTemplate() {
+      // console.log(state.locationHref + state.template);
+      // window.open(state.locationHref + state.template);
+    }
+
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
+      handleChange,
+      downTemplate,
+      BATCH_IMPORT_SCORE,
+      beforeUpload,
+      handleUpload,
+      removeUpload,
+      downloadEeeorData,
       // change,
     };
   },

src/components/drawers/TaskFaceIn.vue

@@ -8,14 +8,14 @@
   >
     <div class="drawerMain">
       <!-- 2022-11-30注释 后面放开 -->
-      <!-- <div class="header">
+       <div class="header">
         <div class="headerTitle">批量面授报名</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
-      </div> -->
+      </div>
       <div class="main">
         <div class="minatitl">
           <div class="up1">请下载</div>
@@ -25,18 +25,154 @@
         <div class="upload">
           <div class="text">上传：</div>
           <div class="right">
-            <div class="load">
+            <div style="height: 176px; margin-bottom: 20px">
+              <a-upload-dragger
+                v-model:fileList="fileList"
+                :action="importLeader"
+                name="uploadFile"
+                :multiple="true"
+                @change="handleChange"
+                :showUploadList="false"
+              >
+                <p class="ant-upload-drag-icon">
+                  <inbox-outlined></inbox-outlined>
+                </p>
+                <p class="ant-upload-text">点击或将文件拖拽到此处上传</p>
+                <p class="ant-upload-hint">支持扩展名：.xls/.xlsx</p>
+              </a-upload-dragger>
+            </div>
+            <!-- <div class="load">
               <div class="cloud"></div>
               <div class="tip">点击或将文件拖拽到此处上传</div>
               <div class="tipz">支持扩展名：.xls/.xlsx</div>
-            </div>
+            </div> -->
+            <div class="loadstate">
+              <div
+                class="loadborder"
+                v-if="uploadpercent < 100 && uploadpercent !== -1"
+              >
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="stateloading">正在上传</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogloading"></div>
+                      </div> -->
+                  </div>
+                  <div class="curloading">
+                    <!-- <div class="cur">55%</div> -->
+                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  </div>
+                </div>
+              </div>
+              <div class="loadborder" v-if="uploadErr">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="statedefeat">上传失败</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogdefeat"></div>
+                      </div> -->
+                  </div>
 
+                  <div class="curloading">
+                    <!-- <div class="cur">55%</div> -->
+                    <div
+                      style="color: #387df7; margin-left: 20px; cursor: pointer"
+                    >
+                      下载失败数据
+                    </div>
+                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  </div>
+                  <div
+                    class="defeat"
+                    style="display: flex; align-items: center"
+                  >
+                    <div style="color: #ff7474">
+                      {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!--  v-if="uploadpercent === 100" -->
+              <div class="loadborder" v-if="uploadpercent === 100">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">{{ fileName }}</div>
+                      <div class="statesucce">上传成功</div>
+                    </div>
+                    <a-progress :percent="uploadpercent" />
+                    <!-- <div class="prog">
+                        <div class="inprogsucce"></div>
+                      </div> -->
+                  </div>
+                  <div class="curloading">
+                    <!-- <div class="cur">100%</div> -->
+                    <div
+                      class="cancel"
+                      style="margin-left: 20px; cursor: pointer"
+                      @click="removeUpload"
+                    >
+                      删除
+                    </div>
+                  </div>
+                </div>
+                <div v-if="errNum">
+                  <div class="downloadErr" @click="downloadEeeorData">
+                    下载失败数据
+                  </div>
+                </div>
+              </div>
+              <div
+                v-if="uploadpercent === 100"
+                class="defeat"
+                style="
+                  display: flex;
+                  align-items: center;
+                  width: 500px;
+                  height: 40px;
+                "
+                :style="{
+                  background: errNum
+                    ? 'rgba(255, 116, 116, 0.1)'
+                    : 'rgba(53, 174, 105, 0.1)',
+                  border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
+                }"
+              >
+                <img
+                  style="width: 14px; height: 14px; margin-left: 16px"
+                  :src="
+                    errNum
+                      ? require('../../assets/images/err.png')
+                      : require('../../assets/images/success.png')
+                  "
+                />
+                <div
+                  style="margin-left: 8px"
+                  :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }"
+                >
+                  {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="exitDraw">取消</button>
-        <button class="btn2" @click="exitDraw">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -44,6 +180,9 @@
 
 <script>
 import { reactive, toRefs } from "vue";
+import { message } from "ant-design-vue";
+import * as api from "../../api/index1";
+import { BATCH_IMPORT_SCORE } from "@/api/config";
 export default {
   name: "TaskImpStu",
   props: {
@@ -53,24 +192,180 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({});
+    console.log(1222)
+    const state = reactive({
+      fileType: ["xls", "xlsx"],
+      importLeader:
+        process.env.VUE_APP_BASE_API +
+        `/admin/studentGroup/importGroup/${props.projectId}`,
+      uploadpercent: -1,
+      uploadErr: false, //上传失败
+      addLoading: false,
+      fileList: [],
+      succNum: 0, //成功数据数
+      errNum: 0, //失败数据数
+      downloadErrUrl: null, //下载失败数据
+      fileName: "",
+      locationHref:
+        location.href.indexOf("http://") !== -1
+          ? "http://43.143.139.204:12016/"
+          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
+      template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
+    });
     const closeDrawer = () => {
+     
+      ctx.emit("closeDraw", true);
       ctx.emit("update:TaskFaceImpStuvisible", false);
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
     };
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if (bool) {
+        console.log("当前是 1 项目 2 路径图", props.type);
+      }
     };
 
-    const exitDraw = () => {
-      ctx.emit("update:TaskFaceImpStuvisible", false);
+    //上传文件
+    const handleChange = (info) => {
+      if (info) {
+        var FileExt = info.file.name.replace(/.+\./, "");
+        if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
+          state.fileList = [];
+          state.uploadpercent = -1;
+          message.destroy();
+          message.error("请上传正确的文件格式");
+          return;
+        }
+      }
+
+      state.addLoading = true;
+      state.uploadpercent = parseInt(info.file.percent);
+      console.log("我是文件上传的进度---------->", info.file.percent);
+      const status = info.file.status;
+      if (status !== "uploading") {
+        // console.log(info.file, info.fileList);
+      }
+      if (status === "done") {
+        state.fileName = info.file.name;
+        let i = 0;
+        let timeouts = setTimeout(() => {
+          clearInterval(timer);
+          state.addLoading = false;
+          message.destroy();
+          message.error(`文件导入超时`);
+        }, 30000);
+
+        let timer = setInterval(() => {
+          let uid = info.file.response.data;
+          api
+            .getImportStatus(uid)
+            .then((res) => {
+              console.log("查询导入状态", res);
+              if (res.data.code === 200) {
+                if (res.data.data.status !== "START") {
+                  i++;
+                  if (i === 1) {
+                    message.destroy();
+                    message.success(`${info.file.name}上传成功`);
+                    state.addLoading = false;
+                    props.searchTaskList && props.searchTaskList();
+                  }
+                  state.succNum = res.data.data.successNum;
+                  state.errNum = res.data.data.failedNum;
+                  state.downloadErrUrl = res.data.data.url;
+                  console.log("props.getStudent", props.getStudent);
+                  clearInterval(timer);
+                  clearTimeout(timeouts);
+                }
+              }
+            })
+            .catch((err) => {
+              state.addLoading = false;
+              clearInterval(timer);
+              clearTimeout(timeouts);
+              console.log("查询导入状态失败", err);
+            });
+        }, 500);
+      } else if (status === "error") {
+        state.uploadErr = true;
+        message.error(`${info.file.name}上传失败`);
+      }
+    };
+    const beforeUpload = (file) => {
+      return new Promise((resolve, reject) => {
+        // const isJpgOrPng =
+        //   file.name.indexOf(".xlsx") !== "-1" ||
+        //   file.name.indexOf(".xls") !== "-1";
+
+        // if (!isJpgOrPng) {
+        //   message.destroy();
+        //   message.error("仅支持xls、xlsx格式!");
+        //   return reject(false);
+        // }
+        const formData = new FormData();
+        formData.append("uploadFile", file);
+        // let progress = { percent: 1 };
+
+        // const intervalId = setInterval(() => {
+        //   if (progress.percent < 100) {
+        //     progress.percent++;
+        //     file.onProgress(progress);
+        //   } else {
+        //     clearInterval(intervalId);
+        //   }
+        // }, 100);
+        api.batchImportScore(formData).then((res) => {
+          if (res.data.code === 200) {
+            console.log("上传成功", res);
+            return reject(true);
+          }
+        });
+        return reject(false);
+      });
+    };
+    const handleUpload = (e) => {
+      console.log("handleUpload", e);
+    };
+
+    //删除
+    const removeUpload = () => {
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
+      state.succNum = 0;
+      state.errNum = 0;
+      state.downloadErrUrl = null;
+      state.addLoading = false;
+    };
+    // 下载失败数据
+    const downloadEeeorData = () => {
+      if (state.downloadErrUrl !== "") {
+        window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
+      }
+    };
+    function downTemplate() {
+      // console.log(state.locationHref + state.template);
+      // window.open(state.locationHref + state.template);
     }
+    // const exitDraw = () => {
+    //   ctx.emit("update:TaskFaceImpStuvisible", false);
+    // }
 
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      exitDraw
+      handleChange,
+      downTemplate,
+      BATCH_IMPORT_SCORE,
+      beforeUpload,
+      handleUpload,
+      removeUpload,
+      downloadEeeorData,
+      // exitDraw
       // change,
     };
   },

src/components/drawers/project/AddCertificate.vue

@@ -372,6 +372,7 @@ import { reactive, toRefs } from "vue";
 import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
 import { message } from "ant-design-vue";
 import * as api from "@/api/index1";
+import { fileUp } from "../../../api/indexEval";
 export default {
   name: "AddCertificate",
   components: {
@@ -587,12 +588,43 @@ export default {
       }
     };
 
-    function beforeUpload(file) {
-      if (!state.fileType.includes(file.name.split(".").slice(-1).join(""))) {
-        message.error("不支持该格式");
+    const beforeUpload = (file) => {
+      const isJpgOrPng =
+        file.type === "image/jpg" ||
+        file.type === "image/jpeg" ||
+        file.type === "image/png" ||
+        file.type === "image/svg" ||
+        file.type === "image/bmp" ||
+        file.type === "image/gif";
+      if (!isJpgOrPng) {
+        message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
         return false;
       }
-    }
+
+      let isLt1M = file.size / 10240 / 10240 <= 1;
+      if (!isLt1M) {
+        this.$message.error("图片大小超过10MB!");
+        return false;
+      }
+
+      const formDatas = new FormData();
+      formDatas.append("file", file);
+      fileUp(formDatas).then((res) => {
+        if (res.data.code === 200) {
+          console.log(file)
+          state.imageUrl = res.data.data;
+          state.imageName = file.name;
+        }
+      });
+      return false;
+    };
+
+    // function beforeUpload(file) {
+    //   if (!state.fileType.includes(file.name.split(".").slice(-1).join(""))) {
+    //     message.error("不支持该格式");
+    //     return false;
+    //   }
+    // }
 
     //查看证书
     const getcertificate = () => {

src/views/projectcenter/ProjectAdd.vue

@@ -3,14 +3,15 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-        >{{ projectInfo.projectId ? "编辑" : "创建"
+      >{{
+          projectInfo.projectId ? "编辑" : "创建"
         }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
       >
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -20,8 +21,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -34,8 +35,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
@@ -43,27 +44,27 @@
           </div>
           <div class="in">
             <NameInput
-              placeholder="请输入项目名称"
-              v-model:value="projectInfo.name"
-              v-model:validate="projectInfo.validate"
-              :maxlength="30"
-              show-count
-              :id="projectInfo.projectId"
+                placeholder="请输入项目名称"
+                v-model:value="projectInfo.name"
+                v-model:validate="projectInfo.validate"
+                :maxlength="30"
+                show-count
+                :id="projectInfo.projectId"
             ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <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" style="flex: 1; display: flex">
             <div
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -71,19 +72,19 @@
                 position: relative;
                 overflow: hidden;
               "
-              v-for="(src, index) in projectPic"
-              :key="index"
-              @click="() => (projectInfo.picUrl = src.value)"
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                :src="src.value"
-                alt="avatar"
+                  :src="src.value"
+                  alt="avatar"
               />
             </div>
           </div>
@@ -91,81 +92,81 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div v-if="projectInfo.projectId" class="in">
             <a-range-picker
-              separator="至"
-              :show-time="{ format: 'HH:mm' }"
-              :placeholder="['      开始时间', '        结束时间']"
-              :disabled-date="disabledDate1"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              :allowClear="false"
-              valueFormat="YYYY-MM-DD HH:mm"
-              @change="timeChange"
-              @ok="clickOk"
-              @openChange="panelOpen"
-              :disabled="viewDetail ? true : false"
+                separator="至"
+                :show-time="{ format: 'HH:mm' }"
+                :placeholder="['      开始时间', '        结束时间']"
+                :disabled-date="disabledDate1"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                :allowClear="false"
+                valueFormat="YYYY-MM-DD HH:mm"
+                @change="timeChange"
+                @ok="clickOk"
+                @openChange="panelOpen"
+                :disabled="viewDetail ? true : false"
             />
           </div>
           <div v-else class="in">
             <a-range-picker
-              separator="至"
-              :show-time="{ format: 'HH:mm' }"
-              :placeholder="['      开始时间', '        结束时间']"
-              :disabled-date="disabledDate"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm"
-              @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                separator="至"
+                :show-time="{ format: 'HH:mm' }"
+                :placeholder="['      开始时间', '        结束时间']"
+                :disabled-date="disabledDate"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm"
+                @change="timeChange"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <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">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
-              @onChange="managerChange"
-              mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <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">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
-              v-model:fullName="projectInfo.sourceBelongFullName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
+                v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -176,8 +177,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -188,15 +189,15 @@
         <div class="name">
           <div class="namebox">
             <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-group
-              v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.boeFlag"
+                :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -211,7 +212,7 @@
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
               <span
-                style="
+                  style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
@@ -225,7 +226,7 @@
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
               <span
-                style="
+                  style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
@@ -242,12 +243,12 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -266,20 +267,15 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-              :fieldNames="{
+                :getPopupContainer="triggerNode => (triggerNode.parentNode || document.body)"
+                placeholder="请选择模版"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+                :fieldNames="{
                 label: 'name',
-                value: 'projectTemplateId',
+                value: 'id',
               }"
             >
             </a-select>
@@ -291,12 +287,12 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-          :loading="loading"
-          v-on:click="createProject"
-          type="primary"
-          class="btn1"
-          style="margin-left: 20px"
-          >确定
+            :loading="loading"
+            v-on:click="createProject"
+            type="primary"
+            class="btn1"
+            style="margin-left: 20px"
+        >确定
         </a-button>
       </div>
     </div>
@@ -383,10 +379,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-        api
+      api
           .getProjectDetail({
             projectId:
-              state.projectInfo.projectId || state.projectInfo.parentId,
+                state.projectInfo.projectId || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -394,8 +390,8 @@ export default {
               ...state.projectInfo,
             };
             !routers.query.projectId &&
-              !!routers.query.parentId &&
-              (state.projectInfo.name = "");
+            !!routers.query.parentId &&
+            (state.projectInfo.name = "");
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,
@@ -422,8 +418,8 @@ export default {
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
                     state.auditDescription = res.rows[i - 1].description
-                      ? res.rows[i - 1].description
-                      : "-";
+                        ? res.rows[i - 1].description
+                        : "-";
                   }
                 }
               });
@@ -437,14 +433,15 @@ export default {
 
     //选择分类
     const classificationChange = (value) => {
-      console.log(`selected ${value}`);
       state.projectType = value; //分类选择的id
     };
 
     const classificationChange5 = (key, option) => {
       state.projectInfo = option;
+      state.projectInfo.projectTemplateId = option.id
+      state.projectInfo.id = ''
       state.projectInfo.type = 3;
-      state.projectInfo.rangeTime = [option.beginTime, option.endTime];
+      state.projectInfo.rangeTime = [dayjs(option.beginTime, "YYYY-MM-DD HH:mm"), dayjs(option.endTime, "YYYY-MM-DD HH:mm")];
       state.projectInfo.parentName = routers.query.parentName;
       state.projectInfo.parentId = routers.query.parentId;
     };
@@ -508,6 +505,7 @@ export default {
       state.loading = true;
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
+        state.loading = false;
         return;
       }
       /**
@@ -525,6 +523,7 @@ export default {
       });
       if (offName) {
         message.destroy();
+        state.loading = false;
         return message.warning("项目名称重复，请重新填写");
       }
       state.projectInfo.type = 3;
@@ -535,7 +534,7 @@ export default {
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         router.push({
           path: "/taskpage",
-          query: { projectId: res.data.data },
+          query: {projectId: res.data.data},
         });
       });
     };
@@ -549,10 +548,10 @@ export default {
 
     const clickOk = (e) => {
       state.clickNum = state.clickNum + 1
-      if(state.clickNum==2) {
+      if (state.clickNum == 2) {
         state.clickNum = 0
         state.changeCondition = false;
-      }else{
+      } else {
         state.changeCondition = true;
       }
       console.log(e)
@@ -560,18 +559,16 @@ export default {
 
     const panelOpen = (e) => {
       console.log(e)
-      if(!e){
+      if (!e) {
         state.clickNum = 0
         state.changeCondition = false;
       }
     }
 
     const disabledDate1 = (current) => {
-      // return current && current < dayjs().startOf("day");
-      console.log(state.projectInfo.rangeTime1)
-      if(state.changeCondition){
-        return current && current < moment(state.projectInfo.rangeTime[0]).endOf("YYYY-MM-DD HH:mm:ss"); 
-      }else{
+      if (state.changeCondition) {
+        return current && current < moment(state.projectInfo.rangeTime[0]).endOf("YYYY-MM-DD HH:mm:ss");
+      } else {
         return current && current > moment(state.projectInfo.rangeTime1[0]).endOf("YYYY-MM-DD HH:mm:ss")
       }
     };
@@ -603,6 +600,7 @@ export default {
   .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
     border-color: #fff !important;
   }
+
   .ant-checkbox-disabled .ant-checkbox-inner {
     background-color: #1890ff !important;
   }