Browse Source

删除操作按钮用户type判断

yufei
余菲 1 year ago
parent
commit
89bdc9cd22
5 changed files with 16 additions and 34 deletions
  1. +0
    -6
      src/layout/index.vue
  2. +10
    -13
      src/views/login/index.vue
  3. +3
    -3
      src/views/task-manage/components/DrawComp.vue
  4. +1
    -4
      src/views/task-manage/index.vue
  5. +2
    -8
      src/views/task-manage/tools/table.js

+ 0
- 6
src/layout/index.vue View File

import Tags from './components/Tags/index.vue' import Tags from './components/Tags/index.vue'
import { useSettingStore } from '@/store/modules/setting.js' import { useSettingStore } from '@/store/modules/setting.js'
import { computed } from 'vue' import { computed } from 'vue'
import { useUserStore } from '@/store/modules/user.js'
const settingStore = useSettingStore() const settingStore = useSettingStore()
const menuMode = computed(() => settingStore.getMenuMode) const menuMode = computed(() => settingStore.getMenuMode)
const tagsMenuSetting = computed(() => settingStore.getTagsMenuSetting) const tagsMenuSetting = computed(() => settingStore.getTagsMenuSetting)
const useUser = useUserStore()
// function getUserNow() {
// useUser.getUserInfo()
// }
// getUserNow()


</script> </script>



+ 10
- 13
src/views/login/index.vue View File

import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js' import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js'
import { updateLoginTime } from '@/api/dashboard/index' import { updateLoginTime } from '@/api/dashboard/index'
import { nextTick } from '@vue/runtime-core'


export default { export default {
name: 'LoginPage', name: 'LoginPage',
// router.push({ path: getPath() }) // router.push({ path: getPath() })
// removePath() // removePath()
userStore.getUserInfos() 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 => { }).catch(err => {
console.log(err) console.log(err)
signoutRedirect() signoutRedirect()

+ 3
- 3
src/views/task-manage/components/DrawComp.vue View File

/> />


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

+ 1
- 4
src/views/task-manage/index.vue View File

import UserModal from './components/UserModal.vue' import UserModal from './components/UserModal.vue'
import { getTaskList } from '@/api/task/index' import { getTaskList } from '@/api/task/index'
import { unref, ref, toRefs, reactive, onUnmounted } from 'vue' import { unref, ref, toRefs, reactive, onUnmounted } from 'vue'
import { useUserStore } from '@/store/modules/user'
import { usePermissionStore } from '@/store/modules/permission' import { usePermissionStore } from '@/store/modules/permission'


export default { export default {
})) }))
return temp return temp
} }
const roleType = useUserStore().userInfo.type // 1管理员,2飞手
// 新增 // 新增
function handleModal() { function handleModal() {
data.rowData = null data.rowData = null
selectedIds, selectedIds,
// deleteComplex, // deleteComplex,
getPermissionLabel, getPermissionLabel,
handleCheck,
roleType
handleCheck
} }
}, },
methods: { methods: {

+ 2
- 8
src/views/task-manage/tools/table.js View File

import { h, ref, reactive } from 'vue' import { h, ref, reactive } from 'vue'
import TableAction from '@/components/DataTable/tools/Action.vue' import TableAction from '@/components/DataTable/tools/Action.vue'
import { getTaskInfo, taskDel } from '@/api/task' import { getTaskInfo, taskDel } from '@/api/task'
import { useUserStore } from '@/store/modules/user'

const roleType = ref(null)
setTimeout(() => {
roleType.value = useUserStore().userInfo.type
})


/* 注册table */ /* 注册table */
const tableRef = ref() const tableRef = ref()
text: true, text: true,
onClick: editHandle.bind(null, row, 'update') 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' auth: 'task:all:edit'
}, },
{ {
onPositiveClick: deleteData.bind(null, row.id) onPositiveClick: deleteData.bind(null, row.id)
}, },
auth: 'task:all:delete', auth: 'task:all:delete',
show: row.status < 16 && row.inspectionType === 1 && roleType.value === 1,
show: row.status < 16 && row.inspectionType === 1,
ButtonProps: { ButtonProps: {
text: true, text: true,
type: 'primary' type: 'primary'

Loading…
Cancel
Save