diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..4f875ef 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -46,7 +46,7 @@
       return {
         show: true,
         icon: 'circle',
-        orient: 'vertile', // 图例方向
+        orient: 'horizontal', // 图例方向
         align: 'left', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..4f875ef 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -46,7 +46,7 @@
       return {
         show: true,
         icon: 'circle',
-        orient: 'vertile', // 图例方向
+        orient: 'horizontal', // 图例方向
         align: 'left', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index f71ee79..df43894 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -39,8 +39,10 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(token, 'token')
-    window.location.href = system.url + params
+    console.log(system.url + params)
+
+    window.open(system.url + params)
+    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..4f875ef 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -46,7 +46,7 @@
       return {
         show: true,
         icon: 'circle',
-        orient: 'vertile', // 图例方向
+        orient: 'horizontal', // 图例方向
         align: 'left', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index f71ee79..df43894 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -39,8 +39,10 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(token, 'token')
-    window.location.href = system.url + params
+    console.log(system.url + params)
+
+    window.open(system.url + params)
+    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue
new file mode 100644
index 0000000..d58880d
--- /dev/null
+++ b/src/views/tested/dashboard/components/editScheduleDialog.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        addSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+      if (type.value === 'edit') {
+        editSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  getCalendarList(param).then((res) => {
+    const response = res.data
+    if (response[form.value.date].length) { // 选择的日期有日程
+      // for (const key in response) {
+      type.value = 'edit'
+      // console.log(response[key])
+
+      list.value = response[form.value.date]
+      // }
+    }
+    else { // 选择的日期没有日程
+      type.value = 'add'
+      list.value = [{
+        scheduleMatters: '', // 日程
+        id: '',
+      }]
+    }
+  })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      delSchedule({ id: list.value[0].id }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        cancle()
+      })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..4f875ef 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -46,7 +46,7 @@
       return {
         show: true,
         icon: 'circle',
-        orient: 'vertile', // 图例方向
+        orient: 'horizontal', // 图例方向
         align: 'left', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index f71ee79..df43894 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -39,8 +39,10 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(token, 'token')
-    window.location.href = system.url + params
+    console.log(system.url + params)
+
+    window.open(system.url + params)
+    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue
new file mode 100644
index 0000000..d58880d
--- /dev/null
+++ b/src/views/tested/dashboard/components/editScheduleDialog.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        addSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+      if (type.value === 'edit') {
+        editSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  getCalendarList(param).then((res) => {
+    const response = res.data
+    if (response[form.value.date].length) { // 选择的日期有日程
+      // for (const key in response) {
+      type.value = 'edit'
+      // console.log(response[key])
+
+      list.value = response[form.value.date]
+      // }
+    }
+    else { // 选择的日期没有日程
+      type.value = 'add'
+      list.value = [{
+        scheduleMatters: '', // 日程
+        id: '',
+      }]
+    }
+  })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      delSchedule({ id: list.value[0].id }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        cancle()
+      })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 10362ba..f0351a8 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -1,30 +1,250 @@
 <!-- 首页看板 -->
 <script lang="ts" setup name="Dashboard">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import verificationDetail from './components/verificationDetail.vue'
 import deviceDetail from './components/deviceDetail.vue'
 import deviceList from './components/deviceList.vue'
 import rightBox from './components/rightBox.vue'
+import editScheduleDialog from './components/editScheduleDialog.vue'
+import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
+import useUserStore from '@/store/modules/user'
 const height = ref(document.body.clientHeight - 50 - 60 - 10)
-window.addEventListener('resize', () => {
-  const bodyHeight = document.body.clientHeight - 50 - 60
-  height.value = bodyHeight
+const user = useUserStore()// 用户信息
+// ------------------------------------UI------------------------------------------
+const blockHeight = ref(300) // 每个展示块高度
+const bigBlockHeight = ref(300) // 大展示块的高度
+const blockWidth = ref(400)
+// 计算工作台区域高度 - 顶部-面包屑-边距
+const benchDivHeight = ref()
+function calcBlockSize() { // 36是消息滚动栏的高度
+  const bodyHeight = document.body.clientHeight - 60 - 20 - 50 - 36
+  bigBlockHeight.value = bodyHeight
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+  benchDivHeight.value = blockHeight.value - 60
+}
+// -----------------------------------日历--------------------------------------------
+const calendarValue = ref(new Date())
+const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
+const editScheduleRef = ref() // 编辑日程ref
+const redCircleData = ref() // 日程列表
+// 点击编辑日程
+const editSchedule = () => {
+  editScheduleRef.value.initDialog()
+}
+// 获取日程列表
+const fetchCalendarList = () => {
+  const param = {
+    userId: user.id,
+    calendarMonth: selectedDate.value,
+  }
+  getCalendarList(param).then((res) => {
+    redCircleData.value = res.data
+  })
+}
+// 点击日期
+const clickDate = (day: string) => {
+  selectDateRecord.value = day
+  selectedDate.value = day.slice(0, 7)
+  fetchCalendarList() // 获取日历列表
+}
+// 点击删除icon
+const deleteData = () => {
+  if (!redCircleData.value || (Object.keys(redCircleData.value).length && !redCircleData.value[selectDateRecord.value].length)) {
+    ElMessage.warning(`${selectDateRecord.value}没有日程，无法删除`)
+    return false
+  }
+  ElMessageBox.confirm(
+    `确定删除${selectDateRecord.value}的日程吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const param = {
+        userId: user.id,
+        scheduleDate: selectDateRecord.value,
+      }
+      delSchedule(param).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchCalendarList() // 获取日历列表
+      })
+    })
+}
+
+// 编辑日程成功
+const editScheduleSuccess = () => {
+  fetchCalendarList() // 获取日历列表
+}
+
+// -----------------------------------------检定详情-------------------------------------
+const measureDetailLoading = ref(false) // 检定详情loading
+const measureDetailXData = ref([]) as any // 检定详情x轴数据
+const measureDetailYDataMax = ref() // 检定详情Y轴数据最大值
+const measureDetailData = ref([]) as any // 检定详情数据
+const measureDetailYearCount = ref(0) // 年度已检数量
+const measureDetailMonthCount = ref(0) // 年度应检数量
+// 获取检定详情
+const fetchMeasureDetail = () => {
+  measureDetailLoading.value = true
+  // getMeasureDetail().then((res: any) => {
+  //   measureDetailXData.value = res.data.map((item: any) => item.date)
+  //   const yValue = res.data.map((item: any) => Number(item.count))
+  //   measureDetailYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
+  //   measureDetailData.value = [{ name: '到期设备', data: yValue }]
+  // measureDetailLoading.value = false
+  // })
+  // 模拟数据
+  setTimeout(() => {
+    measureDetailMonthCount.value = 200
+    measureDetailYearCount.value = 100
+    measureDetailXData.value = ['2023-01', '2023-02', '2023-03', '2023-04', '2023-05', '2023-06', '2023-07', '2023-08', '2023-09'] // x轴
+    measureDetailData.value = [
+      {
+        name: '已检设备数量',
+        data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+      },
+      {
+        name: '应检设备数量',
+        data: [9, 8, 7, 6, 5, 4, 3, 2, 1],
+      },
+    ]
+    measureDetailLoading.value = false // 关闭loading
+  }, 2000)
+}
+// ------------------------------------------------------------------------------------
+onMounted(() => {
+  calcBlockSize()
+  selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
+  fetchMeasureDetail() // 获取检定详情
+  // fetchApprovalMessageData() // 审批提醒
+  // fetchWorkMessageData() // 工作提醒
+  // fetchNoticeList() // 获取通知公告列表
+  fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
 <template>
-  <div class="container" :style="`height:${height}px`">
-    <div class="container" :style="`height:${height}px;width:66.66%`">
-      <!-- 检定详情 -->
-      <verification-detail />
-      <!-- 设备详情 -->
-      <device-detail />
-      <!-- 设备列表 -->
-      <device-list />
-    </div>
-    <div class="container" :style="`height:${height}px;width:33.33%`">
-      <right-box />
-    </div>
-  </div>
+  <app-container>
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          style="overflow: auto;"
+          icon="icon-calendar"
+          title="工作日历"
+          :height="bigBlockHeight"
+          :is-edit="true"
+          :is-show-delete="true"
+          @edit-data="editSchedule"
+          @delete-data="deleteData"
+        >
+          <el-calendar v-model="calendarValue">
+            <template #dateCell="{ data }">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
+                <span>
+                  {{ data.day.split("-").slice(2).join() }}
+                </span>
+              </div>
+              <div v-for="(value, key, index) in redCircleData" :key="index">
+                <el-popover
+                  v-if="key === data.day && value.length"
+                  placement="top-start"
+                  trigger="hover"
+                  width="auto"
+                >
+                  <div class="popover-content-area-class">
+                    <span style="font-weight: 600;">{{ key }}</span>
+                    <li v-for="(e, i) in value" :key="i" class="calendar-li-item">
+                      {{ e.scheduleMatters }}
+                    </li>
+                  </div>
+                  <template #reference>
+                    <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                      <!-- <span>
+                        {{ data.day.split("-").slice(2).join() }}
+                      </span> -->
+                      <span style="margin-top: -30px;">
+                        <el-icon :size="20" color="#f56c6c">
+                          <alarm-clock />
+                        </el-icon>
+                        <!-- <span v-if="key === data.day" class="redCircle" /> -->
+                      </span>
+                    </div>
+                  </template>
+                </el-popover>
+              </div>
+            </template>
+          </el-calendar>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          v-loading="measureDetailLoading"
+          icon="icon-line"
+          title="检定详情"
+          :height="blockHeight"
+        >
+          <div style="display: flex;margin-bottom: 10px;">
+            <div style="display: flex;margin-right: 20px;">
+              <span style="font-size: 14px;">年度已检数量</span>
+              <span style="margin-left: 10px;color: #000;font-weight: 600;">{{ measureDetailYearCount }}</span>
+            </div>
+            <div style="display: flex;">
+              <span style="font-size: 14px;">年度应检数量</span>
+              <span style="margin-left: 10px;color: #000;font-weight: 600;">{{ measureDetailMonthCount }}</span>
+            </div>
+          </div>
+          <line-chart
+            style="width: 100%; height: 90%;"
+            :x-axis-data="measureDetailXData"
+            :width="`${blockWidth - 20}px`"
+            :data="measureDetailData"
+          />
+        </bench-col>
+      </el-col>
+    </el-row>
+    <!-- 编辑日程组件 -->
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>

diff --git a/public/config/config.json b/public/config/config.json
index 313fcf7..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.101:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts
new file mode 100644
index 0000000..c91b411
--- /dev/null
+++ b/src/api/eqpt/dashboard/calendar.ts
@@ -0,0 +1,39 @@
+/**
+ * 日历接口
+ */
+import request from '@/api/index'
+
+// 新增日程
+export function addSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑日程
+export function editSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/update',
+    method: 'post',
+    data,
+  })
+}
+// 日历列表
+export function getCalendarList(data: {	calendarMonth: string; userId: string }) {
+  return request({
+    // url: '/workbench/calendarSchedule/list',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除日程
+export function delSchedule(data: object) {
+  return request({
+    // url: '/workbench/calendarSchedule/delete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/icons/icon-add-circle.svg b/src/assets/icons/icon-add-circle.svg
new file mode 100644
index 0000000..13f4b3b
--- /dev/null
+++ b/src/assets/icons/icon-add-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686822833574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23401" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.83968 438.83968H292.58016a73.343679 73.343679 0 1 0 0 146.32064H438.83968v146.32064a73.343679 73.343679 0 1 0 146.32064 0V585.16032h146.32064a73.343679 73.343679 0 1 0 0-146.32064H585.16032V292.58016a73.343679 73.343679 0 1 0-146.32064 0z m73.343679 585.16032a512 512 0 1 1 512-512 512 512 0 0 1-512.183359 512z"  p-id="23402"></path></svg>
diff --git a/src/assets/icons/icon-reduce-circle.svg b/src/assets/icons/icon-reduce-circle.svg
new file mode 100644
index 0000000..eed0947
--- /dev/null
+++ b/src/assets/icons/icon-reduce-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686823878636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2885" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.239467 1024 0 794.760533 0 512 0 229.239467 229.239467 0 512 0c282.760533 0 512 229.239467 512 512 0 282.760533-229.239467 512-512 512zM292.5568 438.852267a73.147733 73.147733 0 1 0 0 146.295466H731.477333a73.147733 73.147733 0 1 0 0-146.295466H292.522667z" p-id="2886"></path></svg>
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..4f875ef 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -46,7 +46,7 @@
       return {
         show: true,
         icon: 'circle',
-        orient: 'vertile', // 图例方向
+        orient: 'horizontal', // 图例方向
         align: 'left', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index f71ee79..df43894 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -39,8 +39,10 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(token, 'token')
-    window.location.href = system.url + params
+    console.log(system.url + params)
+
+    window.open(system.url + params)
+    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue
new file mode 100644
index 0000000..d58880d
--- /dev/null
+++ b/src/views/tested/dashboard/components/editScheduleDialog.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        addSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+      if (type.value === 'edit') {
+        editSchedule(param).then((res) => {
+          ElMessage.success('设置成功')
+          dialogVisible.value = false
+          emits('editScheduleSuccess')
+        })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  getCalendarList(param).then((res) => {
+    const response = res.data
+    if (response[form.value.date].length) { // 选择的日期有日程
+      // for (const key in response) {
+      type.value = 'edit'
+      // console.log(response[key])
+
+      list.value = response[form.value.date]
+      // }
+    }
+    else { // 选择的日期没有日程
+      type.value = 'add'
+      list.value = [{
+        scheduleMatters: '', // 日程
+        id: '',
+      }]
+    }
+  })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      delSchedule({ id: list.value[0].id }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        cancle()
+      })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 10362ba..f0351a8 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -1,30 +1,250 @@
 <!-- 首页看板 -->
 <script lang="ts" setup name="Dashboard">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import verificationDetail from './components/verificationDetail.vue'
 import deviceDetail from './components/deviceDetail.vue'
 import deviceList from './components/deviceList.vue'
 import rightBox from './components/rightBox.vue'
+import editScheduleDialog from './components/editScheduleDialog.vue'
+import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
+import useUserStore from '@/store/modules/user'
 const height = ref(document.body.clientHeight - 50 - 60 - 10)
-window.addEventListener('resize', () => {
-  const bodyHeight = document.body.clientHeight - 50 - 60
-  height.value = bodyHeight
+const user = useUserStore()// 用户信息
+// ------------------------------------UI------------------------------------------
+const blockHeight = ref(300) // 每个展示块高度
+const bigBlockHeight = ref(300) // 大展示块的高度
+const blockWidth = ref(400)
+// 计算工作台区域高度 - 顶部-面包屑-边距
+const benchDivHeight = ref()
+function calcBlockSize() { // 36是消息滚动栏的高度
+  const bodyHeight = document.body.clientHeight - 60 - 20 - 50 - 36
+  bigBlockHeight.value = bodyHeight
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+  benchDivHeight.value = blockHeight.value - 60
+}
+// -----------------------------------日历--------------------------------------------
+const calendarValue = ref(new Date())
+const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
+const editScheduleRef = ref() // 编辑日程ref
+const redCircleData = ref() // 日程列表
+// 点击编辑日程
+const editSchedule = () => {
+  editScheduleRef.value.initDialog()
+}
+// 获取日程列表
+const fetchCalendarList = () => {
+  const param = {
+    userId: user.id,
+    calendarMonth: selectedDate.value,
+  }
+  getCalendarList(param).then((res) => {
+    redCircleData.value = res.data
+  })
+}
+// 点击日期
+const clickDate = (day: string) => {
+  selectDateRecord.value = day
+  selectedDate.value = day.slice(0, 7)
+  fetchCalendarList() // 获取日历列表
+}
+// 点击删除icon
+const deleteData = () => {
+  if (!redCircleData.value || (Object.keys(redCircleData.value).length && !redCircleData.value[selectDateRecord.value].length)) {
+    ElMessage.warning(`${selectDateRecord.value}没有日程，无法删除`)
+    return false
+  }
+  ElMessageBox.confirm(
+    `确定删除${selectDateRecord.value}的日程吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const param = {
+        userId: user.id,
+        scheduleDate: selectDateRecord.value,
+      }
+      delSchedule(param).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchCalendarList() // 获取日历列表
+      })
+    })
+}
+
+// 编辑日程成功
+const editScheduleSuccess = () => {
+  fetchCalendarList() // 获取日历列表
+}
+
+// -----------------------------------------检定详情-------------------------------------
+const measureDetailLoading = ref(false) // 检定详情loading
+const measureDetailXData = ref([]) as any // 检定详情x轴数据
+const measureDetailYDataMax = ref() // 检定详情Y轴数据最大值
+const measureDetailData = ref([]) as any // 检定详情数据
+const measureDetailYearCount = ref(0) // 年度已检数量
+const measureDetailMonthCount = ref(0) // 年度应检数量
+// 获取检定详情
+const fetchMeasureDetail = () => {
+  measureDetailLoading.value = true
+  // getMeasureDetail().then((res: any) => {
+  //   measureDetailXData.value = res.data.map((item: any) => item.date)
+  //   const yValue = res.data.map((item: any) => Number(item.count))
+  //   measureDetailYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
+  //   measureDetailData.value = [{ name: '到期设备', data: yValue }]
+  // measureDetailLoading.value = false
+  // })
+  // 模拟数据
+  setTimeout(() => {
+    measureDetailMonthCount.value = 200
+    measureDetailYearCount.value = 100
+    measureDetailXData.value = ['2023-01', '2023-02', '2023-03', '2023-04', '2023-05', '2023-06', '2023-07', '2023-08', '2023-09'] // x轴
+    measureDetailData.value = [
+      {
+        name: '已检设备数量',
+        data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+      },
+      {
+        name: '应检设备数量',
+        data: [9, 8, 7, 6, 5, 4, 3, 2, 1],
+      },
+    ]
+    measureDetailLoading.value = false // 关闭loading
+  }, 2000)
+}
+// ------------------------------------------------------------------------------------
+onMounted(() => {
+  calcBlockSize()
+  selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
+  fetchMeasureDetail() // 获取检定详情
+  // fetchApprovalMessageData() // 审批提醒
+  // fetchWorkMessageData() // 工作提醒
+  // fetchNoticeList() // 获取通知公告列表
+  fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
 <template>
-  <div class="container" :style="`height:${height}px`">
-    <div class="container" :style="`height:${height}px;width:66.66%`">
-      <!-- 检定详情 -->
-      <verification-detail />
-      <!-- 设备详情 -->
-      <device-detail />
-      <!-- 设备列表 -->
-      <device-list />
-    </div>
-    <div class="container" :style="`height:${height}px;width:33.33%`">
-      <right-box />
-    </div>
-  </div>
+  <app-container>
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          style="overflow: auto;"
+          icon="icon-calendar"
+          title="工作日历"
+          :height="bigBlockHeight"
+          :is-edit="true"
+          :is-show-delete="true"
+          @edit-data="editSchedule"
+          @delete-data="deleteData"
+        >
+          <el-calendar v-model="calendarValue">
+            <template #dateCell="{ data }">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
+                <span>
+                  {{ data.day.split("-").slice(2).join() }}
+                </span>
+              </div>
+              <div v-for="(value, key, index) in redCircleData" :key="index">
+                <el-popover
+                  v-if="key === data.day && value.length"
+                  placement="top-start"
+                  trigger="hover"
+                  width="auto"
+                >
+                  <div class="popover-content-area-class">
+                    <span style="font-weight: 600;">{{ key }}</span>
+                    <li v-for="(e, i) in value" :key="i" class="calendar-li-item">
+                      {{ e.scheduleMatters }}
+                    </li>
+                  </div>
+                  <template #reference>
+                    <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                      <!-- <span>
+                        {{ data.day.split("-").slice(2).join() }}
+                      </span> -->
+                      <span style="margin-top: -30px;">
+                        <el-icon :size="20" color="#f56c6c">
+                          <alarm-clock />
+                        </el-icon>
+                        <!-- <span v-if="key === data.day" class="redCircle" /> -->
+                      </span>
+                    </div>
+                  </template>
+                </el-popover>
+              </div>
+            </template>
+          </el-calendar>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          v-loading="measureDetailLoading"
+          icon="icon-line"
+          title="检定详情"
+          :height="blockHeight"
+        >
+          <div style="display: flex;margin-bottom: 10px;">
+            <div style="display: flex;margin-right: 20px;">
+              <span style="font-size: 14px;">年度已检数量</span>
+              <span style="margin-left: 10px;color: #000;font-weight: 600;">{{ measureDetailYearCount }}</span>
+            </div>
+            <div style="display: flex;">
+              <span style="font-size: 14px;">年度应检数量</span>
+              <span style="margin-left: 10px;color: #000;font-weight: 600;">{{ measureDetailMonthCount }}</span>
+            </div>
+          </div>
+          <line-chart
+            style="width: 100%; height: 90%;"
+            :x-axis-data="measureDetailXData"
+            :width="`${blockWidth - 20}px`"
+            :data="measureDetailData"
+          />
+        </bench-col>
+      </el-col>
+    </el-row>
+    <!-- 编辑日程组件 -->
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index1.vue b/src/views/tested/dashboard/index1.vue
new file mode 100644
index 0000000..bc6d4ce
--- /dev/null
+++ b/src/views/tested/dashboard/index1.vue
@@ -0,0 +1,39 @@
+<!-- 首页看板 -->
+<script lang="ts" setup name="Dashboard">
+import verificationDetail from './components/verificationDetail.vue'
+import deviceDetail from './components/deviceDetail.vue'
+import deviceList from './components/deviceList.vue'
+import rightBox from './components/rightBox.vue'
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+</script>
+
+<template>
+  <div class="container" :style="`height:${height}px`">
+    <div class="container" :style="`height:${height}px;width:66.66%`">
+      <!-- 检定详情 -->
+      <!-- <verification-detail /> -->
+      <!-- 设备详情 -->
+      <!-- <device-detail /> -->
+      <!-- 设备列表 -->
+      <!-- <device-list /> -->
+    </div>
+    <div class="container" :style="`height:${height}px;width:33.33%`">
+      <right-box />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  // width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  padding: 0;
+  overflow: hidden;
+}
+</style>