Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

src/layout/index.vue

@@ -32,15 +32,9 @@ import SideBar from './components/Sidebar/index.vue'
 import Tags from './components/Tags/index.vue'
 import { useSettingStore } from '@/store/modules/setting.js'
 import { computed } from 'vue'
-import { useUserStore } from '@/store/modules/user.js'
 const settingStore = useSettingStore()
 const menuMode = computed(() => settingStore.getMenuMode)
 const tagsMenuSetting = computed(() => settingStore.getTagsMenuSetting)
-const useUser = useUserStore()
-// function getUserNow() {
-//   useUser.getUserInfo()
-// }
-// getUserNow()
 
 </script>
 

src/views/login/index.vue

@@ -13,7 +13,6 @@ import { useRoute, useRouter } from 'vue-router'
 import { useUserStore } from '@/store/modules/user'
 import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js'
 import { updateLoginTime } from '@/api/dashboard/index'
-import { nextTick } from '@vue/runtime-core'
 
 export default {
   name: 'LoginPage',
@@ -27,18 +26,16 @@ export default {
         // router.push({ path: getPath() })
         // removePath()
         userStore.getUserInfos()
-        nextTick(() => {
-          const authority = res.profile.authority
-          const { VITE_PLATFORM } = import.meta.env
-          if (authority && (authority.includes(VITE_PLATFORM))) {
-            router.push({ path: '/' })
-          } else {
-            $message.error('暂无权限访问，请联系管理员')
-            setTimeout(() => {
-              signoutRedirect()
-            }, 2000)
-          }
-        })
+        const authority = res.profile.authority
+        const { VITE_PLATFORM } = import.meta.env
+        if (authority && (authority.includes(VITE_PLATFORM))) {
+          router.push({ path: '/' })
+        } else {
+          $message.error('暂无权限访问，请联系管理员')
+          setTimeout(() => {
+            signoutRedirect()
+          }, 2000)
+        }
       }).catch(err => {
         console.log(err)
         signoutRedirect()

src/views/task-manage/components/DrawComp.vue

@@ -142,7 +142,7 @@
     />
 
     <fileOss
-      v-if="data.photographyWay === 1 && (roleId === data.flightHandId || roleType === 1)"
+      v-if="data.photographyWay === 1"
       ref="srtRefs"
       :file-type="'srt'"
       :key-name="'srtUrl'"
@@ -152,7 +152,7 @@
       :class="{'uploads': remBtn}"
     />
     <fileOss
-      v-if="data.photographyWay === 2 && (roleId === data.flightHandId || roleType === 1)"
+      v-if="data.photographyWay === 2"
       :file-type="'tif'"
       :key-name="'orthoUrl'"
       :btn-name="'正射影像'"
@@ -162,7 +162,7 @@
       @upload-status="statusfile"
     />
     <fileOss
-      v-if="data.photographyWay === 3 && (roleId === data.flightHandId || roleType === 1)"
+      v-if="data.photographyWay === 3"
       :file-type="'tif'"
       :key-name="'inclinedUrl'"
       :show-upload-btn="true"

src/views/task-manage/index.vue

@@ -41,7 +41,6 @@ import DrawComp from './components/DrawComp.vue'
 import UserModal from './components/UserModal.vue'
 import { getTaskList } from '@/api/task/index'
 import { unref, ref, toRefs, reactive, onUnmounted } from 'vue'
-import { useUserStore } from '@/store/modules/user'
 import { usePermissionStore } from '@/store/modules/permission'
 
 export default {
@@ -77,7 +76,6 @@ export default {
       }))
       return temp
     }
-    const roleType = useUserStore().userInfo.type // 1管理员，2飞手
     // 新增
     function handleModal() {
       data.rowData = null
@@ -111,8 +109,7 @@ export default {
       selectedIds,
       // deleteComplex,
       getPermissionLabel,
-      handleCheck,
-      roleType
+      handleCheck
     }
   },
   methods: {

src/views/task-manage/tools/table.js

@@ -1,12 +1,6 @@
 import { h, ref, reactive } from 'vue'
 import TableAction from '@/components/DataTable/tools/Action.vue'
 import { getTaskInfo, taskDel } from '@/api/task'
-import { useUserStore } from '@/store/modules/user'
-
-const roleType = ref(null)
-setTimeout(() => {
-  roleType.value = useUserStore().userInfo.type
-})
 
 /* 注册table */
 const tableRef = ref()
@@ -134,7 +128,7 @@ const data = reactive({
                 text: true,
                 onClick: editHandle.bind(null, row, 'update')
               },
-              show: row.status < 11 && row.inspectionType === 1 && roleType.value === 1,
+              show: row.status < 11 && row.inspectionType === 1,
               auth: 'task:all:edit'
             },
             {
@@ -145,7 +139,7 @@ const data = reactive({
                 onPositiveClick: deleteData.bind(null, row.id)
               },
               auth: 'task:all:delete',
-              show: row.status < 16 && row.inspectionType === 1 && roleType.value === 1,
+              show: row.status < 16 && row.inspectionType === 1,
               ButtonProps: {
                 text: true,
                 type: 'primary'