sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

节点：冻结一行

Browse Source 
报表：修改请求路径
操作记录：初始化加载昨天数据
This commit is contained in:
高云鹏 2024-11-06 09:50:34 +08:00
parent 1c4dc03363
commit 5f94b5bc86
5 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/dasadmin/package.json
View File

@ -12,19 +12,18 @@
},
"dependencies": {
"@element-plus/icons-vue": "2.3.1",
"@univerjs/core": "^0.2.4",
"@univerjs/design": "^0.2.4",
"@univerjs/docs": "^0.2.4",
"@univerjs/docs-ui": "^0.2.4",
"@univerjs/engine-formula": "^0.2.4",
"@univerjs/engine-numfmt": "^0.2.4",
"@univerjs/engine-render": "^0.2.4",
"@univerjs/facade": "^0.2.4",
"@univerjs/rpc": "^0.2.4",
"@univerjs/sheets": "^0.2.4",
"@univerjs/sheets-formula": "^0.2.4",
"@univerjs/sheets-ui": "^0.2.4",
"@univerjs/ui": "^0.2.4",
"@univerjs/core": "^0.4.2",
"@univerjs/design": "^0.4.2",
"@univerjs/docs": "^0.4.2",
"@univerjs/docs-ui": "^0.4.2",
"@univerjs/engine-formula": "^0.4.2",
"@univerjs/engine-render": "^0.4.2",
"@univerjs/facade": "^0.4.2",
"@univerjs/sheets": "^0.4.2",
"@univerjs/sheets-formula": "^0.4.2",
"@univerjs/sheets-formula-ui": "^0.4.2",
"@univerjs/sheets-ui": "^0.4.2",
"@univerjs/ui": "^0.4.2",
"@vueuse/core": "10.10.0",
"axios": "1.7.2",
"countup.js": "2.8.0",

6
ui/dasadmin/src/api/backend/statAnalysis/request.ts
View File

@ -48,7 +48,7 @@ export const getReportTemplateListReq = (data: { category: '单机报表' | '多
},
success: boolean
}>>({
url: '/api/report/template/getList',
url: '/api/page/report/template/getList',
method: 'post',
data
})
@ -65,7 +65,7 @@ export const addReportTemplateListReq = (data: { category: '单机报表' | '多
}[],
success: boolean
}>>({
url: '/api/report/template/add',
url: '/api/page/report/template/add',
method: 'post',
data
})
@ -77,7 +77,7 @@ export const delReportTemplateListReq = (data: { id: string }) => {
msg: string,
success: boolean
}>>({
url: '/api/report/template/del',
url: '/api/page/report/template/del',
method: 'post',
data
})

1
ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
View File

@ -561,6 +561,7 @@ getBlongLineList()
<style scoped lang="scss">
.airBlower {
width: 100%;
height: 100%;
.containerPart {
height: 100%;

25
ui/dasadmin/src/views/backend/node/univer.vue
View File

@ -117,7 +117,7 @@ import '@univerjs/design/lib/index.css'
import '@univerjs/ui/lib/index.css'
import '@univerjs/docs-ui/lib/index.css'
import '@univerjs/sheets-ui/lib/index.css'
// import '@univerjs/sheets-formula-ui/lib/index.css'
import '@univerjs/sheets-formula-ui/lib/index.css'
import { Univer, UniverInstanceType, Tools, Workbook, LocaleType, IWorkbookData } from '@univerjs/core'
import { defaultTheme } from '@univerjs/design'
@ -132,7 +132,7 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'
import { UniverSheetsPlugin } from '@univerjs/sheets'
import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula'
// import { UniverSheetsFormulaUIPlugin } from '@univerjs/sheets-formula-ui'
import { UniverSheetsFormulaUIPlugin } from '@univerjs/sheets-formula-ui'
import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'
import DesignZhCN from '@univerjs/design/locale/zh-CN'
@ -140,7 +140,7 @@ import UIZhCN from '@univerjs/ui/locale/zh-CN'
import DocsUIZhCN from '@univerjs/docs-ui/locale/zh-CN'
import SheetsZhCN from '@univerjs/sheets/locale/zh-CN'
import SheetsUIZhCN from '@univerjs/sheets-ui/locale/zh-CN'
// import SheetsFormulaUIZhCN from '@univerjs/sheets-formula-ui/locale/zh-CN'
import SheetsFormulaUIZhCN from '@univerjs/sheets-formula-ui/locale/zh-CN'
import { FUniver } from '@univerjs/facade'
import { excelDefaultConfig, createWookbookData, createUpLoadExcelData, createSheetData, setExcelNameToLinkId } from './utils'
@ -194,8 +194,8 @@ const initExcel = (data = {}) => {
theme: defaultTheme,
locale: LocaleType.ZH_CN,
locales: {
// [LocaleType.ZH_CN]: Tools.deepMerge(SheetsZhCN, DocsUIZhCN, SheetsUIZhCN,SheetsFormulaUIZhCN, UIZhCN, DesignZhCN),
[LocaleType.ZH_CN]: Tools.deepMerge(SheetsZhCN, DocsUIZhCN, SheetsUIZhCN, UIZhCN, DesignZhCN),
[LocaleType.ZH_CN]: Tools.deepMerge(SheetsZhCN, DocsUIZhCN, SheetsUIZhCN, SheetsFormulaUIZhCN, UIZhCN, DesignZhCN),
// [LocaleType.ZH_CN]: Tools.deepMerge(SheetsZhCN, DocsUIZhCN, SheetsUIZhCN, UIZhCN, DesignZhCN),
},
})
univerRef.value = univer
@ -217,8 +217,7 @@ const initExcel = (data = {}) => {
univer.registerPlugin(UniverSheetsPlugin)
univer.registerPlugin(UniverSheetsUIPlugin)
univer.registerPlugin(UniverSheetsFormulaPlugin)
// univer.registerPlugin(UniverSheetsFormulaUIPlugin)
univer.registerPlugin(UniverSheetsFormulaUIPlugin)
// create workbook instance
workbook.value = univer.createUnit<IWorkbookData, Workbook>(UniverInstanceType.UNIVER_SHEET, data)
@ -244,13 +243,11 @@ const initExcel = (data = {}) => {
})
hasLoading.value = false
// const wb = univerAPI.getActiveWorkbook()
// const worksheet = wb.getActiveSheet()
// console.log(worksheet)
// worksheet.setFrozenRows(1)
// const freezeState = worksheet.getFreeze()
// console.log('当前冻结状态：', freezeState)
// 获取活动工作簿和工作表
const wb = univerAPI.getActiveWorkbook()
const worksheet = wb!.getActiveSheet()
// 冻结第一行
worksheet.setFrozenRows(1)
}
/**

10
ui/dasadmin/src/views/backend/operatingRecord/index.vue
View File

@ -61,7 +61,7 @@ import { getOperatingListReq } from '/@/api/backend/operatingRecord/request'
import type { OperatingReqType, OperatingResType } from '/@/views/backend/operatingRecord/type'
import { getAirBlowerListReq } from '/@/api/backend/airBlower/request'
const datePickerValue = ref('')
const datePickerValue = ref<any[]>([])
const shortcuts = [
{
text: '今天',
@ -159,6 +159,14 @@ const getAirBlowerList = () => {
}
})
}
const getDefaultTimeForYesterday = () => {
const start = dayjs().subtract(1, 'day').startOf('day').toDate()
const end = dayjs().subtract(1, 'day').endOf('day').toDate()
datePickerValue.value = [start, end]
}
getDefaultTimeForYesterday()
search()
getAirBlowerList()
</script>