From 5f94b5bc86567ab1d10b5b0b3636987fe353b01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Wed, 6 Nov 2024 09:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=9A=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C=20=E6=8A=A5=E8=A1=A8=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=98=A8=E5=A4=A9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/package.json                      | 25 +++++++++----------
 .../src/api/backend/statAnalysis/request.ts   |  6 ++---
 .../backend/equipment/airBlower/index.vue     |  1 +
 ui/dasadmin/src/views/backend/node/univer.vue | 25 ++++++++-----------
 .../views/backend/operatingRecord/index.vue   | 10 +++++++-
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/ui/dasadmin/package.json b/ui/dasadmin/package.json
index 1147f73f..bffe03d5 100644
--- a/ui/dasadmin/package.json
+++ b/ui/dasadmin/package.json
@@ -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",
diff --git a/ui/dasadmin/src/api/backend/statAnalysis/request.ts b/ui/dasadmin/src/api/backend/statAnalysis/request.ts
index 3884a68f..a3b1f123 100644
--- a/ui/dasadmin/src/api/backend/statAnalysis/request.ts
+++ b/ui/dasadmin/src/api/backend/statAnalysis/request.ts
@@ -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
     })
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 70c417f2..5c5fd8c0 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -561,6 +561,7 @@ getBlongLineList()
 
 <style scoped lang="scss">
 .airBlower {
+    width: 100%;
     height: 100%;
     .containerPart {
         height: 100%;
diff --git a/ui/dasadmin/src/views/backend/node/univer.vue b/ui/dasadmin/src/views/backend/node/univer.vue
index be2cd503..6d7574a3 100644
--- a/ui/dasadmin/src/views/backend/node/univer.vue
+++ b/ui/dasadmin/src/views/backend/node/univer.vue
@@ -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)
 }
 
 /**
diff --git a/ui/dasadmin/src/views/backend/operatingRecord/index.vue b/ui/dasadmin/src/views/backend/operatingRecord/index.vue
index 2024eaca..c568bd0a 100644
--- a/ui/dasadmin/src/views/backend/operatingRecord/index.vue
+++ b/ui/dasadmin/src/views/backend/operatingRecord/index.vue
@@ -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>