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

src/components/drawers/ProMess.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">项目信息</div>
+        <div class="headerTitle">任务信息</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"

src/components/drawers/ProjectScore.vue

@@ -140,7 +140,6 @@
               </div>
               <div v-else class="btns">
                 <div class="btn1" @click="edit=!edit">
-                
                 <span class="btn1text">保存</span>
               </div>
               </div>
@@ -346,9 +345,6 @@ export default {
       score1:5,
       score2:5,
       edit:true,
-     
-      
-      
     });
     const getTableData = () => {
       let datas = state.tabledataStu;

src/components/drawers/SeeStu.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">学员换组</div>
+        <div class="headerTitle">查看</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"

src/views/courselibrary/CoursewareManage.vue

@@ -876,106 +876,6 @@
       </div>
     </a-modal>
     <!-- 面授课程管理查看详情页面 -->
-    <!-- 操作授权页面 -->
-    <!-- <a-modal
-      v-model:visible="gpm_hs"
-      title="Title"
-      @ok="closeModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="modalStyle givpowerModal"
-      width="80%"
-    >
-      <div class="modalHeader">
-        <div class="headerLeft">
-          <img
-            style="width: 17px; height: 18px; margin-right: 8px"
-            src="@/assets/images/coursewareManage/givepower.png"
-          />
-          <span class="headerLeftText">授权</span>
-        </div>
-        <div style="margin-right: 57px; cursor: pointer">
-          <img
-            @click="gpm_exit"
-            style="width: 22px; height: 22px"
-            src="../../assets/images/basicinfo/close22.png"
-          />
-        </div>
-      </div>
-      <div class="modalMain">
-        <div class="givepower" :style="{ display: gpm_hs ? 'block' : 'none' }">
-          <div class="gp_main">
-            <div class="gpm_inputbtn">
-              <a-input
-                v-model:value="value16"
-                style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                "
-                placeholder="请输入姓名"
-              />
-              <div class="gpm_btn btn1">
-                <div class="search"></div>
-                <div class="btnText">搜索</div>
-              </div>
-              <div class="gpm_btn btn2">
-                <div class="reset"></div>
-                <div class="btnText">重置</div>
-              </div>
-            </div>
-            <div class="gpm_notice">
-              <div class="th_icon"></div>
-              <div class="textarea">
-                已选择 <span style="color: #4ea6ff">1</span> 项
-              </div>
-              <div class="textarea">
-                <span style="color: #999ba3">列表选项总计：</span
-                ><span>5条</span>
-              </div>
-            </div>
-            <div class="gpm_table">
-              <a-table
-                :row-selection="{
-                  selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
-                }"
-                :columns="columns5"
-                :data-source="tableData5"
-                :loading="tableDataTotal === -1 ? true : false"
-                :pagination="{
-                  showSizeChanger: true,
-                  showQuickJumper: true,
-                  hideOnSinglePage: true,
-                  pageSizeOptions: [],
-                  pageSize: pageSize,
-                  current: currentPage,
-                  total: tableDataTotal,
-                  onChange: (page, pageSize) => {
-                    currentPage = page;
-                    // console.log('page', page)
-                    // 加翻页查找代码
-                    // 	this.setState({
-                    // 		currentPage: page,
-                    // 	}, () => {
-                    // 		this.getMilitaryDeployment()
-                    // 	})
-                  },
-                }"
-              >
-                <template #bodyCell="{ column }">
-                  <template v-if="column.key === 'opacation'">
-                    <a>取消授权</a>
-                  </template>
-                </template>
-              </a-table>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal> -->
-    <!--操作授权页面 -->
     <!--开课页面 -->
     <a-modal
       v-model:visible="stm_hs"
@@ -1461,6 +1361,7 @@
       :closable="closableQR"
       wrapClassName="QRModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="qr_exit"
     >
       <div class="QR" :style="{ display: QR_hs ? 'block' : 'none' }">
@@ -1503,6 +1404,7 @@
       :closable="closableQR"
       wrapClassName="recgradeModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="rg_exit"
     >
       <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
@@ -1553,6 +1455,7 @@
       :closable="closableQR"
       wrapClassName="graModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="graduate_exit"
     >
       <div
@@ -1660,25 +1563,26 @@
       :closable="closableQR"
       wrapClassName="DelModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="delete_exit"
     >
       <div
         class="delete"
         :style="{
-          display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none',
+          display: del_hs || copy_hs || nouse_hs ? 'block' : 'none',
         }"
       >
         <div class="del_header"></div>
         <div class="del_main">
           <div class="header">
             <div
-              class="del-icon"
+              class="del-icons"
               :style="{ display: del_hs ? 'block' : 'none' }"
             >
               <img src="@/assets/images/coursewareManage/notice.png" alt="" />
             </div>
             <div
-              class="del-icon"
+              class="del-icons"
               :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
             >
               <img src="@/assets/images/coursewareManage/QR.png" alt="" />
@@ -1896,45 +1800,6 @@ const columns4 = [
     align: "center",
   },
 ];
-//5授权弹窗 6是开课表格
-// const columns5 = [
-//   {
-//     title: "姓名",
-//     dataIndex: "name",
-//     key: "name",
-//     width: "10%",
-//     align: "left",
-//   },
-//   {
-//     title: "归属组织",
-//     dataIndex: "organization",
-//     key: "organization",
-//     width: "19%",
-//     align: "center",
-//   },
-//   {
-//     title: "岗位",
-//     dataIndex: "position",
-//     key: "position",
-//     width: "19%",
-//     align: "center",
-//   },
-//   {
-//     title: "拥有权限",
-//     dataIndex: "authority",
-//     key: "authority",
-//     width: "19%",
-//     align: "center",
-//   },
-//   {
-//     title: "操作",
-//     dataIndex: "opacation",
-//     key: "opacation",
-//     width: "34%",
-//     align: "center",
-//   },
-// ];
-
 //开课表格
 const columns6 = [
   {
@@ -2213,46 +2078,6 @@ export default defineComponent({
           status: "已通过",
         },
       ],
-
-      // 5授权弹窗 6开课
-      // tableData5: [
-      //   {
-      //     key: 1,
-      //     name: "李明",
-      //     organization: "-",
-      //     position: "产品经理",
-      //     authority: "归属权",
-      //   },
-      //   {
-      //     key: 2,
-      //     name: "李洋",
-      //     organization: "-",
-      //     position: "产品经理",
-      //     authority: "查看权",
-      //   },
-      //   {
-      //     key: 3,
-      //     name: "小李",
-      //     organization: "-",
-      //     position: "产品经理",
-      //     authority: "管理权",
-      //   },
-      //   {
-      //     key: 4,
-      //     name: "雄安名",
-      //     organization: "-",
-      //     position: "产品经理",
-      //     authority: "管理权",
-      //   },
-      //   {
-      //     key: 5,
-      //     name: "王哥",
-      //     organization: "-",
-      //     position: "产品经理",
-      //     authority: "管理权",
-      //   },
-      // ],
-
       //开课
       tableData6: [
         {
@@ -2381,7 +2206,6 @@ export default defineComponent({
       om_1: false,
       ft_1: false,
       om_ckxq: false,
-      // gpm_hs: false,
       stm_hs: false,
       cstm_hs: false,
       sm_hs: false,
@@ -2894,6 +2718,7 @@ export default defineComponent({
                       >
                         <div
                           onClick={() => {
+                            state.delete_hs = true;
                             state.copy_hs = true;
                           }}
                         >
@@ -3221,13 +3046,10 @@ export default defineComponent({
       columns1,
       columns2,
       columns4,
-      // columns5,
       columns6,
       columns7,
       options1,
       options2,
-      // getTableDate,
-      // getTableDate2,
       of_hShow,
       of_exit,
       hideShow,
@@ -3237,7 +3059,6 @@ export default defineComponent({
       om_exit,
       ckxq_hs,
       ftsr_exit,
-      // gpm_exit,
       stm_exit,
       createkk,
       cstm_exit,
@@ -3260,14 +3081,6 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
-// .dropdown-style{
-//   .ant-select-dropdown-menu{
-//     background: #6767bd;
-//   }
-//   .ant-select-dropdown-menu-item {
-//     color: #4EA6FF !important;
-// }
-// }
 .courseManage {
   width: 100%;
   height: 100%;
@@ -3422,7 +3235,6 @@ export default defineComponent({
 .selectonlineface {
   z-index: 999;
   width: 679px;
-  // height: 525px;
   background: #ffffff;
   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
   position: absolute;
@@ -4092,7 +3904,6 @@ export default defineComponent({
         }
         .onlinemanage {
           display: none;
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .om_main {
@@ -4530,7 +4341,6 @@ export default defineComponent({
           }
         }
         .givepower {
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .gp_main {
@@ -4647,7 +4457,6 @@ export default defineComponent({
           }
         }
         .schooltime {
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .st_main {
@@ -4869,7 +4678,6 @@ export default defineComponent({
           }
         }
         .studentsmanage {
-          z-index: 1000;
           min-width: 1000px;
           background: #ffffff;
           .stm_main {
@@ -5115,7 +4923,6 @@ export default defineComponent({
         }
         .modalMain {
           .ftsturecord {
-            z-index: 999;
             min-width: 1000px;
             background: #ffffff;
             .ftsr_main {
@@ -5157,7 +4964,6 @@ export default defineComponent({
       width: 424px !important;
       .ant-modal-body {
         .delete {
-          z-index: 99999;
           width: 424px;
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
@@ -5184,7 +4990,7 @@ export default defineComponent({
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
-              .del-icon {
+              .del-icons {
                 width: 16px;
                 height: 16px;
                 position: relative;

src/views/projectcenter/LibraryAdd.vue

@@ -322,22 +322,58 @@
             </div>
             <hr color="#E8E8E8" />
             <div class="pjc_body">
-              <div class="pjcb_header">
+              <div class="groupright">
-                <span>规则</span>
+                <div class="spandiv"><span class="spantext">规则</span></div>
-                <div class="edit_btn">
+                <div v-if="edit" class="btns">
-                  <div class="edit"></div>
+                  <div class="btn1" @click="edit = !edit">
-                  <div class="btnText">编辑</div>
+                    <img src="../../assets/images/projectadd/edit1.png" />
+                    <span class="btn1text">编辑</span>
                   </div>
                 </div>
-              <div class="pjcb_content">
+                <div v-else class="btns">
+                  <div class="btn1" @click="edit = !edit">
+                    <span class="btn1text">保存</span>
+                  </div>
+                </div>
+              </div>
+
+              <div v-if="edit" class="pjcb_content">
                 <div class="content content1">
-                  <span>当前设计下，学员可以获得 10 积分</span>
+                  <span>当前设计下，学员可以获得 </span
+                  ><span class="scoretext">{{ scoresum }}</span
+                  ><span>积分</span>
                 </div>
                 <div class="content content2">
-                  <span>完成【必修/选修】获得 5 积分</span>
+                  <span>完成【必修/选修】获得 </span
+                  ><span class="scoretext">{{ score1 }} </span><span>积分</span>
                 </div>
                 <div class="content content3">
-                  <span>优秀学员可获得 5 积分</span>
+                  <span>优秀学员可获得 </span
+                  ><span class="scoretext">{{ score2 }}</span
+                  ><span>积分</span>
+                </div>
+              </div>
+              <div v-else class="pjcb_content">
+                <div class="content content1">
+                  <span>当前设计下，学员可以获得 </span
+                  ><span class="scoretext">{{ scoresum }}</span
+                  ><span>积分</span>
+                </div>
+                <div class="content content2">
+                  <span>完成【必修/选修】获得 </span
+                  ><span
+                    ><a-input
+                      v-model:value="score1"
+                      :bordered="false"
+                      @change="getScore"
+                    /> </span
+                  ><span>积分</span>
+                </div>
+                <div class="content content3">
+                  <span>优秀学员可获得 </span
+                  ><span
+                    ><a-input v-model:value="score2" :bordered="false" /></span
+                  ><span>积分</span>
                 </div>
               </div>
             </div>
@@ -603,6 +639,9 @@ export default defineComponent({
       value3: false,
       value4: false,
       hideshow: false,
+      score1: 5,
+      score2: 5,
+      edit: true,
     });
     const value = ref("");
     const value2 = ref("");
@@ -626,6 +665,12 @@ export default defineComponent({
       changecheck3,
     };
   },
+  computed: {
+    // 计算属性的 getter
+    scoresum: function () {
+      return Number(this.score1) + Number(this.score2);
+    },
+  },
 });
 </script>
 <style lang="scss">
@@ -1098,47 +1143,70 @@ export default defineComponent({
       .pjc_body {
         margin-left: 34px;
         margin-right: 34px;
-        .pjcb_header {
+
+        .groupright {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          margin: 24px auto;
+          .btn1 {
-          .edit_btn {
             width: 100px;
-            // padding: 0px 26px 0px 26px;
+            height: 40px;
-            height: 38px;
-            background: rgb(64, 158, 255);
-            border-radius: 8px;
-            border: 1px solid rgba(64, 158, 255, 1);
             display: flex;
             align-items: center;
             justify-content: center;
-            flex-shrink: 0;
+            margin-right: 16px;
+            border: 1px solid #409eff;
+            border-radius: 8px;
+            background: #409eff;
             cursor: pointer;
-            .edit {
+            .btn1text {
-              width: 15px;
+              color: #ffffff;
-              height: 15px;
-              background-image: url(@/assets/images/coursewareManage/export1.png);
-              background-size: 100% 100%;
-            }
-            .btnText {
-              font-size: 14px;
-              font-weight: 400;
-              color: rgb(255, 255, 255);
-              line-height: 36px;
               margin-left: 5px;
+              font-size: 14px;
+            }
+          }
+          .btn2 {
+            width: 100px;
+            height: 40px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 32px;
+            border: 1px solid #409eff;
+            border-radius: 8px;
+            cursor: pointer;
+            background: #ffffff;
+            .btn2text {
+              color: #409eff;
+              margin-left: 5px;
+              font-size: 14px;
             }
           }
         }
         .pjcb_content {
-          border: 1px solid #388be1;
+          border: 1px solid #409eff;
-          padding: 32px;
+          padding: 20px;
+          margin-top: 10px;
+          .ant-input {
+            width: 46px;
+            font-size: 16px;
+            color: #409eff;
+          }
+          .scoretext {
+            color: #409eff;
+            font-size: 16px;
+            margin-left: 3px;
+            margin-right: 4px;
+          }
           .pjcb_content :last-child {
             margin-bottom: 0px;
           }
           .content {
-            margin-bottom: 24px;
+            align-items: center;
+            height: 50px;
+            display: flex;
           }
+          margin-bottom: 130px;
         }
       }
     }

src/views/projectcenter/ProjectManage.vue

@@ -45,9 +45,7 @@
             style="width: 270px"
           />
         </div>
-      </div>
+        <div class="btnn btn1">
-      <div class="btns">
-        <div class="btn btn1">
           <div class="search"></div>
           <div class="btnText">搜索</div>
         </div>
@@ -55,6 +53,8 @@
           <div class="search"></div>
           <div class="btnText">重置</div>
         </div>
+      </div>
+      <div class="btns">
         <div class="btn btn3" @click="showModal1">
           <div class="search"></div>
           <div class="btnText">创建项目</div>
@@ -2580,10 +2580,6 @@ export default {
         margin-right: 20px;
         margin-bottom: 20px;
       }
-    }
-    .btns {
-      display: flex;
-      // flex-wrap: wrap;
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -2595,6 +2591,7 @@ export default {
         justify-content: center;
         margin-right: 14px;
         flex-shrink: 0;
+        cursor: pointer;
         .search {
           background-size: 100%;
         }
@@ -2606,11 +2603,34 @@ export default {
           margin-left: 5px;
         }
       }
+      .btnn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #409EFF;
+        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/search1.png");
+          background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
       .btn2 {
@@ -2620,16 +2640,8 @@ export default {
           background-image: url("../../assets/images/courseManage/reset1.png");
         }
       }
-      .btn3 {
-        margin-right: 0px;
-        .search {
-          width: 17px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/add1.png");
-        }
-      }
       .btn1:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);
         .search {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
@@ -2637,23 +2649,55 @@ export default {
           color: #ffffff;
         }
       }
+      .btn1:active {
+        background: #0982ff;
+      }
       .btn2:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.1);
+      }
+      .btn2:active {
+        background: rgba(64, 158, 255, 0.2);
+      }
+    }
+    .btns {
+      display: flex;
+      // flex-wrap: wrap;
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #409EFF;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
         .search {
-          background-image: url("../../assets/images/courseManage/reset0.png");
+          background-size: 100%;
         }
         .btnText {
-          color: #ffffff;
+          font-size: 14px;
+          font-weight: 400;
+          color: #FFFFFF;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn3 {
+        margin-right: 0px;
+        .search {
+          width: 17px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/add0.png");
         }
       }
       .btn3:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);
-        .search {
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
-        .btnText {
-          color: #ffffff;
       }
+      .btn3:active {
+        background: #0982ff;
       }
     }
   }

src/views/projectcenter/TaskPage.vue

@@ -553,6 +553,9 @@
                       onChange: onSelectChange,
                     }"
                   />
+                  <div class="nostu" style="display:block;">
+                    <div class="nostuimg"></div>
+                  </div>
                   <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
@@ -3912,6 +3915,16 @@ export default {
         > td {
         background: rgba(250, 250, 250, 1);
       }
+      .nostu{
+        width: 100%;
+        .nostuimg{
+          margin:75px auto;
+          width: 412px;
+          height:212px;
+          background-image: url(@/assets/images/taskpage/nostu.png);
+          background-size: 100% 100%;
+        }
+      }
       .pa {
         // left: 0;
         margin-top: 15px;