Merge branch 'zcwy-zsx' into 'master'

Zcwy zsx

See merge request !45

src/api/api.js

@@ -130,4 +130,3 @@ export const EditVoteInvolvedAndBrowse = `/vote/editVoteInvolvedAndBrowse post`
 export const ROUTER_DETAIL_CHAPTER_LIST = `/stu/router/chapterPcList`
 
 
-

src/views/homework/HomeworkPage.vue

@@ -496,7 +496,7 @@ const { data } =
     : useRequest(TASK_WORK_DETAIL, { workId, type });
 
 console.log("data==----->", data);
-
+const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
   workerId: workId,
   type
@@ -551,7 +551,8 @@ const handleClick = () => {
     workId,
     type,
     taskId: taskId || infoId,
-    workScore: -1
+    workScore: -1,
+    submitStartTime:answerTime
   }).then((res) => {
     submitList.value.length!==0&&submitList.value.unshift(res.data);
     open();

src/views/survey/SurveyDetail.vue

@@ -46,7 +46,7 @@
             <div class="question" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
               <div class="text">{{ value.assessmentScTitle }}</div>
               <div class="answer">
-                <div class="answerL">完全没用</div>
+                <div class="answerL">{{value.minimumEvaluation?value.minimumEvaluation:'完全没用'}}</div>
                 <div class="answerC">
                   <div class="answerCitem"
                        v-for="(item, key) in orderArr(value.assessmentMinScore,value.assessmentMaxScore)"
@@ -73,7 +73,7 @@
                     <div>{{ item + 1 }}</div>
                   </div>
                 </div>
-                <div class="answerR">非常有帮助/启发</div>
+                <div class="answerR">{{value.highestEvaluation?value.highestEvaluation:'非常有帮助/启发'}}</div>
               </div>
             </div>
           </div>
@@ -214,6 +214,25 @@
 			</span>
     </template>
   </el-dialog>
+  <!-- 可编辑名称 -->
+  <el-dialog @open="onDialogOpen" v-model="bg_name" title="" width="20%" center :show-close="false" :align-center="true">
+    <div style="text-align: center;font-size:16px;">
+      <el-input ref="inputElement" @focus="focusInput" v-model="nameInput" placeholder="请输入内容"></el-input>
+    </div>
+    <template #footer>
+			<span class="dialog-footer">
+				<el-button class="cancel"
+                   style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
+                   @click="of_name">取消</el-button>
+				<el-button class="back"
+                   style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
+                   type="primary" @click="nameUpdata">
+					确定
+				</el-button>
+			</span>
+    </template>
+  </el-dialog>
+  
 </template>
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
@@ -222,7 +241,7 @@ import {useRoute, useRouter} from "vue-router/dist/vue-router";
 import {request, usePage, useRequest} from "@/api/request";
 import {ASSESSMENT_QUERY, ASSESSMENT_SUBMIT} from "@/api/api";
 import {ElMessage} from "element-plus";
-import {ref, watch,onMounted} from "vue";
+import {ref, watch,onMounted,nextTick } from "vue";
 import dayjs from "dayjs";
 import {useTaskPage} from "@/api/useCommon";
 
@@ -280,7 +299,6 @@ function orderArr(a, b) {
   return arrs;
 }
 onMounted(() => {
-console.log(data.value,'aaaa')
   if(isSubmitTrue==true){
     open();
     return
@@ -300,8 +318,6 @@ const centerDialogVisible = ref(false);
 const open = () => {
   centerDialogVisible.value = true;
 };
-
-
 const isEmptyValue = ref(false);
 function emptyValuePromp() {
   if (data.value.isSubmit) {
@@ -347,6 +363,345 @@ function submit() {
 }
 </script>
 <style lang="scss">
+.selectonlineface{
+    z-index: 999;
+    width: 679px;
+    background: #ffffff;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+    position: absolute;
+    left: 50%;
+    top: -100%;
+    transform: translate(-50%, -50%);
+    .bg_headers {
+      position: absolute;
+      width: 100%;
+      height: 40px;
+      background: linear-gradient(
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
+      );
+    }
+    .bg_main {
+      width: 100%;
+      position: relative;
+      .bg_main_header {
+        display: flex;
+        align-items: center;
+        padding-top: 20px;
+        padding-left: 26px;
+        font-size: 16px;
+        .bg_main_header_icon {
+          width: 16px;
+          height: 16px;
+          margin-right: 10px;
+          // background-image: url(@/assets/images/evaluation/uploads.png);
+          background-size: 100% 100%;
+        }
+        .bg_main_header_close {
+          position: absolute;
+          right: 42px;
+          cursor: pointer;
+          width: 20px;
+          height: 20px;
+          // background-image: url(@/assets/images/coursewareManage/close.png);
+          background-size: 100% 100%;
+        }
+      }
+      .text_color{
+        color:#d9d9d9;
+      }
+      .bg_body {
+        width: 80%;
+        margin: 3px auto;
+
+        .bg_body_bt {
+          display: flex;
+          align-items: center;
+          justify-content: end;
+          margin: 14px auto;
+
+          .bg_body_bttext {
+            width: 110px;
+            display: flex;
+            justify-content: end;
+            margin-right: 20px;
+            .bg_body_btimg{
+              width: 10px;
+              height: 10px;
+              margin-top: -3px;
+              margin-right: 6px;
+              background-size: 100% 100%;
+            }
+          }
+          .mbl_items12 {
+            // width: 300px;
+            margin-left: 128px;
+
+            .i12_box1 {
+              display: flex;
+              align-items: center;
+              padding: 17px 0px 17px 21px;
+              border: 1px solid #eff4fc;
+              border-radius: 8px;
+              margin-bottom: 10px;
+
+              .file_img {
+                width: 27px;
+                height: 32px;
+                // background-image: url(@/assets/images/coursewareManage/imgs.png);
+                margin-right: 22px;
+
+                img {
+                  width: 100%;
+                  height: 100%;
+                }
+              }
+
+              .file_detail {
+                width: 250px;
+                margin-right: 21px;
+
+                .file_updata {
+                  display: flex;
+                  align-items: center;
+
+                  .updatabox {
+                    position: relative;
+                    width: 230px;
+                    height: 5px;
+                    background-color: rgba(192, 192, 192, 0.25);
+                    border-radius: 3px;
+
+                    .updatacolor {
+                      position: absolute;
+                      left: 0;
+                      width: 100%;
+                      height: 5px;
+                      background-color: #57c887;
+                      border-radius: 3px;
+                    }
+
+                    .updatacolor2 {
+                      position: absolute;
+                      left: 0;
+                      width: 80%;
+                      height: 5px;
+                      background-color: #ff7474;
+                      border-radius: 3px;
+                    }
+
+                    .updatacolor3 {
+                      position: absolute;
+                      left: 0;
+                      width: 60%;
+                      height: 5px;
+                      background-color: #4ea6ff;
+                      border-radius: 3px;
+                    }
+
+                    .updataxq {
+                      position: absolute;
+                      right: 2px;
+                      top: -30px;
+                      color: #57c887;
+                    }
+
+                    .updataxq2 {
+                      position: absolute;
+                      right: 2px;
+                      top: -30px;
+                      color: #ff7474;
+                    }
+
+                    .updataxq3 {
+                      position: absolute;
+                      right: 2px;
+                      top: -30px;
+                      color: #4ea6ff;
+                    }
+                  }
+                }
+              }
+
+              .file_operation {
+                display: flex;
+
+                .fobox {
+                  margin-right: 5px;
+                  cursor: pointer;
+                }
+              }
+            }
+          }
+        }
+        .bg_body_input {
+          flex: 1;
+          position: relative;
+          .ant-upload-picture-card-wrapper{
+            width: 200px;
+            margin-right: 18px;
+          }
+          .i_upload_img {
+              width: 200px;
+              height: 112px;
+            }
+            ::v-deep .ant-upload.ant-upload-select-picture-card{
+              width: 200px;
+              height: 112px;
+            }
+            .i_upload {
+              width: 200px;
+              height: 112px;
+              text-align: center;
+              align-items: center;
+              cursor: pointer;
+
+              .addimg {
+                position: relative;
+
+                .heng {
+                  position: absolute;
+                  top: 59px;
+                  left: 71px;
+                  width: 60px;
+                  border: 1px solid #d9d9d9;
+                }
+
+                .shu {
+                  position: absolute;
+                  top: 30px;
+                  left: 100px;
+                  height: 60px;
+                  border: 1px solid #d9d9d9;
+                }
+              }
+            }
+          .upload_box{
+            border: 1px solid #d9d9d9;
+            padding: 2px 5px;
+            background-color: #d9d9d9;
+            border-radius: 2px;
+            cursor: pointer;
+          }
+          .error-message{
+            color: red;
+            font-size: 11px;
+            margin-top: 2px;
+            margin-bottom: 0;
+          }
+        }
+        .bg_footer {
+          width: 100%;
+          margin-left: 174px;
+          margin-top: 25px;
+          margin-bottom: 20px;
+          display: flex;
+
+          .btn {
+            width: 100px;
+            height: 40px;
+            background: rgba(64, 158, 255, 0);
+            border-radius: 8px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              line-height: 40px;
+            }
+          }
+
+          .btn5 {
+            border: 1px solid rgba(64, 158, 255, 1);
+            color: #4ea6ff;
+          }
+
+          .btn6 {
+            background-color: #4ea6ff;
+            color: #ffffff;
+          }
+        }
+      }
+      .headers{
+        margin-left: 38px;
+        margin-right: 38px;
+        margin-top: 30px;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        .btn{
+          display: flex;
+        }
+        .headers_item{
+          margin-right: 20px;
+          margin-bottom: 20px;
+          .headers_item_text{
+            margin-right: 15px;
+          }
+          .headers_item_btn {
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            background: #4ea6ff;
+            border-radius: 8px;
+            border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+
+            .search {
+              background-size: 100%;
+            }
+
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #ffffff;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+          .btn1 {
+            .search {
+              width: 15px;
+              height: 17px;
+              // background-image: url("../../assets/images/courseManage/search0.png");
+            }
+          }
+          .btn2 {
+            .search {
+              width: 16px;
+              height: 18px;
+              // background-image: url("../../assets/images/courseManage/reset0.png");
+            }
+          }
+          ::v-deep .ant-select {
+            border-radius: 5px;
+            width: 100%;
+            height: 40px;
+            .ant-select-selector {
+              border-radius: 8px;
+              width: 100%;
+              height: 40px;
+            }
+            .ant-select-selection-placeholder{
+              line-height: 40px;
+            }
+            .ant-select-selection-item{
+              line-height: 40px;
+            }
+          }
+        }
+      }
+    }
+  }
 .preNext {
   position: absolute;
   right: 0px;

vite.config.js

@@ -76,6 +76,10 @@ export default defineConfig(({ command, mode }) =>
 			'/vote': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
 				changeOrigin: true,
+			},'stu/project/redirectDetail':{
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+				changeOrigin: true,
+
 			},
 			'/admin': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,