diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}
diff --git a/src/views/equipement/source/change/list.vue b/src/views/equipement/source/change/list.vue
index dec320f..d9c23da 100644
--- a/src/views/equipement/source/change/list.vue
+++ b/src/views/equipement/source/change/list.vue
@@ -50,6 +50,7 @@
   { text: '标准代码', value: 'standardNo', align: 'center', width: '160' },
   { text: '标准名称', value: 'standardName', align: 'center' },
   { text: '标准所在部门', value: 'deptName', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请人', value: 'createUserName', align: 'center' },
   { text: '申请时间', value: 'createTime', align: 'center', width: '180' },

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}
diff --git a/src/views/equipement/source/change/list.vue b/src/views/equipement/source/change/list.vue
index dec320f..d9c23da 100644
--- a/src/views/equipement/source/change/list.vue
+++ b/src/views/equipement/source/change/list.vue
@@ -50,6 +50,7 @@
   { text: '标准代码', value: 'standardNo', align: 'center', width: '160' },
   { text: '标准名称', value: 'standardName', align: 'center' },
   { text: '标准所在部门', value: 'deptName', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请人', value: 'createUserName', align: 'center' },
   { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index de680aa..51349d1 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -51,6 +51,7 @@
 const columns = ref<TableColumn[]>([
   { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '合同名称及编号', value: 'contractNameAndNo_hide', align: 'center', followLink: true, width: '380' },

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}
diff --git a/src/views/equipement/source/change/list.vue b/src/views/equipement/source/change/list.vue
index dec320f..d9c23da 100644
--- a/src/views/equipement/source/change/list.vue
+++ b/src/views/equipement/source/change/list.vue
@@ -50,6 +50,7 @@
   { text: '标准代码', value: 'standardNo', align: 'center', width: '160' },
   { text: '标准名称', value: 'standardName', align: 'center' },
   { text: '标准所在部门', value: 'deptName', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请人', value: 'createUserName', align: 'center' },
   { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index de680aa..51349d1 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -51,6 +51,7 @@
 const columns = ref<TableColumn[]>([
   { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '合同名称及编号', value: 'contractNameAndNo_hide', align: 'center', followLink: true, width: '380' },
diff --git a/src/views/resource/customer/examine/list.vue b/src/views/resource/customer/examine/list.vue
index cf9b82c..fdd2f1e 100644
--- a/src/views/resource/customer/examine/list.vue
+++ b/src/views/resource/customer/examine/list.vue
@@ -54,6 +54,7 @@
   { text: '文件编号', value: 'formNo', align: 'center', width: '200' },
   { text: '实验室', value: 'labCodeName', align: 'center', width: '150' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '测试/校准或检定项目', value: 'measureItem', align: 'center' },
   { text: '委托方签字情况', value: 'signStatusName', align: 'center', width: '150' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '150' },

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}
diff --git a/src/views/equipement/source/change/list.vue b/src/views/equipement/source/change/list.vue
index dec320f..d9c23da 100644
--- a/src/views/equipement/source/change/list.vue
+++ b/src/views/equipement/source/change/list.vue
@@ -50,6 +50,7 @@
   { text: '标准代码', value: 'standardNo', align: 'center', width: '160' },
   { text: '标准名称', value: 'standardName', align: 'center' },
   { text: '标准所在部门', value: 'deptName', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请人', value: 'createUserName', align: 'center' },
   { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index de680aa..51349d1 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -51,6 +51,7 @@
 const columns = ref<TableColumn[]>([
   { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '合同名称及编号', value: 'contractNameAndNo_hide', align: 'center', followLink: true, width: '380' },
diff --git a/src/views/resource/customer/examine/list.vue b/src/views/resource/customer/examine/list.vue
index cf9b82c..fdd2f1e 100644
--- a/src/views/resource/customer/examine/list.vue
+++ b/src/views/resource/customer/examine/list.vue
@@ -54,6 +54,7 @@
   { text: '文件编号', value: 'formNo', align: 'center', width: '200' },
   { text: '实验室', value: 'labCodeName', align: 'center', width: '150' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '测试/校准或检定项目', value: 'measureItem', align: 'center' },
   { text: '委托方签字情况', value: 'signStatusName', align: 'center', width: '150' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '150' },
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index ed419a4..49811b8 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -162,7 +162,7 @@
             tempList.push({
               ...i,
               approvalFileId: i.id, // 文件审批表的关联文件表id
-              fileApprovalId: i.fileApprovalId, // 文件审批表id
+              fileApprovalId: i.fileApprovalId || i.id, // 文件审批表id
               fileVersion: i.fileVersion === '' ? '/' : i.fileVersion, // 版本号
               grantTypeName: title, // 文件发放类型名称
               grantType, // 文件发放类型
@@ -183,6 +183,7 @@
     })
   }
   else {
+    console.log(listParam, 'listParam')
     listParam.forEach((item: any) => {
       const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
       if (index === -1) {
@@ -195,11 +196,13 @@
           fileNo: item.formNo || item.fileNo || item.applyName, // 文件编号
           fileName: item.formName || item.fileName || item.applyNo, // 文件名称
           fileVersion: type !== '1' ? '/' : item.fileVersion, // 版本号
-          pdfUrl: type === '2' ? '/' : type === '4' ? (item.file || '/') : type === '3' ? (item.contractExecutionFile || '/') : type === '5' ? (item.levelRelationFilePdf || '/') : (item.pdfUrl || '/'), // 文件附件
+          pdfUrl: type === '2' ? (item.file || '/') : type === '4' ? (item.file || '/') : type === '3' ? (item.contractExecutionFile || '/') : type === '5' ? (item.levelRelationFilePdf || '/') : (item.pdfUrl || '/'), // 文件附件
           remark: '', // 备注
           grantType, // 文件发放类型
           grantTypeName: title, // 文件发放类型名称
           id: '',
+          approvalFileId: type === '2' ? item.fileId: item.id, // 文件审批表的关联文件表id
+          fileApprovalId: type === '2' ? item.fileId: item.id, // 文件审批表id
         })
       }
     })

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index 4efea57..f025735 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -81,3 +81,11 @@
     data
   })
 }
+// 未检定设备数量分析
+export function getNoVerificationAmount(data: object) {
+  return request({
+    url: '/data/sample/noMeasure/amount',
+    method: 'post',
+    data
+  })
+}
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..f4f0e61
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\344\273\273\345\212\241\345\215\225\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..57f6be6
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
new file mode 100644
index 0000000..7eabf37
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\345\217\227\346\243\200\350\256\276\345\244\207\345\210\206\346\236\220-\345\217\227\346\243\200\350\256\276\345\244\207\350\247\204\346\240\274\345\236\213\345\217\267\346\200\273\351\207\217.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
new file mode 100644
index 0000000..656fffc
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\201\234\347\224\250\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..355c6b0
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\345\217\227\346\243\200\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
new file mode 100644
index 0000000..63b729f
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\346\243\200\345\256\232\345\220\210\346\240\274\347\216\207.png"
Binary files differ
diff --git "a/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png" "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
new file mode 100644
index 0000000..9ed92b2
--- /dev/null
+++ "b/src/assets/images/dataManagement/eqptDevice/\350\256\241\351\207\217\346\243\200\345\256\232\345\210\206\346\236\220-\350\207\252\346\243\200\347\216\207.png"
Binary files differ
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 676fef9..60196c7 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -4,11 +4,13 @@
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
+import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: '',
-  },
+    default: ''
+  }
 })
 // 日期查询条件
 const dateRef = ref()
@@ -18,6 +20,7 @@
 })
 const selectCurrentTime = ref()
 const menu = ref(['当日', '近7日', '近14天', '自定义时间'])
+
 // 时间筛选条件
 const startTime = ref()
 const calendarChange = (e: any) => {
@@ -28,69 +31,173 @@
     const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳
     const minTime = startTime.value - timeRange * 2
     const maxTime = startTime.value + timeRange * 15
-    return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value
-  }
-  else {
+    return (
+      time.getTime() <= minTime ||
+      time.getTime() >= maxTime ||
+      time.getTime() === startTime.value
+    )
+  } else {
     return false
   }
 }
 // 点击自定义时间
-const clickBtn = (event: any) => {
-  const select = event.target.value
-  if (select && select === '自定义时间') {
-    dateRef.value.focus()
-  }
-  else if (select && select !== '自定义时间') {
-    selectCurrentTime.value = []
-    startTime.value = ''
+// const clickBtn = (event: any) => {
+//   const select = event.target.innerText
+//   if (select && select === '自定义时间') {
+//     console.log('自定义时间', 'innerText')
+//     console.log(dateRef.value)
+//     dateRef.value.focus(true)
+//     // dateRef.value.click()
+//   } else if (select && select !== '自定义时间') {
+//     selectCurrentTime.value = []
+//     startTime.value = ''
+//   }
+// }
+const currentBak = ref('')
+const handlerFocus = () => {
+  console.log('获取焦点')
+  // 记录之前
+  currentBak.value = current.value
+  current.value = '自定义时间'
+}
+const handlerBlur = () => {
+  console.log('失去焦点')
+  if (!selectCurrentTime.value.length) {
+    current.value = currentBak.value || '近7日'
   }
 }
 const timeDate = ref<string[]>([])
-watch(() => current.value, (newVal) => {
-  if (newVal) {
-    if (newVal === '当日') {
-      timeDate.value = [dayjs().format('YYYY-MM-DD')]
+watch(
+  () => current.value,
+  newVal => {
+    if (newVal) {
+      if (newVal === '当日') {
+        timeDate.value = [dayjs().format('YYYY-MM-DD')]
+      } else if (newVal === '近7日') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      } else if (newVal === '近14天') {
+        timeDate.value = getRangeAllTime(
+          dayjs().subtract(14, 'day').format('YYYY-MM-DD'),
+          dayjs().format('YYYY-MM-DD')
+        )
+      }
+      if (!newVal.includes('自定义')) {
+        fetchData()
+        selectCurrentTime.value = []
+      }
     }
-    else if (newVal === '近7日') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(7, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+watch(
+  () => selectCurrentTime.value,
+  newVal => {
+    if (newVal.length === 2) {
+      console.log('确定时间')
+      timeDate.value = getRangeAllTime(newVal[0], newVal[1])
+      fetchData()
     }
-    else if (newVal === '近14天') {
-      timeDate.value = getRangeAllTime(dayjs().subtract(14, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'))
+  }
+)
+const searchQueryResult = ref({
+  groupCode: '',
+  labCode: '',
+  timeStart: '',
+  timeEnd: ''
+})
+watch(
+  () => props.lab,
+  newVal => {
+    if (newVal) {
+      searchQueryResult.value.labCode = props.lab
+      fetchData()
     }
-    fetchData()
   }
-})
-watch(() => selectCurrentTime.value, (newVal) => {
-  if (newVal.length === 2) {
-    timeDate.value = getRangeAllTime(newVal[0], newVal[1])
-    fetchData()
+)
+// 基础信息展示数据
+const baseInfo = ref([
+
+  {
+    name: '任务单总量',
+    value: 'orderAmount',
+    data: '',
+    icon: eqptDevice['任务单总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备规格型号总量',
+    value: 'modelAmount',
+    data: '',
+    icon: eqptDevice['受检设备规格型号总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备总量',
+    value: 'sampleAmount',
+    data: '',
+    icon: eqptDevice['受检设备总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备年度到期应检总量',
+    value: 'expireAmount',
+    data: '',
+    icon: eqptDevice['受检设备年度到期应检总量'],
+    color: '#1AAF8B'
+  },
+  {
+    name: '受检设备已检总量',
+    value: 'measuredAmount',
+    data: '',
+    icon: eqptDevice['受检设备已检总量'],
+    color: '#1AAF8B'
   }
-})
-watch(() => props.lab, (newVal) => {
-  if (newVal) {
-    fetchData()
-  }
-})
+])
 const showChart = ref<any[]>([
   {
+    name: '未检定设备数量分析',
+    type: 'rank-table',
+    source: 'system',
+    data: [],
+    columns: [
+      {
+        text: '部门',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '数量',
+        value: 'count',
+        align: 'center'
+      },
+    ]
+  },
+  {
+    name: '受检设备来源分析',
+    type: 'pie',
+    source: 'system',
+    center: ['50%', '60%'],
+    labelPosition: 'outside',
+    radius: '70%',
+    data: []
+  },
+  {
     name: '任务单来源分析',
     type: 'pie',
     source: 'system',
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: [],
+    data: []
   },
-  {
-    name: '受检设备来源排行榜',
-    type: 'rank',
-    source: 'system',
-  },
+
   {
     name: '受检设备种类分析',
     type: 'pie',
     source: 'system',
-    data: [],
+    data: []
   },
   {
     name: '受检设备数量趋势',
@@ -99,7 +206,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false,
+    gradient: false
   },
   {
     name: '受检设备性能趋势',
@@ -108,59 +215,100 @@
     xAxisData: [],
     data: [],
     smooth: true,
-    gradient: true,
-  },
+    gradient: true
+  }
 ])
-watch(() => showChart.value.length, () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  })
-})
+watch(
+  () => showChart.value.length,
+  () => {
+    setTimeout(() => {
+      const resize = new Event('resize')
+      window.dispatchEvent(resize)
+    })
+  }
+)
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
-  loading.value = true
-  setTimeout(() => {
-    // 任务单来源分析
-    const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
-    showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备种类分析
-    const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
-    showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
-      name: item,
-      value: String(Math.floor(Math.random() * 100) + 1),
-    }))
-    // 受检设备数量趋势
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
-      name: item,
-      // symbol: 'emptyCircle',
-      symbol: 'circle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
-    // 受检设备性能趋势
-    const name3 = ['禁用', '故障维修', '报废']
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
-      name: item,
-      symbol: 'emptyCircle',
-      data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
-    }))
-    showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
-    // 受检设备来源排行榜
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
-    showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
-    loading.value = false
-  }, 3000)
+  console.log(current.value, '当前日期类型---要查询了')
+  if (current.value !== '自定义时间') {
+    console.log(timeDate.value, 'timeDate')
+    if (current.value === '当日') {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59`
+    } else {
+      searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00`
+      searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59`
+    }
+  } else {
+    searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00`
+    searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59`
+    console.log(selectCurrentTime.value, 'selectCurrentTime.value')
+  }
+  searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
+    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  // 获取基础数据
+  getBaseInfo(searchQueryResult.value).then(res => {
+    baseInfo.value.forEach(item => {
+      item.data = res.data[item.value]
+    })
+  })
+  // 未检定数量分析
+  getNoVerificationAmount(searchQueryResult.value).then(res => {
+    console.log(res.data, '未检定数量分析')
+    const current = showChart.value.filter(
+      item => item.name === '未检定设备数量分析'
+    )[0]
+    current.data = []
+    for(const i in res.data) {
+      current.data.push({
+        dept: i,
+        count: res.data[i]
+      })
+    }
+  })
+  // 受检设备来源分析
+  getDeviceSource(searchQueryResult.value).then(res => {
+    console.log(res.data, '受检设备来源分析')
+  })
+  // loading.value = true
+  // setTimeout(() => {
+  //   // 任务单来源分析
+  //   const name1 = ['西昌发射站/一连', '西昌发射站/二连', '文昌发射站/一连', '文昌发射站/二连', '文昌地面站/一连', '西昌地面站/一连']
+  //   showChart.value.filter((item: any) => item.name === '任务单来源分析')[0].data = name1.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备种类分析
+  //   const name2 = ['一般压力表', '精密压力表', '数字多用表', '频谱分析仪', '三线表', '铷钟', '数字计数器']
+  //   showChart.value.filter((item: any) => item.name === '受检设备种类分析')[0].data = name2.map((item: string) => ({
+  //     name: item,
+  //     value: String(Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   // 受检设备数量趋势
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].data = name2.slice(0, 4).map((item: string) => ({
+  //     name: item,
+  //     // symbol: 'emptyCircle',
+  //     symbol: 'circle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备数量趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备性能趋势
+  //   const name3 = ['禁用', '故障维修', '报废']
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].data = name3.map((item: string) => ({
+  //     name: item,
+  //     symbol: 'emptyCircle',
+  //     data: timeDate.value.map(item => Math.floor(Math.random() * 100) + 1),
+  //   }))
+  //   showChart.value.filter((item: any) => item.name === '受检设备性能趋势')[0].xAxisData = timeDate.value
+  //   // 受检设备来源排行榜
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].data = name1.map(() => (Math.floor(Math.random() * 100) + 1)).sort((a: any, b: any) => b - a)
+  //   showChart.value.filter((item: any) => item.name === '受检设备来源排行榜')[0].xAxisData = name1
+  //   loading.value = false
+  // }, 3000)
 }
-setTimeout(() => {
-  fetchData()
-}, 100)
 defineExpose({
-  showChart,
+  showChart
 })
 
 // 拖拽结束
@@ -169,6 +317,15 @@
   const resize = new Event('resize')
   window.dispatchEvent(resize)
 }
+onMounted(() => {
+  // year.value = String(currentYear)
+  if (props.lab) {
+    searchQueryResult.value.labCode = props.lab
+    // setTimeout(() => {
+    //   fetchData()
+    // }, 10)
+  }
+})
 </script>
 
 <template>
@@ -176,68 +333,49 @@
     <!-- 查询条件 -->
     <div class="btns">
       <div />
-      <div>
-        <el-radio-group v-model="current" @click="clickBtn">
+      <div style="position: relative">
+        <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item" :label="item">
             {{ item }}
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <el-date-picker
-          ref="dateRef"
-          v-model="selectCurrentTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          class="time-daterange"
-          style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :disabled-date="pickerOptions" @calendar-change="calendarChange "
-        />
+        <div
+          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
+        >
+          <el-date-picker
+            style="width: 101px"
+            ref="dateRef"
+            v-model="selectCurrentTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            class="time-daterange"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :disabled-date="pickerOptions"
+            @calendar-change="calendarChange"
+            @focus="handlerFocus"
+            @blur="handlerBlur"
+          />
+        </div>
       </div>
     </div>
     <!-- 展示内容 -->
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+          <div class="header-icon" style="width: 55px">
+            <img :src="item.icon" width="55px" height="50px" />
           </div>
           <div class="header-content">
             <div class="content-title">
-              任务单总量
+              {{ item.name }}
             </div>
-            <div class="content-count">
-              69
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备规格型号总量
-            </div>
-            <div class="content-count">
-              2529
-            </div>
-          </div>
-        </div>
-        <div class="count-item">
-          <div class="header-icon">
-            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
-          </div>
-          <div class="header-content">
-            <div class="content-title">
-              受检设备总量
-            </div>
-            <div class="content-count">
-              12654
+            <div class="content-count" :style="{ color: item.color }">
+              {{ item.data }}
             </div>
           </div>
         </div>
@@ -245,7 +383,9 @@
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
       <draggable
-        v-model="showChart" item-key="name" class="chart"
+        v-model="showChart"
+        item-key="name"
+        class="chart"
         animation="300"
         drag-class="dragClass"
         ghost-class="ghostClass"
@@ -253,17 +393,147 @@
         @end="onEnd"
       >
         <template #item="{ element, index }">
-          <div :style="{ width: `${showChart.length === 6 ? '31%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+          <div
+          :style="{
+              width: `${
+                 '31.5%'
+              }`
+            }"
+            class="chart-item"
+          >
             <div class="chart-name">
-              {{ element.name }}
+              <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal" :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}" :label-position="element.labelPosition" :radius="element.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
-              <bar-chart-horizontal-rank v-if="element.type === 'rank'" :colors="colors" label-position="" :x-axis-data="element.xAxisData" :data="element.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
-              <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
-              <scroll-table v-if="element.type === 'rank-table'" style="width: 100%;" :height="330" :data="element.data" :columns="element.columns" />
+              <div style="width: 100%; height: 100%">
+                <div
+                  class="chart-name"
+                  style="width: 100%; height: 10%; display: flex"
+                >
+                  {{ element.name }}
+                  <div
+                    v-if="element.name === '人员持证到期趋势'"
+                    style="width: 350px; margin-left: 40px"
+                  >
+                    <el-date-picker
+                      v-model="datetimerange"
+                      type="daterange"
+                      value-format="YYYY-MM-DD"
+                      format="YYYY-MM-DD"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                    />
+                  </div>
+                </div>
+                <div style="width: 100%; height: 90%">
+                  <pie-chart
+                    v-if="element.type === 'pie'"
+                    :title="element.title"
+                    :show-total="element.showTotal"
+                    :data="element.data"
+                    :colors="colors"
+                    :center="element.center"
+                    label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition"
+                    :radius="element.radius"
+                    :grid="{
+                      top: 50,
+                      left: 15,
+                      right: 15,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <line-chart
+                    v-if="element.type === 'line'"
+                    :colors="colors"
+                    :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData"
+                    :data="element.data"
+                    :smooth="element.smooth"
+                    :grid="{
+                      top: 47,
+                      left: 5,
+                      right: 5,
+                      bottom: 10,
+                      containLabel: true
+                    }"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 2,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '5'
+                    }"
+                  />
+                  <bar-chart-double
+                    v-if="element.type === 'bar-double'"
+                    :legend-data="element.legendData"
+                    :data1="element.data1"
+                    :data2="element.data2"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-vertical
+                    v-if="element.type === 'bar-vertical'"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <bar-chart-horizontal
+                    v-if="element.type === 'bar-horizontal'"
+                    bar-width="10"
+                    :bar-coner="0"
+                    :data="element.data"
+                    :x-axis-data="element.xAxisData"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
+                    }"
+                  />
+                  <scroll-table
+                    v-if="element.type === 'rank-table'"
+                    style="width: 100%"
+                    :height="300"
+                    :data="element.data"
+                    :columns="element.columns"
+                  />
+                </div>
+              </div>
             </div>
           </div>
         </template>
@@ -319,16 +589,16 @@
 
   .count {
     display: flex;
-    width: 50%;
+    width: 70%;
     margin: 0 auto;
     position: absolute;
     top: -40px;
-    left: 50%;
+    left: 44%;
     transform: translateX(-50%);
 
     .count-item {
       margin-left: 20px;
-      width: 30%;
+      // width: 30%;
       height: 75px;
       display: flex;
       padding: 0 10px;
@@ -355,6 +625,7 @@
           font-weight: 700;
           font-size: 24px;
           color: #1aaf8b;
+          text-align: center;
         }
       }
     }
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts
index 38994b5..b2bd7ed 100644
--- a/src/views/dataManagement/components/data/img.ts
+++ b/src/views/dataManagement/components/data/img.ts
@@ -21,6 +21,10 @@
 import expireAmount from '@/assets/images/dataManagement/device/设备分析-年度到期设备总量.png'
 import shouldTraceAmount from '@/assets/images/dataManagement/device/设备分析-应溯源总数量.png'
 import tracedAmount from '@/assets/images/dataManagement/device/设备分析-实际溯源总数量.png'
+import orderAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-任务单总量.png'
+import modelAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备规格型号总量.png'
+import sampleAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
+// import expireAmount from '@/assets/images/dataManagement/eqptDevice/受检设备分析-受检设备总量.png'
 export const resourceManage = {
   人员总数: staffAmount,
   体系文件总数: systemFileAmount,
@@ -55,3 +59,11 @@
   应溯源总数量: shouldTraceAmount,
   实际溯源总数量: tracedAmount,
 }
+
+export const eqptDevice = {
+  任务单总量: orderAmount,
+  受检设备规格型号总量: modelAmount,
+  受检设备总量: sampleAmount,
+  受检设备年度到期应检总量: shouldTraceAmount,
+  受检设备已检总量: tracedAmount,
+}
diff --git a/src/views/equipement/source/change/list.vue b/src/views/equipement/source/change/list.vue
index dec320f..d9c23da 100644
--- a/src/views/equipement/source/change/list.vue
+++ b/src/views/equipement/source/change/list.vue
@@ -50,6 +50,7 @@
   { text: '标准代码', value: 'standardNo', align: 'center', width: '160' },
   { text: '标准名称', value: 'standardName', align: 'center' },
   { text: '标准所在部门', value: 'deptName', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请人', value: 'createUserName', align: 'center' },
   { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index de680aa..51349d1 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -51,6 +51,7 @@
 const columns = ref<TableColumn[]>([
   { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '合同名称及编号', value: 'contractNameAndNo_hide', align: 'center', followLink: true, width: '380' },
diff --git a/src/views/resource/customer/examine/list.vue b/src/views/resource/customer/examine/list.vue
index cf9b82c..fdd2f1e 100644
--- a/src/views/resource/customer/examine/list.vue
+++ b/src/views/resource/customer/examine/list.vue
@@ -54,6 +54,7 @@
   { text: '文件编号', value: 'formNo', align: 'center', width: '200' },
   { text: '实验室', value: 'labCodeName', align: 'center', width: '150' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
   { text: '测试/校准或检定项目', value: 'measureItem', align: 'center' },
   { text: '委托方签字情况', value: 'signStatusName', align: 'center', width: '150' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '150' },
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index ed419a4..49811b8 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -162,7 +162,7 @@
             tempList.push({
               ...i,
               approvalFileId: i.id, // 文件审批表的关联文件表id
-              fileApprovalId: i.fileApprovalId, // 文件审批表id
+              fileApprovalId: i.fileApprovalId || i.id, // 文件审批表id
               fileVersion: i.fileVersion === '' ? '/' : i.fileVersion, // 版本号
               grantTypeName: title, // 文件发放类型名称
               grantType, // 文件发放类型
@@ -183,6 +183,7 @@
     })
   }
   else {
+    console.log(listParam, 'listParam')
     listParam.forEach((item: any) => {
       const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
       if (index === -1) {
@@ -195,11 +196,13 @@
           fileNo: item.formNo || item.fileNo || item.applyName, // 文件编号
           fileName: item.formName || item.fileName || item.applyNo, // 文件名称
           fileVersion: type !== '1' ? '/' : item.fileVersion, // 版本号
-          pdfUrl: type === '2' ? '/' : type === '4' ? (item.file || '/') : type === '3' ? (item.contractExecutionFile || '/') : type === '5' ? (item.levelRelationFilePdf || '/') : (item.pdfUrl || '/'), // 文件附件
+          pdfUrl: type === '2' ? (item.file || '/') : type === '4' ? (item.file || '/') : type === '3' ? (item.contractExecutionFile || '/') : type === '5' ? (item.levelRelationFilePdf || '/') : (item.pdfUrl || '/'), // 文件附件
           remark: '', // 备注
           grantType, // 文件发放类型
           grantTypeName: title, // 文件发放类型名称
           id: '',
+          approvalFileId: type === '2' ? item.fileId: item.id, // 文件审批表的关联文件表id
+          fileApprovalId: type === '2' ? item.fileId: item.id, // 文件审批表id
         })
       }
     })
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 009313b..321a9c1 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -16,7 +16,8 @@
 import { getFileMethodList } from '@/api/resource/fileTechnology'
 import { detailMethodNovelty, failUpdateNovelty, refuseApproval, revokeApproval, revokeDelete, saveNovelty, setProsessShowBench, submitNovelty, updateDraftNovelty } from '@/api/resource/fileNovelty'
 const $route = useRoute()
-
+// 是否admin超级管理员
+const isAdmin = ref(false)
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -194,6 +195,7 @@
       if (novelty.value.taskId === '') {
         novelty.value.taskId = sessionStorage.getItem('noveltySearchTaskId')!
       }
+      isMonunted.value = false
     }
   })
 }
@@ -525,16 +527,24 @@
   await getGroupCodeDict()
   await getNoveltyResultDict()
   if ($route.query.type === 'create') {
+    isMonunted.value = false
     // 填充实验室部门
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
-    console.log(userInfo, 'userInfo')
-
+    console.log(userInfo.username, 'userInfo')
+    if(userInfo.username === 'admin') {
+      isAdmin.value = true
+      return
+    }
+    else {
+      isAdmin.value = false
+    }
     // 填充查新纪录
     getFileMethodList({
       offset: 1,
       limit: 9999,
     }).then((res) => {
+      // console.log(res.data, '123')
       const data = res.data.rows.filter((item: any) => item.groupCode === userInfo.groupNo && (item.labCode === 'A' || item.labCode === userInfo.bizLabCode))
       data.forEach((element: any) => {
         novelty.value.logList.push({
@@ -547,14 +557,46 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-
+          file: element.file
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-
+const isMonunted= ref(true)
+watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
+  if(!isAdmin.value || isMonunted.value) {
+    return
+  }
+  if(!novelty.value.groupCode || !novelty.value.groupCode) {
+     return
+  }
+  // 填充查新纪录
+  novelty.value.logList = []
+  getFileMethodList({
+      offset: 1,
+      limit: 9999,
+    }).then((res) => {
+      // console.log(res.data, '123')
+      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+      data.forEach((element: any) => {
+        novelty.value.logList.push({
+          id: '',
+          fileId: element.id,
+          fileNo: element.fileNo,
+          fileName: element.fileName,
+          noveltyResult: element.noveltyStatus ? '1' : '2',
+          groupCode: element.groupCode,
+          groupCodeName: element.groupCodeName,
+          labCodeName: element.labCodeName,
+          labCode: element.labCode,
+          file: element.file
+          // 有更新1  无更新2
+        })
+      })
+    })
+})
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -835,7 +877,7 @@
             <el-col :span="6">
               <el-form-item label="实验室" prop="labCode">
                 <el-select
-                  v-model="novelty.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable"
+                  v-model="novelty.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable || !isAdmin"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in labCodePartDict" :key="dict.id" :label="dict.name" :value="dict.value" />
@@ -850,7 +892,7 @@
             <el-col :span="6">
               <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="novelty.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
+                  v-model="novelty.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable || !isAdmin"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
@@ -920,7 +962,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="查新结果" align="center">
+              <el-table-column class="label" label="查新结果" align="center">
                 <template #default="scope">
                   <el-radio-group v-model="scope.row.noveltyResult">
                     <el-radio
@@ -1042,4 +1084,9 @@
     }
   }
 }
+.label{
+  ::v-deep(.el-radio__label) {
+        display: block !important;
+      }
+}
 </style>