Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx
This commit is contained in:
@@ -30,7 +30,7 @@ import { getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningD
|
||||
const props = defineProps({
|
||||
height: [String, Number]
|
||||
})
|
||||
|
||||
const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
|
||||
const router = useRouter() // 路由对象
|
||||
defineOptions({
|
||||
name: 'businessUser'
|
||||
@@ -44,7 +44,7 @@ const tableStore = new TableStore({
|
||||
method: 'POST',
|
||||
publicHeight: 65,
|
||||
isWebPaging: true,
|
||||
filename:'待办任务',
|
||||
filename: '待办任务',
|
||||
column: [
|
||||
{
|
||||
field: 'index',
|
||||
@@ -208,10 +208,19 @@ const tableStore = new TableStore({
|
||||
// 页面内tab切换
|
||||
let type = row.tabValue
|
||||
let key = '3'
|
||||
let name = row.routePath
|
||||
if (VITE_FLAG) {
|
||||
let key = row.routePath?.split('?')[0].slice(-1)
|
||||
const isNumber = /^\d$/.test(key)
|
||||
if (!isNumber) {
|
||||
name = row.routePath + type
|
||||
}
|
||||
}
|
||||
|
||||
// 业务记录id
|
||||
let id = row.id
|
||||
router.push({
|
||||
name: row.routePath,
|
||||
name: name,
|
||||
query: {
|
||||
type,
|
||||
id,
|
||||
|
||||
Reference in New Issue
Block a user