Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/AddLive.vue

@@ -258,6 +258,7 @@ const formData = ref({
   assessmentId: "",
   assessmentName: "",
   livePlayback: "",
+  liveExplain: ""
 });
 const emit = defineEmits({});
 const taskIndex = ref(-1);
@@ -375,9 +376,9 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.liveName;
-    data.info = formData.value;
+    data.info = {...formData.value};
     data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
-
+    console.log(data)
   }
   emit("update:taskList", [...props.taskList]);
   closeDrawer();

src/components/drawers/ViewAssess.vue

@@ -195,7 +195,7 @@ export default {
         console.log('我是传递过来的参数2', props.basicdata)
         api.QueryAssessmentDetail({
           "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds,
-          "courseId": props.basicdata.id,
+          "courseId": props.datasource.courseId,
           "studentId": props.datasource.studentId
         }).then(res=>{
           console.log(res)

src/components/drawers/project/ProjectExamManage.vue

@@ -169,13 +169,13 @@ export default {
         },
         {
           id: 2,
-          value: "10",
-          label: "未通过",
+          value: "9",
+          label: "已完成",
         },
         {
           id: 3,
           value: "1",
-          label: "已通过",
+          label: "进行中",
         },
       ],
       selectedRowKeys: [],
@@ -305,7 +305,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
+          customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
         },
         {
           title: "操作",

src/components/drawers/project/ProjectVoteManage.vue

@@ -360,7 +360,7 @@
             "studentName": state.name,
             "targetId":props.datasource.projectId,
             "taskId": props.datasource.courseId,
-            "type": 2
+            "type": 1
           });
           api.QueryVoteManagementDetail({
             "pageNo": state.currentPage,
@@ -370,7 +370,7 @@
             "studentName": state.name,
             "targetId":props.datasource.routerId,
             "taskId": props.datasource.courseId,
-            "type": 2
+            "type": 1
           }).then(res=>{
             console.log('投票数据获取', res)
             if(res.data.code==200){

src/components/drawers/router/RouterCommonManage.vue

@@ -128,16 +128,19 @@
       </div>-->
     </div>
   </a-drawer>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
+    :basicdata="datasource.info" />
 </template>
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
+import ViewAssess from "../ViewAssess";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
 export default {
   name: "RouterCommonManage",
-
+  components: { ViewAssess },
   props: {
     CommonModelVisible: {
       type: Boolean,
@@ -200,6 +203,8 @@ export default {
       ],
       tabledata: [],
       tableDataTotalLoading: true, // 表格loading加载配置
+      evalDataSource: "",
+      Assessvisible: false
     });
     const tableDataFunc = () => {
       const columns = [
@@ -317,9 +322,42 @@ export default {
           },
         },
       ];
+
+      let obj = {
+          title: "操作",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
+          width: 60,
+          align: "center",
+          ellipsis: true,
+          className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <a
+                  onClick={()=>{
+                    console.log('iyiy', text.record)
+                    showassess(text.record);
+                  }}>查看</a>
+              </div>
+            );
+          },
+        }
+
+        {/* 评估查看操作 */}
+        if(props.datasource.type==11){
+          columns.push(obj)
+        }
+
       return columns;
     };
 
+    {/* 查看评估弹框 */}
+    const showassess = (data) => {
+      state.evalDataSource = data;
+      state.Assessvisible = true;
+    };
+
     const closeDrawer = () => {
       ctx.emit("update:CommonModelVisible", false);
       state.currentPage = 1;
@@ -477,6 +515,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      showassess,
       afterVisibleChange,
       tableDataFunc,
       godie,

src/components/drawers/router/RouterExaminationManage.vue

@@ -286,7 +286,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({ record: { finishStatus } }) => ({ 1: '通过', 2: '未通过' }[finishStatus] || '未开始'),
+          customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
         },
         {
           title: "操作",
@@ -299,7 +299,7 @@ export default {
           customRender: (text) => {
             {/* debugger */ }
             console.log("text" + text.record)
-            if (text.record.finishStatus === 1 || text.record.finishStatus === 2) {
+            if (text.record.finishStatus === 1 || text.record.finishStatus === 9) {
               return (
                 <div class="racona">
                   <a-button

src/components/student/TableStudent.vue

@@ -354,14 +354,45 @@
     :courseId="id"
     :courseType="type"
   />
+
+  <!-- 有重复添加的项目时的弹窗 -->
+  <a-modal
+    v-model:visible="deleteModalVisible"
+    :footer="null"
+    wrapClassName="deleteModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closeSameModal"></div>
+        </div>
+        <div class="body">
+          <span>确定删除?</span>
+          <span>数据删除后不可恢复！</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1" @click="closeSameModal">
+            <div class="btnText">取消</div>
+          </div>
+          <div class="del_btn btn2" @click="sureSameModal">
+            <div class="btnText">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
 </template>
 <script setup>
-import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
+import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
 import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
-import { message, Modal } from "ant-design-vue";
+import { message } from "ant-design-vue";
 // import { topStudent } from "../../api/indexProjStu";
 import SeeStu from "../../components/drawers/SeeStu";
 import EScore from "../drawers/ExportScore.vue";
@@ -369,7 +400,7 @@ import OrgClass from "@/components/project/OrgClass";
 import ExportHomeWork from "../Modals/ExportHomeWork.vue";
 import * as api from "../../api/index1";
 import ImpStu from "../drawers/AddLevelImportStu";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
+// import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { checkPer } from "@/utils/utils";
 
 const props = defineProps({
@@ -378,7 +409,7 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  activeKey:{
+  activeKey: {
     type: String,
     default: "",
   },
@@ -581,7 +612,7 @@ function exportTaskStuRouter() {
 
 onMounted(() => {
   // debugger
-  console.log("props.activeKey1" + props.activeKey1)
+  console.log("props.activeKey1" + props.activeKey1);
   getStuList();
 });
 watch(props.isgetStudent, () => {
@@ -652,26 +683,42 @@ function bathDel() {
   delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
 }
 
+const deleteModalVisible = ref(false);
+const deleteId = ref(null);
 function del(id, row) {
   if (row.isLeader === "1") {
     return message.warning("" + row.name + "是小组长，请勿删除!");
   }
-
-  Modal.confirm({
-    title: () => "确定删除?",
-    icon: () => createVNode(ExclamationCircleOutlined),
-    content: () => "数据删除后不可恢复！",
-    okText: () => "确定",
-    okType: "danger",
-    cancelText: () => "取消",
-    onOk() {
-      if (id) {
-        tableData.value.loading = true;
-        delStudentList({ ids: [id] }).then(() => getStuList());
-      }
-    },
-  });
+  deleteModalVisible.value = true;
+  deleteId.value = id;
+  // Modal.confirm({
+  //   title: () => "确定删除?",
+  //   icon: () => createVNode(ExclamationCircleOutlined),
+  //   content: () => "数据删除后不可恢复！",
+  //   okText: () => "确定",
+  //   okType: "danger",
+  //   class: "deleteModal",
+  //   cancelText: () => "取消",
+  //   onOk() {
+  //     if (id) {
+  //       tableData.value.loading = true;
+  //       delStudentList({ ids: [id] }).then(() => getStuList());
+  //     }
+  //   },
+  // });
 }
+//确定删除
+const sureSameModal = () => {
+  if (deleteId.value) {
+    tableData.value.loading = true;
+    delStudentList({ ids: [deleteId.value] }).then(() => getStuList());
+    deleteModalVisible.value = false;
+  }
+};
+//取消
+const closeSameModal = () => {
+  deleteModalVisible.value = false;
+};
 
 function submitCall(flag) {
   tableData.value.loading = true;
@@ -1022,6 +1069,132 @@ defineExpose({ getStuList, startLoading });
   }
 }
 
+.deleteModal {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+
+        .delete {
+          z-index: 999;
+          width: 424px;
+          height: 258px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+
+          // position: absolute;
+          // left: 50%;
+          // top: 10%;
+          // transform: translate(-50%, -50%);
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 68px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+
+          .del_main {
+            width: 100%;
+            position: relative;
+
+            .header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+
+              .icon {
+                width: 16px;
+                height: 16px;
+                margin-right: 10px;
+                background-image: url(@/assets/images/taskpage/gan.png);
+                background-size: 100% 100%;
+              }
+
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
+
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                flex-shrink: 0;
+                cursor: pointer;
+
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
+              }
+
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
+              }
+
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #ffffff;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 /*.delete {
   z-index: 9999;
   width: 424px;

src/views/projectcenter/TaskAdd.vue

@@ -1679,5 +1679,6 @@ const cancelStorage = async () => {
 .footBox {
   position: fixed;
   bottom: 0;
+  z-index: 99999;
 }
 </style>