Merge branch 'pre-release' into 'release'

Pre release

See merge request !67

.env.prod

@@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading
-VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit
+VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id=
 

.env.release

@@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading
-VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc-release/need/waitaudit
+VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc-release/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
 

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本1.4.1------------");
+console.log("版本1.4.2------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/ActiveAttendance.vue

@@ -86,11 +86,11 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px"  v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="signQR">
             <div class="wz">签到二维码</div>
           </div>
-          <div class="btn btn2" @click="showqdModal">
+          <div class="btn btn1" @click="showqdModal">
             <div class="wz">批量签到</div>
           </div>
           <div class="btn btn1" @click="exportTaskStu">
@@ -274,6 +274,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode";
 import * as api from "../../api/indexTaskManage";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ActiveAttendance",
   components: {
@@ -281,6 +282,14 @@ export default {
     TwoDimensionalCode,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     AAvisible: {
       type: Boolean,
       default: false,
@@ -782,6 +791,7 @@ export default {
           align: "center",
           customRender: (value) => {
             return (
+              checkPer(props.permissions,props.createId)?
               <div
                 class="opa"
                 style="display:flex;justify-content:center;align-items:center;"
@@ -897,6 +907,7 @@ export default {
                   <div>请假</div>
                 </div>
               </div>
+                :''
             );
           },
         },
@@ -1022,6 +1033,7 @@ export default {
       tableDataFunc,
       clearLine,
       showqdModal,
+      checkPer,
       closeqdModal,
       showsingleqdModal,
       showsingleqtModal,
@@ -1145,7 +1157,7 @@ export default {
                 .img2 {
                   width: 16px;
                   height: 18px;
-                  background-image: url(../../assets/images/courseManage/reset1.png);
+                  background-image: url(../../assets/images/courseManage/reset0.png);
                   background-size: 100% 100%;
                   margin-right: 7px;
                 }
@@ -1158,9 +1170,9 @@ export default {
               }
 
               .btn2 {
-                background: #ffffff;
+                background: #4ea6ff;
 
-                color: #4ea6ff;
+                color: #fff;
                 border: 1px solid #4ea6ff;
               }
             }

src/components/drawers/AddActive.vue

@@ -76,6 +76,7 @@
             <div class="btnbox">
               <a-input-number
                   :min="0"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   v-model:value="formData.activityDuration"
@@ -153,7 +154,7 @@
                   <span>活动开始前：</span>
                   <a-input-number
                       :min="0"
-                      :max="30"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 88px;
@@ -171,7 +172,7 @@
                   <span>活动开始后：</span>
                   <a-input-number
                       :min="0"
-                      :max="30"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 88px;
@@ -197,7 +198,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddCase.vue

@@ -109,7 +109,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -361,42 +361,42 @@ defineExpose({ openDrawer });
           }
 
           .btn2 {
-            background: rgb(255, 255, 255);
+            background: rgb(64, 158, 255);
 
             .search {
               width: 15px;
               height: 17px;
-              background-image: url("@/assets/images/coursewareManage/reset1.png");
+              background-image: url("@/assets/images/coursewareManage/reset0.png");
             }
 
             .btnText {
-              color: rgb(64, 158, 255);
+              color: rgb(255, 255, 255);
             }
           }
 
-          .btn1:hover {
+          // .btn1:hover {
-            background: rgb(255, 255, 255);
+          //   background: rgb(255, 255, 255);
 
-            .search {
+          //   .search {
-              background-image: url("@/assets/images/courseManage/search1.png");
+          //     background-image: url("@/assets/images/courseManage/search1.png");
-            }
+          //   }
 
-            .btnText {
+          //   .btnText {
-              color: #4ea6ff;
+          //     color: #4ea6ff;
-            }
+          //   }
-          }
+          // }
 
-          .btn2:hover {
+          // .btn2:hover {
-            background: rgba(64, 158, 255, 1);
+          //   background: rgba(64, 158, 255, 1);
 
-            .search {
+          //   .search {
-              background-image: url("@/assets/images/courseManage/reset0.png");
+          //     background-image: url("@/assets/images/courseManage/reset0.png");
-            }
+          //   }
 
-            .btnText {
+          //   .btnText {
-              color: #ffffff;
+          //     color: #ffffff;
-            }
+          //   }
-          }
+          // }
         }
       }
 

src/components/drawers/AddDiscuss.vue

@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddEval.vue

@@ -105,7 +105,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddFaceteach.vue

@@ -126,7 +126,7 @@
             <div class="select">
               <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px;"
                   v-model:value="duration"
@@ -180,7 +180,7 @@
                   <span>开始前：</span>
                   <a-input-number
                       :min="0"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;
@@ -196,7 +196,7 @@
                   <span>开始后：</span>
                   <a-input-number
                       :min="0"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;

src/components/drawers/AddHomework.vue

@@ -5,7 +5,7 @@
   <a-drawer :visible="visible" class="drawerStyle addhomeworkDrawer" width="1000" placement="right">
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}任务</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
              @click="closeDrawer"/>
       </div>
@@ -80,7 +80,7 @@
         </div>
       </div>
       <div class="main_btns" style="background:#fff;">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" html-type="submit" @click="confirm">确定</a-button>
       </div>
     </div>

src/components/drawers/AddInvist.vue

@@ -18,7 +18,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddLevelImportStu.vue

@@ -170,7 +170,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>

src/components/drawers/AddLive.vue

@@ -60,7 +60,7 @@
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="formData.liveDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
@@ -158,7 +158,7 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>直播开始前：</span>
-                  <a-input-number :min="0" :max="30" :precision="0" style="
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
@@ -168,7 +168,7 @@
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
-                  <a-input-number :min="0" :max="30" :precision="0" style="
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
@@ -213,7 +213,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddOnline.vue

@@ -11,7 +11,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ taskIndex === -1 ? "编辑" : "添加" }}任务</div>
+        <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}在线</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
              @click="closeDrawer"/>
       </div>
@@ -34,7 +34,7 @@
         />
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddProject.vue

@@ -143,7 +143,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button @click="closeDrawer" class="btn1">取消</button>
+        <button @click="closeDrawer" class="btn2">取消</button>
         <button @click="confirm" class="btn2">确定</button>
       </div>
     </div>

src/components/drawers/AddRef.vue

@@ -75,7 +75,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/drawers/AddTest.vue

@@ -96,7 +96,7 @@
               <span style="margin-right: 3px">考试时长：</span>
             </div>
             <div class="select">
-              <a-input-number :disabled="taskIndex >= 0  && isEdit" :min="0" :max="300" :precision="0"
+              <a-input-number :disabled="taskIndex >= 0  && isEdit" :min="0" :max="999999" :precision="0"
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="formData.examinationDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -133,7 +133,7 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
-                  <a-input-number :disabled="taskIndex >= 0 && isEdit" :min="-1" :max="300" :precision="0" style="
+                  <a-input-number :disabled="taskIndex >= 0 && isEdit" :min="-1" :max="999999" :precision="0" style="
                           width: 100px;
                           height: 32px;
                           border-radius: 8px;
@@ -235,7 +235,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" @click="confirm">确定</a-button>
       </div>
     </div>

src/components/drawers/AssessmentAll.vue

@@ -192,7 +192,7 @@ function reset() {
 
 const goResearchmanage = () => {
   // router.push({ path: "/researchmanage" });
-  window.open(process.env.VUE_APP_BASE + "/researchmanage");
+  window.open(process.env.VUE_APP_BASE + "/researchmanage?openCreate=true");
 };
 </script>
 <style lang="scss">
@@ -279,7 +279,7 @@ const goResearchmanage = () => {
           .btnsn {
             padding: 0px 26px 0px 26px;
             height: 38px;
-            background: #ffffff;
+            background: rgba(64, 158, 255, 1) !important;
             border-radius: 8px;
             border: 1px solid rgba(64, 158, 255, 1);
             display: flex;
@@ -292,14 +292,14 @@ const goResearchmanage = () => {
             .search {
               width: 16px;
               height: 18px;
-              background-image: url("../../assets/images/courseManage/reset1.png");
+              background-image: url("../../assets/images/courseManage/reset0.png") !important;
               background-size: 100% 100%;
             }
 
             .btnText {
               font-size: 14px;
               font-weight: 400;
-              color: #4ea6ff;
+              color: #fff !important;
               line-height: 36px;
               margin-left: 5px;
             }

src/components/drawers/CommonTest.vue

@@ -118,7 +118,7 @@
             <div class="select">
               <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   v-model:value="formData.examinationDuration"
@@ -171,7 +171,7 @@
                   <span>允许重复考试：</span>
                   <a-input-number
                       :min="-1"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;

src/components/drawers/EvList.vue

@@ -33,7 +33,7 @@
             </div>
           </div>
           <div class="mi_btns">
-            <div class="btn btn1" @click="search">
+            <div class="btn btn2" @click="search">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
@@ -63,7 +63,7 @@
         <img style="width: 700px" src="../../assets/images/evImg.png" />
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -403,42 +403,42 @@ defineExpose({ openDrawer });
           }
 
           .btn2 {
-            background: rgb(255, 255, 255);
+            background: rgb(64, 158, 255);
 
             .search {
               width: 15px;
               height: 17px;
-              background-image: url("@/assets/images/coursewareManage/reset1.png");
+              background-image: url("@/assets/images/coursewareManage/reset0.png");
             }
 
             .btnText {
-              color: rgb(64, 158, 255);
+              color: rgb(255, 255, 255);
             }
           }
 
-          .btn1:hover {
+          // .btn1:hover {
-            background: rgb(255, 255, 255);
+          //   background: rgb(255, 255, 255);
 
-            .search {
+          //   .search {
-              background-image: url("@/assets/images/courseManage/search1.png");
+          //     background-image: url("@/assets/images/courseManage/search1.png");
-            }
+          //   }
 
-            .btnText {
+          //   .btnText {
-              color: #4ea6ff;
+          //     color: #4ea6ff;
-            }
+          //   }
-          }
+          // }
 
-          .btn2:hover {
+          // .btn2:hover {
-            background: rgba(64, 158, 255, 1);
+          //   background: rgba(64, 158, 255, 1);
 
-            .search {
+          //   .search {
-              background-image: url("@/assets/images/courseManage/reset0.png");
+          //     background-image: url("@/assets/images/courseManage/reset0.png");
-            }
+          //   }
 
-            .btnText {
+          //   .btnText {
-              color: #ffffff;
+          //     color: #ffffff;
-            }
+          //   }
-          }
+          // }
         }
       }
 

src/components/drawers/FaceManage.vue

@@ -54,7 +54,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促{{title}}</div>
@@ -137,6 +137,7 @@ import CKWork from './CheckWork.vue'
 import CQue from './CheckQue.vue'
 import EntryScores from "./EntryScores.vue";
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "FaceManage",
   components: {
@@ -146,6 +147,14 @@ export default {
     ASOver,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Fvisible: {
       type: Boolean,
       default: false,
@@ -446,6 +455,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       getTableDate,
       getManageList,

src/components/drawers/ProjectScore.vue

@@ -19,7 +19,7 @@
               <span class="btn1text">搜索</span>
             </div>
             <div class="btn2" @click="resetStud">
-              <img src="../../assets/images/courseManage/reset1.png" />
+              <img src="../../assets/images/courseManage/reset0.png" />
               <span class="btn2text">重置</span>
             </div>
           </div>
@@ -86,7 +86,7 @@
                 <span class="btn1text">搜索</span>
               </div>
               <div class="btn2" @click="rankReset">
-                <img src="../../assets/images/courseManage/reset1.png" />
+                <img src="../../assets/images/courseManage/reset0.png" />
                 <span class="btn2text">重置</span>
               </div>
             </div>
@@ -813,9 +813,9 @@ export default {
         border: 1px solid #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
-        background: #ffffff;
+        background: #4ea6ff;
         .btn2text {
-          color: #4ea6ff;
+          color: #fff;
           margin-left: 5px;
           font-size: 14px;
         }

src/components/drawers/SelectTest.vue

@@ -64,7 +64,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -305,7 +305,7 @@ defineExpose({openDrawer})
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-image: url(../../assets/images/courseManage/reset0.png) !important;
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -318,9 +318,9 @@ defineExpose({openDrawer})
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff !important;
 
-            color: #4ea6ff;
+            color: #fff !important;
             border: 1px solid #4ea6ff;
           }
         }

src/components/drawers/SubsetManage.vue

@@ -59,7 +59,7 @@
       </div> -->
       <!-- <div class="zhu">注：随机分组不对小组长生效</div> -->
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="addGroup">确定</button>
       </div>
     </div>

src/components/drawers/TestManage.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div
             class="btn btn1"
             @click="godie"
@@ -127,12 +127,21 @@ import { toRefs, reactive } from "vue";
 import { message } from 'ant-design-vue';
 import * as api from "../../api/indexExam";
 import CQue from './CheckQue.vue'
+import {checkPer} from "@/utils/utils";
 export default {
   name: "TestManage",
   components: {
     CQue,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     TMvisible: {
       type: Boolean,
       default: false,
@@ -517,6 +526,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      checkPer,
       afterVisibleChange,
       tableDataFunc,
       onSelect,

src/components/drawers/TimeManage.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促{{title}}</div>
@@ -105,12 +105,21 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from 'ant-design-vue';
 import CVote from "./CheckVote.vue"
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "TimeManage",
   components:{
     CVote,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Tvisible: {
       type: Boolean,
       default: false,
@@ -461,6 +470,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       tableDataFunc,

src/components/drawers/UnlockMode.vue

@@ -72,7 +72,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="saveUnlock">确定</button>
       </div>
     </div>

src/components/drawers/WorkManage.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" style="margin-right: 20px; cursor: pointer">
             <div class="img1"></div>
             <div class="wz">导出数据</div>
@@ -117,6 +117,7 @@ import EHWork from "./ExportHWork.vue"
 import EScore from "./ExportScore.vue"
 import WorkDetail from "../drawers/WorkDetail.vue";
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "WorkManage",
   components: {
@@ -125,6 +126,14 @@ export default {
     EScore,
     },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Wvisible: {
       type: Boolean,
       default: false,
@@ -420,6 +429,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      checkPer,
       afterVisibleChange,
       showEHWorkModal,
       showEScoreModal,

src/components/drawers/project/AddCertificate.vue

@@ -312,7 +312,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="saveupdatecertificate">确定</button>
       </div>
     </div>

src/components/drawers/project/ImpoterGroupLeader.vue

@@ -85,7 +85,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>

src/components/drawers/project/ProjectEvalManage.vue

@@ -74,7 +74,7 @@
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>-->
-          <div class="btn btn2" @click="exportTaskStu">
+          <div class="btn btn2" @click="exportTaskStu"  v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
@@ -119,10 +119,19 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectEvalManage",
 
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Evalvisible: {
       type: Boolean,
       default: false,
@@ -417,6 +426,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,
@@ -536,7 +546,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -548,9 +558,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -577,7 +587,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -589,9 +599,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/project/ProjectExamManage.vue

@@ -55,7 +55,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px"  v-if="checkPer(permissions,createId)">
         
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
@@ -127,6 +127,7 @@ import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
 import { batchSendMessage } from "@/api/index1";
+import {checkPer} from "@/utils/utils";
 
 // import * as api from "../../../api/index";
 export default {
@@ -136,6 +137,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     TMvisible: {
       type: Boolean,
       default: false,
@@ -448,6 +457,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       onSelectChange,
@@ -539,7 +549,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -552,9 +562,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -584,7 +594,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -597,9 +607,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -533,7 +533,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -546,9 +546,9 @@
             }
   
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
   
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -578,7 +578,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -591,9 +591,9 @@
           }
   
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
             margin-right: 20px;
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -66,7 +66,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!-- <div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -192,6 +192,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectFaceTaskManage",
   components: {
@@ -203,6 +204,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Fvisible: {
       type: Boolean,
       default: false,
@@ -694,6 +703,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       onSelectChange,

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -67,7 +67,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -164,6 +164,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectHomeWorkManage",
   components: {
@@ -174,6 +175,14 @@ export default {
     ExportHomeWork,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Wvisible: {
       type: Boolean,
       default: false,
@@ -649,7 +658,7 @@ export default {
       showEntryScore,
       godie,
       clearLine,
-
+      checkPer,
       searchTaskList,
       resetTaskList,
       changePaginationStu,
@@ -738,7 +747,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -751,9 +760,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -783,7 +792,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -796,9 +805,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/project/ProjectOnlineManage.vue

@@ -90,7 +90,7 @@
             <div class="wz">催促学习</div>
           </div>
         -->
-          <div class="btn btn2" @click="exportTaskStu">
+          <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
@@ -138,11 +138,20 @@ import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
 import ViewAssess from "../ViewAssess";
+import {checkPer} from "@/utils/utils";
 
 export default {
   name: "ProjectOnlineManage",
   components: { ViewAssess },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Tvisible: {
       type: Boolean,
       default: false,
@@ -499,6 +508,9 @@ export default {
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+      }else if(props.datasource.type==8){
+        {/* 讨论导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }
@@ -507,6 +519,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       showassess,
       closeDrawer,
       afterVisibleChange,
@@ -631,7 +644,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -643,9 +656,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -672,7 +685,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -684,9 +697,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/project/ProjectVoteManage.vue

@@ -74,7 +74,7 @@
                 <div class="img1"></div>
                 <div class="wz">催促学习</div>
             </div>-->
-            <div class="btn btn2" @click="exportTaskStu">
+            <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
                 <div class="img2"></div>
                 <div class="wz">导出数据</div>
             </div>
@@ -125,6 +125,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CVote from "../CheckVote.vue"
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "ProjectVoteManage",
@@ -132,6 +133,14 @@
         CVote,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       ProjectVoteModelVisible: {
         type: Boolean,
         default: false,
@@ -439,6 +448,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
@@ -558,7 +568,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -570,9 +580,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -599,7 +609,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -611,9 +621,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

src/components/drawers/router/RouterCommonManage.vue

@@ -84,7 +84,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
         <!--
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
@@ -138,10 +138,19 @@ import { message } from "ant-design-vue";
 import ViewAssess from "../ViewAssess";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterCommonManage",
   components: { ViewAssess },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     CommonModelVisible: {
       type: Boolean,
       default: false,
@@ -519,6 +528,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,
@@ -638,7 +648,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -650,9 +660,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -679,7 +689,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -691,9 +701,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/router/RouterEvaluationManage.vue

@@ -67,7 +67,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -117,10 +117,19 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterEvaluationManage",
 
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     EvaluationModelVisible: {
       type: Boolean,
       default: false,
@@ -416,6 +425,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -56,7 +56,7 @@
               </div>
             </div>
           </div>
-          <div class="btnss" style="margin-top: 20px">
+          <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
               <div class="img1"></div>
               <div class="wz">催促考试</div>
@@ -131,6 +131,7 @@
   import ExportAchievement from "../ExportAchievement.vue";
   import * as api from '../../../api/indexTaskManage';
   import { batchSendMessage } from "@/api/index1";
+  import {checkPer} from "@/utils/utils";
   
   // import * as api from "../../../api/index";
   export default {
@@ -139,6 +140,14 @@
       ExportAchievement,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       ExaminationExaminaModelVisible: {
         type: Boolean,
         default: false,
@@ -449,6 +458,7 @@
         afterVisibleChange,
         onSelectChange,
         godie,
+        checkPer,
         clearLine,
         showEScoreModal,
         searchTableData,
@@ -537,7 +547,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -550,9 +560,9 @@
             }
   
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
   
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -582,7 +592,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -595,9 +605,9 @@
           }
   
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
             margin-right: 20px;
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

src/components/drawers/router/RouterExaminationManage.vue

@@ -32,7 +32,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促考试</div>
@@ -89,6 +89,7 @@ import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
 import { batchSendMessage } from "@/api/index1";
+import {checkPer} from "@/utils/utils";
 
 // import * as api from "../../../api/index";
 export default {
@@ -98,6 +99,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     ExaminationModelVisible: {
       type: Boolean,
       default: false,
@@ -454,6 +463,7 @@ export default {
       afterVisibleChange,
       onSelectChange,
       godie,
+      checkPer,
       clearLine,
       showEScoreModal,
       searchTableData,
@@ -542,7 +552,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -555,9 +565,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -587,7 +597,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -600,9 +610,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/router/RouterFaceStu.vue

@@ -82,7 +82,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div
             class="btn btn1"
             style="margin-right: 20px"
@@ -231,6 +231,7 @@ import * as api from "../../../api/index1";
 import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
 import { message } from "ant-design-vue";
 import { toDate } from "../../../api/method";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "FaceManage",
   components: {
@@ -239,6 +240,14 @@ export default {
     TwoDimensionalCode,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     FSvisible: {
       type: Boolean,
       default: false,
@@ -911,7 +920,7 @@ export default {
       // closeStopModal,
       signQR,
       afterVisibleChange,
-
+      checkPer,
       searchTaskList,
       resetTaskList,
       changePaginationStu,

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -61,7 +61,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!--<div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -168,6 +168,7 @@ import CheckAnsware from '../CheckAnsware.vue'
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterFaceTeachManage",
   components: {
@@ -179,6 +180,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     FaceTeachModelVisible: {
       type: Boolean,
       default: false,
@@ -640,6 +649,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       searchTaskList,
       resetTaskList,

src/components/drawers/router/RouterHomeworkManage.vue

@@ -38,7 +38,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -107,6 +107,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterCommonManage",
   components: {
@@ -117,6 +118,14 @@ export default {
     ExportHomeWork,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     HomeworkModelVisible: {
       type: Boolean,
       default: false,
@@ -585,6 +594,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       searchTaskList,
       resetTaskList,
@@ -675,7 +685,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -688,9 +698,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -720,7 +730,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -733,9 +743,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }

src/components/drawers/router/RouterProjectManage.vue

@@ -68,7 +68,7 @@
                 </div>
             </div>
             </div>
-            <div class="btnss" style="margin-top: 20px">
+            <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <!--
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
@@ -126,6 +126,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CheckStu from "../CheckStu";
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "RouterProjectManage",
@@ -133,6 +134,14 @@
         CheckStu,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       PjModelVisible: {
         type: Boolean,
         default: false,
@@ -485,6 +494,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
@@ -598,7 +608,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -610,9 +620,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -639,7 +649,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -651,9 +661,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

src/components/drawers/router/RouterVoteManage.vue

@@ -68,7 +68,7 @@
                 </div>
             </div>
             </div>
-            <div class="btnss" style="margin-top: 20px">
+            <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <!--
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
@@ -125,6 +125,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CVote from "../CheckVote.vue"
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "RouterVoteManage",
@@ -132,6 +133,14 @@
         CVote,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       VoteModelVisible: {
         type: Boolean,
         default: false,
@@ -459,6 +468,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
@@ -578,7 +588,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -590,9 +600,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -619,7 +629,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -631,9 +641,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

src/components/student/ChangeGroupModal.vue

@@ -25,7 +25,7 @@
               @change="selectGroup"></a-select>
           </div>
           <div class="btn">
-            <button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
+            <button class="sameb btn2" @click="closeChangeModal" style="cursor: pointer">
               取消
             </button>
             <button class="sameb btn2" @click="changeGroup" style="cursor: pointer">

src/components/student/CommonStudent.vue

@@ -49,7 +49,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -93,7 +93,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -123,7 +123,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -248,7 +248,7 @@
           </div>
         </div>
         <div class="btnn">
-          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="closeDrawer">取消</button>
           <button class="btn2" @click="submitAuth">确定</button>
         </div>
       </div>

src/components/student/OnlineClassModelStudent.vue

@@ -206,24 +206,24 @@ const columns = ref([
     ellipsis: true,
     customRender: () => "-",
   },
-  {
+  // {
-    title: "评估状态",
+  //   title: "评估状态",
-    dataIndex: "status",
+  //   dataIndex: "status",
-    key: "status",
+  //   key: "status",
-    width: 80,
+  //   width: 80,
-    align: "center",
+  //   align: "center",
-    ellipsis: true,
+  //   ellipsis: true,
-    customRender: () => "-",
+  //   customRender: () => "-",
-  },
+  // },
-  {
+  // {
-    title: "考试成绩",
+  //   title: "考试成绩",
-    dataIndex: "score",
+  //   dataIndex: "score",
-    key: "score",
+  //   key: "score",
-    width: 80,
+  //   width: 80,
-    align: "center",
+  //   align: "center",
-    ellipsis: true,
+  //   ellipsis: true,
-    customRender: ({ record: { score } }) => score || "-",
+  //   customRender: ({ record: { score } }) => score || "-",
-  },
+  // },
   {
     title: "状态",
     dataIndex: "status",

src/components/student/TableCertificateStudent.vue

@@ -51,7 +51,7 @@
         <template #icon>
           <img
             style="margin-right: 10px"
-            src="../../assets/images/leveladd/reset.png"
+            src="../../assets/images/leveladd/reset0.png"
         /></template>
         重置
       </a-button>

src/components/student/TableModelStudent.vue

@@ -48,14 +48,14 @@
             </a-col>
             <a-col :span="2">
               <a-button
-                class="cus-btn white"
+                class="cus-btn"
-                style="width: 100px"
+                style="width: 100px;background: #4ea6ff;color: #fff;"
                 @click="reset"
               >
                 <template #icon
                   ><img
                     style="margin-right: 10px"
-                    src="../../assets/images/leveladd/reset.png"
+                    src="../../assets/images/leveladd/reset0.png"
                   />
                 </template>
                 重置
@@ -90,7 +90,7 @@
           </div>
         </div>
         <div class="btnn">
-          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="closeDrawer">取消</button>
           <button class="btn2" @click="closeDrawer">确定</button>
         </div>
       </div>

src/components/vote/AddVote.vue

@@ -12,7 +12,7 @@
     <div class="drawerMain">
       <div class="header">
         <div v-if="taskIndex>=0" class="headerTitle">编辑投票任务</div>
-        <div v-else class="headerTitle">添加投票任务</div>
+        <div v-else class="headerTitle">添加投票</div>
         <img
             style="width: 29px; height: 29px; cursor: pointer"
             src="../../assets/images/basicinfo/close.png"
@@ -102,7 +102,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>

src/components/vote/CreateVote.vue

@@ -50,7 +50,7 @@
           <a-button
             type="primary"
             ghost
-            style="width: 100px; height: 40px; border-radius: 8px"
+            style="width: 100px; height: 40px; border-radius: 8px;background-color: #4ea6ff;color: #fff;"
             @click="closeDrawer"
           >
             取消

src/components/vote/VoteQuestion.vue

@@ -4,7 +4,7 @@
   <div class="content">
     <div class="tagbox">
       <div class="deleteop" @click="handleDel">
-        <div><img src="../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题干</div>
       </div>
     </div>
@@ -192,11 +192,12 @@ function handleDel() {
         margin-top: 20px;
         margin-right: 30px;
         border: 1px solid #4ea6ff;
+        background-color: #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
 
         .del_text {
-          color: #4ea6ff;
+          color: #fff;
           font-size: 14px;
           margin-left: 5px;
         }

src/views/courselibrary/CoursewareManage.vue

@@ -1005,7 +1005,7 @@
                 <span>开始前：</span>
                 <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="
                     width: 100px;
@@ -1021,7 +1021,7 @@
                 <span>开始后：</span>
                 <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="
                     width: 100px;
@@ -3798,11 +3798,11 @@ export default defineComponent({
           dataIndex: "studentBandDesc",
           key: "7",
           align: "center",
-          customRender: (record) => {
+          customRender: (text) => {
             return (
               <div class="racona">
                 <span>
-                  {record.studentBandDesc ? record.studentBandDesc : "-"}
+                  {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
                 </span>
               </div>
             );

src/views/learningpath/LearningPath.vue

@@ -281,7 +281,7 @@
             </div>
           </div>
           <div class="btn">
-            <button class="samtn btn1" @click="handleOut">取消</button>
+            <button class="samtn btn2" @click="handleOut">取消</button>
             <a-button
               class="samtn btn2"
               @click="createLearnPath"
@@ -411,7 +411,7 @@
             </div>
           </div>
           <div class="btn">
-            <button class="samtn btn1" @click="handleOut1">取消</button>
+            <button class="samtn btn2" @click="handleOut1">取消</button>
             <a-button
               class="samtn btn2"
               @click="editLearnPath"
@@ -490,7 +490,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
@@ -519,7 +519,7 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopyModal">
+            <div class="del_btn btn2" @click="closeCopyModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="copyLearnPath">
@@ -553,7 +553,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
@@ -583,7 +583,7 @@
             <span>您确定要删除此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteModal">
+            <div class="del_btn btn2" @click="closeDeleteModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteLearnPath">
@@ -613,7 +613,7 @@
             <span>您确定要启用此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="delete_exit">
+            <div class="del_btn btn2" @click="delete_exit" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="delete_exit">
@@ -644,7 +644,7 @@
             <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
@@ -730,7 +730,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore" style="margin-right:32px;">取消</button>
           <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
         </div>
       </div>

src/views/learningpath/LevelAdd.vue

@@ -499,7 +499,6 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        v-if="checkPer(permissions,createId)"
                         @click="showAA(item.type, item.name, item)"
                         :style="{
                           display:
@@ -525,7 +524,6 @@
                       </div>
                       <div
                         class="operation"
-                        v-if="checkPer(permissions,createId)"
                         style="cursor: pointer; margin-right: 35px"
                         @click="
                           item.type === 1 ||
@@ -908,8 +906,8 @@
               </div>
               <div class="btn">
                 <button
-                  class="sameb btn1"
+                  class="sameb btn2"
-                  style="cursor: pointer"
+                  style="cursor: pointer;margin-right: 32px;"
                   @click="closeChangeModal"
                 >
                   取消
@@ -954,7 +952,7 @@
               <span>请确认是否批量删除学员</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn2" style="margin-right:32px;">
                 <div class="btnText" @click="delete_exit">取消</div>
               </div>
               <div class="del_btn btn2">
@@ -1069,6 +1067,8 @@
       />
       <!-- 面授学员抽屉 -->
       <RouterFaceStu
+        :permissions="permissions"
+        :createId="createId"
         v-model:FSvisible="FSvisible"
         :datasource="facestudent"
         :type="2"
@@ -1076,6 +1076,8 @@
       />
       <!-- 活动考勤抽屉 -->
       <active-attendance
+        :permissions="permissions"
+        :createId="createId"
         v-model:AAvisible="AAvisible"
         :datasource="liveData"
         :title="showKaoqinText"
@@ -1083,13 +1085,25 @@
         classify="2"
       />
       <!-- 时间管理抽屉 -->
-      <time-manage v-model:Tvisible="visible" :title="showTimeText" />
+      <time-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Tvisible="visible" :title="showTimeText" />
       <!-- 考试管理抽屉 -->
-      <test-manage v-model:TMvisible="TMvisible" :title="showTestText" />
+      <test-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:TMvisible="TMvisible" :title="showTestText" />
       <!-- 面授管理抽屉 -->
-      <face-manage v-model:Fvisible="FaceVisivle" />
+      <face-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Fvisible="FaceVisivle" />
       <!-- 作业管理抽屉 -->
-      <work-manage v-model:Wvisible="Wvisible" />
+      <work-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Wvisible="Wvisible" />
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
@@ -1163,7 +1177,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
@@ -1193,7 +1207,7 @@
             <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
@@ -1223,7 +1237,7 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopy">
+            <div class="del_btn btn2" @click="closeCopy" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="sureCopy">
@@ -1257,7 +1271,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
@@ -1279,6 +1293,8 @@
 
     <!-- 面授管理抽屉 开始 -->
     <router-face-teach-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:FaceTeachModelVisible="faceTeachModelVisible"
       :title="faceTeachModelVisibleTitle"
       :datasource="faceData"
@@ -1287,6 +1303,8 @@
 
     <!-- 系统考试管理抽屉 开始-->
     <router-examination-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ExaminationModelVisible="examinationModelVisible"
       :title="examinationModelVisibleTitle"
       :datasource="examinationData"
@@ -1296,6 +1314,8 @@
 
     <!-- 外部考试管理抽屉 开始-->
     <router-examination-external-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ExaminationExaminaModelVisible="examinationExaminaModelVisible"
       :title="examinationModelVisibleTitle"
       :datasource="examinationData"
@@ -1306,6 +1326,8 @@
 
     <!-- 测评管理抽屉 开始-->
     <router-evaluation-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:EvaluationModelVisible="evaluationModelVisible"
       :title="evaluationModelVisibleTitle"
       :datasource="evaluationData"
@@ -1315,6 +1337,8 @@
 
     <!-- 作业管理抽屉 开始-->
     <router-homework-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:HomeworkModelVisible="homeworkModelVisible"
       :title="homeworkModelVisibleTitle"
       :datasource="homeworkData"
@@ -1323,6 +1347,8 @@
 
     <!-- 公共管理抽屉 开始-->
     <router-common-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:CommonModelVisible="commonModelVisible"
       :title="commonModelVisibleTitle"
       :datasource="commonData"
@@ -1333,6 +1359,8 @@
 
     <!-- 投票管理抽屉 开始-->
     <router-vote-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:VoteModelVisible="voteModelVisible"
       :title="voteModelVisibleTitle"
       :datasource="voteData"
@@ -1343,6 +1371,8 @@
 
     <!-- 项目管理抽屉 开始-->
     <router-project-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:PjModelVisible="pjModelVisible"
       :title="pjModelVisibleTitle"
       :datasource="pjData"

src/views/learningpath/LevelAddDetail.vue

@@ -96,7 +96,7 @@
               <div class="co1">{{ formValue.remark?.length || 0 }}/100</div>
             </div>
             <div class="btn">
-              <button class="btn1" @click="closeModal">取消</button>
+              <button class="btn2" @click="closeModal" style="margin-right: 32px;">取消</button>
               <button class="btn2" @click="editChapter">确定</button>
             </div>
           </div>
@@ -320,8 +320,8 @@
 
     <div class="footbtn footBox">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
+        <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
-        <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -349,7 +349,7 @@
               ></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer;margin-right: 32px;" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -1432,17 +1432,17 @@ const cancelStorage = async () => {
             }
 
             .btn2 {
-              background-color: #ffffff;
+              background-color: #4ea6ff;
 
               .imgIcon {
                 width: 16px;
                 height: 16px;
-                background-image: url(@/assets/images/projectadd/delete.png);
+                background-image: url(@/assets/images/projectadd/delete1.png);
                 background-size: 100%;
               }
 
               .btnText {
-                color: #4ea6ff;
+                color: #fff;
               }
             }
           }

src/views/projectcenter/LibraryAdd.vue

@@ -64,7 +64,7 @@
               >
                 <img
                   class="editimg"
-                  src="../../assets/images/projectadd/edit.png"
+                  src="../../assets/images/projectadd/edit1.png"
                 />
                 <span class="editext">编辑</span>
               </router-link>
@@ -2248,10 +2248,11 @@ export default defineComponent({
           position: absolute;
           right: 38px;
           top: 0;
-          color: #4ea6ff;
+          color: #fff;
           width: 100px;
           height: 40px;
           border: 1px solid #4ea6ff;
+          background: #4ea6ff;
           border-radius: 8px;
 
           .editimg {
@@ -2267,15 +2268,15 @@ export default defineComponent({
           }
         }
 
-        .edit:hover {
+        // .edit:hover {
-          color: #ffffff;
+        //   color: #ffffff;
-          background-color: #4ea6ff;
+        //   background-color: #4ea6ff;
-          cursor: pointer;
+        //   cursor: pointer;
 
-          .editimg {
+        //   .editimg {
-            background-image: url("../../assets/images/projectadd/edit1.png");
+        //     background-image: url("../../assets/images/projectadd/edit1.png");
-          }
+        //   }
-        }
+        // }
       }
 
       .taskSyllabus {

src/views/projectcenter/ProjectAdd.vue

@@ -199,7 +199,7 @@
     </div>
     <div class="footer">
       <div class="btn">
-        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button @click="backPage" class="btn1">取消</a-button>
         <a-button :loading="loading" v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定
         </a-button>
       </div>
@@ -229,7 +229,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
           <a-button class="samtn btn2" @click="closeLearnBgMore" :loading="projectInfo.validated===1">确定</a-button>
         </div>
       </div>

src/views/projectcenter/ProjectManage.vue

@@ -359,7 +359,7 @@
             </div>
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal2" style="margin-right: 32px;">取消</a-button>
             <a-button class="pubtn2" @click="createStoreyProject" :loading="buttonLoading || projectInfo.validated===1"
               >确定
             </a-button>
@@ -568,7 +568,7 @@
             <span>您确定要复制此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopyModal">
+            <div class="del_btn btn2" @click="closeCopyModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="copyProject">
@@ -601,7 +601,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
@@ -631,7 +631,7 @@
             <span>您确定要删除此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteModal">
+            <div class="del_btn btn2" @click="closeDeleteModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteProject">
@@ -661,7 +661,7 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStartModal">
+            <div class="del_btn btn2" @click="closeStartModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="templateProject">
@@ -742,7 +742,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="closeProjectPub" style="margin-right: 32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseProject">发布</a-button>
         </div>
       </div>
@@ -775,7 +775,7 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
@@ -806,7 +806,7 @@
             <div class="back">（项目撤回结束后学员可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackFinashModal">
+            <div class="del_btn btn2" @click="closeBackFinashModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reFinashedProject">
@@ -866,7 +866,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeReviewModal">
+            <div class="del_btn btn2" @click="closeReviewModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reviewProject">
@@ -897,7 +897,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeRecallReviewModal">
+            <div class="del_btn btn2" @click="closeRecallReviewModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallReviewProject">

src/views/projectcenter/SonProject.vue

@@ -264,7 +264,7 @@
           class="btn1"
           >确定
         </a-button>
-        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button type="primary" @click="backPage" class="btn1">取消</a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
@@ -305,7 +305,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
           <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
         </div>
       </div>

src/views/projectcenter/TaskAdd.vue

@@ -123,7 +123,7 @@
                 移动任务到阶段
               </button>
               <div class="edit" @click="deleteTaskAll">
-                <img class="editimg" src="../../assets/images/projectadd/delete.png"/>
+                <img class="editimg" src="../../assets/images/projectadd/delete1.png"/>
                 <span class="editext">批量删除</span>
               </div>
             </div>
@@ -276,8 +276,8 @@
 
     <div class="footbtn footBox">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
+        <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
-        <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -334,8 +334,8 @@
                 width: 100px;
                 border: 1px solid #4ea6ff;
                 border-radius: 4px;
-                color: #4ea6ff;
+                color: #fff;
-                background-color: #ffffff;
+                background-color: #4ea6ff;
               ">
             取消
           </button>
@@ -376,7 +376,7 @@
                         :options="projectInfo.stageList.map(({name:label},value)=>({label,value,disabled:value===activeIndex}))"></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -1396,10 +1396,11 @@ const cancelStorage = async () => {
             position: absolute;
             right: 0;
             top: 0;
-            color: #4ea6ff;
+            color: #fff;
             width: 120px;
             height: 40px;
             border: 1px solid #4ea6ff;
+            background-color: #4ea6ff;
             border-radius: 8px;
 
             .editimg {
@@ -1415,15 +1416,15 @@ const cancelStorage = async () => {
             }
           }
 
-          .edit:hover {
+          // .edit:hover {
-            color: #ffffff;
+          //   color: #ffffff;
-            background-color: #4ea6ff;
+          //   background-color: #4ea6ff;
-            cursor: pointer;
+          //   cursor: pointer;
 
-            .editimg {
+          //   .editimg {
-              background-image: url("../../assets/images/projectadd/delete1.png");
+          //     background-image: url("../../assets/images/projectadd/delete1.png");
-            }
+          //   }
-          }
+          // }
         }
 
         .notable {

src/views/projectcenter/TaskPage.vue

@@ -103,7 +103,7 @@
                 <div class="back"></div>
               </div>
               <div class="del_btnbox">
-                <div class="del_btn btn1" @click="closeReviewModal">
+                <div class="del_btn btn2" @click="closeReviewModal" style="margin-right: 32px;">
                   <div class="btnText">取消</div>
                 </div>
                 <div class="del_btn btn2" @click="submitReviewProject">
@@ -621,7 +621,7 @@
                           class="operation"
                           style="cursor: pointer"
                           @click="showAA(item.type, item.name, item)"
-                          v-if="(item.type == 6 || item.type == 9) && checkPer(permissions,createId)"
+                          v-if="(item.type == 6 || item.type == 9)"
                         >
                           考勤
                         </div>
@@ -640,7 +640,6 @@
                         </div>
                         <div
                           class="operation"
-                          v-if="checkPer(permissions,createId)"
                           style="cursor: pointer; margin-right: 10px"
                           @click="
                             item.type == '1' ||
@@ -791,7 +790,7 @@
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png" />
+                      <img src="../../assets/images/courseManage/reset0.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
@@ -801,20 +800,20 @@
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
-                  <div class="btn2" @click="showSubset">
+                  <div class="btn1" @click="showSubset">
-                    <img src="../../assets/images/courseManage/reset2.png" />
+                    <img src="../../assets/images/courseManage/reset4.png" />
-                    <span class="btn2text">随机分组</span>
+                    <span class="btn1text">随机分组</span>
                   </div>
-                  <div class="btn2" @click="exportGroup">
+                  <div class="btn1" @click="exportGroup">
-                    <span class="btn2text">导出小组</span>
+                    <span class="btn1text">导出小组</span>
                   </div>
                   <ImpoterGroupLeader
                     :data="{ targetId: projectId, type: 1 }"
                     :url="`/admin/studentGroup/importGroup`"
                     :template-url="`/admin/studentGroup/exportGroup/${projectId}`"
                   >
-                    <div class="btn2">
+                    <div class="btn1">
-                      <span class="btn2text">导入小组长</span>
+                      <span class="btn1text">导入小组长</span>
                     </div>
                   </ImpoterGroupLeader>
                 </div>
@@ -942,7 +941,7 @@
                   <div class="te">搜索</div>
                 </div>
                 <div
-                  class="btn btn2"
+                  class="btn btn1"
                   @click="rankReset"
                   style="cursor: pointer"
                 >
@@ -1469,6 +1468,8 @@
     </div>
     <!-- 时间管理抽屉 -->
     <time-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Tvisible="visible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
@@ -1476,6 +1477,8 @@
     />
     <!-- 在线、案例等管理抽屉 -->
     <ProjectOnlineManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Tvisible="onlineVisible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
@@ -1485,6 +1488,8 @@
     />
     <!-- 面授管理抽屉 -->
     <ProjectFaceTaskManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Fvisible="FaceVisivle"
       :projectTaskId="projectTaskId"
       :title="showFaceText"
@@ -1492,6 +1497,8 @@
     />
     <!-- 作业管理抽屉 -->
     <ProjectHomeWorkManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Wvisible="Wvisible"
       :projectTaskId="projectTaskId"
       :title="showWorkText"
@@ -1499,6 +1506,8 @@
     />
     <!-- 系统考试管理抽屉 -->
     <ProjectExamManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:TMvisible="TMvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1506,6 +1515,8 @@
     />
     <!-- 外部考试管理抽屉 -->
     <ProjectExternalExamManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:TMvisibleExternal="TMvisibleExternal"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1513,6 +1524,8 @@
     />
     <!-- 投票管理抽屉 -->
     <ProjectVoteManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ProjectVoteModelVisible="projectVoteModelVisible"
       :title="voteModelVisibleTitle"
       :levelName="voteLevelName"
@@ -1520,6 +1533,8 @@
     />
     <!-- 测评抽屉 -->
     <ProjectEvalManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Evalvisible="Evalvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1528,6 +1543,8 @@
     />
     <!-- 添加证书抽屉 -->
     <AddCertificate
+      :permissions="permissions"
+      :createId="createId"
       v-model:ACertificate="ACertificate"
       v-model:projectId="projectId"
       v-model:ACertificateEdit="ACertificateEdit"
@@ -1562,6 +1579,8 @@
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
     <proj-check-ship
+      :permissions="permissions"
+      :createId="createId"
       v-model:ProjCheckvisible="Stuvisible"
       :selectProjectId="projectId"
       v-model:addAuthList="addAuthList"
@@ -1598,11 +1617,15 @@
     />
     <!-- 面授学员抽屉 -->
     <ProjectFaceStu
+      :permissions="permissions"
+      :createId="createId"
       v-model:FSvisible="FSvisible"
       :projectTaskInfo="facestudent"
     />
     <!-- 活动直播考勤抽屉 -->
     <active-attendance
+      :permissions="permissions"
+      :createId="createId"
       v-model:AAvisible="AAvisible"
       :datasource="liveData"
       :title="showKaoqinText"
@@ -1678,7 +1701,7 @@
             >
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal">取消</a-button>
             <a-button class="pubtn2" @click="closeModal">发布</a-button>
           </div>
         </div>
@@ -1750,7 +1773,7 @@
             <div class="in">
               <a-input-number
                 :min="0"
-                :max="300"
+                :max="999999"
                 :precision="0"
                 style="width: 395px; height: 40px; border-radius: 8px"
                 v-model:value="groupInfo.groupMemberCount"
@@ -1773,7 +1796,7 @@
             </div>
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal2" style="margin-right:32px;">取消</a-button>
             <a-button class="pubtn2" :loading="buttonLoading" @click="createG">确定</a-button>
           </div>
         </div>
@@ -1801,7 +1824,7 @@
               <span>您是否授予此学员优秀学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="cancelyou">
+              <div class="del_btn btn2" @click="cancelyou" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeModal1">
@@ -1833,7 +1856,7 @@
               <span>您是否取消此学员优学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="cancelcanyou">
+              <div class="del_btn btn2" @click="cancelcanyou" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeModal3">
@@ -1865,7 +1888,7 @@
               <span>您确定要删除此学员吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="closeDeleteOne">
+              <div class="del_btn btn2" @click="closeDeleteOne" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeDeleteOneConfirm">
@@ -1899,7 +1922,7 @@
               <span>您确定要删除此课程吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn2" style="margin-right: 32px;">
                 <div class="btnText" @click="delete_exit">取消</div>
               </div>
               <div class="del_btn btn2">
@@ -1931,7 +1954,7 @@
               <span>您确定批量删除吗？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="closeCancelDelete">
+              <div class="del_btn btn2" @click="closeCancelDelete" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeAllDelete">
@@ -2015,7 +2038,7 @@
                 >
               </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="closeProjectPub">取消</a-button>
           <a-button class="pubtn2" @click="releaseProject">发布</a-button>
         </div>
       </div>
@@ -2048,7 +2071,7 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
@@ -2079,7 +2102,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeRecallReviewModal">
+            <div class="del_btn btn2" @click="closeRecallReviewModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallReviewProject">
@@ -2112,7 +2135,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
@@ -2142,7 +2165,7 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStartModal">
+            <div class="del_btn btn2" @click="closeStartModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="templateProject">
@@ -6498,10 +6521,10 @@ export default {
           border: 1px solid #4ea6ff;
           border-radius: 8px;
           cursor: pointer;
-          background: #ffffff;
+          background: #4ea6ff;
 
           .btn2text {
-            color: #4ea6ff;
+            color: #fff;
             margin-left: 5px;
             font-size: 14px;
           }
@@ -7081,7 +7104,7 @@ export default {
           .img2 {
             width: 16px;
             height: 18px;
-            background-image: url(../../assets/images/coursewareManage/reset1.png);
+            background-image: url(../../assets/images/coursewareManage/reset0.png);
             background-size: 100%;
             margin-right: 5px;
           }

src/views/projectcenter/temTask.vue

@@ -121,7 +121,7 @@
                 移动任务到阶段
               </button>
               <div class="edit" @click="showdeAll">
-                <img class="editimg" src="../../assets/images/projectadd/delete.png" />
+                <img class="editimg" src="../../assets/images/projectadd/delete1.png" />
                 <span class="editext">批量删除</span>
               </div>
             </div>
@@ -278,7 +278,7 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="templateLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -334,8 +334,8 @@
                       width: 100px;
                       border: 1px solid #4ea6ff;
                       border-radius: 4px;
-                      color: #4ea6ff;
+                      color: #fff;
-                      background-color: #ffffff;
+                      background-color: #4ea6ff;
                     ">
               取消
             </button>
@@ -370,7 +370,7 @@
             <span>您确定要添加阶段吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeConfirm">
+            <div class="del_btn btn2" @click="closeConfirm" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="showModal">
@@ -394,7 +394,7 @@
             <span>您确定要删除所有阶段吗？</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCancel">
+            <div class="del_btn btn2" @click="closeCancel" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="removeAllLevel">
@@ -418,7 +418,7 @@
             <span>您确定要删除此任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDelete">
+            <div class="del_btn btn2" @click="closeDelete" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="confirmDelTask">
@@ -441,7 +441,7 @@
             <span>您确定要批量删除任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeAll">
+            <div class="del_btn btn2" @click="closeDeAll" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteTaskAll">
@@ -471,7 +471,7 @@
                 :options="projectInfo.stageList.map(({ name: label }, value) => ({ label, value, disabled: value === activeIndex }))"></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -500,7 +500,7 @@
             }}</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteStage">
+            <div class="del_btn btn2" @click="closeDeleteStage" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteStage">
@@ -1523,10 +1523,11 @@ const cancelStorage = async () => {
             position: absolute;
             right: 0;
             top: 0;
-            color: #4ea6ff;
+            color: #fff;
             width: 120px;
             height: 40px;
             border: 1px solid #4ea6ff;
+            background: #4ea6ff;
             border-radius: 8px;
 
             .editimg {
@@ -1542,15 +1543,15 @@ const cancelStorage = async () => {
             }
           }
 
-          .edit:hover {
+          // .edit:hover {
-            color: #ffffff;
+          //   color: #ffffff;
-            background-color: #4ea6ff;
+          //   background-color: #4ea6ff;
-            cursor: pointer;
+          //   cursor: pointer;
 
-            .editimg {
+          //   .editimg {
-              background-image: url("../../assets/images/projectadd/delete1.png");
+          //     background-image: url("../../assets/images/projectadd/delete1.png");
-            }
+          //   }
-          }
+          // }
         }
 
         .notable {

src/views/research/ResearchManage.vue

@@ -156,7 +156,7 @@
   </div>
 </template>
 <script setup>
-import {ref} from "vue";
+import {ref,onMounted} from "vue";
 import {createResearch, deleteResearch, editAssessmentName, editReleaseStatus,} from "@/api/indexResearch";
 import {checkPer} from "@/utils/utils";
 import {Form, message} from "ant-design-vue";
@@ -275,6 +275,15 @@ const formData = ref({
   validated: 0,
 });
 
+onMounted(() => {
+  // 是否需要触发新建弹框
+  let str = location.href;
+  let isOpen = str.includes("openCreate=true");
+  if(isOpen){
+    newNext.value = true;
+  }
+});
+
 const newNext = ref(false);
 const dateTime = ref([]);
 const nameRef = ref();