修改bug

package.json

@@ -26,7 +26,7 @@
     "sass": "^1.58.0",
     "sass-loader": "^13.2.0",
     "terser": "^5.16.5",
-    "v-viewer": "^3.0.11",
+    "v-viewer": "^3.0.21",
     "vue": "^3.2.45",
     "vue-router": "^4.0.10",
     "vuex": "^4.0.2",

src/main.js

@@ -31,8 +31,9 @@ app.use(store);
 app.component("svg-icon", SvgIcon);
 
 app.use(Viewer, {
-  Options: {
-    inline: true,
+  defaultOptions: {
+    zIndex: '999999999',
+    inline: false,
     button: true, //右上角按钮
     navbar: true, //底部缩略图
     title: true, //当前图片标题
@@ -45,7 +46,6 @@ app.use(Viewer, {
     transition: true, //使用 CSS3 过度
     fullscreen: true, //播放时是否全屏
     keyboard: true, //是否支持键盘
-    url: "data-source",
   },
 });
 

src/views/roles/roles.vue

@@ -253,7 +253,7 @@
               <div class="rolesSel">
                 <el-tag
                   class="tag"
-                  v-for="(item, index) in row.departmentManageArr"
+                  v-for="(item, index) in row.departmentViewArr"
                   :key="item.id"
                 >
                   {{ item.name }}
@@ -263,20 +263,21 @@
                   effect="light"
                   content=""
                   placement="bottom"
-                  v-if="row.departmentManageNum"
+                  v-if="row.departmentViewNum"
                 >
                   <template #content>
                     <el-tag
                       class="tag"
-                      v-for="(item, index) in row.departmentManageJson"
+                      v-for="(item, index) in row.departmentViewJson"
                       :key="item.id"
                     >
                       {{ item.name }}
                     </el-tag>
                   </template>
-                  <el-tag type="primary">+{{ row.departmentManageNum }}</el-tag>
+                  <el-tag type="primary">+{{ row.departmentViewNum }}</el-tag>
                 </el-tooltip>
               </div>
+              
             </template>
           </el-table-column>
           <el-table-column prop="roles" label="管理权限" width="350">
@@ -291,7 +292,7 @@
               <div class="rolesSel">
                 <el-tag
                   class="tag"
-                  v-for="(item, index) in row.departmentViewArr"
+                  v-for="(item, index) in row.departmentManageArr"
                   :key="item.id"
                 >
                   {{ item.name }}
@@ -301,18 +302,18 @@
                   effect="light"
                   content=""
                   placement="bottom"
-                  v-if="row.departmentViewNum"
+                  v-if="row.departmentManageNum"
                 >
                   <template #content>
                     <el-tag
                       class="tag"
-                      v-for="(item, index) in row.departmentViewJson"
+                      v-for="(item, index) in row.departmentManageJson"
                       :key="item.id"
                     >
                       {{ item.name }}
                     </el-tag>
                   </template>
-                  <el-tag type="primary">+{{ row.departmentViewNum }}</el-tag>
+                  <el-tag type="primary">+{{ row.departmentManageNum }}</el-tag>
                 </el-tooltip>
               </div>
             </template>

src/views/user/user.vue

@@ -1035,7 +1035,7 @@
             :page-size="delRecordPageSize"
             layout="total, prev, pager, next, jumper, slot"
             :total="delRecordTotal"
-            @update:current-page="handleCurrentChange"
+            @update:current-page="delRecordHandleCurrentChange"
           />
         </div>
       </div>
@@ -3084,11 +3084,7 @@ const addBatchConcel = () => {
 };
 
 // 打开删除记录页面 （--------------------------------------------------）
-const DelRecordClick = async () => {
-  delRecordShow.value = true;
-  delBatchShow.value = false;
-  homeShow.value = false;
-  addMemberTitle.value = "删除异常记录";
+const DelRecordList=async ()=>{
   let data = {
     currentPage: delRecordCurrentPage.value,
     pageCount: delRecordPageSize.value,
@@ -3114,6 +3110,13 @@ const DelRecordClick = async () => {
       center: true,
     });
   }
+}
+const DelRecordClick = async () => {
+  delRecordShow.value = true;
+  delBatchShow.value = false;
+  homeShow.value = false;
+  addMemberTitle.value = "删除异常记录";
+  DelRecordList()
 };
 // 关闭删除记录页面
 const delRecordClose = () => {
@@ -3121,6 +3124,11 @@ const delRecordClose = () => {
   delBatchShow.value = false;
   homeShow.value = true;
 };
+const delRecordHandleCurrentChange = (value) => {
+  console.log(value, "每页显示条数");
+  delRecordCurrentPage.value = value;
+  DelRecordList()
+};
 
 // 打开入学登记审核列表页面 （--------------------------------------------------）
 const enrollmentList=async ()=>{
@@ -3169,8 +3177,8 @@ const enrollmentClose = () => {
 };
 const enrollmentHandleCurrentChange = (value) => {
   console.log(value, "每页显示条数");
-  enrollmentPageSize.value = value;
-  enrollmentCurrentPage.value = 1;
+  enrollmentCurrentPage.value = value;
+  enrollmentList()
 };
 // 改变年级获取班级数据
 const enrollmentGradeChange=async ()=>{
@@ -4134,6 +4142,7 @@ const confirmExportSettings = async () => {
     departmentId: treeNodeId.value,
     name: searchInput.keyWord,
     gauageOutfitVos: arr,
+    ifGraduate: searchInput.ifGraduate,
   };
   let res = await axios({
     method: "post",
@@ -5067,8 +5076,13 @@ onUnmounted(() => {
 
     .el-dialog__body {
       padding: 0px 20px 20px 20px;
+      height: 800px;
+      // overflow: auto;
+      // display: flex;
+      // flex-direction: column;
       .footer {
         width: calc(100%);
+        height: calc(100% - 112px);
         margin-bottom: 20px;
 
         .el-table--fit {