修改bug

src/components/base/CardListItem.vue

@@ -21,7 +21,7 @@ const fileType = ['doc', 'docx', 'xls', 'xlsx', 'pdf', 'ppt', 'pptx', 'mp3', 'mp
         <Files />
       </el-icon>
       <div class="tool-pop-btn">
-        <router-link v-permission="props.permission.edit" :to="`${props.path}/update?id=${props.data.id}`">
+        <router-link v-if="props.data.auth_edit" :to="`${props.path}/update?id=${props.data.id}`">
           <div class="edit-btn">编辑</div>
         </router-link>
         <router-link v-permission="props.permission.view" :to="`${props.path}/view?id=${props.data.id}`">
@@ -103,6 +103,8 @@ const fileType = ['doc', 'docx', 'xls', 'xlsx', 'pdf', 'ppt', 'pptx', 'mp3', 'mp
       height: 100%;
       background: rgba(0, 0, 0, 0.6);
       opacity: 0;
+      padding-top: 52px;
+      box-sizing: border-box;
       .edit-btn {
         width: 113px;
         line-height: 32px;
@@ -111,7 +113,7 @@ const fileType = ['doc', 'docx', 'xls', 'xlsx', 'pdf', 'ppt', 'pptx', 'mp3', 'mp
         text-align: center;
         font-size: 14px;
         color: #ffffff;
-        margin: 52px auto 12px;
+        margin: 0 auto 12px;
         cursor: pointer;
       }
       .view-btn {

src/modules/resource/courseware/components/Operation.vue

@@ -9,8 +9,6 @@ const route = useRoute()
 
 const props = defineProps(['data'])
 
-const path = route.path
-
 // 详情id
 const id = route.query.id as string
 // 设置部门共享
@@ -73,7 +71,11 @@ const handlePlatform = () => {
 const handleStatus = () => {
   ElMessageBox.confirm(
     `
-    ${parseInt(props.data.status) === 1 ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？' : '确认再次上线该资源吗？'}
+    ${
+      parseInt(props.data.status) === 1
+        ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？'
+        : '确认再次上线该资源吗？'
+    }
   `,
     '提示',
     {
@@ -123,19 +125,26 @@ const handlesetBelong = () => {
 
 <template>
   <div class="tool-btn-box" v-if="$route.query.id" style="margin-bottom: 20px">
-    <template v-if="path === '/resource/courseware/view'">
+    <template v-if="props.data.auth_edit">
       <router-link v-permission="'v1-resource-courseware-update'" :to="`/resource/courseware/update?id=${id}`">
         <div class="btn-item">编辑课件信息</div>
       </router-link>
     </template>
-    <div v-permission="'v1-resource-courseware-set-department'" class="btn-item" @click="handleDepartment">
+    <div v-if="props.data.auth_department" class="btn-item" @click="handleDepartment">
       {{ props.data.department_public == 0 ? '部门共享' : '取消部门共享' }}
     </div>
-    <div v-permission="'v1-resource-courseware-set-platform'" class="btn-item" @click="handlePlatform">
+    <div v-if="props.data.platform" class="btn-item" @click="handlePlatform">
       {{ props.data.platform_public == 0 ? '平台共享' : '取消平台共享' }}
     </div>
-    <div v-if="path === '/resource/lessonplan/view'" v-permission="'v1-resource-courseware-set-status'" class="btn-item" @click="handleStatus">{{ props.data.status == 0 ? '资源上线' : '资源下线' }}</div>
-    <div v-permission="'v1-resource-courseware-set-belong'" class="btn-item" @click="handleMembers">更改负责人</div>
+    <div
+      v-if="props.data.auth_status"
+      v-permission="'v1-resource-courseware-set-status'"
+      class="btn-item"
+      @click="handleStatus"
+    >
+      {{ props.data.status == 0 ? '资源上线' : '资源下线' }}
+    </div>
+    <div v-if="props.data.auth_belong" class="btn-item" @click="handleMembers">更改负责人</div>
   </div>
   <el-dialog v-model="dialogFormVisible" title="更改负责人" center>
     <el-form :model="form">

src/modules/resource/courseware/views/List.vue

@@ -20,8 +20,12 @@ const defaultProps = {
 }
 
 const appList = ref()
+
 // 列表切换
-const isCard = $ref(true)
+let isCard = $ref(true)
+const changeCard = () => {
+  isCard = !isCard
+}
 
 // 资源出处 tab触发
 const tabValue = ref('1')
@@ -83,7 +87,7 @@ const typeFilter = () => {
         <el-tab-pane label="部门资源" name="2"></el-tab-pane>
         <el-tab-pane label="公开资源" name="3"></el-tab-pane>
       </el-tabs>
-      <el-icon class="video-head-icon" @click="isCard = !isCard"><Expand /></el-icon>
+      <el-icon class="video-head-icon" @click="changeCard"><Expand /></el-icon>
     </div>
     <div class="video-tool-btn">
       <router-link v-permission="'v1-resource-courseware-create'" to="/resource/courseware/update">
@@ -109,7 +113,7 @@ const typeFilter = () => {
       </template>
       <template #table-operate="{ row }">
         <el-space>
-          <router-link v-permission="'v1-resource-courseware-update'" :to="`/resource/courseware/update/?id=${row.id}`">
+          <router-link v-if="row.auth_edit" :to="`/resource/courseware/update/?id=${row.id}`">
             <el-button plain>编辑</el-button>
           </router-link>
           <router-link v-permission="'v1-resource-courseware-view'" :to="`/resource/courseware/view/?id=${row.id}`">

src/modules/resource/dashboard/components/Newest.vue

 <script setup lang="ts">
-import { checkPermission } from '@/utils/permission'
 import { ElMessage } from 'element-plus'
 
 const router = useRouter()
@@ -54,8 +53,8 @@ const resourceType = (name: string, isGetPath: number) => {
   return path[name]
 }
 
-const viewDetails = (row: { id: string, resource_type: string }) => {
-  if (checkPermission(resourceType(row.resource_type, 3))) {
+const viewDetails = (row: { id: string, auth_view: boolean, resource_type: string }) => {
+  if (row.auth_view) {
     router.push({
       path: resourceType(row.resource_type, 1),
       query: {

src/modules/resource/lessonplan/components/Operation.vue

@@ -9,8 +9,6 @@ const route = useRoute()
 
 const props = defineProps(['data'])
 
-const path = route.path
-
 // 详情id
 const id = route.query.id as string
 // 设置部门共享
@@ -73,7 +71,11 @@ const handlePlatform = () => {
 const handleStatus = () => {
   ElMessageBox.confirm(
     `
-    ${parseInt(props.data.status) === 1 ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？' : '确认再次上线该资源吗？'}
+    ${
+      parseInt(props.data.status) === 1
+        ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？'
+        : '确认再次上线该资源吗？'
+    }
   `,
     '提示',
     {
@@ -123,19 +125,26 @@ const handlesetBelong = () => {
 
 <template>
   <div class="tool-btn-box" v-if="$route.query.id" style="margin-bottom: 20px">
-    <template v-if="path === '/resource/lessonplan/view'">
+    <template v-if="props.data.auth_edit">
       <router-link v-permission="'v1-resource-lesson-plan-update'" :to="`/resource/lessonplan/update?id=${id}`">
         <div class="btn-item">编辑教案信息</div>
       </router-link>
     </template>
-    <div v-permission="'v1-resource-lesson-plan-set-department'" class="btn-item" @click="handleDepartment">
+    <div v-if="props.data.auth_department" class="btn-item" @click="handleDepartment">
       {{ props.data.department_public == 0 ? '部门共享' : '取消部门共享' }}
     </div>
-    <div v-permission="'v1-resource-lesson-plan-set-platform'" class="btn-item" @click="handlePlatform">
+    <div v-if="props.data.platform" class="btn-item" @click="handlePlatform">
       {{ props.data.platform_public == 0 ? '平台共享' : '取消平台共享' }}
     </div>
-    <div v-if="path === '/resource/lessonplan/view'" v-permission="'v1-resource-lesson-plan-set-status'" class="btn-item" @click="handleStatus">{{ props.data.status == 0 ? '资源上线' : '资源下线' }}</div>
-    <div v-permission="'v1-resource-lesson-plan-set-belong'" class="btn-item" @click="handleMembers">更改负责人</div>
+    <div
+      v-if="props.data.auth_status"
+      v-permission="'v1-resource-lesson-plan-set-status'"
+      class="btn-item"
+      @click="handleStatus"
+    >
+      {{ props.data.status == 0 ? '资源上线' : '资源下线' }}
+    </div>
+    <div v-if="props.data.auth_belong" class="btn-item" @click="handleMembers">更改负责人</div>
   </div>
   <el-dialog v-model="dialogFormVisible" title="更改负责人" center>
     <el-form :model="form">

src/modules/resource/lessonplan/views/List.vue

@@ -10,7 +10,11 @@ const store = useMapStore()
 
 const appList = ref()
 
-const isCard = $ref(true)
+// 列表切换
+let isCard = $ref(true)
+const changeCard = () => {
+  isCard = !isCard
+}
 
 // 筛选部门列表
 const departmentList: any = useProjectList().departmentList
@@ -83,7 +87,7 @@ const typeFilter = () => {
         <el-tab-pane label="部门资源" name="2"></el-tab-pane>
         <el-tab-pane label="公开资源" name="3"></el-tab-pane>
       </el-tabs>
-      <el-icon class="video-head-icon" @click="isCard = !isCard"><Expand /></el-icon>
+      <el-icon class="video-head-icon" @click="changeCard"><Expand /></el-icon>
     </div>
     <div class="video-tool-btn">
       <router-link v-permission="'v1-resource-lesson-plan-create'" to="/resource/lessonplan/update">
@@ -109,10 +113,7 @@ const typeFilter = () => {
       </template>
       <template #table-operate="{ row }">
         <el-space>
-          <router-link
-            v-permission="'v1-resource-lesson-plan-update'"
-            :to="`/resource/lessonplan/update/?id=${row.id}`"
-          >
+          <router-link v-if="row.auth_edit" :to="`/resource/lessonplan/update/?id=${row.id}`">
             <el-button plain>编辑</el-button>
           </router-link>
           <router-link v-permission="'v1-resource-lesson-plan-view'" :to="`/resource/lessonplan/view?id=${row.id}`">

src/modules/resource/lessonplan/views/View.vue

@@ -18,11 +18,46 @@ const listOptions = {
     { label: '操作', slots: 'table-operate', align: 'center' }
   ],
   data: [
-    { img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg', cursor_name: '宏观经济学', type_name: '产业学院', zhang: '第一章', jie: '第三小节', update: '2020-01-01' },
-    { img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg', cursor_name: '宏观经济学', type_name: '产业学院', zhang: '第一章', jie: '第三小节', update: '2020-01-01' },
-    { img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg', cursor_name: '宏观经济学', type_name: '产业学院', zhang: '第一章', jie: '第三小节', update: '2020-01-01' },
-    { img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg', cursor_name: '宏观经济学', type_name: '产业学院', zhang: '第一章', jie: '第三小节', update: '2020-01-01' },
-    { img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg', cursor_name: '宏观经济学', type_name: '产业学院', zhang: '第一章', jie: '第三小节', update: '2020-01-01' }
+    {
+      img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg',
+      cursor_name: '宏观经济学',
+      type_name: '产业学院',
+      zhang: '第一章',
+      jie: '第三小节',
+      update: '2020-01-01'
+    },
+    {
+      img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg',
+      cursor_name: '宏观经济学',
+      type_name: '产业学院',
+      zhang: '第一章',
+      jie: '第三小节',
+      update: '2020-01-01'
+    },
+    {
+      img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg',
+      cursor_name: '宏观经济学',
+      type_name: '产业学院',
+      zhang: '第一章',
+      jie: '第三小节',
+      update: '2020-01-01'
+    },
+    {
+      img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg',
+      cursor_name: '宏观经济学',
+      type_name: '产业学院',
+      zhang: '第一章',
+      jie: '第三小节',
+      update: '2020-01-01'
+    },
+    {
+      img: 'https://webapp-pub.ezijing.com/upload/admin/527caa9260ce1d6f9b2477902337e9e4.jpeg',
+      cursor_name: '宏观经济学',
+      type_name: '产业学院',
+      zhang: '第一章',
+      jie: '第三小节',
+      update: '2020-01-01'
+    }
   ]
 }
 const id = route.query.id as string
@@ -43,7 +78,7 @@ getLessonDetails({ id: id }).then((res: any) => {
   <AppCard title="教案资源关联使用课程">
     <AppList v-bind="listOptions" ref="appList" stripe>
       <template #table-img="{ row }">
-        <img :src="row.img" style="width: 100px;display:block;">
+        <img :src="row.img" style="width: 100px; display: block" />
       </template>
       <template #table-operate="{ row }">
         <el-space>

src/modules/resource/other/components/Operation.vue

@@ -75,7 +75,11 @@ const handlePlatform = () => {
 const handleStatus = () => {
   ElMessageBox.confirm(
     `
-    ${parseInt(props.data.status) === 1 ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？' : '确认再次上线该资源吗？'}
+    ${
+      parseInt(props.data.status) === 1
+        ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？'
+        : '确认再次上线该资源吗？'
+    }
   `,
     '提示',
     {
@@ -125,19 +129,21 @@ const handlesetBelong = () => {
 
 <template>
   <div class="tool-btn-box" v-if="$route.query.id" style="margin-bottom: 20px">
-    <template v-if="path === '/resource/other/view'">
+    <template v-if="props.data.auth_edit">
       <router-link v-permission="'v1-resource-other-information-update'" :to="`/resource/other/update?id=${id}`">
         <div class="btn-item">编辑其他资料信息</div>
       </router-link>
     </template>
-    <div v-permission="'v1-resource-other-information-set-department'" class="btn-item" @click="handleDepartment">
+    <div v-if="props.data.auth_department" class="btn-item" @click="handleDepartment">
       {{ props.data.department_public == 0 ? '部门共享' : '取消部门共享' }}
     </div>
-    <div v-permission="'v1-resource-other-information-set-platform'" class="btn-item" @click="handlePlatform">
+    <div v-if="props.data.platform" class="btn-item" @click="handlePlatform">
       {{ props.data.platform_public == 0 ? '平台共享' : '取消平台共享' }}
     </div>
-    <div v-if="path === '/resource/other/view'" v-permission="'v1-resource-other-information-set-status'" class="btn-item" @click="handleStatus">{{ props.data.status == 0 ? '资源上线' : '资源下线' }}</div>
-    <div v-permission="'v1-resource-other-information-set-belong'" class="btn-item" @click="handleMembers">更改负责人</div>
+    <div v-if="props.data.auth_status" class="btn-item" @click="handleStatus">
+      {{ props.data.status == 0 ? '资源上线' : '资源下线' }}
+    </div>
+    <div v-if="props.data.auth_belong" class="btn-item" @click="handleMembers">更改负责人</div>
   </div>
   <el-dialog v-model="dialogFormVisible" title="更改负责人" center>
     <el-form :model="form">

src/modules/resource/other/views/List.vue

@@ -10,8 +10,12 @@ import { useGetCategoryList } from '@/composables/useGetCategoryList'
 const store = useMapStore()
 
 const appList = ref()
+
 // 列表切换
-const isCard = $ref(true)
+let isCard = $ref(true)
+const changeCard = () => {
+  isCard = !isCard
+}
 
 // 资源出处 tab触发
 const tabValue = ref('1')
@@ -84,7 +88,7 @@ const typeFilter = () => {
         <el-tab-pane label="部门资源" name="2"></el-tab-pane>
         <el-tab-pane label="公开资源" name="3"></el-tab-pane>
       </el-tabs>
-      <el-icon class="video-head-icon" @click="isCard = !isCard"><Expand /></el-icon>
+      <el-icon class="video-head-icon" @click="changeCard"><Expand /></el-icon>
     </div>
     <div class="video-tool-btn">
       <router-link v-permission="'v1-resource-other-information-create'" to="/resource/other/update">
@@ -110,10 +114,7 @@ const typeFilter = () => {
       </template>
       <template #table-operate="{ row }">
         <el-space>
-          <router-link
-            v-permission="'v1-resource-other-information-update'"
-            :to="`/resource/other/update/?id=${row.id}`"
-          >
+          <router-link v-if="row.auth_edit" :to="`/resource/other/update/?id=${row.id}`">
             <el-button plain>编辑</el-button>
           </router-link>
           <router-link v-permission="'v1-resource-other-information-view'" :to="`/resource/other/view/?id=${row.id}`">

src/modules/resource/video/components/CardListItem.vue

@@ -9,12 +9,16 @@ const props:any = defineProps<{ data: object }>()
       <!-- <img :src="props.data.cover" /> -->
       <div class="cover-img" :style="`background-image:url(${props.data.cover})`"></div>
       <div class="tool-pop-btn">
-        <router-link v-permission="'v1-resource-video-update'" :to="`/resource/video/update?id=${props.data.id}`">
-          <div class="edit-btn">编辑</div>
-        </router-link>
-        <router-link v-if="props.data.status == '1'" v-permission="'v1-resource-video-view'" :to="`/resource/video/view?id=${props.data.id}`">
-          <div class="view-btn">查看</div>
-        </router-link>
+        <div style="min-width:100%">
+          <router-link v-if="props.data.auth_edit" :to="`/resource/video/update?id=${props.data.id}`">
+            <div class="edit-btn">编辑</div>
+          </router-link>
+        </div>
+        <div style="min-width:100%">
+          <router-link v-if="props.data.auth_view" :to="`/resource/video/view?id=${props.data.id}`">
+            <div class="view-btn">查看</div>
+          </router-link>
+        </div>
       </div>
     </div>
     <div class="card-item-bottom">
@@ -73,6 +77,8 @@ const props:any = defineProps<{ data: object }>()
       height: 100%;
       background: rgba(0, 0, 0, 0.6);
       opacity: 0;
+      padding-top: 52px;
+      box-sizing: border-box;
       .edit-btn{
         width: 113px;
         line-height: 32px;
@@ -81,7 +87,7 @@ const props:any = defineProps<{ data: object }>()
         text-align: center;
         font-size: 14px;
         color: #FFFFFF;
-        margin: 52px auto 12px;
+        margin: 0 auto 12px;
         cursor: pointer;
       }
       .view-btn{

src/modules/resource/video/components/Operation.vue

@@ -9,8 +9,6 @@ const route = useRoute()
 
 const props = defineProps(['data'])
 
-const path = route.path
-
 // 详情id
 const id = route.query.id as string
 // 设置部门共享
@@ -73,7 +71,11 @@ const handlePlatform = () => {
 const handleStatus = () => {
   ElMessageBox.confirm(
     `
-    ${parseInt(props.data.status) === 1 ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？' : '确认再次上线该资源吗？'}
+    ${
+      parseInt(props.data.status) === 1
+        ? '已下线的资源将不能被关联到课程使用，确认下线该资源吗？'
+        : '确认再次上线该资源吗？'
+    }
   `,
     '提示',
     {
@@ -122,24 +124,29 @@ const handlesetBelong = () => {
 
 <template>
   <div class="tool-btn-box" v-if="$route.query.id" style="margin-bottom: 20px">
-    <template v-if="path === '/resource/video/view'">
-      <router-link v-permission="'v1-resource-video-update'" :to="`/resource/video/update?id=${id}`">
+    <template v-if="props.data.auth_edit">
+      <router-link :to="`/resource/video/update?id=${id}`">
         <div class="btn-item">编辑视频信息</div>
       </router-link>
-      <router-link v-permission="'v1-resource-video-get-ppt'" :to="`/resource/video/edit-courseware?id=${id}`">
+      <router-link :to="`/resource/video/edit-courseware?id=${id}`">
         <div class="btn-item">编辑视频课件</div>
       </router-link>
     </template>
-    <div v-permission="'v1-resource-video-set-department'" class="btn-item" @click="handleDepartment">
+    <div v-if="props.data.auth_department" class="btn-item" @click="handleDepartment">
       {{ props.data.department_public == 0 ? '部门共享' : '取消部门共享' }}
     </div>
-    <div v-permission="'v1-resource-video-set-platform'" class="btn-item" @click="handlePlatform">
+    <div v-if="props.data.platform" class="btn-item" @click="handlePlatform">
       {{ props.data.platform_public == 0 ? '平台共享' : '取消平台共享' }}
     </div>
-    <div v-if="path === '/resource/video/view'" v-permission="'v1-resource-video-set-status'" class="btn-item" @click="handleStatus">
+    <div
+      v-if="props.data.auth_status"
+      v-permission="'v1-resource-video-set-status'"
+      class="btn-item"
+      @click="handleStatus"
+    >
       {{ props.data.status == 0 ? '资源上线' : '资源下线' }}
     </div>
-    <div v-permission="'v1-resource-video-set-belong'" class="btn-item" @click="handleMembers">更改负责人</div>
+    <div v-if="props.data.auth_belong" class="btn-item" @click="handleMembers">更改负责人</div>
   </div>
   <el-dialog v-model="dialogFormVisible" title="更改负责人" center>
     <el-form :model="form">

src/modules/resource/video/views/List.vue

@@ -27,7 +27,7 @@ const tabChange = () => {
 }
 
 // 列表切换
-const isCard = $ref(true)
+let isCard = $ref(true)
 
 // table 数据
 const listOptions = $computed(() => {
@@ -76,6 +76,10 @@ const listOptions = $computed(() => {
 const typeFilter = () => {
   appList.value.refetch()
 }
+
+const changeCard = () => {
+  isCard = !isCard
+}
 </script>
 
 <template>
@@ -86,7 +90,7 @@ const typeFilter = () => {
         <el-tab-pane label="部门资源" name="2"></el-tab-pane>
         <el-tab-pane label="公开资源" name="3"></el-tab-pane>
       </el-tabs>
-      <el-icon class="video-head-icon" @click="isCard = !isCard"><Expand /></el-icon>
+      <el-icon class="video-head-icon" @click="changeCard"><Expand /></el-icon>
     </div>
     <div class="video-tool-btn">
       <router-link to="/resource/video/update" v-permission="'v1-resource-video-create'">
@@ -127,14 +131,10 @@ const typeFilter = () => {
       </template>
       <template #table-operate="{ row }">
         <el-space>
-          <router-link v-permission="'v1-resource-video-update'" :to="`/resource/video/update?id=${row.id}`">
+          <router-link v-if="row.auth_edit" :to="`/resource/video/update?id=${row.id}`">
             <el-button plain>编辑</el-button>
           </router-link>
-          <router-link
-            v-if="row.status == '1'"
-            v-permission="'v1-resource-video-view'"
-            :to="`/resource/video/view?id=${row.id}`"
-          >
+          <router-link v-permission="'v1-resource-video-view'" :to="`/resource/video/view?id=${row.id}`">
             <el-button type="primary" plain>查看</el-button>
           </router-link>
         </el-space>

src/utils/axios.ts

@@ -51,7 +51,7 @@ httpRequest.interceptors.response.use(
       // 未登录
       if (status === 403) {
         location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(location.href)}`
-      } else if (status === 400 || status === 402) {
+      } else if (status === 402) {
         // 未授权
         router.push('/401')
       } else {