提交

src/components/growthpath/GrowthActive.vue

@@ -267,7 +267,7 @@ const rulesRef = ref({
     },
   ],
 });
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
 const durationText = computed(() =>
   dateTime.value?.length
     ? dayjs(dateTime.value[1]).diff(dayjs(dateTime.value[0]), "minute")
@@ -349,7 +349,7 @@ function openDrawer(row) {
       dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"),
       dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm"),
     ]);
-  row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+  validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;
 }
 

src/components/growthpath/GrowthDiscuss.vue

@@ -94,7 +94,7 @@ const props = defineProps({
   growId: String,
 });
 const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
   info: {
     discussName: "",
     discussExplain: "",
@@ -118,12 +118,17 @@ const rulesRef = ref({
   ],
 });
 
-let validate = Form.useForm(formData.value.info, rulesRef).validate
+let validate = null;
 const closeDrawer = () => {
   visible.value = false;
   dateTime.value = [];
-  formData.reset();
+  formData.value = {
-  formData.value.info = {};
+    info: {
+      discussName: "",
+      discussExplain: "",
+      discussSettings: true,
+    },
+  };
 };
 
 async function confirm() {
@@ -161,7 +166,7 @@ function openDrawer(row) {
       row.info.discussSettings === "false" || row.info.discussSettings === false
         ? false
         : true);
-  row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+  validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;
 }
 

src/components/growthpath/GrowthHomework.vue

@@ -198,12 +198,13 @@ async function confirm() {
       } else {
         message.success("添加成功");
       }
+      closeDrawer();
       emit("refresh");
     } else {
       message.error(res.msg);
     }
   });
-  closeDrawer();
+  
 }
 let validate = null;
 function openDrawer(row) {

src/components/growthpath/GrowthLive.vue

@@ -356,7 +356,7 @@ const props = defineProps({
 });
 const visible = ref(false);
 const headers = { token: getCookieForName("token") };
-const formData = useResetRef({
+const formData = ref({
   info: {
     liveName: "",
     liveLink: "",
@@ -436,7 +436,7 @@ const rulesRef = ref({
     },
   ],
 });
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
 const { resetFields } = Form.useForm(formData.value.info, rulesRef);
 const durationText = computed(() =>
   dateTime.value?.length
@@ -451,8 +451,26 @@ const closeDrawer = () => {
     imageUrl.value = "";
     visible.value = false;
     dateTime.value = [];
-    formData.reset();
+    formData.value = {
-    formData.value.info = {};
+      info: {
+        liveName: "",
+        liveLink: "",
+        liveStartTime: "",
+        liveEndTime: "",
+        liveNotice: "",
+        liveDuration: "",
+        liveTeacherId: "",
+        liveTeacherName: "",
+        liveCover: "",
+        beforeSignIn: "",
+        afterSignIn: "",
+        isEvaluate: false,
+        assessmentId: "",
+        assessmentName: "",
+        livePlayback: "",
+        liveExplain: "",
+      },
+    };
     resetFields();
   }
 };
@@ -495,11 +513,11 @@ async function confirm() {
       } else {
         message.success("添加成功");
       }
+      closeDrawer();
       emit("refresh");
     } else {
       message.error(res.msg);
     }
-    closeDrawer();
   });
 }
 
@@ -507,7 +525,7 @@ function openDrawer(row) {
   row && (formData.value = row);
   row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
   row && (imageUrl.value = row.info.liveCover);
-  row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+  validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;
 }
 

src/components/growthpath/GrowthOnlineManage.vue

@@ -18,123 +18,128 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="main">
+      <template v-if="step == 1">
-        <template v-if="datasource.taskType == 4">
+        <div class="main">
-          <div class="endtime">
-            起止时间：{{ datasource.info.submitStartTime }}
-            ～
-            {{ datasource.info.submitEndTime }}
-          </div>
-        </template>
-        <div class="search" style="justify-content: flex-start">
-          <div class="sealeft">
-            <div class="namecon" style="margin-right: 16px">
-              <PostSelectNew width="200px" v-model:value="stdPosition">
-              </PostSelectNew>
-            </div>
-            <div class="namecon" style="margin-right: 16px">
-              <OfficeSelect
-                v-model:value="qualsLevelCode"
-                :searchData="stdPosition"
-                width="200px"
-              />
-            </div>
-            <div class="namecon" style="margin-right: 16px">
-              <div class="select">
-                <a-select
-                  v-model:value="completionStatus"
-                  style="width: 200px"
-                  placeholder="任务状态"
-                  :options="projectNameList"
-                  @change="selectCompletionStatus"
-                  allowClear
-                ></a-select>
-              </div>
-            </div>
-            <div class="namecon" style="margin-right: 16px">
-              <a-input
-                v-model:value="name"
-                style="width: 200px; height: 40px; border-radius: 8px"
-                placeholder="请输入姓名/工号"
-              />
-            </div>
-          </div>
-          <div class="btns">
-            <div
-              class="btn btn1"
-              style="margin-right: 20px"
-              @click="searchTaskList"
-            >
-              <div class="img1"></div>
-              <div class="wz">搜索</div>
-            </div>
-            <div class="btn btn2" @click="resetTaskList">
-              <div class="img2"></div>
-              <div class="wz">重置</div>
-            </div>
-          </div>
-        </div>
-        <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" @click="godie" style="margin-right: 20px">
-            <div class="img1"></div>
-            <div class="wz">催促学习</div>
-          </div>
-
-          <div class="btn btn2" @click="exportTaskStu">
-            <div class="img2"></div>
-            <div class="wz">导出数据</div>
-          </div>
-
           <template v-if="datasource.taskType == 4">
-            <div
+            <div class="endtime">
-              class="btn btn2"
+              起止时间：{{ datasource.info.submitStartTime }}
-              @click="exportHomeWorkShow"
+              ～
-              style="margin-left: 20px"
+              {{ datasource.info.submitEndTime }}
-            >
-              <div class="wz">导出作业</div>
-            </div>
-            <div class="btn btn2" style="margin-left: 20px">
-              <div class="wz" @click="showEntryScore">导入成绩</div>
             </div>
           </template>
-        </div>
+          <div class="search" style="justify-content: flex-start">
-        <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
+            <div class="sealeft">
-          <a-table
+              <div class="namecon" style="margin-right: 16px">
-            style="border: 1px solid #f2f6fe"
+                <PostSelectNew width="200px" v-model:value="stdPosition">
-            :columns="tableDataFunc()"
+                </PostSelectNew>
-            :data-source="tableData"
+              </div>
-            :loading="tableDataTotalLoading"
+              <div class="namecon" style="margin-right: 16px">
-            :scroll="{ x: 900 }"
+                <OfficeSelect
-            :pagination="false"
+                  v-model:value="qualsLevelCode"
-          />
+                  :searchData="stdPosition"
-          <div class="tableBox">
+                  width="200px"
-            <div class="pa">
+                />
-              <a-pagination
+              </div>
-                :showSizeChanger="false"
+              <div class="namecon" style="margin-right: 16px">
-                showQuickJumper="true"
+                <div class="select">
-                hideOnSinglePage="true"
+                  <a-select
-                :pageSize="pageSize"
+                    v-model:value="completionStatus"
-                :current="currentPage"
+                    style="width: 200px"
-                :total="tableDataTotal"
+                    placeholder="任务状态"
-                class="pagination"
+                    :options="projectNameList"
-                @change="changePaginationStu"
+                    @change="selectCompletionStatus"
-                v-if="tableDataTotal > 10"
+                    allowClear
-              />
+                  ></a-select>
+                </div>
+              </div>
+              <div class="namecon" style="margin-right: 16px">
+                <a-input
+                  v-model:value="name"
+                  style="width: 200px; height: 40px; border-radius: 8px"
+                  placeholder="请输入姓名/工号"
+                />
+              </div>
+            </div>
+            <div class="btns">
+              <div
+                class="btn btn1"
+                style="margin-right: 20px"
+                @click="searchTaskList"
+              >
+                <div class="img1"></div>
+                <div class="wz">搜索</div>
+              </div>
+              <div class="btn btn2" @click="resetTaskList">
+                <div class="img2"></div>
+                <div class="wz">重置</div>
+              </div>
+            </div>
+          </div>
+          <div class="btnss" style="margin-top: 20px">
+            <template v-if="tableData.length">
+              <div class="btn btn1" @click="godie" style="margin-right: 20px">
+                <div class="img1"></div>
+                <div class="wz">催促学习</div>
+              </div>
+
+              <div class="btn btn2" @click="exportTaskStu">
+                <div class="img2"></div>
+                <div class="wz">导出数据</div>
+              </div>
+
+              <template v-if="datasource.taskType == 4">
+                <div
+                  class="btn btn2"
+                  @click="exportHomeWorkShow"
+                  style="margin-left: 20px"
+                >
+                  <div class="wz">导出作业</div>
+                </div>
+                <div class="btn btn2" style="margin-left: 20px">
+                  <div class="wz" @click="showEntryScore">导入成绩</div>
+                </div>
+              </template>
+            </template>
+          </div>
+          <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
+            <a-table
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tableData"
+              :loading="tableDataTotalLoading"
+              :scroll="{ x: 900 }"
+              :pagination="false"
+            />
+            <div class="tableBox">
+              <div class="pa">
+                <a-pagination
+                  :showSizeChanger="false"
+                  showQuickJumper="true"
+                  hideOnSinglePage="true"
+                  :pageSize="pageSize"
+                  :current="currentPage"
+                  :total="tableDataTotal"
+                  class="pagination"
+                  @change="changePaginationStu"
+                  v-if="tableDataTotal > 10"
+                />
+              </div>
             </div>
           </div>
         </div>
-      </div>
+      </template>
-     
+      <template v-if="step == 2">
+        <EScore
+          :type="2"
+          @close="closeImport"
+          :id="datasource?.id"
+          :pid="datasource?.growthId"
+          v-model:searchTaskList="searchTaskList"
+        />
+      </template>
     </div>
   </a-drawer>
 
-  <EScore
-    v-model:eScorevisible="Evisible"
-    :type="2"
-    :id="datasource?.id"
-    :pid="datasource?.growthId"
-    v-model:searchTaskList="searchTaskList"
-  />
   <!-- <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
     :basicdata="datasource.info" /> -->
 </template>
@@ -143,7 +148,6 @@
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import ViewAssess from "../ViewAssess";
-import { checkGrowthPer } from "@/utils/utils";
 import EScore from "@/components/growthpath/GrowthScore.vue";
 
 import {
@@ -202,6 +206,7 @@ export default {
       visible: props.Tvisible,
       name: "",
       pageNum: 1,
+      step: 1, // 步骤数
       Evisible: false, //录入成绩抽屉
       pageSize: 10,
       currentPage: 1,
@@ -232,6 +237,12 @@ export default {
       evalDataSource: "",
       Assessvisible: false,
     });
+    // 关闭导入成绩
+    const closeImport = () => {
+      state.step = 1;
+      state.tableDataTotalLoading = true;
+      getData();
+    };
     const tableDataFunc = () => {
       const columns = [
         {
@@ -431,13 +442,19 @@ export default {
     };
 
     const closeDrawer = () => {
-      ctx.emit("update:Tvisible", false);
+      if (state.step == 1) {
-      state.currentPage = 1;
+        ctx.emit("update:Tvisible", false);
-      state.name = "";
+        state.currentPage = 1;
-      state.completionStatus = undefined;
+        state.name = "";
-      state.tableData = [];
+        state.completionStatus = undefined;
-      state.stdPosition = null;
+        state.tableData = [];
-      state.qualsLevelCode = null;
+        state.stdPosition = null;
+        state.qualsLevelCode = null;
+      } else {
+        state.step = 1;
+        state.tableDataTotalLoading = true;
+        getData();
+      }
     };
     const afterVisibleChange = (bol) => {
       if (bol == true) {
@@ -478,7 +495,7 @@ export default {
     };
     // 导入成绩
     const showEntryScore = () => {
-      state.Evisible = true;
+      state.step = 2;
     };
     // 获取数据
     function getData() {
@@ -582,6 +599,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      closeImport,
       onMounted,
       onUnmounted,
       onChange,

src/components/growthpath/GrowthRef.vue

@@ -96,7 +96,7 @@ const props = defineProps({
   growId: String,
 });
 const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
   info: {
     linkName: "",
     linkAddress: "",
@@ -121,13 +121,18 @@ const rulesRef = ref({
   ],
 });
 
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
 
 const closeDrawer = () => {
   visible.value = false;
   dateTime.value = [];
-  formData.reset();
+  formData.value = {
-  formData.value.info = {};
+    info: {
+      linkName: "",
+      linkAddress: "",
+      linkDescription: "",
+    },
+  };
 };
 
 async function confirm() {
@@ -160,7 +165,7 @@ async function confirm() {
 
 function openDrawer(row) {
   row && (formData.value = row);
-  row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+  validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;
 }
 

src/components/growthpath/GrowthScore.vue

@@ -1,193 +1,168 @@
 <template>
-  <a-drawer
+  <div class="ExportScore">
-    :visible="eScorevisible"
+    <div class="minatitl">
-    class="drawerStyle ExportScore"
+      <div class="up1">请下载</div>
-    placement="right"
+      <div class="up2" @click="downTemplate" style="cursor: pointer">模板</div>
-    width="700px"
+      <div class="up1">，按要求填写数据并导入</div>
-    @after-visible-change="afterVisibleChange"
+    </div>
-  >
+    <div class="upload">
-    <div class="drawerMain">
+      <div class="text">上传：</div>
-      <div class="header">
+      <div class="right">
-        <div class="headerTitle">导入成绩</div>
+        <div style="height: 176px; margin-bottom: 20px">
-        <img
+          <a-upload-dragger
-          style="width: 29px; height: 29px; cursor: pointer"
+            v-model:fileList="fileList"
-          src="../../assets/images/basicinfo/close.png"
+            :action="importHomeWork"
-          @click="closeDrawer"
+            name="uploadFile"
-        />
+            :multiple="true"
-      </div>
+            :headers="headers"
-      <div class="main">
+            @change="handleChange"
-        <div class="minatitl">
+            :showUploadList="false"
-          <div class="up1">请下载</div>
+            :data="{
-          <div class="up2" @click="downTemplate" style="cursor: pointer">
+              // type: type,
-            模板
+              // taskId: Number(id),
-          </div>
+              workId: datesource.info ? datesource.info.id : id,
-          <div class="up1">，按要求填写数据并导入</div>
+              // targetId: Number(id),
+            }"
+          >
+            <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="upload">
+        <!-- <div class="load">
-          <div class="text">上传：</div>
-          <div class="right">
-            <div style="height: 176px; margin-bottom: 20px">
-              <a-upload-dragger
-                v-model:fileList="fileList"
-                :action="importHomeWork"
-                name="uploadFile"
-                :multiple="true"
-                :headers="headers"
-                @change="handleChange"
-                :showUploadList="false"
-                :data="{
-                  // type: type,
-                  // taskId: Number(id),
-                  workId: datesource.info ? datesource.info.id : id,
-                  // targetId: Number(id),
-                }"
-              >
-                <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 class="loadstate">
-              <div
+          <div
-                class="loadborder"
+            class="loadborder"
-                v-if="uploadpercent < 100 && uploadpercent !== -1"
+            v-if="uploadpercent < 100 && uploadpercent !== -1"
-              >
+          >
-                <div class="content">
+            <div class="content">
-                  <div class="img"></div>
+              <div class="img"></div>
-                  <div class="timebox">
+              <div class="timebox">
-                    <div class="timetop">
+                <div class="timetop">
-                      <div class="tit">{{ fileName }}</div>
+                  <div class="tit">{{ fileName }}</div>
-                      <div class="stateloading">正在上传</div>
+                  <div class="stateloading">正在上传</div>
-                    </div>
+                </div>
-                    <a-progress :percent="uploadpercent" />
+                <a-progress :percent="uploadpercent" />
-                    <!-- <div class="prog">
+                <!-- <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="curloading">
-                <div class="content">
+                <!-- <div class="cur">55%</div> -->
-                  <div class="img"></div>
+                <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
-                  <div class="timebox">
+                        <div class="cancel" style="margin-left: 15px">取消</div> -->
-                    <div class="timetop">
+              </div>
-                      <div class="tit">{{ fileName }}</div>
+            </div>
-                      <div class="statedefeat">上传失败</div>
+          </div>
-                    </div>
+          <div class="loadborder" v-if="uploadErr">
-                    <a-progress :percent="uploadpercent" />
+            <div class="content">
-                    <!-- <div class="prog">
+              <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>
 
-                  <div class="curloading">
+              <div class="curloading">
-                    <!-- <div class="cur">55%</div> -->
+                <!-- <div class="cur">55%</div> -->
-                    <div
+                <div style="color: #387df7; margin-left: 20px; cursor: pointer">
-                      style="color: #387df7; margin-left: 20px; cursor: pointer"
+                  下载失败数据
-                    >
+                </div>
-                      下载失败数据
+                <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
-                    </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="defeat" style="display: flex; align-items: center">
-              <div class="loadborder" v-if="uploadpercent === 100">
+                <div style="color: #ff7474">
-                <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>
+          <!--  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 class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="closeDrawer">确定</button>
-      </div>
     </div>
-    <!--  加载动画 -->
+  </div>
-    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+  <div class="btnn">
-      <a-spin :spinning="addLoading" tip="" />
+    <button class="btn1" @click="closeDrawer">取消</button>
-    </div>
+    <button class="btn2" @click="closeDrawer">确定</button>
-  </a-drawer>
+  </div>
+  <!--  加载动画 -->
+  <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+    <a-spin :spinning="addLoading" tip="" />
+  </div>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -248,6 +223,7 @@ export default {
       state.fileList = [];
       state.uploadpercent = -1;
       state.uploadErr = false; //上传失败
+      ctx.emit("close");
     };
 
     const afterVisibleChange = (bool) => {
@@ -420,280 +396,251 @@ export default {
 
 <style lang="scss">
 .ExportScore {
-  .drawerMain {
+  overflow-y: auto;
-    min-width: 600px;
+
-    margin: 0px 32px 0px 32px;
+  .minatitl {
-    overflow-x: auto;
     display: flex;
-    flex-direction: column;
 
-    .header {
+    .up1 {
-      height: 73px;
+      font-size: 16px;
-      border-bottom: 1px solid #e8e8e8;
+      font-weight: 400;
-      display: flex;
+      color: #333333;
-      justify-content: space-between;
-      align-items: center;
-      // background-color: red;
-      margin-bottom: 20px;
-      flex-shrink: 0;
-
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        // margin-left: 24px;
-      }
     }
 
-    .main {
+    .up2 {
-      overflow-y: auto;
+      font-size: 16px;
+      font-weight: 400;
+      color: #4ea6ff;
+      margin-left: 4px;
+    }
+  }
 
-      .minatitl {
+  .upload {
+    margin-top: 32px;
+    display: flex;
+
+    .text {
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .right {
+      margin-left: 6px;
+
+      .load {
+        width: 500px;
+        height: 176px;
+        background: #f5f9fd;
+        border-radius: 4px;
+        // opacity: 0.3;
+        border: 1px dashed #caddfd;
         display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-bottom: 20px;
 
-        .up1 {
+        .cloud {
-          font-size: 16px;
+          margin-top: 52px;
-          font-weight: 400;
+          width: 28px;
-          color: #333333;
+          height: 28px;
+          background-image: url(../../assets/images/basicinfo/cloud.png);
         }
 
-        .up2 {
+        .tip {
-          font-size: 16px;
+          font-size: 14px;
           font-weight: 400;
           color: #4ea6ff;
-          margin-left: 4px;
+          margin-top: 15px;
+          cursor: pointer;
+        }
+
+        .tipz {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999999;
+          margin-top: 10px;
         }
       }
 
-      .upload {
+      .loadstate {
-        margin-top: 32px;
+        width: 500px;
-        display: flex;
+        margin-bottom: 100px;
 
-        .text {
+        .loadborder {
-          font-size: 14px;
+          width: 500px;
-          font-weight: 400;
+          height: 173px;
-          color: #333333;
+          border-radius: 4px;
-        }
+          border: 1px dashed #eaeaea;
+          margin-bottom: 30px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          position: relative;
 
-        .right {
+          .content {
-          margin-left: 6px;
-
-          .load {
-            width: 500px;
-            height: 176px;
-            background: #f5f9fd;
-            border-radius: 4px;
-            // opacity: 0.3;
-            border: 1px dashed #caddfd;
             display: flex;
-            flex-direction: column;
+            margin-left: 20px;
-            align-items: center;
+            position: relative;
-            margin-bottom: 20px;
 
-            .cloud {
+            .defeat {
-              margin-top: 52px;
+              width: 400px;
-              width: 28px;
+              position: absolute;
-              height: 28px;
+              left: 46px;
-              background-image: url(../../assets/images/basicinfo/cloud.png);
+              top: 38px;
-            }
-
-            .tip {
               font-size: 14px;
-              font-weight: 400;
+              font-weight: 500;
-              color: #4ea6ff;
+              justify-content: space-between;
-              margin-top: 15px;
-              cursor: pointer;
             }
 
-            .tipz {
+            .img {
-              font-size: 14px;
+              width: 30px;
-              font-weight: 400;
+              height: 34px;
-              color: #999999;
+              background-image: url(../../assets/images/basicinfo/exl.png);
-              margin-top: 10px;
             }
-          }
 
-          .loadstate {
+            .timebox {
-            width: 500px;
+              margin-left: 15px;
-            margin-bottom: 100px;
+              margin-top: -5px;
 
-            .loadborder {
+              .timetop {
-              width: 500px;
-              height: 173px;
-              border-radius: 4px;
-              border: 1px dashed #eaeaea;
-              margin-bottom: 30px;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              position: relative;
-
-              .content {
                 display: flex;
-                margin-left: 20px;
+                width: 262px;
-                position: relative;
+                justify-content: space-between;
 
-                .defeat {
+                // margin-bottom: 8px;
-                  width: 400px;
+                .tit {
-                  position: absolute;
-                  left: 46px;
-                  top: 38px;
                   font-size: 14px;
-                  font-weight: 500;
+                  font-weight: 400;
-                  justify-content: space-between;
+                  color: #333333;
                 }
 
-                .img {
+                .stateloading {
-                  width: 30px;
+                  font-size: 14px;
-                  height: 34px;
+                  font-weight: 400;
-                  background-image: url(../../assets/images/basicinfo/exl.png);
+                  color: #4ea6ff;
                 }
 
-                .timebox {
+                .statedefeat {
-                  margin-left: 15px;
+                  font-size: 14px;
-                  margin-top: -5px;
+                  font-weight: 400;
-
+                  color: #ff7474;
-                  .timetop {
-                    display: flex;
-                    width: 262px;
-                    justify-content: space-between;
-
-                    // margin-bottom: 8px;
-                    .tit {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #333333;
-                    }
-
-                    .stateloading {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #4ea6ff;
-                    }
-
-                    .statedefeat {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #ff7474;
-                    }
-
-                    .statesucce {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #35ae69;
-                    }
-                  }
-
-                  .prog {
-                    width: 262px;
-                    height: 5px;
-                    background: #eaf1fe;
-                    border-radius: 4px;
-
-                    .inprogloading {
-                      width: 55%;
-                      height: 5px;
-                      border-radius: 4px;
-
-                      background: #4ea6ff;
-                    }
-
-                    //下载失败条
-                    .inprogdefeat {
-                      width: 55%;
-                      height: 5px;
-                      border-radius: 4px;
-
-                      background: #ff7474;
-                    }
-
-                    //下载成功条
-                    .inprogsucce {
-                      width: 100%;
-                      height: 5px;
-                      border-radius: 4px;
-
-                      background: #57c887;
-                    }
-                  }
                 }
 
-                .curloading {
+                .statesucce {
-                  margin-left: 15px;
+                  font-size: 14px;
-                  margin-top: 15px;
+                  font-weight: 400;
-                  display: flex;
+                  color: #35ae69;
-
-                  .cur {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #333333;
-                  }
-
-                  .cancel {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #387df7;
-                  }
                 }
               }
 
-              .downloadErr {
+              .prog {
-                width: 120px;
+                width: 262px;
-                height: 32px;
+                height: 5px;
-                display: flex;
+                background: #eaf1fe;
-                align-items: center;
+                border-radius: 4px;
-                justify-content: center;
+
-                border-radius: 2px;
+                .inprogloading {
-                border: 1px solid #387df7;
+                  width: 55%;
+                  height: 5px;
+                  border-radius: 4px;
+
+                  background: #4ea6ff;
+                }
+
+                //下载失败条
+                .inprogdefeat {
+                  width: 55%;
+                  height: 5px;
+                  border-radius: 4px;
+
+                  background: #ff7474;
+                }
+
+                //下载成功条
+                .inprogsucce {
+                  width: 100%;
+                  height: 5px;
+                  border-radius: 4px;
+
+                  background: #57c887;
+                }
+              }
+            }
+
+            .curloading {
+              margin-left: 15px;
+              margin-top: 15px;
+              display: flex;
+
+              .cur {
+                font-size: 14px;
+                font-weight: 400;
+                color: #333333;
+              }
+
+              .cancel {
                 font-size: 14px;
                 font-weight: 400;
                 color: #387df7;
-                line-height: 20px;
-                cursor: pointer;
-                margin-left: 66px;
-                margin-top: 16px;
-                position: absolute;
-                bottom: 28;
               }
             }
           }
+
+          .downloadErr {
+            width: 120px;
+            height: 32px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 2px;
+            border: 1px solid #387df7;
+            font-size: 14px;
+            font-weight: 400;
+            color: #387df7;
+            line-height: 20px;
+            cursor: pointer;
+            margin-left: 66px;
+            margin-top: 16px;
+            position: absolute;
+            bottom: 28;
+          }
         }
       }
     }
+  }
 
-    .btnn {
+  .btnn {
-      height: 72px;
+    height: 72px;
-      width: 100%;
+    width: 100%;
-      position: absolute;
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
+    .btn1 {
+      width: 100px;
+      height: 40px;
+      border: 1px solid #4ea6ff;
+      border-radius: 8px;
+      color: #4ea6ff;
       background-color: #fff;
-      bottom: 0;
+      cursor: pointer;
-      left: 0;
+    }
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
 
-      .btn1 {
+    .btn2 {
-        width: 100px;
+      cursor: pointer;
-        height: 40px;
+      width: 100px;
-        border: 1px solid #4ea6ff;
+      height: 40px;
-        border-radius: 8px;
+      background: #4ea6ff;
-        color: #4ea6ff;
+      border-radius: 8px;
-        background-color: #fff;
+      border: 0;
-        cursor: pointer;
+      margin-left: 15px;
-      }
+      color: #fff;
-
-      .btn2 {
-        cursor: pointer;
-        width: 100px;
-        height: 40px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 0;
-        margin-left: 15px;
-        color: #fff;
-      }
     }
   }
 }

src/components/growthpath/GrowthVote.vue

@@ -144,7 +144,7 @@ const title = computed(() => {
 // 步骤数
 const step = ref(1);
 const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
   info: {
     voteName: "",
     voteStartTime: "",
@@ -182,7 +182,7 @@ const rulesRef = ref({
   ],
 });
 
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
 // 关闭弹窗
 const closeDrawer = () => {
   if (step.value > 1) {
@@ -190,9 +190,14 @@ const closeDrawer = () => {
   } else {
     visible.value = false;
     dateTime.value = [];
-    formData.reset();
+    formData.value = {
-    formData.value.info = {
+      info: {
-      voteStemDtoList: [],
+        voteName: "",
+        voteStartTime: "",
+        voteEndTime: "",
+        voteStemDtoList: [],
+        voteExplain: "",
+      },
     };
   }
 };
@@ -245,7 +250,7 @@ function openDrawer(row) {
       dayjs(row.info.voteStartTime, "YYYY-MM-DD HH:mm"),
       dayjs(row.info.voteEndTime, "YYYY-MM-DD HH:mm"),
     ]);
-  row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+  validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;
 }
 

src/components/growthpath/ImportStu.vue

@@ -35,8 +35,7 @@
                 :multiple="false"
                 @change="handleChange"
                 :data="{
-                  growthId: Number(courseId),
+                  growthId: String(growId),
-                  type: courseType,
                 }"
                 :showUploadList="false"
               >
@@ -219,7 +218,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    courseId: {
+    growId: {
       type: String,
       default: "",
     },
@@ -235,10 +234,10 @@ export default {
     const store = useStore();
     const state = reactive({
       redisKey: "",
-      importStudent: `${process.env.VUE_APP_BOE_API_URL}${
+      // importStudent: `${process.env.VUE_APP_BOE_API_URL}${
-        process.env.VUE_APP_BASE_API_GROWTH || ""
+      //   process.env.VUE_APP_BASE_API_GROWTH || ""
-      }/professional/allocation/importLearner`,
+      // }/professional/allocation/importLearner`,
-
+      importStudent: `http://192.168.31.211:32002/professional/allocation/importLearner`,
       timers: "", // 定时器，用于清空定时器使用
       isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
       uploadpercent: -1,
@@ -268,7 +267,7 @@ export default {
       if (state.redisKey && state.succNum != 0 && item) {
         saveStudent({
           redisKey: state.redisKey,
-          growId: props.courseId,
+          growId: props.growId,
           isImportNotMatchStudent: state.groupValue ? 1 : 0,
         })
           .then((res) => {
@@ -343,7 +342,7 @@ export default {
         console.log("上传成功返回的UUID----->", info);
         console.log("我是导入学员接口传递的参数", {
           file: info.file.originFileObj,
-          targetId: props.courseId,
+          targetId: props.growId,
           type: 14,
         });
         state.fileName = info.file.name;

src/components/growthpath/StudentManage.vue

@@ -286,7 +286,7 @@
   <ImportStu
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
-    :courseId="id"
+    :growId="growId"
     :courseType="type"
   />
   <GrowthDrawer ref="GrowthDrawerRef" title="新增学员" width="1200px">
@@ -732,11 +732,8 @@ const AddImpStuvisible = ref(false); //导入学员抽屉
 const showImpStu = () => {
   AddImpStuvisible.value = true;
 };
-const AddImpStuvisibleClose = (isget) => {
+const AddImpStuvisibleClose = () => {
-  console.log("关闭了导入学员弹框", isget);
+  getStuList();
-  if (isget) {
-    getStuList();
-  }
 };
 
 function startLoading() {

src/views/growthpath/PathManage.vue

@@ -47,12 +47,10 @@
             <div class="line"></div>
           </template>
 
-          <router-link to="/growthpath"
+          <div style="display: flex" @click="goBack">
-            ><div style="display: flex">
+            <img class="img2" src="../../assets/images/leveladd/back.png" />
-              <img class="img2" src="../../assets/images/leveladd/back.png" />
+            <div class="return">返回</div>
-              <div class="return">返回</div>
+          </div>
-            </div>
-          </router-link>
         </div>
       </div>
       <div class="split"></div>
@@ -623,7 +621,6 @@
         :title="showTimeText"
         :datasource="commonData"
       />
-     
     </a-spin>
   </div>
 
@@ -838,6 +835,11 @@ export default {
         query: { growId: state.routerId, pre: state.preId },
       });
     };
+
+    // 返回
+    const goBack = () => {
+      router.go(-1);
+    };
     // 列表拖动结束
     const draggableOnEnd = () => {
       // 开启加载弹窗，getListTask请求完成后会关闭弹框
@@ -1440,6 +1442,7 @@ export default {
       qrcodeAssement,
       handleMenuClickpg,
       draggableOnEnd,
+      goBack,
       handleMenuClick,
       qrcodeVisible,
       handlerSuperiors,