Merge branch 'pre-dev' into 'develop'

Pre dev

See merge request !71

src/components/drawers/ViewAssess.vue

@@ -114,7 +114,7 @@
             </div>
           </div>
           <!-- 评分题 -->
-          <div v-if="values.questionType==4" class="assessbox" style="margin-top: 30px">
+          <div v-if="values.questionType==4" class="assessbox" style="margin-top: 30px;">
             <div class="box1">
               <div class="asstype">评估类型：</div>
               <div class="typename">评分题</div>
@@ -134,8 +134,8 @@
             </div>
           </div>
 
+          <div v-if="index==questionListArr.length-1" style="width:100%;height: 200px;"></div>
         </div>
-        <div style="margin-top: 30px;margin-bottom: 60px;"></div>
         
       </div>
       <div class="btnn">

src/views/courselibrary/CoursewareManage.vue

@@ -347,7 +347,7 @@
             </a-button> -->
             <a-button
               v-if="
-                (record.auditStatus === 2 || record.auditStatus === 3)
+                (record.auditStatus === 3)
               "
               @click="() => handleStart(record, String(record.courseform))"
               type="link"
@@ -925,6 +925,7 @@
                 v-model:validated="validated"
                 show-count
                 :id="offcoursePlanId"
+                :onceName="onceName"
                 :type="5"
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入开课名称"
@@ -2571,6 +2572,7 @@ export default defineComponent({
       xjkkradioV1: "",
       completeType: "",
       xjkkinputV1: "",
+      onceName: "",
       xjkkinputV2: "",
       xjkkinputV3: "",
       xjkkinputV4: null,
@@ -3619,6 +3621,7 @@ export default defineComponent({
       state.xjkkradioV1 = "";
       state.completeType = "";
       state.xjkkinputV1 = "";
+      state.onceName = "";
       state.xjkkinputV2 = "";
       state.xjkkinputV3 = "";
       state.xjkkinputV4 = null;
@@ -3760,6 +3763,7 @@ export default defineComponent({
       state.EditTestId = Number(item.testId);
       state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
+      state.onceName = item.name;
       state.beforeValue = item.beforeStart; //考勤 开始前
       state.afterStartValue = item.afterStart; //考勤 开始后
       if (item.signFlag === 1) {