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

2025-12-18 23:36:46 +08:00 · 2022-10-26 11:59:07 +08:00
parent 1f4bb0fd2a 0e74c17aee
commit 25a79633e6
16 changed files with 73 additions and 109 deletions
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -934,9 +934,9 @@ export default {
              > td {
              background: #f6f9fd;
            }
-            .opa {
-              // background-color: #bfa;
-            }
+            // .opa {
+            //   background-color: #bfa;
+            // }
          }
          // .tab {
          //   .ant-table-thead > tr > th {
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -216,6 +216,7 @@
        display: flex;
        justify-content: space-between;
        align-items: center;
+        flex-shrink: 0;
        .headerTitle {
          font-size: 18px;
          font-weight: 600;
--- a/src/components/drawers/AddLevelAddStu.vue
+++ b/src/components/drawers/AddLevelAddStu.vue
@@ -72,7 +72,7 @@
                      :data-source="tabledata"
                      :loading="tableDataTotal === -1 ? true : false"
                      expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
+                      :scroll="{ x: 500 }"
                      @expand="expandTable"
                      :pagination="false"
                      :row-selection="{
@@ -156,7 +156,7 @@
                        :data-source="tabledata1"
                        :loading="tableDataTotal === -1 ? true : false"
                        expandRowByClick="true"
-                        :scroll="{ x: 500, y: 560 }"
+                        :scroll="{ x: 500 }"
                        @expand="expandTable"
                        :pagination="false"
                        :row-selection="{
@@ -246,7 +246,7 @@
                      :data-source="tabledata2"
                      :loading="tableDataTotal === -1 ? true : false"
                      expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
+                      :scroll="{ x: 500 }"
                      @expand="expandTable"
                      :pagination="false"
                      :row-selection="{
@@ -1014,11 +1014,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    const getMousePosition = () => {
--- a/src/components/drawers/ManageRight.vue
+++ b/src/components/drawers/ManageRight.vue
@@ -800,11 +800,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -754,11 +754,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
@@ -812,7 +812,7 @@ export default {
      display: flex;
      // height: 80%;
      margin-bottom: 72px;
-        overflow-y: auto;
+      overflow-y: auto;
      .left {
        width: 65%;
        // height: 100%;
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -755,11 +755,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -755,11 +755,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/ProjManagePower.vue
+++ b/src/components/drawers/ProjManagePower.vue
@@ -755,11 +755,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -755,11 +755,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -491,8 +491,6 @@ export default {
          cursor: pointer;
          }
      }
-      .ant-table-tbody{
-     
      .pa {
        margin-top: 15px;
        // height: 20px;
@@ -502,9 +500,6 @@ export default {
        // bottom: 20px;
      }
    }
-    
-
-    }
  .scorelist {
    
    padding-bottom: 100px;
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -755,11 +755,11 @@ export default {
    };
    const onSelectChange1 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys1 = selectedRowKeys;
    };
    const onSelectChange2 = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRowKeys2 = selectedRowKeys;
    };

    return {
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -15,6 +15,7 @@
            @click="closeDrawer"
          />
        </div>
+        <div class="contentMain">
        <div class="main">
        
          <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
@@ -40,11 +41,11 @@
            </div>
          </div>
        </div>
+      </div>
        <div class="btnn">
          <button class="btn1" @click="closeDrawer">取消</button>
          <button class="btn2" @click="closeDrawer">确定</button>
        </div>
-  
      </div>
    </a-drawer>
 </template>
@@ -213,7 +214,6 @@
    .drawerMain {
      min-width: 600px;
      margin: 0px 32px 0px 32px;
-      overflow-x: scroll;
      display: flex;
      flex-direction: column;
      .header {
@@ -236,17 +236,11 @@
      .main {
        width: 100%;
        height: 100%;
-  
-        // background-color: #bfa;
-        // overflow-y: auto;
        .endtime {
          font-size: 16px;
          font-weight: 500;
          color: #333333;
        }
-  
-     
-  
        .tableBox {
          padding-bottom: 100px;
          .ant-table-selection-column {
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -3,7 +3,7 @@
    :visible="TaskFaceImpStuvisible"
    class="drawerStyle TaskFaceImpStu"
    placement="right"
-    width="40%"
+    width="700px"
    @after-visible-change="afterVisibleChange"
  >
    <div class="drawerMain">
@@ -82,7 +82,7 @@
                    </div>
                  </div>
                  <div class="curloading">
-                    <div class="cur">55%</div>
+                    <div class="cur">100%</div>
                    <div class="cancel" style="margin-left: 20px">删除</div>
                  </div>
                </div>
@@ -145,6 +145,7 @@ export default {
      align-items: center;
      // background-color: red;
      margin-bottom: 20px;
+      flex-shrink: 0;
      .headerTitle {
        font-size: 18px;
        font-weight: 600;
@@ -154,6 +155,7 @@ export default {
      }
    }
    .main {
+      overflow-y: auto;
      .minatitl {
        display: flex;
        .up1 {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1503,6 +1503,7 @@
      :closable="closableQR"
      wrapClassName="recgradeModal"
      style="margin-top: 400px"
+      @cancel="rg_exit"
    >
      <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
        <div class="rg_header"></div>
@@ -1552,6 +1553,7 @@
      :closable="closableQR"
      wrapClassName="graModal"
      style="margin-top: 400px"
+      @cancel="graduate_exit"
    >
      <div
        class="graduate"
@@ -1611,78 +1613,46 @@
      </div>
    </a-modal>
    <!--结业页面 -->
-    <!--请确定是否同意此学员学习此课程弹窗 -->
+    <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
    <a-modal
-      v-model:visible="agreestudy_hs"
+      v-model:visible="agreereject_hs"
      :footer="null"
      :closable="closableQR"
      wrapClassName="agrstudyModal"
-      style="margin-top: 400px"
+      centered="true"
+      @cancel="agreereject_exit"
    >
      <div
        class="agreestudy"
-        :style="{ display: agreestudy_hs ? 'block' : 'none' }"
+        :style="{ display: agreereject_hs ? 'block' : 'none' }"
      >
        <div class="agree_header"></div>
        <div class="agree_main">
          <div class="agreem_header">
            <div class="agreem_icon"></div>
            <span>提示</span>
-            <div class="close_exit" @click="agreestudy_exit"></div>
+            <div class="close_exit" @click="agreereject_exit"></div>
          </div>
          <div class="agreem_body">
-            <div class="body_box">
+            <div class="body_box" :style="{ display: agreestudy_hs ? 'block' : 'none' }">
              <div>请确定是否同意此学员学习此课程</div>
            </div>
-          </div>
-          <div class="qrm_btnbox">
-            <div class="qrm_btn btn1">
-              <div class="btnText" @click="agreestudy_exit">取消</div>
-            </div>
-            <div class="qrm_btn btn2">
-              <div class="btnText" @click="agreestudy_exit">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!--请确定是否同意此学员学习此课程弹窗 -->
-    <!--请确定是否拒绝此学员学习此课程弹窗 -->
-    <a-modal
-      v-model:visible="rejectstudy_hs"
-      :footer="null"
-      :closable="closableQR"
-      wrapClassName="agrstudyModal"
-      style="margin-top: 400px"
-    >
-      <div
-        class="agreestudy"
-        :style="{ display: rejectstudy_hs ? 'block' : 'none' }"
-      >
-        <div class="agree_header"></div>
-        <div class="agree_main">
-          <div class="agreem_header">
-            <div class="agreem_icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="rejectstudy_exit"></div>
-          </div>
-          <div class="agreem_body">
-            <div class="body_box">
+            <div class="body_box" :style="{ display: rejectstudy_hs ? 'block' : 'none' }">
              <div>请确定是否拒绝此学员学习此课程</div>
            </div>
          </div>
          <div class="qrm_btnbox">
            <div class="qrm_btn btn1">
-              <div class="btnText" @click="rejectstudy_exit">取消</div>
+              <div class="btnText" @click="agreereject_exit">取消</div>
            </div>
            <div class="qrm_btn btn2">
-              <div class="btnText" @click="rejectstudy_exit">确定</div>
+              <div class="btnText" @click="agreereject_exit">确定</div>
            </div>
          </div>
        </div>
      </div>
    </a-modal>
-    <!--请确定是否拒绝此学员学习此课程弹窗 -->
+    <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
    <!--删除 复制 停用弹窗 -->
    <a-modal
      v-model:visible="delete_hs"
@@ -1738,7 +1708,7 @@
        </div>
      </div>
    </a-modal>
-    <!--删除弹窗 -->
+    <!--删除 复制 停用弹窗 -->
    <!-- 学员管理课程库-归属权抽屉 -->
    <own-power v-model:ownpowervisible="ownpowervisible" />
    <!-- 学员管理课程库-归属权抽屉 -->
@@ -2419,6 +2389,7 @@ export default defineComponent({
      closableQR: false,
      rg_hs: false,
      graduate_hs: false,
+      agreereject_hs:false,
      agreestudy_hs: false,
      rejectstudy_hs: false,
      delete_hs: false,
@@ -2806,6 +2777,7 @@ export default defineComponent({
                      <div
                        class="jc"
                        onClick={() => {
+                          state.agreereject_hs = true;
                          state.agreestudy_hs = true;
                        }}
                      >
@@ -2816,6 +2788,7 @@ export default defineComponent({
                      <div
                        class="jc"
                        onClick={() => {
+                          state.agreereject_hs = true;
                          state.rejectstudy_hs = true;
                        }}
                      >
@@ -3155,9 +3128,6 @@ export default defineComponent({
    const ftsr_exit = () => {
      state.om_ckxq = false;
    };
-    // const gpm_exit = () => {
-    //   state.gpm_hs = false;
-    // };
    const stm_exit = () => {
      state.stm_hs = false;
    };
@@ -3213,10 +3183,9 @@ export default defineComponent({
    const graduate_exit = () => {
      state.graduate_hs = false;
    };
-    const agreestudy_exit = () => {
+    const agreereject_exit = () => {
+      state.agreereject_hs = false;
      state.agreestudy_hs = false;
-    };
-    const rejectstudy_exit = () => {
      state.rejectstudy_hs = false;
    };
    const delete_exit = () => {
@@ -3281,8 +3250,7 @@ export default defineComponent({
      qr_exit,
      rg_exit,
      graduate_exit,
-      agreestudy_exit,
-      rejectstudy_exit,
+      agreereject_exit,
      delete_exit,
      onSelectChange,
      faceManageChange,
@@ -4008,21 +3976,24 @@ export default defineComponent({
 }
 .agrstudyModal {
  .ant-modal {
+      width:429px !important;
+      height:258px !important;
    .ant-modal-content {
-      // width:679px !important;
+      width:429px !important;
+      height:258px !important;
      .ant-modal-body {
+        width:429px !important;
+        height:258px !important;
+        padding:0px !important;
        .agreestudy {
          z-index: 9999;
-          width: 679px;
+          width: 429px;
+          height:258px;
          background: #ffffff;
          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
-          position: absolute;
-          left: 50%;
-          top: 10%;
-          transform: translate(-50%, -50%);
          .agree_header {
            position: absolute;
-            width: calc(100%);
+            width: 100%;
            height: 40px;
            background: linear-gradient(
              rgba(78, 166, 255, 0.2) 0%,
@@ -4056,13 +4027,11 @@ export default defineComponent({
              }
            }
            .agreem_body {
-              .body_box {
-                display: flex;
-                justify-content: center;
-                align-items: center;
+              display: flex;
+              justify-content: center;
+              align-items: center;
                width: 100%;
-                margin: 20px auto;
-              }
+                margin: 45px auto 62px auto;
            }
            .qrm_btnbox {
              display: flex;
@@ -5188,7 +5157,7 @@ export default defineComponent({
      width: 424px !important;
      .ant-modal-body {
        .delete {
-          z-index: 9999;
+          z-index: 99999;
          width: 424px;
          background: #ffffff;
          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1192,12 +1192,13 @@
        :closable="close"
        wrapClassName="canclestu"
        centered="true"
+        @cancel="closeModal1"
      >
        <div class="delete">
          <div class="del_header"></div>
          <div class="del_main">
            <div class="header">
-              <div class="icon"></div>
+              <div class="icon1"></div>
              <span>提示</span>
            </div>
            <div class="body">
@@ -1482,6 +1483,7 @@
        :closable="closableQR"
        wrapClassName="DelModal"
        style="margin-top: 400px"
+        @cancel="delete_exit"
      >
        <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
          <div class="del_header"></div>
@@ -2771,7 +2773,7 @@ export default {
              padding-top: 20px;
              padding-left: 26px;
              font-size: 16px;
-              .icon {
+              .icon1 {
                width: 16px;
                height: 16px;
                margin-right: 10px;
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -148,7 +148,7 @@ export default defineComponent({
                      <router-link to="/libraryadd">
                        <div class="jc">
                          查看{" "}
-                          <span style="color:#E9E9E9;margin-left:8px;">|</span>
+                          <span style="color:#E9E9E9;margin-left:15px;">|</span>
                        </div>
                      </router-link>
                    </div>
@@ -164,14 +164,14 @@ export default defineComponent({
                    <div class="ops1">
                      <div class="jc">
                        发布
-                        <span style="color:#E9E9E9;margin-left:8px;">|</span>
+                        <span style="color:#E9E9E9;margin-left:15px;">|</span>
                      </div>
                    </div>
                    <div class="ops2">
                      <router-link to="/libraryadd">
                        <div class="jc">
                          查看
-                          <span style="color:#E9E9E9;margin-left:8px;">|</span>
+                          <span style="color:#E9E9E9;margin-left:15px;">|</span>
                        </div>
                      </router-link>
                    </div>
@@ -237,6 +237,7 @@ export default defineComponent({
          align-items: center;
          justify-content: center;
          margin-left: 14px;
+          cursor: pointer;
          flex-shrink: 0;
          .search {
            background-size: 100%;