Merge branch 'projects/mescc/develop' into projects/mescc/dy

Reviewed-on: #104

.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-11 08:33:19
+ # @LastEditTime: 2024-06-24 16:57:53
- # @LastEditors: zhp
+ # @LastEditors: DY
  # @Description:
 ###
 # 开发环境配置
@@ -13,13 +13,19 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
-VUE_APP_BASE_API = 'http://192.168.1.56:48080'
+# 闫阳
+# VUE_APP_BASE_API = 'http://192.168.1.81:48080'
+# 徐
+# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
+# 郭
+# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
 # sara
 # VUE_APP_BASE_API = 'http://192.168.1.63:48080'
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
-
+# 蔡
+# VUE_APP_BASE_API = 'http://192.168.1.54:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/api/produceData/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-05-07 08:54:59
- * @LastEditTime: 2024-06-03 08:52:02
+ * @LastEditTime: 2024-06-19 15:22:10
  * @LastEditors: DY
  * @Description:
  */
@@ -10,23 +10,33 @@ import request from '@/utils/request'
 // 查询生产数据管理分页
 export function getProduceDataPage(data) {
   return request({
-    url: 'ip/prod-output/prodOutputDataPage',
+    url: '/ip/proddata/page',
     method: 'post',
     data: data
   })
 }
 
-export function getProduceDataDetail(id){
+// 查询图数据
+export function getproddata(data) {
   return request({
-     url: '/ip/prod-output/get?id=' + id,
+    url: '/ip/proddata/list',
-    method: 'get'
+    method: 'post',
+    data: data
+  })
+}
+
+export function getProduceDataDetail(data){
+  return request({
+    url: '/ip/proddata/get',
+    method: 'post',
+    data: data
   })
 }
 
 // 导出生产数据
 export function exportOutPutExcel(data) {
   return request({
-    url: '/ip/prod-output/output-export-excel',
+    url: '/ip/proddata/export-excel',
     method: 'post',
     data: data,
     responseType: 'blob'

src/api/report/benchmarking.js

@@ -1,6 +1,115 @@
 // 对标报表的接口
 import request from '@/utils/request'
 
+// 产量对标FTO
+export function fTOReportByDateRangePage(data) {
+  return request({
+    url: '/ip/prod-output/queryOBFTOReportByDateRange',
+    method: 'post',
+    data: data
+  })
+}
+// 产量对标FTO导出
+export function fTOReportByDateRangeExport(data) {
+  return request({
+    url: '/ip/prod-output/queryOBFTOReportByDateRangeExcel',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 芯片产量对标
+export function cPReportByDateRangePage(data) {
+  return request({
+    url: '/ip/prod-output/queryCPReportByDateRange',
+    method: 'post',
+    data: data
+  })
+}
+// 芯片产量对标导出
+export function cPReportByDateRangeExport(data) {
+  return request({
+    url: '/ip/prod-output/queryCPReportByDateRangeExport',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 标准组件产量对标
+export function sCPReportByDateRangePage(data) {
+  return request({
+    url: '/ip/prod-output/querySCPReportByDateRange',
+    method: 'post',
+    data: data
+  })
+}
+// 标准组件产量对标导出
+export function sCPReportByDateRangeExport(data) {
+  return request({
+    url: '/ip/prod-output/querySCPReportByDateRangeExport',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 转化效率对标
+export function componentconvertrateCPage(data) {
+  return request({
+    url: '/ip/componentconvertrate-compare/page',
+    method: 'post',
+    data: data
+  })
+}
+// 转化效率对标导出
+export function componentconvertrateCExport(data) {
+  return request({
+    url: '/ip/componentconvertrate-compare/export-excel',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 芯片良率对标
+export function chipyieldRatePage(data) {
+  return request({
+    url: '/ip/chipyield-rate/page',
+    method: 'post',
+    data: data
+  })
+}
+// 芯片良率对标导出
+export function chipyieldRateExport(data) {
+  return request({
+    url: '/ip/chipyield-rate/export-excel',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 标准组件良率对标
+export function componentyieldRatePage(data) {
+  return request({
+    url: '/ip/componentyield-rate/page',
+    method: 'post',
+    data: data
+  })
+}
+// 标准组件良率对标导出
+export function componentyieldRateExport(data) {
+  return request({
+    url: '/ip/componentyield-rate/export-excel',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+
 // 稼动率对标
 export function utilzationComparePage(data) {
   return request({
@@ -36,3 +145,75 @@ export function chipoeeCompareExport(data) {
     data: data
   })
 }
+
+// 封装OEE对标
+export function componentOEEPage(data) {
+  return request({
+    url: '/ip/component-oee/page',
+    method: 'post',
+    data: data
+  })
+}
+// 封装OEE对标导出
+export function componentOEEExport(data) {
+  return request({
+    url: '/ip/component-oee/export',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 芯片人均产量
+export function chipAnnualAverageProductionPage(data) {
+  return request({
+    url: '/ip/chip-annual-average-production/page',
+    method: 'post',
+    data: data
+  })
+}
+// 芯片人均产量导出
+export function chipAnnualAverageProductionExport(data) {
+  return request({
+    url: '/ip/chip-annual-average-production/export',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 标准组件人均产量对标
+export function componentAapPage(data) {
+  return request({
+    url: '/ip/prod-output/componentAap',
+    method: 'post',
+    data: data
+  })
+}
+// 标准组件人均产量对标导出
+export function componentAapExport(data) {
+  return request({
+    url: '/ip/prod-output/componentAap-export',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}
+
+// 指标完成情况对标
+export function targetCompletionPage(data) {
+  return request({
+    url: '/ip/prod-output/TargetCompletion',
+    method: 'post',
+    data: data
+  })
+}
+// 指标完成情况对标导出
+export function targetCompletionExport(data) {
+  return request({
+    url: '/ip/prod-output/TargetCompletion-export',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}

src/api/report/index.js

@@ -0,0 +1,95 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-06-17 09:41:03
+ * @LastEditTime: 2024-06-20 15:39:21
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+export function getComprehensiveDataPage(data) {
+  return request({
+    url: 'ip/comprehensive/data/get/comprehensive/data',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportComprehensiveDataPage(data) {
+   return request({
+    url: 'ip/comprehensive/data/export/comprehensive/data',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}
+
+
+export function getProduceTransData(data) {
+   return request({
+    url: 'ip/prod-output/queryYCEReportByDateRange',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportProduceTransData(data) {
+   return request({
+    url: 'ip/prod-output/queryYCEReportByDateRangeExcel',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}
+
+
+export function getProduceSituationData(data) {
+   return request({
+    url: 'ip/production/situation/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportProduceSituationData(data) {
+   return request({
+    url: 'ip/production/situation/export/production/situation',
+    method: 'post',
+     data: data,
+      responseType: 'blob',
+  })
+}
+
+export function getProductionSituationMWData(data) {
+   return request({
+    url: 'ip/production/situation/power/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportProductionSituationMWData(data) {
+   return request({
+    url: 'ip/production/situation/power/export/production/situation',
+    method: 'post',
+     data: data,
+      responseType: 'blob',
+  })
+}
+
+
+export function getProductionYieldSituationMWData(data) {
+   return request({
+    url: 'ip/product/yield/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportProductionYieldSituationMWData(data) {
+   return request({
+    url: 'ip/product/yield/export/production/situation',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}

src/assets/icons/svg/darkHome.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="01数字驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产量驾驶舱" transform="translate(-1438.000000, -12.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-20" transform="translate(1438.000000, 8.000000)">
+                <g id="编组" transform="translate(0.000000, 4.000000)">
+                    <rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                    <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" stroke="#FFFFFF" stroke-width="0.1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/factoryWorkOrder.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 15</title>
+    <g id="03设备管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="工单管理" transform="translate(-714.000000, -131.000000)">
+            <g id="编组-15" transform="translate(714.000000, 131.000000)">
+                <g id="编组-13备份" fill="#0B58FF" opacity="0.227236793">
+                    <rect id="矩形备份-2" x="0" y="0" width="26" height="26" rx="6"></rect>
+                </g>
+                <g id="公司" transform="translate(4.749735, 4.749735)" fill-rule="nonzero">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16.50053" height="16.50053"></rect>
+                    <path d="M11.933204,3.46511501 L11.933204,1 C11.933204,0.44771525 11.4854888,-1.01453063e-16 10.933204,0 L7.7088886,0 L7.7088886,0 C3.83109495,0 0.687522083,3.16186639 0.687522083,7.06222625 L0.687522083,15.50053 C0.687522083,16.0528147 1.13523733,16.50053 1.68752208,16.50053 L14.8130079,16.50053 C15.3652927,16.50053 15.8130079,16.0528147 15.8130079,15.50053 L15.8130079,6.45996015 L15.8130079,6.45996015 L11.933204,3.46511501 Z M10.8812851,15.4709239 L1.80917527,15.4709239 L1.80917527,6.9505448 C1.81175925,3.6815283 4.55432163,1.03209261 7.93823277,1.02960612 L10.8812851,1.02960612 L10.8812851,15.4709239 Z M14.8298514,15.4709239 L11.9257773,15.4709239 L11.9257773,5.179727 L14.850314,7.12879718 L14.8298514,15.4709239 Z M3.75976827,9.04329837 L8.75976827,9.04329837 L8.75976827,10.3766317 L3.75976827,10.3766317 L3.75976827,9.04329837 Z M3.75976827,6.3766317 L8.75976827,6.3766317 L8.75976827,7.70996504 L3.75976827,7.70996504 L3.75976827,6.3766317 Z" id="形状" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/workProcess.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 13</title>
+    <g id="03设备管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="工单管理" transform="translate(-474.000000, -131.000000)">
+            <g id="编组-13" transform="translate(474.000000, 131.000000)">
+                <rect id="矩形备份-2" fill="#66DD89" opacity="0.227236793" x="0" y="0" width="26" height="26" rx="6"></rect>
+                <g id="机床、加工中心" transform="translate(3.000000, 3.000000)" fill-rule="nonzero">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                    <path d="M18.1818304,15.1909171 L18.1818304,2.5 C18.1818304,2.22385763 17.9579728,2 17.6818304,2 L2.7272736,2 C2.45113122,2 2.2272736,2.22385763 2.2272736,2.5 L2.2272736,10.195451 C2.2272736,10.3084167 2.31885035,10.3999934 2.431816,10.3999934 C2.54478165,10.3999934 2.63635841,10.4915702 2.63635841,10.6045358 L2.63635841,10.999993 C2.63635841,11.3313636 2.90498735,11.5999925 3.23635794,11.5999925 L3.24999521,11.5999925 C3.58889745,11.5999925 3.86363201,11.8747271 3.86363201,12.2136293 L3.86363201,12.7909094 C3.86363201,13.016846 4.04678981,13.2000037 4.2727264,13.2000037 C4.498663,13.2000037 4.6818208,13.016846 4.6818208,12.7909094 L4.6818208,12.2136293 C4.6818208,11.8747271 4.95655535,11.5999925 5.2954576,11.5999925 L5.30909486,11.5999925 C5.64046546,11.5999925 5.9090944,11.3313636 5.9090944,10.999993 L5.9090944,10.6045358 C5.9090944,10.4915702 6.00067115,10.3999934 6.1136368,10.3999934 C6.22660245,10.3999934 6.3181792,10.3084167 6.3181792,10.195451 L6.3181792,6.5 C6.3181792,6.22385763 6.54203683,6 6.8181792,6 L12.772736,6 C13.0488784,6 13.272736,6.22385763 13.272736,6.5 L13.272736,15.1000019 C13.272736,15.3761442 13.0488784,15.6000019 12.772736,15.6000019 L11.7272736,15.6000019 C11.4511312,15.6000019 11.2272736,15.3761442 11.2272736,15.1000019 L11.2272736,14.8000009 C11.2272736,14.3581726 10.869101,14 10.4272727,14 L8.75453855,14 C8.31271023,14 7.95453761,14.3581726 7.95453761,14.8000009 L7.95453761,15.1000019 C7.95453761,15.3761442 7.73067998,15.6000019 7.45453761,15.6000019 L6.4090944,15.6000019 C6.13295202,15.6000019 5.9090944,15.3761442 5.9090944,15.1000019 L5.9090944,14.8000009 C5.9090944,14.3581726 5.55092178,14 5.10909346,14 L3.43635934,14 C2.99453103,14 2.63635841,14.3581726 2.63635841,14.8000009 L2.63635841,15.1000019 C2.63635841,15.3761442 2.41250078,15.6000019 2.13635841,15.6000019 L1.8181792,15.6000019 C1.36631131,15.6000019 1,15.9663132 1,16.4181811 L1,17.5 C1,17.7761424 1.22385763,18 1.5,18 L18.5,18 C18.7761424,18 19,17.7761424 19,17.5 L19,16.0090867 C19,15.7831554 18.8168465,15.6000019 18.5909152,15.6000019 C18.3649839,15.6000019 18.1818304,15.4168484 18.1818304,15.1909171 Z M5.0909056,10.8000056 L3.4545472,10.8000056 L3.4545472,10.3999934 L5.0909056,10.3999934 L5.0909056,10.8000056 Z M5.49999041,6.20000375 L5.49999041,9.60000656 L5.49999041,9.60000656 L3.04544321,9.60000656 L3.04544321,2.80000562 L17.3636416,2.80000562 L17.3636416,15.6000019 L14.0909056,15.6000019 L14.0909056,6.20000375 C14.0909056,5.647719 13.6431904,5.20000375 13.0909056,5.20000375 L6.49999041,5.20000375 C5.94770566,5.20000375 5.49999041,5.647719 5.49999041,6.20000375 Z M8.7727264,14.7999963 L10.4090848,14.7999963 L10.4090848,15.6000019 L8.7727264,15.6000019 L8.7727264,14.7999963 Z M3.4545472,14.7999963 L5.0909056,14.7999963 L5.0909056,15.6000019 L3.4545472,15.6000019 L3.4545472,14.7999963 Z M18.1818304,17.1999944 L1.81816962,17.1999944 L1.81816962,16.3999888 L18.1818304,16.3999888 L18.1818304,17.1999944 Z M12.0454528,4.00000469 C12.0440427,4.28673847 12.1996755,4.55228735 12.4534043,4.69605646 C12.707133,4.83982557 13.0201502,4.83982557 13.2738789,4.69605646 C13.5276077,4.55228735 13.6832405,4.28673847 13.6818304,4.00000469 C13.6832405,3.71327091 13.5276077,3.44772202 13.2738789,3.30395291 C13.0201502,3.1601838 12.707133,3.1601838 12.4534043,3.30395291 C12.1996755,3.44772202 12.0440427,3.71327091 12.0454528,4.00000469 L12.0454528,4.00000469 Z M5.49999041,3.60001125 L11.2272736,3.60001125 L11.2272736,4.39999813 L5.49999041,4.39999813 L5.49999041,3.60001125 Z M15.3181792,11.5999925 L16.136368,11.5999925 L16.136368,14.7999963 L15.3181792,14.7999963 L15.3181792,11.5999925 Z M15.3181792,9.19999438 L16.136368,9.19999438 L16.136368,10.8000056 L15.3181792,10.8000056 L15.3181792,9.19999438 Z M15.3181792,6.79999625 L16.136368,6.79999625 L16.136368,8.4000075 L15.3181792,8.4000075 L15.3181792,6.79999625 Z" id="形状" fill="#43B866"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/styles/index.scss

@@ -232,6 +232,8 @@ aside {
   background-color: #d9d9d9;
 }
 
+// 大屏滚动表格
+
 .no-data-bg {
   position: absolute;
   display: inline-block;
@@ -252,3 +254,13 @@ aside {
     letter-spacing: 1px;
   }
 }
+
+.dv-scroll-board .rows .ceil,
+.dv-scroll-board .header .header-item {
+  border-right: 1px solid rgba(13, 23, 40, 1);
+}
+
+.dv-scroll-board .rows .ceil:last-child,
+.dv-scroll-board .header .header-item:last-child {
+  border-right: none;
+}

src/components/Breadcrumb/index.vue

@@ -2,10 +2,12 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for=" (item, index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{
+        <span :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .65)')}"
+          v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{
           item.meta.title
           }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <a :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .45)')}" v-else
+          @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -18,7 +20,29 @@ export default {
       levelList: null
     }
   },
+  computed: {
+    changeColor() {
+      // console.log(this.$route);
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
   watch: {
+    changeColor(val) {
+      if (val == true) {
+        let item = document.getElementsByClassName('el-breadcrumb__separator')
+        // let item  =document.getElementsByClassName('')
+        item[0].style.color = rgba(255, 255, 255, 0.45)
+        item[1].style.color = rgba(255, 255, 255, 0.45)
+      } else {
+        let item = document.getElementsByClassName('el-breadcrumb__separator')
+        item[0].style.color = ''
+          item[1].style.color = ''
+      }
+    },
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
       if (route.path.startsWith('/redirect/')) {
@@ -70,13 +94,20 @@ export default {
   margin-left: 8px;
 
   .no-redirect {
-    color: rgba(0, 0, 0, 0.65);
+    color: rgba(0, 0, 0, .45);
     cursor: text;
   }
 }
-
 .app-breadcrumb .el-breadcrumb__inner a,
 .el-breadcrumb__inner.is-link {
-  color: rgba(0, 0, 0, 0.45);
+  color:rgba(0, 0, 0, 0.65)
 }
 </style>
+<!-- <style lang="scss">
+.changeColor {
+  --theme-color: rgba(255, 255, 255, 0.45);
+}
+.el-breadcrumb__separator {
+  color:var(--theme-color);
+}
+</style> -->

src/components/Hamburger/index.vue

@@ -1,14 +1,16 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-11 13:56:19
+ * @LastEditors: zhp
+ * @Description:
+-->
 <template>
   <div style="padding: 0 15px;" @click="toggleClick">
-    <svg
+    <svg :class="{'is-active':isActive}" class="hamburger" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"
-      :class="{'is-active':isActive}"
+      width="64" height="64" :fill="changeColor === true ? 'rgba(255, 255, 255, 1)' : '' ">
-      class="hamburger"
+      <path
-      viewBox="0 0 1024 1024"
+        d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
-      xmlns="http://www.w3.org/2000/svg"
-      width="64"
-      height="64"
-    >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>
   </div>
 </template>
@@ -22,6 +24,15 @@ export default {
       default: false
     }
   },
+  computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
   methods: {
     toggleClick() {
       this.$emit('toggleClick')

src/layout/components/Navbar.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="navbar">
+  <div ref="navbar" class="navbar"
+    :style="changeColor ? 'background: rgba(0, 21, 41, 1);boxShadow:0px 1px 8px 0px rgba(0,131,255,0.35)' : ''">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
       @toggleClick="toggleSideBar" />
 
@@ -41,6 +42,13 @@ export default {
       'nickname',
       'device'
     ]),
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -58,6 +66,23 @@ export default {
       }
     }
   },
+  watch: {
+    // changeColor: {
+    //   handler(val){
+    //     if (val == true) {
+    //       let svg = document.getElementsByClassName('hamburger')
+    //       console.log('svg', svg)
+    //       svg[0].style.color = 'rgba(255, 255, 255, 1)'
+    //       svg[0].setAttribute('fill', 'rgba(255, 255, 255, 1)')
+    //     } else {
+    //       let svg = document.getElementsByClassName('hamburger')
+    //       console.log('svg', svg);
+    //       svg[0].setAttribute('fill', '')
+    //     }
+    //   },
+    //   immediate: true, //立即执行
+    // }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')

src/layout/components/NavbarRight.vue

@@ -1,25 +1,31 @@
 <template>
   <div class="right-msg" :style="blackTitle ? 'color: #000' : 'color: #fff'">
     <div class="home-icon" v-if='blackTitle'>
-      <svg-icon icon-class="home" style="font-size: 24px; cursor: pointer;" @click="toHome" />
+      <svg-icon :icon-class="changeColor === true ? 'darkHome' : 'home'"
+        style="font-size: 24px; cursor: pointer;color: aqua;" @click="toHome" />
     </div>
     <div class="time-msg">
-      <div class="line1">{{ timeZone }}&nbsp;&nbsp;&nbsp;&nbsp;{{ topTime }}</div>
+      <div class="line1" :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''">{{ timeZone
-      <div class="line2">{{ topDate }}</div>
+        }}&nbsp;&nbsp;&nbsp;&nbsp;{{ topTime }}</div>
+      <div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ topDate }}</div>
     </div>
     <div class="base-msg">
       <div class="avatar">
         <el-dropdown>
           <img :src="require(`../../assets/images/choicepart/avatar.png`)" alt="" width="32" height="32" />
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item><svg-icon icon-class="helpbtn" />帮助文档</el-dropdown-item>
+            <el-dropdown-item>
-            <el-dropdown-item @click.native="logout"><svg-icon icon-class="exitbtn" />退出登录</el-dropdown-item>
+              <svg-icon icon-class="helpbtn" />帮助文档
+            </el-dropdown-item>
+            <el-dropdown-item @click.native="logout">
+              <svg-icon icon-class="exitbtn" />退出登录
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
       <div class="use-msg">
-        <div class="line1">{{ nickname }}</div>
+        <div :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''" class="line1">{{ nickname }}</div>
-        <div class="line2">{{ dept }}</div>
+        <div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ dept }}</div>
       </div>
     </div>
   </div>
@@ -48,6 +54,15 @@ export default {
       }
     }
   },
+  computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
   created() {
     // this.getUserMsg()
     this.getTime()

src/layout/components/TagsView/ScrollPane.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-04 10:44:35
+ * @LastEditors: zhp
+ * @Description:
+-->
 <template>
   <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
     <slot />
@@ -17,7 +24,9 @@ export default {
   computed: {
     scrollWrapper() {
       return this.$refs.scrollContainer.$refs.wrap
-    }
+    },
+  },
+  watch: {
   },
   mounted() {
     this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)

src/layout/components/TagsView/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div id="tags-view-container" class="tags-view-container">
+  <div ref="tagsViewContainer"
+    :style="changeColor === true ? 'background:rgba(0, 21, 41, 1);borderTop:0px solid #d8dce5' : ''" id="tags-view-container"
+    class="tags-view-container">
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
@@ -36,6 +38,13 @@ export default {
     }
   },
   computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     visitedViews() {
       return this.$store.state.tagsView.visitedViews
     },
@@ -44,9 +53,31 @@ export default {
     },
     theme() {
       return this.$store.state.settings.theme;
-    }
+    },
   },
   watch: {
+    changeColor(val) {
+      if (val == true) {
+        // console.log('this.$refs.tagsViewContainer', this.$refs.tagsViewContainer);
+        // this.$refs.tagsViewContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)'
+        // this.$refs.tagsViewContainer.style.borderTop = '0px solid #d8dce5'
+        var tag = document.getElementsByClassName("tags-view-item")
+        console.log('tag', tag)
+        for (let i in tag) {
+          tag[i].classList.add("changeColor")
+          // tag[i].classList.remove("default")
+        }
+        // console.log('this.$refs.scrollContainer', this.$refs.tag);
+      } else {
+        // this.$refs.tagsViewContainer.style.backgroundColor = ''
+        // this.$refs.tagsViewContainer.style.borderTop = '1px solid #d8dce5'
+        var tag = document.getElementsByClassName("tags-view-item")
+        for (let i in tag) {
+          tag[i].classList.remove("changeColor")
+          // tag[i].classList.add("default")
+        }
+      }
+    },
     $route() {
       this.addTags()
       this.moveToCurrentTag()
@@ -60,6 +91,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$route, this.changeColor);
     this.initTags()
     this.addTags()
   },
@@ -68,11 +100,23 @@ export default {
       return route.path === this.$route.path
     },
     activeStyle(tag) {
+      if (this.changeColor) {
+        if (!this.isActive(tag)) return {
+          "background-color": 'rgba(0, 59, 115, 1)',
+          "border-color": 'rgba(0, 59, 115, 1)',
+          "color": 'rgba(255, 255, 255, 1)'
+        };
+        return {
+          "background-color": this.theme,
+          "border-color": this.theme
+        };
+      } else {
         if (!this.isActive(tag)) return {};
         return {
           "background-color": this.theme,
           "border-color": this.theme
         };
+      }
     },
     isAffix(tag) {
       return tag.meta && tag.meta.affix
@@ -230,6 +274,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// :root{
+//   --theme-color: rgba(0, 0, 0, 0.45);
+//   --theme-background: #f4f4f4ff;
+// }
+.changeColor{
+  --theme-background: rgba(0, 59, 115, 1);
+  --theme-color: rgba(255, 255, 255, 1);
+}
 .tags-view-container {
   height: 42px;
   width: 100%;
@@ -245,8 +297,8 @@ export default {
       cursor: pointer;
       height: 28px;
       line-height: 28px;
-      color: rgba(0, 0, 0, 0.45);
+      color: var(--theme-color,rgba(0, 0, 0, 0.45));
-      background: #F4F4F4FF;
+      background:var(--theme-background,#f4f4f4ff);
       padding: 0 8px 0 12px;
       font-size: 14px;
       letter-spacing: 1px;
@@ -331,7 +383,7 @@ export default {
       .el-icon-close {
         &:hover {
           background-color: #fff;
-          color: #409eff;
+          color: rgba(62, 142, 247, 1);
         }
       }
     }

src/layout/index.vue

@@ -2,7 +2,8 @@
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
     <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+    <div :style="changeColor ? 'background: rgba(0, 21, 41, 1)' : ''" ref="mainContainer"
+      :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
@@ -39,6 +40,13 @@ export default {
       needTagsView: state => state.settings.tagsView,
       fixedHeader: state => state.settings.fixedHeader
     }),
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
@@ -51,6 +59,16 @@ export default {
       return variables;
     }
   },
+  watch: {
+    // changeColor(val) {
+    //   if (val == true) {
+    //     // console.log('this.$refs.mainContainer', this.$refs.mainContainer);
+    //     this.$refs.mainContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)'
+    //   } else {
+    //     this.$refs.mainContainer.style.backgroundColor = ''
+    //   }
+    // },
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })

src/store/modules/home.js

@@ -92,7 +92,7 @@ const actions = {
   /** 初始化首页数据 */
   async initHome({ commit }) {
     const dataArr = await getHomeInfo();
-    console.log('dataArr', dataArr);
+    // console.log('dataArr', dataArr);
       let preData = dataArr.previousProdOutputOutDO
       let preFtoData = dataArr.previousProdOutputFtoDO
     // const targetArr = await getHomeInfo();
@@ -127,7 +127,7 @@ const actions = {
     //   const payload = handler(factoryData)
     //   commit("SET_COPILOT_INFO", { type, payload });
     // } else {
-      console.log('factoryList',factoryList)
+      // console.log('factoryList',factoryList)
       let factoryData = factoryList.prodOutputOutDO ? factoryList.prodOutputOutDO : factoryList.prodOutputRateDO
       let preData = factoryList.previousProdOutputOutDO ? factoryList.previousProdOutputOutDO : factoryList.previousProdOutputRateDO
       let preFtoData = factoryList.previousProdOutputFtoDO ? factoryList.previousProdOutputFtoDO : []
@@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
 }
 
 function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
-  console.log('工厂',targetListResponse);
+  // console.log('工厂',preData);
 
   // 初始数据
   const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
@@ -343,17 +343,24 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
   //     componentYieldRate: 0.73,
   //   },
   // ];
-  if (preData && preData[0] != null) {
+  if (preData) {
     for (const factory of preData) {
-      const fId = getPreFactoryId(factory);
+      const fId = getPreFactoryId(factory)
+      // console.log('factory',factory.previousYearOee);
         //  chipInvest.previous[fId] = factory.previousYearInputNumber;
       // chipOeeRate.current[fId] = factory.oee;
+      if (factory.previousGlassType === 0) {
          chipOeeRate.previous[fId] = factory.previousYearOee;
+      }
+      // chipOeeRate.previous[fId] = factory.previousYearOee;
       // 转化效率
+        if (factory.previousGlassType === 1) {
         transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency;
+      }
+      // transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
       // 芯片良率 与 标准组件良率
-      if (![0, 1].includes(factory.glassType)) continue;
+      if (![0, 1].includes(factory.previousGlassType)) continue;
-      const _t = [chipRate, stdRate][factory.glassType]
+      const _t = [chipRate, stdRate][factory.previousGlassType]
       // _t.current[fId] = factory.yieldRate ;
       _t.previous[fId] = factory.previousYearYieldRate ;
       // }
@@ -378,10 +385,14 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
         transformRate.target[fId] = componentConversionEfficiency
       }
       // 芯片OEE
+      if (factory.glassType === 0) {
          chipOeeRate.current[fId] = factory.oee;
+      }
       // chipOeeRate.previous[fId] = factory.previousYearOee;
       // 转化效率
+      if (factory.glassType === 1) {
         transformRate.current[fId] = factory.componentConversionEfficiency;
+      }
       // transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency ;
       // 芯片良率 与 标准组件良率
       if (![0, 1].includes(factory.glassType)) continue;
@@ -389,6 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
       _t.current[fId] = factory.yieldRate ;
       // _t.previous[fId] = factory.previousYearYieldRate ;
     }
+    // console.log('chipOeeRate',stdRate);
     // console.log('chipOeeRate',chipOeeRate);
     return {
       chipOeeRate,
@@ -400,12 +412,12 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
 }
 
 function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
-  console.log('prodOutputFtoListRes',preFtoData);
+  // console.log('prodOutputFtoListRes',preFtoData);
   // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init()
-   if (prodOutputFtoListRes) {
+   if (prodOutputFtoListRes.length !== 0 ) {
     for (const factory of prodOutputFtoListRes) {
-      console.log(factory);
+      // console.log(factory);
       const fId = getFactoryId(factory);
       // const preFId = getPreFactoryId(factory);
       // if (fId) {
@@ -418,7 +430,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
    }
    if (preFtoData) {
     for (const factory of preFtoData) {
-      console.log(factory);
+      // console.log(factory);
       const fId = getPreFactoryId(factory);
       // const preFId = getPreFactoryId(factory);
       // if (fId) {
@@ -429,10 +441,13 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
       // }
     }
    }
-    if (preData && preData[0] != null) {
+    if (preData) {
     for (const factory of preData) {
       const fId = getPreFactoryId(factory);
-         chipInvest.previous[fId] = factory.previousYearInputNumber;
+      if (factory.previousGlassType === 0) {
+      chipInvest.previous[fId] = factory.previousYearInputNumber
+      }
+        //  chipInvest.previous[fId] = factory.previousYearInputNumber;
       if (![0, 1, 2].includes(factory.previousGlassType)) continue;
       const _t = [chipOutput, stdOutput, bipvOutput][factory.previousGlassType];
       // if (fId) {
@@ -445,11 +460,14 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
     }
   }
     // console.log('ftoInvest',ftoInvest)
-  if (factoryListResponse && factoryListResponse[0] != null) {
+  if (factoryListResponse) {
     for (const factory of factoryListResponse) {
       const fId = getFactoryId(factory);
+      // console.log('factory.inputNumber', factory, fId);
+      if (factory.glassType === 0) {
+      chipInvest.current[fId] = factory.inputNumber
+      }
       // const preFId = getPreFactoryId(factory);
-
       // 获取目标值
       if (targetListResponse) {
         const { chipYield, componentYield, bipvProductOutput } =
@@ -459,7 +477,6 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
         bipvOutput.target[fId] = bipvProductOutput;
       }
       // 芯片投入
-          chipInvest.current[fId] = factory.inputNumber;
 
       // 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
       // 因为后端写的垃圾数据，所以这里要做一下判断
@@ -467,6 +484,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
       const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
         _t.current[fId] = factory.outputNumber;
     }
+    // console.log('chipInvest',ftoInvest);
     return {
       chipInvest,
       // ftoInvest,
@@ -475,15 +493,6 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
       stdOutput,
       bipvOutput,
     };
-  }else{
-      return {
-      chipInvest,
-      // ftoInvest,
-      ftoInvest,
-      chipOutput,
-      stdOutput,
-      bipvOutput,
-    }
   }
 }
 

src/utils/constants.js

@@ -143,6 +143,8 @@ export const tyjxfactoryList =[
 
 // 暂时只有瑞昌邯郸数据
 export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司']
+
+export const factoryListabbr =['瑞昌', '邯郸']
 export const factoryArray =[
   {
     name: '瑞昌中建材光电材料有限公司',

src/views/components/ChartContainer.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-10 15:17:28
+ * @LastEditTime: 2024-07-19 15:18:00
+ * @LastEditors: zhp
+ * @Description:
+-->
+
 <!--
     filename: ChartContainer.vue
     author: liubin
@@ -43,7 +51,7 @@ export default {
 }
 
 ::-webkit-scrollbar {
-  width: 8px;
+  width: 80%;
   height: 8px;
 }
 

src/views/copilot/components/BarChartBase.vue

@@ -9,7 +9,7 @@
   <chart-container class="bar-chart-base">
     <div class="legend">
       <span v-for="item in legend" :key="item.label" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
     </div>
     <div ref="chart" style="height:94%;width:100%"></div>
   </chart-container>
@@ -62,7 +62,36 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            var res = `<span style='color:rgba(255,255,255,0.85);display:inline-block;margin-bottom:8px;'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:12px;height:12px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>` +
+                `<span style='display:inline-block;width:60px;color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;text-align: right;'>${params[i].value ? params[i].value : 0}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -73,24 +102,24 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/片",
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
             align: "right",
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -108,7 +137,7 @@ export default {
           {
             name: "", // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -143,7 +172,7 @@ export default {
           {
             name: "", // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -188,19 +217,19 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
+      this.options.series.map((item) => {
-        item.barWidth = val ? 18 : 12;
+        item.barWidth = val ? 18 : 16;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
-      this.initChart(this.actualOptions);
+      this.initChart(this.options);
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       // this.initChart(this.actualOptions);
       this.canvasReset()
     },
@@ -209,14 +238,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      // const actualOptions = JSON.parse(JSON.stringify(this.options));
-      console.log('actualOptions', this.options)
+      // console.log('actualOptions', this.options)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data || [];
+      this.options.series[1].data = val?.[1]?.data || [];
-      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.options.series[1].name = val?.[1]?.name || "";
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -225,7 +254,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -249,7 +278,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.chart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };

src/views/copilot/components/Container.vue

@@ -8,9 +8,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
+    <button v-if="0" style="
-      v-if="0"
-      style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,22 +18,11 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
+      " @click="$emit('refresh')">
-      @click="$emit('refresh')"
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-    >
+        style="width: 24px; height: 24px">
-      <svg
+        <path stroke-linecap="round" stroke-linejoin="round"
-        xmlns="http://www.w3.org/2000/svg"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
       </svg>
     </button>
     <!-- decoration  -->
@@ -44,19 +31,13 @@
     <div v-if="side == 'left'" class="corner bl"></div>
     <div v-if="side == 'right'" class="corner br"></div>
     <!-- content  -->
-    <div
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      class="container-head"
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
+    <div class="container-body" :class="[
-      class="container-body"
-      :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
+      ]">
-    >
       <slot />
     </div>
   </div>
@@ -92,6 +73,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -141,7 +123,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -161,8 +143,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/components/ContainerIcon.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-07 16:54:54
+ * @LastEditTime: 2024-07-09 16:55:58
  * @LastEditors: zhp
  * @Description:
 -->
@@ -61,8 +61,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/copilot/components/FactoryDataHeader.vue

@@ -12,7 +12,7 @@
     <div class="page-title">{{ companyName }}</div>
     <section class="menu2">
       <div class="btn-group">
-        <el-tooltip class="item" effect="dark" content="导出" placement="top">
+        <el-tooltip v-if="showPeriod" class="item" effect="dark" content="导出" placement="top">
           <button type="button" class="export-btn" @click="handleExport" />
         </el-tooltip>
         <el-tooltip class="item" effect="dark" :content="isFullscreen  === false ? '退出全屏' : '全屏'" placement="top">
@@ -48,10 +48,20 @@ export default {
       type: String,
     },
   },
+  watch: {
+    period(val) {
+      if (val != 1) {
+        this.showPeriod = true
+      } else {
+        this.showPeriod = false
+      }
+    }
+  },
   data() {
     return {
       isFullscreen: false,
       content: '全屏',
+      showPeriod:false,
       dataList: [
         { id: 1, name: "日" },
         { id: 2, name: "周" },
@@ -63,6 +73,8 @@ export default {
   computed: {},
   methods: {
     handleExport() {
+      // if (this.period != 1) {
+        this.showPeriod = true
         exportFactoryDataExcel({
           factoryId: this.companyId,
           timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
@@ -71,6 +83,10 @@ export default {
           this.$download.excel(response, `${this.companyName}生产数据.xls`);
           // this.exportLoading = false;
         }).catch(() => { });
+      // } else {
+      //   this.showPeriod = false
+      // }
+
     },
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
@@ -107,7 +123,7 @@ export default {
   gap: 8px;
 }
 .factory-header > .menu2 {
-  width: 26vw;
+  width: 20vw;
   display: flex;
   justify-content: flex-end;
   align-items: center;

src/views/copilot/components/bottomLeftContainer.vue

@@ -0,0 +1,226 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-09 15:07:50
+ * @LastEditTime: 2024-07-09 15:41:38
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-05 09:43:51
+ * @LastEditTime: 2024-07-09 15:06:52
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
+    <!-- content  -->
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    right: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 90%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 8%;
+    bottom: 0;
+    background: linear-gradient(to right, transparent 60%, #024798 98%, transparent 90%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/bottomRightContainer.vue

@@ -0,0 +1,219 @@
+<!--
+    filename: Container.vue
+    author: liubin
+    date: 2024-04-09 10:44:09
+    description:
+-->
+
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
+    <!-- content  -->
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    left: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 95%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    right: 3%;
+    bottom: 0;
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/button.vue

@@ -75,8 +75,8 @@ button {
 .copilot-btn::after {
   content: "";
   position: absolute;
-  width: 16px;
+  width: 0.7vw;
-  height: 16px;
+  height: 0.7vw;
   top: 0;
   background: transparent;
   border-style: solid;

src/views/copilot/components/efficiencyLeftContainer.vue

@@ -0,0 +1,220 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-09 15:15:00
+ * @LastEditTime: 2024-07-19 16:11:37
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
+    <!-- content  -->
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 5%,
+        #024798 10%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    right: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 5%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 90%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 10%;
+    bottom: 0;
+    background: linear-gradient(to right,transparent 60%, #024798 95%, transparent 97%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.7vw;
+    height: 0.7vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/efficiencyRightContainer.vue

@@ -0,0 +1,220 @@
+<!--
+    filename: Container.vue
+    author: liubin
+    date: 2024-04-09 10:44:09
+    description:
+-->
+
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
+    <!-- content  -->
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+
+
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 5%,
+    #024798 10%,
+    transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    left: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 95%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    right: 3%;
+    bottom: 0;
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.7vw;
+    height: 0.7vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/ftoBarChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-06-04 08:54:10
+ * @LastEditTime: 2024-07-19 16:08:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
   <chart-container class="bar-chart-base">
     <div class="legend">
       <span v-for="item in legend" :key="item.label" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
     </div>
     <div ref="ftoChart" style="height:94%;width:100%"></div>
   </chart-container>
@@ -63,7 +63,36 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            var res = `<span style='color:rgba(255,255,255,0.85);display:inline-block;margin-bottom:8px;'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:12px;height:12px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>` +
+                `<span style='display:inline-block;width:60px;color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;text-align: right;'>${params[i].value ? params[i].value : 0 }</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -74,24 +103,24 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/片",
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
             align: "right",
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -109,7 +138,7 @@ export default {
           {
             name: "", // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -144,7 +173,7 @@ export default {
           {
             name: "", // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -189,19 +218,19 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
+      this.options.series.map((item) => {
-        item.barWidth = val ? 18 : 12;
+        item.barWidth = val ? 18 : 16;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
-      this.initChart(this.actualOptions);
+      this.initChart(this.options);
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       // this.initChart(this.actualOptions);
       this.canvasReset()
     },
@@ -210,14 +239,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      // const actualOptions = JSON.parse(JSON.stringify(this.options));
-      console.log('actualOptions', this.options)
+      // console.log('actualOptions', this.options)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val[1].data;
+      this.options.series[1].data = val[1].data;
-      actualOptions.series[1].name = val[1].name;
+      this.options.series[1].name = val[1].name;
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -226,7 +255,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -250,7 +279,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.ftoChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };

src/views/copilot/components/leftContainer.vue

@@ -1,16 +1,14 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:43:51
- * @LastEditTime: 2024-06-05 09:43:52
+ * @LastEditTime: 2024-07-19 16:11:59
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
+    <button v-if="false" style="
-      v-if="false"
-      style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,22 +18,11 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
+      " @click="$emit('refresh')">
-      @click="$emit('refresh')"
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-    >
+        style="width: 24px; height: 24px">
-      <svg
+        <path stroke-linecap="round" stroke-linejoin="round"
-        xmlns="http://www.w3.org/2000/svg"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
       </svg>
     </button>
     <!-- decoration  -->
@@ -44,19 +31,13 @@
     <div class="corner bl"></div>
     <div class="corner br"></div>
     <!-- content  -->
-    <div
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      class="container-head"
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
+    <div class="container-body" :class="[
-      class="container-body"
-      :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
+      ]">
-    >
       <slot />
     </div>
   </div>
@@ -92,6 +73,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -99,23 +81,25 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
-    left: 0;
+    right: 0;
-    background: radial-gradient(
+    background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -123,12 +107,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 90%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 7%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to right,transparent 60%, #024798 95%, transparent 97%);
     z-index: 0;
   }
 
@@ -141,7 +125,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -161,8 +145,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/components/rightContainer.vue

@@ -8,9 +8,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
+    <button v-if="false" style="
-      v-if="false"
-      style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,22 +18,11 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
+      " @click="$emit('refresh')">
-      @click="$emit('refresh')"
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-    >
+        style="width: 24px; height: 24px">
-      <svg
+        <path stroke-linecap="round" stroke-linejoin="round"
-        xmlns="http://www.w3.org/2000/svg"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
       </svg>
     </button>
     <!-- decoration  -->
@@ -44,19 +31,13 @@
     <div class="corner bl"></div>
     <div class="corner br"></div>
     <!-- content  -->
-    <div
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      class="container-head"
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
+    <div class="container-body" :class="[
-      class="container-body"
-      :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
+      ]">
-    >
       <slot />
     </div>
   </div>
@@ -92,6 +73,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -99,13 +82,17 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 10%,
+    #024798 20%,
+    transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
@@ -113,7 +100,7 @@ export default {
     background: radial-gradient(
       circle at center,
       #024798 2%,
-      #024798 30%,
+      #024798 100%,
       transparent
     );
     z-index: 1;
@@ -123,12 +110,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 95%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    right: 1%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
     z-index: 0;
   }
 
@@ -141,7 +128,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -161,8 +148,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/components/twoContainer.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:48:37
- * @LastEditTime: 2024-06-05 09:53:49
+ * @LastEditTime: 2024-07-19 16:14:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -99,6 +99,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -106,23 +108,25 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+          #024798 20%,
+          transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
     left: 0;
-    background: radial-gradient(
+    background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -133,7 +137,7 @@ export default {
     width: 60%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 6%;
     bottom: 0;
     background: linear-gradient(to right, #024798, transparent);
     z-index: 0;
@@ -148,7 +152,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -168,8 +172,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+      height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/efficiency/components/ChipOee.vue

@@ -47,8 +47,11 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -60,44 +63,47 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${yesterday}日目标`, color: "#58adfa" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${yesterday}日目标`, color: "#58adfa" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${dayBeYes}日`, color: "#12f7f1" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `${year - 1}年本周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${year - 1}年${month}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else if (this.period === '月' && this.than === '环比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${lastMonth}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else {
         items = [
+          { label: `${year}年目标`, color: "#58adfa" },
           { label: `${year - 1}年`, color: "#12f7f1" },
           { label: `${year}年`, color: "#58adfa" },
-          { label:  `${year}年`, color: "#58adfa" },
-
           // { label: `${year}年目标`, value: valueTuple[2] },
         ];
       }
@@ -138,14 +144,6 @@ export default {
       // console.log('chipOee', chipOeeRate)
       let dataList = null
       switch (this.period) {
-        case "日":
-          dataList = [];
-          dataList[0] = chipOeeRate?.previous;
-          dataList[1] = chipOeeRate?.current;
-        case "周":
-          dataList = [];
-          dataList[0] = chipOeeRate?.previous;
-          dataList[1] = chipOeeRate?.current;
           default:
           dataList = [];
           dataList[0] = chipOeeRate?.previous;
@@ -163,8 +161,11 @@ function getTemplate(period, dataList, than) {
   // console.log('dataList',dataList);
   let items = [];
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -177,26 +178,36 @@ function getTemplate(period, dataList, than) {
   if (period === '日' && than === '同比') {
     items = [
       {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `${yesterday}日目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
       {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `${yesterday}日目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
@@ -209,6 +220,11 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `本周目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '周' && than === '环比') {
     items = [
@@ -221,6 +237,11 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `本周目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '月' && than === '同比') {
     items = [

src/views/copilot/efficiency/components/TransformRate.vue

@@ -47,8 +47,11 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -60,44 +63,47 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${yesterday}日目标`, color: "#58adfa" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${yesterday}日目标`, color: "#58adfa" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${dayBeYes}日`, color: "#12f7f1" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `${year - 1}年本周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${year - 1}年${month}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else if (this.period === '月' && this.than === '环比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${lastMonth}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else {
         items = [
+          { label: `${year}年目标`, color: "#58adfa" },
           { label: `${year - 1}年`, color: "#12f7f1" },
           { label: `${year}年`, color: "#58adfa" },
-          { label: `${year}年`, color: "#58adfa" },
-
           // { label: `${year}年目标`, value: valueTuple[2] },
         ];
       }
@@ -109,17 +115,9 @@ export default {
     series() {
       // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
       const transformRate = this.transformRate
-      // console.log('chipOee', chipOeeRate)
+      console.log('chipOee', transformRate)
       let dataList = null;
       switch (this.period) {
-        case "日":
-          dataList = [];
-          dataList[0] = transformRate.previous;
-          dataList[1] = transformRate.current;
-        case "周":
-          dataList = [];
-          dataList[0] = transformRate.previous;
-          dataList[1] = transformRate.current;
         default:
           dataList = [];
           dataList[0] = transformRate.previous;
@@ -154,8 +152,11 @@ function getTemplate(period, dataList,than) {
   // console.log('dataList',dataList);
   let items = [];
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -168,26 +169,36 @@ function getTemplate(period, dataList,than) {
   if (period === '日' && than === '同比') {
     items = [
       {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `${yesterday}日目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
       {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `${yesterday}日目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
@@ -200,6 +211,11 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `本周目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '周' && than === '环比') {
     items = [
@@ -212,6 +228,11 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
+      {
+        name: `本周目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
     ];
   } else if (period === '月' && than === '同比') {
     items = [

src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-06-06 15:12:58
+ * @LastEditTime: 2024-07-19 16:10:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <chart-container class="bar-chart-base">
     <div class="legend">
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
     </div>
     <div ref="oeeChart" style="height:94%;width:100%"></div>
   </chart-container>
@@ -62,7 +62,42 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85);margin-bottom:8px'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `${params[i].seriesType === "line"
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:3.5%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.6%;left:4.8%;'></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px'>${params[i].seriesName}</span>`
+                  : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px'>${params[i].seriesName}</span>`
+                }` +
+                `<span style='display:inline-block;text-align: right;width:180px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -73,23 +108,23 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/%",
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -107,7 +142,7 @@ export default {
           {
             name: "", // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -142,7 +177,7 @@ export default {
           {
             name: "", // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -180,30 +215,30 @@ export default {
             itemStyle: {
               color: "#f3c000",
             },
-            areaStyle: {
+            // areaStyle: {
-              color: {
+            //   color: {
-                type: "linear",
+            //     type: "linear",
-                x: 0,
+            //     x: 0,
-                y: 0,
+            //     y: 0,
-                x2: 0,
+            //     x2: 0,
-                y2: 1,
+            //     y2: 1,
-                colorStops: [
+            //     colorStops: [
-                  {
+            //       {
-                    offset: 0,
+            //         offset: 0,
-                    color: "#f3c000", // 0% 处的颜色
+            //         color: "#f3c000", // 0% 处的颜色
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 0.55,
+            //         offset: 0.55,
-                    color: "#f3c00033",
+            //         color: "#f3c00033",
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 1,
+            //         offset: 1,
-                    color: "transparent", // 100% 处的颜色
+            //         color: "transparent", // 100% 处的颜色
-                  },
+            //       },
-                ],
+            //     ],
-                global: false, // 缺省为 false
+            //     global: false, // 缺省为 false
-              },
+            //   },
-            },
+            // },
             data: [], // this.series[0].data,
           },
         ],
@@ -222,11 +257,11 @@ export default {
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     isFullscreen(val) {
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       // if (val === false && this.isOpen === true) {
       //   console.log(val)
       //   this.width = 97 + '%'
@@ -236,12 +271,12 @@ export default {
       //   this.canvasReset()
       // }
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
-      this.initChart(this.actualOptions)
+      this.initChart(this.options)
       this.canvasReset()
     },
     series(val) {
@@ -252,14 +287,14 @@ export default {
       // console.log('val', val)
       const actualOptions = JSON.parse(JSON.stringify(this.options))
       console.log(actualOptions)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data;
+      this.options.series[1].data = val?.[1]?.data;
-      actualOptions.series[1].name = val?.[1]?.name;
+      this.options.series[1].name = val?.[1]?.name;
-      actualOptions.series[2].data = val?.[2]?.data || [];
+      this.options.series[2].data = val?.[2]?.data || [];
-      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.options.series[2].name = val?.[2]?.name || "";
       this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -273,7 +308,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -296,7 +331,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };
@@ -328,10 +363,10 @@ export default {
       margin-right: 0.22vw;
     }
   }
-     .legend-item:nth-child(3) {
+     .legend-item:nth-child(1) {
        margin-left: 1vw;
      }
- .legend-item:nth-child(3):before {
+ .legend-item:nth-child(1):before {
    // width: 12px;
    // height: 2px;
    width: 1vw;
@@ -340,11 +375,11 @@ export default {
    position: absolute;
    top: 50%;
    // left: -16px;
-   left: -0.951vw;
+   left: -1.3vw;
    transform: translateY(-50%);
  }
 
- .legend-item:nth-child(3):after {
+ .legend-item:nth-child(1):after {
    background-color: #f3c000;
    content: "";
    display: inline-block;
@@ -355,15 +390,15 @@ export default {
    height: 0.3191vw;
    border-radius: 100%;
    top: 50%;
-   left: -0.851vw;
+   left: -1.13vw;
    // left: -16px;
    transform: translateY(-50%) translateX(50%);
  }
-  .legend-item:nth-child(1):before {
+  .legend-item:nth-child(2):before {
     background-color: #12f7f1;
   }
 
-  .legend-item:nth-child(2):before {
+  .legend-item:nth-child(3):before {
     background-color: #58adfa;
   }
 }

src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-06-06 15:13:06
+ * @LastEditTime: 2024-07-19 16:10:19
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <chart-container class="bar-chart-base">
     <div class="legend">
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
     </div>
     <div ref="oeeChart" style="height:94%;width:100%"></div>
   </chart-container>
@@ -62,7 +62,42 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85);margin-bottom:8px'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `${params[i].seriesType === "line"
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:3.5%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.6%;left:4.8%;'></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px'>${params[i].seriesName}</span>`
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px'>${params[i].seriesName}</span>`
+                }` +
+                `<span style='display:inline-block;text-align: right;width:180px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -73,23 +108,23 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/%",
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -107,7 +142,7 @@ export default {
           {
             name: "", // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -142,7 +177,7 @@ export default {
           {
             name: "", // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -180,30 +215,30 @@ export default {
             itemStyle: {
               color: "#f3c000",
             },
-            areaStyle: {
+            // areaStyle: {
-              color: {
+            //   color: {
-                type: "linear",
+            //     type: "linear",
-                x: 0,
+            //     x: 0,
-                y: 0,
+            //     y: 0,
-                x2: 0,
+            //     x2: 0,
-                y2: 1,
+            //     y2: 1,
-                colorStops: [
+            //     colorStops: [
-                  {
+            //       {
-                    offset: 0,
+            //         offset: 0,
-                    color: "#f3c000", // 0% 处的颜色
+            //         color: "#f3c000", // 0% 处的颜色
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 0.55,
+            //         offset: 0.55,
-                    color: "#f3c00033",
+            //         color: "#f3c00033",
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 1,
+            //         offset: 1,
-                    color: "transparent", // 100% 处的颜色
+            //         color: "transparent", // 100% 处的颜色
-                  },
+            //       },
-                ],
+            //     ],
-                global: false, // 缺省为 false
+            //     global: false, // 缺省为 false
-              },
+            //   },
-            },
+            // },
             data: [], // this.series[0].data,
           },
         ],
@@ -222,11 +257,11 @@ export default {
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     isFullscreen(val) {
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       // if (val === false && this.isOpen === true) {
       //   console.log(val)
       //   this.width = 97 + '%'
@@ -236,12 +271,12 @@ export default {
       //   this.canvasReset()
       // }
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
-      this.initChart(this.actualOptions)
+      this.initChart(this.options)
       this.canvasReset()
     },
     series(val) {
@@ -250,15 +285,15 @@ export default {
         return;
       }
       console.log(val)
-      const actualOptions = JSON.parse(JSON.stringify(this.options))
+      // const actualOptions = JSON.parse(JSON.stringify(this.options))
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data || [];
+      this.options.series[1].data = val?.[1]?.data || [];
-      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.options.series[1].name = val?.[1]?.name || "";
-      actualOptions.series[2].data = val?.[2]?.data || [];
+      this.options.series[2].data = val?.[2]?.data || [];
-      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.options.series[2].name = val?.[2]?.name || "";
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -272,7 +307,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -295,7 +330,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };
@@ -327,17 +362,17 @@ export default {
       margin-right: 0.22vw;
     }
   }
- .legend-item:nth-child(3) {
+ .legend-item:nth-child(1) {
    margin-left: 1vw;
  }
-  .legend-item:nth-child(1):before {
+  .legend-item:nth-child(2):before {
     background-color: #12f7f1;
   }
 
-  .legend-item:nth-child(2):before {
+  .legend-item:nth-child(3):before {
     background-color: #58adfa;
   }
-    .legend-item:nth-child(3):before {
+ .legend-item:nth-child(1):before {
    // width: 12px;
    // height: 2px;
    width: 1vw;
@@ -346,11 +381,11 @@ export default {
    position: absolute;
    top: 50%;
    // left: -16px;
-      left: -0.951vw;
+   left: -1.3vw;
    transform: translateY(-50%);
  }
 
-    .legend-item:nth-child(3):after {
+ .legend-item:nth-child(1):after {
    background-color: #f3c000;
    content: "";
    display: inline-block;
@@ -361,7 +396,7 @@ export default {
    height: 0.3191vw;
    border-radius: 100%;
    top: 50%;
-      left: -0.851vw;
+   left: -1.13vw;
    // left: -16px;
    transform: translateY(-50%) translateX(50%);
  }

src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue

@@ -65,13 +65,13 @@ export default {
     valueTuple() {
       const getter = this.chipRate;
       // console.log(getter)
-      if (this.period === "日" || this.period === "周") {
+      // if (this.period === "日" || this.period === "周") {
-        return [
+      //   return [
-          getter.previous[this.factoryId],
+      //     getter.previous[this.factoryId],
-          getter.current[this.factoryId],
+      //     getter.current[this.factoryId],
-          0,
+      //     0,
-        ];
+      //   ];
-      }
+      // }
       // [100, 200, 200]
       return [
         getter.previous[this.factoryId],
@@ -87,8 +87,11 @@ export default {
       const vt = this.valueTuple;
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -100,23 +103,27 @@ export default {
       // const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${month}月${today}日良率`, },
+          { label: `${yesterday}日良率`, },
-          { label: `${year-1}年${month}月${today}日良率` },
+          { label: `${year - 1}年${yesterday}日良率` },
+          { label: `${yesterday}日目标` },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${month}月${today}日良率` },
           { label: `${yesterday}日良率` },
+          { label: `${dayBeYes}日良率` },
+          { label: `${yesterday}日目标` },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `本周良率`, },
           { label: `${year - 1}年本周良率` },
+          { label: `本周目标`, },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { label: `本周良率`, },
           { label: `上周良率`, },
+          { label: `本周目标`, },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
@@ -139,17 +146,18 @@ export default {
       }
       let titleValue = vt[1] === null ? 0 + '%' : this.formatNumber(vt[1]) + '%',
         subtitle = {
-          日: "本日良率",
+          日: "昨日良率",
           周: "本周良率",
           月: `${month}月良率`,
           年: `${year}良率`,
         }[this.period];
-      console.log(vt[1]);
+      console.log(vt[0]);
       const t = getOptions({
         // single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
+        yesterday,
         currentName: items[0].label,
         preName: items[1].label,
         previousSum: vt[0],
@@ -161,8 +169,11 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -174,24 +185,27 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0]) ) + "%" },
+          { label: `${year - 1}年${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0]) ) + "%" },
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${yesterday}日目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${dayBeYes}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${yesterday}日目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `${year-1}年本周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
           { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-
+          { label: `本周目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { label: `上周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
           { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `本周目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
@@ -304,6 +318,8 @@ export default {
   .legend-item {
     margin-left: 15px;
     display: flex;
+    font-size: 16px;
+    // font-weight: 600;
     flex-direction: column;
     // align-items: center;
     align-items: flex-start;
@@ -357,8 +373,6 @@ export default {
   background: #003982;
 }
   .legend-item__value {
-    font-size: 24px;
-    font-weight: 600;
   }
 }
 </style>

src/views/copilot/efficiency/components/sub/std/ProgressBar.vue

@@ -47,12 +47,12 @@ export default {
   computed: {
     dataRate() {
       // if (this.current != 0 && this.target != 0) {
-        console.log( '1111111111', this.current, this.target);
+        console.log( '1111111111', this.current, this.target,this.previous);
       return this.current == 0 && this.target == 0
           ? 0
         : this.current != 0 && this.target != 0
           ? `${((this.current / this.target) * 100).toFixed(2)}%`
-          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : this.previous >=100 ? 100 + '%' : this.previous + '%';
+          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? parseFloat(this.current).toFixed(2) + '%' : 0 + '%'
       // } else if(this.previous != 0) {
       //   return this.previous + '%'
       // }

src/views/copilot/efficiency/components/sub/std/StdRateItem.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-06-06 15:14:29
+ * @LastEditTime: 2024-07-09 15:04:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,21 +11,21 @@
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
-      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
     </div>
   </div>
   <div v-else-if="period == '周'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
-      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
     </div>
   </div>
   <div v-else-if="period == '月'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
-      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
       <!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
     </div>
   </div>
@@ -33,7 +33,7 @@
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
-      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
       <!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
     </div>
   </div>
@@ -42,10 +42,12 @@
 <script>
 import CityName from "./CityName.vue";
 import ProgressBar from "./ProgressBar.vue";
+import preProgressBar from "./preProgressBar.vue";
+
 
 export default {
   name: "StdRateItem",
-  components: { CityName, ProgressBar },
+  components: { CityName, ProgressBar, preProgressBar },
   props: {
     city: {
       type: Object,
@@ -69,16 +71,19 @@ export default {
     titlePre() {
       console.log(this.city);
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       const today = new Date().getDate();
       const month = new Date().getMonth() + 1;
       const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
-        return `${year-1}年${month}月${today}日`
+        return `${year - 1}年${yesterday}日`
       } else if (this.period === '日' && this.than === '环比') {
-        return `${yesterday}日`
+        return `${dayBeYes}日`
       } else if (this.period === '周' && this.than === '同比') {
         return `${year-1}年本周`
       } else if (this.period === '周' && this.than === '环比') {
@@ -93,14 +98,18 @@ export default {
     },
     title() {
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       const today = new Date().getDate();
       const month = new Date().getMonth() + 1;
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
-        return `${month}月${today}日`
+        return `${yesterday}日`
       } else if (this.period === '日' && this.than === '环比') {
-        return `${month}月${today}日`
+        return `${yesterday}日`
       } else if (this.period === '周' && this.than === '同比') {
         return `本周`
       } else if (this.period === '周' && this.than === '环比') {
@@ -141,7 +150,7 @@ export default {
   align-items: center;
   gap: 8px;
   flex: 1 1 auto;
-  padding: 12px;
+  padding: 16px;
 }
 
 .std-rate-item__value {

src/views/copilot/efficiency/components/sub/std/preProgressBar.vue

@@ -0,0 +1,130 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-27 09:12:54
+ * @LastEditTime: 2024-07-09 15:02:46
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <div class="progress-bar" :data-title="title" :data-rate="previous + '%'">
+    <div class="progress-bar__rate" :style="{ width: dataRate == '-' ? 0 : dataRate }"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ProgressBar",
+  components: {},
+  props: {
+    value: {
+      type: Number,
+      default: 0,
+    },
+    target: {
+      type: Number,
+      default: 0,
+    },
+    previous: {
+      type: Number,
+      default: 0,
+    },
+    current: {
+      type: Number,
+      default: 0,
+    },
+    // total: {
+    //   type: Number,
+    //   default: 0,
+    // },
+    title: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    dataRate() {
+      // if (this.current != 0 && this.target != 0) {
+        // console.log( '1111111111', this.current, this.target,this.previous);
+      return this.previous >= 100 ? 100 + '%' : parseFloat(this.previous).toFixed(2) + '%';
+      // } else if(this.previous != 0) {
+      //   return this.previous + '%'
+      // }
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.progress-bar {
+  height: 10px;
+  background-color: #002f6b;
+  border-radius: 4px;
+  margin-bottom: 12px;
+  position: relative;
+
+  &:before {
+    content: attr(data-title);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -200%;
+    font-size: 12px;
+  }
+
+  &:after {
+    content: attr(data-rate);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -200%;
+    right: 0;
+    font-size: 12px;
+  }
+
+  &:first-child {
+    &:after {
+      color: #11eae3;
+    }
+  }
+
+  &:nth-child(2) {
+    &:after {
+      color: #0e65fd;
+    }
+  }
+
+  .progress-bar__rate {
+    position: absolute;
+    display: inline-block;
+    height: 100%;
+    width: 0;
+    border-radius: 4px;
+     background: linear-gradient(to right,
+          #004c5e11 10%,
+          #004c5e,
+          #0ac0c0,
+          #11eae3);
+  }
+
+  &:first-child {
+    .progress-bar__rate {
+      background: linear-gradient(to right,
+          #004c5e11 10%,
+          #004c5e,
+          #0ac0c0,
+          #11eae3);
+    }
+  }
+
+  &:nth-child(2) {
+    .progress-bar__rate {
+      background: linear-gradient(to right, #0048a811, #0048a8, #0e65fd);
+    }
+  }
+}
+</style>

src/views/copilot/efficiency/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-06-05 09:45:47
+ * @LastEditTime: 2024-07-09 15:16:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -30,8 +30,9 @@
 </template>
 
 <script>
-import Container from "@/views/copilot/components/rightContainer.vue";
+import Container from "@/views/copilot/components/efficiencyRightContainer.vue";
-import leftContainer from "@/views/copilot/components/leftContainer.vue";
+import leftContainer from "@/views/copilot/components/efficiencyLeftContainer.vue";
+
 import ChipOeeVue from "./components/ChipOee.vue";
 import ChipRateVue from "./components/ChipRate.vue";
 import StdRateVue from "./components/StdRate.vue";
@@ -102,12 +103,12 @@ export default {
   flex: 1;
   display: flex;
   flex-direction: column;
-  gap: 16px;
+  gap: 20px;
 }
 
 .flex {
   display: flex;
-  gap: 16px;
+  gap: 20px;
   flex: 1;
 }
 

src/views/copilot/efficiency/options/chipOptions.js

@@ -6,30 +6,36 @@ export default ({
   targetSum,
   currentName,
   preName,
+  yesterday,
 }) => ({
   grid: {
-    left: '0%',
+    left: 300,
     right: 0,
     bottom: 0,
     top: 0,
     containLabel: true,
   },
-  tooltip: {},
+  tooltip: {
+    trigger: "item",
+    extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+    backgroundColor: '#001829',
+    borderColor: '#001829',
+  },
   title: {
     text: titleValue,
-    left: "44%",
+    left: "48%",
-    top: "37%",
+    top: "middle",
     textAlign: "center",
     textStyle: {
       fontWeight: 600,
-      fontSize: 26,
+      fontSize: 36,
-      color: "#fffd",
+       color: "rgba(223,241,254,.8)",
     },
-    subtext: `\u2002${subtitle}\u2002`,
+    subtext: `\u2002${yesterday + '日良率'}\u2002`,
     subtextStyle: {
-      fontSize: 14,
+      fontSize: 16,
       fontWeight: 100,
-      color: "#fffd",
+      color: "rgba(255,255,255,.7)",
       align: "right",
     },
   },
@@ -39,7 +45,7 @@ export default ({
       type: "pie",
       name: "当前良率",
       radius: ["70%", "85%"],
-      center: ["45%", "52%"],
+      center: ["50%", "52%"],
       emptyCircleStyle: {
         color: "#003982",
       },
@@ -48,7 +54,7 @@ export default ({
     {
       type: "pie",
       radius: ["70%", "85%"],
-      center: ["45%", "52%"],
+      center: ["50%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -61,7 +67,15 @@ export default ({
           value: currentSum,
           name: currentName,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+            backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter:`
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+              </div>
+              `
           },
           selected: false,
           itemStyle: {
@@ -86,7 +100,15 @@ export default ({
           value:(targetSum - currentSum) === 0 ? 1 : (targetSum - currentSum),
           name: currentName,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+           backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter:`
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+              </div>
+              `
           },
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -97,7 +119,7 @@ export default ({
     {
       type: "pie",
       radius: ["55%", "70%"],
-      center: ["45%", "52%"],
+      center: ["50%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -109,6 +131,17 @@ export default ({
         {
           value: previousSum,
           name: preName,
+           tooltip: {
+           backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
+          },
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -129,10 +162,19 @@ export default ({
           },
         },
         {
-          value:previousSum == 0
+          value:previousSum === 0 ? 1 : 0,
-              ? 1
+          name: preName,
-              : 0,
+          tooltip: {
-          name: "-",
+             backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
+          },
           itemStyle: { color: "transparent" },
           label: { show: false },
         },

src/views/copilot/factoryData/components/BarChartBase.vue

@@ -1,4 +1,5 @@
 <template>
+  <chart-container class="bar-chart-base">
     <div class="left-chart-base">
       <!-- <div class="legend">
       <span v-for="item in legend" :key="item.label" class="legend-item"
@@ -7,13 +8,17 @@
 
       <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
     </div>
+  </chart-container>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
+import ChartContainer from "../../components/ChartContainer.vue";
+
 // import CopilotButton from "./chartButton"
 export default {
   components: {
+    ChartContainer
     // CopilotButton,
   },
   name: "Energy",
@@ -50,13 +55,40 @@ export default {
       options: {
         color: ["#FFD160", "#2760FF", "#12FFF5"],
         grid: {
-          left: "7%",
+          left: "9%",
-          right: "7%",
+          right: "3%",
           bottom: "15%",
           top: "15%",
         },
         tooltip: {
           trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            var res = ``;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                `<span style='display:inline-block;margin-right:4px;width:12px;height:12px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${params[0].axisValueLabel}</span>` +
+                `<span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value  : 0}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+            // return res;
+          },
         },
         xAxis: {
           axisTick: {
@@ -68,26 +100,40 @@ export default {
             },
           },
           axisLabel: {
+            interval: 0,//设置横坐标为斜
             rotate:45,
-            color: "rgba(255, 255, 255, 0.7)",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
+            // formatter: function (value) {
+            //   console.log(value);
+
+            //   return value;
+            // },
           },
           data: [],
         },
+        // dataZoom: [
+        //   {
+        //     // show: true,
+        //     start: 0,
+        //     end: 50
+        //   }
+        //   ],
         yAxis: {
             type: "value",
             name: "单位/片",
+            position: 'left',
             nameTextStyle: {
-              color: "rgba(255, 255, 255, 0.7)",
+              color: "rgba(223,241,254,.8)",
-              fontSize: 12,
+              fontSize: 16,
               align: "right",
             },
             axisTick: {
               show: false,
             },
             axisLabel: {
-              color: "rgba(255, 255, 255, 0.7)",
+              color: "rgba(223,241,254,.8)",
-              fontSize: 12,
+              fontSize:16,
             },
             axisLine: {
               show: true,
@@ -155,7 +201,7 @@ export default {
             //     { offset: 1, color: "#12FFF5" + "00" },
             //   ]),
             // },
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -199,11 +245,11 @@ export default {
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     // isFullscreen(val) {
     //   this.actualOptions.series.map((item) => {
-    //     item.barWidth = val ? 18 : 12;
+    //     item.barWidth = val ? 18 : 16;
     //   });
-    //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-    //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-    //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
     //   this.initOptions(this.actualOptions);
     // },
     // series(val) {
@@ -221,9 +267,9 @@ export default {
     //   this.actualOptions = actualOptions;
     //   this.initOptions(actualOptions);
     // },
-    energyCockpits() {
+    // energyCockpits() {
-      this.initChart();
+    //   this.initChart();
-    },
+    // },
     isOpen(val) {
       this.canvasReset();
     },
@@ -258,6 +304,9 @@ export default {
         if (this.energyCockpits) {
           this.energyCockpits.forEach(ele => {
             this.data.push(ele.targetProduction)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -268,6 +317,9 @@ export default {
         if (this.energyCockpits) {
           this.energyCockpits.forEach(ele => {
             this.data.push(ele.plannedInvestment)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -277,6 +329,9 @@ export default {
         if (this.energyCockpits) {
           this.energyCockpits.forEach(ele => {
             this.data.push(ele.actualInvestment)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -286,6 +341,9 @@ export default {
         if (this.energyCockpits) {
           this.energyCockpits.forEach(ele => {
             this.data.push(ele.actualProduction)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -295,6 +353,9 @@ export default {
         if (this.energyCockpits) {
           this.energyCockpits.forEach(ele => {
             this.data.push(ele.wasteNum)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -305,6 +366,9 @@ export default {
           this.energyCockpits.forEach(ele => {
             console.log(ele.reworkNum);
             this.data.push(ele.reworkNum)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
             this.orderXAxis.push(ele.workOrderNumber)
           });
         }
@@ -360,11 +424,11 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(document.getElementById("factoryEnergyChart"));
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      // const actualOptions = JSON.parse(JSON.stringify(this.options));
-      actualOptions.xAxis.data = this.orderXAxis;
+      this.options.xAxis.data = this.orderXAxis;
-      actualOptions.series[0].data = this.data;
+      this.options.series[0].data = this.data;
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.chart.setOption(actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };

src/views/copilot/factoryData/components/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-06-07 09:29:45
+ * @LastEditTime: 2024-07-18 16:48:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <chart-container class="bar-chart-base">
     <div class="legend">
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
     </div>
     <div ref="oeeChart" style="height:100%"></div>
   </chart-container>
@@ -56,13 +56,70 @@ export default {
       actualOptions: null,
       options: {
         grid: {
-          left: "5%",
+          left: "8%",
           right: "0%",
           bottom: "3%",
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        // tooltip: {
+        //   trigger: "axis",
+        //   axisPointer: {
+        //     // type: "cross",
+        //     crossStyle: {
+        //       color: "rgba(237,237,237,0.5)",
+        //     },
+        //   },
+        //   extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+        //   backgroundColor: '#001829',
+        //   borderColor: '#001829',
+        //   // textStyle: {
+        //   //   color:'rgba(255, 255, 255, 0.85)'
+        //   // },
+        //   formatter: params => {
+        //     console.log('params', params)
+        //     var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+        //     for (var i = 0, l = params.length; i < l; i++) {
+        //       res +=
+        //         "<br/>" +
+        //         `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
+        //         `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].seriesName}</span>` +
+        //         `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value}</span>`;
+        //     }
+        //     return res;
+        //   },
+        // },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            var res = `<span style='display:inline-block;color:rgba(255,255,255,0.85);margin-bottom:8px;font-size:16px;letter-spacing: 2px;'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:12px;height:12px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>` +
+                `<span style='display:inline-block;width:60px;color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;text-align:right'>${params[i].value ? params[i].value : 0}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+            // return res;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -73,24 +130,25 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/片",
+          position: 'left',
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
             align: "right",
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -108,7 +166,7 @@ export default {
           {
             name: "FTO", // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -143,7 +201,7 @@ export default {
           {
             name: "", // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -175,7 +233,7 @@ export default {
           {
             name: "", // "2024年目标值",
             type: "line",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color:'#f3c000'
@@ -201,12 +259,12 @@ export default {
     },
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
+      this.options.series.map((item) => {
-        item.barWidth = val ? 18 : 12;
+        item.barWidth = val ? 18 : 16;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       // if (val === false && this.isOpen === true) {
       //   console.log(val)
       //   this.width = 97 + '%'
@@ -216,12 +274,12 @@ export default {
       //   this.canvasReset()
       // }
       // this.actualOptions.series.map((item) => {
-      //   item.barWidth = val ? 18 : 12;
+      //   item.barWidth = val ? 18 : 16;
       // });
-      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
-      this.initChart(this.actualOptions)
+      this.initChart(this.options)
       this.canvasReset()
     },
     series(val) {
@@ -231,16 +289,17 @@ export default {
       }
       // console.log('val', val)
       const actualOptions = JSON.parse(JSON.stringify(this.options))
+      console.log(actualOptions);
       // actualOptions.xAxis.data = val
       console.log(actualOptions)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data;
+      this.options.series[1].data = val?.[1]?.data;
-      actualOptions.series[1].name = val?.[1]?.name;
+      this.options.series[1].name = val?.[1]?.name;
-      actualOptions.series[2].data = val?.[2]?.data || [];
+      this.options.series[2].data = val?.[2]?.data || [];
-      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.options.series[2].name = val?.[2]?.name || "";
       this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -277,27 +336,28 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };
 </script>
 
 <style scoped lang="scss">
+
 .bar-chart-base {
   // position: relative;
 
   .legend {
     position: absolute;
-    top: 5.2vh;
+    top: 3vh;
-    right: 1vw;
+    right: 13vw;
   }
 
   .legend-item {
     position: relative;
-    // font-size: 12px;
+    font-size: 1.2vw;
     margin-right:1.2vw;
-
+    color: #DFF1FE;
     &::before {
       content: "";
       display: inline-block;
@@ -346,5 +406,9 @@ export default {
    // left: -16px;
    transform: translateY(-50%) translateX(50%);
  }
+}
+ .echarts-tooltip-dark {
+   background: #001829;
+
  }
 </style>

src/views/copilot/factoryData/components/ChipOee.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-29 14:48:06
- * @LastEditTime: 2024-06-07 14:11:01
+ * @LastEditTime: 2024-06-18 14:49:25
  * @LastEditors: zhp
  * @Description:
 -->
@@ -54,8 +54,20 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
+      //今天的时间
+      // var day2 = new Date();
+      // day2.setTime(day2.getTime());
+      // var s2 = (day2.getMonth() + 1) + "月" + day2.getDate() + '日';
+      // const today = new Date().getDate();
+      // let yesterday = new Date().getDate() -1;
+      // const month = new Date().getMonth() + 1;
+      // const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+      // const year = new Date().getFullYear();
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -67,13 +79,16 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === 1 && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${year - 1}年${yesterday}累计` },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日累计`, },
+
+          // { label: `${month}月${today}日目标`, },
         ];
       } else if (this.period === 1 && this.than === '环比') {
         items = [
-          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${dayBeYes}日累计` },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日累计` },
+          // { label: `${month}月${today}日目标`, },
         ];
       } else if (this.period === 2 && this.than === '同比') {
         items = [
@@ -158,8 +173,11 @@ function getTemplate(period, dataList, than) {
   // console.log('dataList',dataList);
   let items = [];
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -172,11 +190,11 @@ function getTemplate(period, dataList, than) {
   if (period === 1 && than === '同比') {
     items = [
       {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
@@ -184,11 +202,11 @@ function getTemplate(period, dataList, than) {
   } else if (period ===1 && than === '环比') {
     items = [
       {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },

src/views/copilot/factoryData/components/ContainerIcon.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-09 16:49:22
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
     filename: ContainerIcon.vue
     author: liubin
@@ -49,8 +56,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/copilot/factoryData/components/Order.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="order-container">
     <div class="table">
-      <dv-scroll-board v-if="showTable" :config="config" style="width: 100%; height: 100%" ref="orderScrollBoard" />
+      <dv-scroll-board v-if="showTable" :config="config"
+        style="width: 100%; height: 100%; color: rgba(255, 255, 255,1);font-size:16," ref="orderScrollBoard" />
     </div>
     <div class="chart">
       <div class="chart-title">
         <span class="title">工单情况</span>
         <span class="line"></span>
       </div>
-      <div class="button-type" style="margin-left: auto;position: absolute;right: 1%;top: 57%;z-index: 999;">
+      <div class="button-type" style="margin-left: auto;position: absolute;right: 3%;top: 57%;z-index: 999;">
         <CopilotButton v-for="i in ['目标产量', '计划投入', '实际投入', '实际产出', '废品数量', '待再加工']" :key="i" :label="i"
           :active="i === type" @click="() => $emit('update:type', i)" />
       </div>
-      <barChartBase :type="type" :energyCockpits="prodOrder" ref="barChart"
+      <barChartBase :type="type" :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1"></barChartBase>
-        style="height: 0;flex:1"></barChartBase>
     </div>
   </div>
 
@@ -40,9 +40,10 @@ export default {
         evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
         data: [],
         rowNum: 12,
+        fontSize:16,
         waitTime: 3000,
-        columnWidth: [100],
+        columnWidth: [150],
-        align: ["center"],
+        align: ["left"],
         carousel: "page",
       },
     };
@@ -99,53 +100,39 @@ export default {
           let arr = [];
           // arr.push(i + 1);
           arr.push(
-            `<span title=${this.prodOrder[i].workOrderNumber || ""}>${
+            `<span title=${this.prodOrder[i].workOrderNumber || ""} style='color: rgba(223,241,254,.8);font-size:16px' >${
             this.prodOrder[i].workOrderNumber || ""
-            }</span>`
+            }</span>`,
-          );
+              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].orderStatus || ""}>${this.prodOrder[i].orderStatus === 1 ? '未开始' : this.prodOrder[i].orderStatus === 2 ? '进行中' : '已完成' || ""
-          arr.push(
+              }</span>`,
-            `<span title=${this.prodOrder[i].inStatus || ""}>${
+              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].plannedInvestment || ""}>${this.prodOrder[i].plannedInvestment || ""
-            this.prodOrder[i].inStatus || ""
+              }</span>`,
-            }</span>`
+              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].actualInvestment || ""}>${this.prodOrder[i].actualInvestment || ""
-          );
+              }</span>`,
-          arr.push(
+              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].targetProduction || ""}>${this.prodOrder[i].targetProduction || ""
-            `<span title=${this.prodOrder[i].plannedInvestment || ""}>${
+              }</span>`,
-            this.prodOrder[i].plannedInvestment || ""
+              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
-            }</span>`
+              }</span>`,
-          );
+              `<span style="display:inline-block;width:45px;color: rgba(223,241,254,.8)">${this.prodOrder[i].productionProgress
-          arr.push(
+                ? this.prodOrder[i].productionProgress.toFixed(2) * 100 + "%"
-            `<span title=${this.prodOrder[i].actualInvestment || ""}>${this.prodOrder[i].actualInvestment || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].targetProduction || ""}>${this.prodOrder[i].targetProduction || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
-            }</span>`
-          );
-          arr.push(`<span style="display:inline-block;width:45px;">${
-            this.prodOrder[i].productionProgress
-            ? this.prodOrder[i].productionProgress.toFixed(0) + "%"
                 : "0%"
               }</span>
             <div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;">
             <svg xmlns="http://www.w3.org/200/svg" height="20" width="20">
               <circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/>
-              <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${
+              <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${this.prodOrder[i].productionProgress
-            this.prodOrder[i].productionProgress
+                ? this.prodOrder[i].productionProgress.toFixed(2) *100 *
-            ? this.prodOrder[i].productionProgress.toFixed(0) *
                 37.68 *
                 0.01 +
                 "," +
                 (1 -
-              this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
+                  this.prodOrder[i].productionProgress.toFixed(2) * 0.01) * 100 *
                 37.68
                 : 0 + "," + 37.68
               }"/>
             </svg>
-          </div>`);
+          </div>`
+          )
           outArr.push(arr);
         }
         this.config.data = outArr;
@@ -202,7 +189,7 @@ export default {
               height: 1px; // display: inline-block;
               border: 1px solid;
               // display: inline-block;
-              border-image: linear-gradient(90deg, rgba(25, 146, 255, 0) 10%, rgba(95, 190, 249, 1), rgba(0, 120, 228, 0) 90%, ) 2 2;
+              border-image: linear-gradient(90deg, rgba(25, 146, 255, 0) 0%, rgba(95, 190, 249, 1), rgba(0, 120, 228, 0) 90%, ) 2 2;
               backdrop-filter: blur(3px);
             }
           }

src/views/copilot/factoryData/components/ProdMonitor.vue

@@ -118,7 +118,11 @@
     <div class="chart">
       <div class="chart-title">
         <span class="title">生产情况</span>
-        <span class="line"></span>
+        <div class="button-than" style="position: absolute;right: 3%;">
+          <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
+            @click="() => $emit('update:than', i)" />
+        </div>
+        <!-- <span class="line"></span> -->
       </div>
       <barChartBase :companyId="companyId" :than="than" :period="period" :data="factoryData" ref="barChart"
         style="height: 0;flex:1">
@@ -129,10 +133,12 @@
 <script>
 import { number } from 'echarts';
 import barChartBase from './ChipOee'
+import CopilotButton from "./button.vue"
 export default {
   name: "ProdMonitor",
   components: {
     barChartBase,
+    CopilotButton
   },
   data() {
     return {
@@ -153,6 +159,9 @@ export default {
       type: Number,
       default:0
     },
+    than: {
+      type: String,
+    },
     than: {
       type: String,
       default: '同比',
@@ -181,10 +190,14 @@ export default {
   },
   mounted() {
     this.makeData();
+    this.$nextTick(() => {
+      let button = document.getElementsByClassName('button-than')
+      button[0].children[0].style.borderRadius = '4px 0 0 4px'
+      button[0].children[1].style.borderRadius = '0px 4px 4px 0'
+    })
   },
   methods: {
     makeData() {
-      console.log('msgObj', this.msgObj);
       this.msgObj.chip = {};
       this.msgObj.stand = {};
       this.msgObj.bipv = {};
@@ -233,19 +246,19 @@ export default {
           // width: 5vw;
           color: #FFFFFF;
           line-height: 24px;
-          text-align: left;
+          // text-align: left;
           font-style: normal;
           display: inline-block;
       }
-      .line{
+      // .line{
-        flex: 1;
+      //   flex: 1;
-        // width: 80%;
+      //   // width: 80%;
-        height: 1px;        // display: inline-block;
+      //   height: 1px;        // display: inline-block;
-        border: 1px solid;
+      //   border: 1px solid;
-        // display: inline-block;
+      //   // display: inline-block;
-        border-image: linear-gradient(90deg, rgba(25, 146, 255, 0) 10%, rgba(95, 190, 249, 1), rgba(0, 120, 228, 0) 90%,) 2 2;
+      //   border-image: linear-gradient(90deg, rgba(25, 146, 255, 0) 10%, rgba(95, 190, 249, 1), rgba(0, 120, 228, 0) 90%,) 2 2;
-        backdrop-filter: blur(3px);
+      //   backdrop-filter: blur(3px);
-      }
+      // }
     }
   }
   .data{

src/views/copilot/factoryData/components/button.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-06 14:22:56
- * @LastEditTime: 2024-06-07 10:53:39
+ * @LastEditTime: 2024-07-02 13:54:08
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,7 +62,7 @@ button {
   font-size: 16px;
   color: #FFFFFF;
   line-height: 22px;
-  letter-spacing: 5px;
+  /* letter-spacing: 5px; */
   text-align: center;
   font-style: normal;
   letter-spacing: 10px;

src/views/copilot/factoryData/components/chartButton.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-07 08:37:17
- * @LastEditTime: 2024-06-07 11:04:41
+ * @LastEditTime: 2024-07-18 16:16:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -59,7 +59,7 @@ button {
   font-size: 18px; */
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
-  font-size: 12px;
+  font-size: 14px;
   color: #FFFFFF;
   line-height: 22px;
   letter-spacing: 5px;
@@ -91,7 +91,7 @@ button {
   font-size: 18px; */
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
-  font-size: 12px;
+  font-size: 14px;
   color: #FFFFFF;
   line-height: 22px;
   letter-spacing: 5px;

src/views/copilot/factoryData/components/leftContainer.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:36:07
- * @LastEditTime: 2024-06-05 09:38:23
+ * @LastEditTime: 2024-07-19 16:16:02
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,9 +15,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
+    <button v-if="false" style="
-      v-if="false"
-      style="
         appearance: none;
         outline: none;
         border: none;
@@ -27,22 +25,11 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
+      " @click="$emit('refresh')">
-      @click="$emit('refresh')"
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-    >
+        style="width: 24px; height: 24px">
-      <svg
+        <path stroke-linecap="round" stroke-linejoin="round"
-        xmlns="http://www.w3.org/2000/svg"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
       </svg>
     </button>
     <!-- decoration  -->
@@ -51,19 +38,13 @@
     <div class="corner bl"></div>
     <div class="corner br"></div>
     <!-- content  -->
-    <div
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      class="container-head"
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
+    <div class="container-body" :class="[
-      class="container-body"
-      :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
+      ]">
-    >
       <slot />
     </div>
   </div>
@@ -99,6 +80,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -106,21 +89,23 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 2%, rgba(5, 138, 237, .7) 20%, rgba(2, 82, 215, 0.24) 70%, ) 71 71;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 96%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
-    left: 0;
+    right: 0;
     background: radial-gradient(
       circle at center,
       #024798 2%,
-      #024798 30%,
+      #024798 100%,
       transparent
     );
     z-index: 1;
@@ -130,12 +115,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 80%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    right: 4%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to right, transparent 10%, #024798 95%, transparent 98%);
     z-index: 0;
   }
 
@@ -148,7 +133,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -168,8 +153,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/factoryData/components/rightContainer.vue

@@ -33,12 +33,8 @@
     <!-- content  -->
     <div class="container-head" ref="container-head"
       :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      <Icon :icon="icon"></Icon>
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
-      <div class="button-than" style="margin-left: auto;">
-        <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
-          @click="() => $emit('update:than', i)" />
-      </div>
     </div>
     <div class="container-body" :class="[
       side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
@@ -50,12 +46,10 @@
 
 <script>
 import ContainerIconVue from "./ContainerIcon.vue"
-import CopilotButton from "./button.vue"
 export default {
   name: "DashboardContainer",
   components: {
     Icon: ContainerIconVue,
-    CopilotButton
   },
   props: {
     side: {
@@ -66,9 +60,6 @@ export default {
       type: String,
       default: "cube",
     },
-    than: {
-      type: String,
-    },
     title: {
       type: String,
       default: "Default Title",
@@ -80,43 +71,38 @@ export default {
   },
   computed: {},
   mounted() {
-    this.$nextTick(() => {
+
-      let button = document.getElementsByClassName('button-than')
-      console.log(button);
-      button[0].children[0].style.borderRadius = '4px 0 0 4px'
-      button[0].children[1].style.borderRadius = '0px 4px 4px 0'
-      console.log(button[0].children[0].style);
-    })
   },
   methods: {},
 };
 </script>
 
 <style scoped lang="scss">
+
+
 .copilot-container {
-  height: 0;
+  height: 100%;
   flex: 1;
   display: flex;
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 0%,rgba(5, 138, 237, .7) 40%, rgba(2, 82, 215, 0.24) 70%,) 71 71;
   backdrop-filter: blur(4px);
-
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 96%;
       width: 0.11415vw;
       border-radius: 2px;
       top: 0%;
       left: 0;
-    background: radial-gradient(
+      background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -124,12 +110,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 80%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 3%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, transparent 10%, #024798 95%, transparent 98%);
     z-index: 0;
   }
 
@@ -142,7 +128,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -162,8 +148,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/copilot/factoryData/hdIndex.vue

@@ -4,9 +4,9 @@
       @update:than="updateThan" @update:period="updatePeriod" />
     <div class="factory-section">
       <section class="top flex">
-        <db-container title="生产监控" icon="prod" @update:than="updateThan" :than="than">
+        <db-container title="生产监控" icon="prod">
-          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+          <prod-monitor @update:than="updateThan" :companyId="companyId" :factoryData="factoryData" :than="than"
-            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+            :period="period" :data="data" :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
         </db-container>
         <left-container title="工单监控" icon="order">
           <order @update:type="updateType" :type="type" :prodOrder="prodOrder" />
@@ -88,7 +88,7 @@ export default {
     updateThan(val) {
       console.log(val);
       this.than = val;
-      // this.getMes();
+      this.getMes()
     },
     updatePeriod(val) {
       this.period = val;
@@ -134,11 +134,11 @@ export default {
         if (preData && preData[0] != null) {
           for (const factory of preData) {
             if (factory.previousGlassType === 0) {
-              preDataDetail[1] = factory.previousYearOutputNumber
+              preDataDetail[1] = factory.previousOutputNumber
             } else if (factory.previousGlassType === 1) {
-              preDataDetail[2] = factory.previousYearOutputNumber
+              preDataDetail[2] = factory.previousOutputNumber
-            } else if (factory.previousYearOutputNumber === 2) {
+            } else if (factory.previousGlassType === 2) {
-              currentDataDetail[3] = factory.outputNumber
+              preDataDetail[3] = factory.previousOutputNumber
             }
           }
         }

src/views/copilot/factoryData/index.vue

@@ -4,9 +4,9 @@
       @update:period="updatePeriod" />
     <div class="factory-section">
       <section class="top flex">
-        <db-container title="生产监控" icon="prod" @update:than="updateThan" :than="than">
+        <db-container title="生产监控" icon="prod">
-          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+          <prod-monitor @update:than="updateThan" :than="than" :companyId="companyId" :factoryData="factoryData"
-            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+             :period="period" :data="data" :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
         </db-container>
         <left-container title="工单监控" icon="order">
           <order @update:type="updateType" :type="type" :prodOrder="prodOrder" />
@@ -89,7 +89,7 @@ export default {
     updateThan(val) {
       console.log(val);
       this.than = val;
-      // this.getMes();
+      this.getMes()
     },
     updatePeriod(val) {
       this.period = val;
@@ -132,16 +132,17 @@ export default {
             // }
           }
         }
-        if (preData && preData[0] != null) {
+        if (preData) {
           for (const factory of preData) {
             if (factory.previousGlassType === 0) {
-              preDataDetail[1] = factory.previousYearOutputNumber
+              console.log('factory', factory)
+              preDataDetail[1] = factory.previousOutputNumber
             } else if (factory.previousGlassType === 1) {
-              preDataDetail[2] = factory.previousYearOutputNumber
+              preDataDetail[2] = factory.previousOutputNumber
             }
           }
         }
-        if (targetListResponse && targetListResponse[0] != null) {
+        if (targetListResponse) {
           for (const factory of targetListResponse) {
             targetDataDetail[0] = factory.ftoInput
             // if (factory.previousGlassType === 0) {
@@ -153,7 +154,7 @@ export default {
           }
         }
         // console.log('ftoInvest',ftoInvest)
-        if (factoryListResponse && factoryListResponse[0] != null) {
+        if (factoryListResponse) {
           for (const factory of factoryListResponse) {
             // targetDataDetail[0] = factory.ftoInput
             if (factory.glassType === 0) {
@@ -163,6 +164,7 @@ export default {
             }
           }
         }
+        console.log('  this.factoryData.preDataDetail', preDataDetail);
         this.factoryData.preDataDetail = preDataDetail
         this.factoryData.currentDataDetail = currentDataDetail
         this.factoryData.targetDataDetail = targetDataDetail

src/views/copilot/yield/components/ChipInvest.vue

@@ -45,8 +45,11 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -58,13 +61,13 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${dayBeYes}日`, color: "#12f7f1" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
@@ -149,8 +152,11 @@ export default {
 function getTemplate(period, dataList,than) {
   let items = [];
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -163,11 +169,11 @@ function getTemplate(period, dataList,than) {
   if (period === '日' && than === '同比') {
     items = [
       {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
@@ -175,11 +181,11 @@ function getTemplate(period, dataList,than) {
   } else if (period === '日' && than === '环比') {
     items = [
       {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },

src/views/copilot/yield/components/FtoInvest.vue

@@ -45,8 +45,11 @@ export default {
     legend() {
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -58,13 +61,13 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${dayBeYes}日`, color: "#12f7f1" },
-          { label: `${month}月${today}日`, color: "#58adfa" },
+          { label: `${yesterday}日`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
@@ -150,9 +153,15 @@ export default {
 
 function getTemplate(period, dataList,than) {
   let items = [];
+  // var day1 = new Date();
+  // day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  // var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -165,11 +174,11 @@ function getTemplate(period, dataList,than) {
   if (period === '日' && than === '同比') {
     items = [
       {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
@@ -177,11 +186,11 @@ function getTemplate(period, dataList,than) {
   } else if (period === '日' && than === '环比') {
     items = [
       {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
         data: dataList ? dataList[0] : [],
       },
       {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },

src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-20 13:32:59
- * @LastEditTime: 2024-06-06 08:42:04
+ * @LastEditTime: 2024-07-19 16:05:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -78,13 +78,13 @@ export default {
     valueTuple() {
       // [previousValue, currentValue, sumValue?]
       const getter = this.$store.getters.copilot.yield[this.dataSourceField];
-      if (this.period === "日" || this.period === "周") {
+      // if (this.period === "日" || this.period === "周") {
-        console.log(this.period)
+      //   console.log(this.period)
-        return [
+      //   return [
-          getter.previous[this.factoryId],
+      //     getter.previous[this.factoryId],
-          getter.current[this.factoryId],
+      //     getter.current[this.factoryId],
-        ];
+      //   ];
-      }
+      // }
       // [100, 200, 200]
       return [
         getter.previous[this.factoryId],
@@ -100,8 +100,11 @@ export default {
       const vt = this.valueTuple;
       let items = [];
       var day1 = new Date();
-      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var day2 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
       var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
       //今天的时间
       // var day2 = new Date();
       // day2.setTime(day2.getTime());
@@ -113,15 +116,15 @@ export default {
       // const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${month}月${today}日累计`,},
+          { label: `${yesterday}日累计`,},
-          { label: `${year-1}年${month}月${today}日累计` },
+          { label: `${year - 1}年${yesterday}累计` },
-          { label: `${month}月${today}日目标`, },
+          { label: `${yesterday}日目标`, },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${month}月${today}日累计`},
           { label: `${yesterday}日累计`},
-          { label: `${month}月${today}日目标`, },
+          { label: `${dayBeYes}日累计` },
+          { label: `${yesterday}日目标`, },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
@@ -160,12 +163,17 @@ export default {
           : (vt[1] != 0 && vt[1] != null) && vt[2] == 0
             ? "100%" : '0%',
         subtitle =
-          this.period == "日" ? `${month}月${today}日累计完成值` : this.period == "周" ? `本周累计完成值` : this.period == "月" ? `${month}月累计完成值` : `${year}年累计完成值`;
+          this.period == "日" ? `${yesterday}日累计完成值` : this.period == "周" ? `本周累计完成值` : this.period == "月" ? `${month}月累计完成值` : `${year}年累计完成值`;
-      console.log(this.valueTuple[0], this.valueTuple[1], this.valueTuple[2],)
+      console.log('titleValue', items)
-      console.log(this.valueTuple[2]- this.valueTuple[1])
+      let titleSize = fontSize(0.35)
+      let subtitleSize = fontSize(0.14)
+
+      // console.log(this.valueTuple[2]- this.valueTuple[1])
       return getOptions({
         titleValue,
         subtitle,
+        titleSize,
+        subtitleSize,
         currentName: items[0].label,
         preName: items[1].label,
         previousSum: this.valueTuple[0],
@@ -216,13 +224,22 @@ export default {
     // },
   },
 };
-
+function fontSize(res){
+  let clientWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+  if (!clientWidth) return;
+  let fontSize = 100 * (clientWidth / 1920);
+  return res * fontSize;
+}
 function calculateItems(period, valueTuple, than) {
   console.log('valueTuple', valueTuple);
   let items = [];
   var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
   var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
+
   //今天的时间
   // var day2 = new Date();
   // day2.setTime(day2.getTime());
@@ -234,15 +251,15 @@ function calculateItems(period, valueTuple, than) {
   const year = new Date().getFullYear();
   if (period === '日' && than === '同比') {
     items = [
-      { label: `${year-1}年${month}月${today}日累计`, value: valueTuple[0] },
+      { label: `${year - 1}年${yesterday}累计`, value: valueTuple[0] },
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
+      { label: `${yesterday}累计`, value: valueTuple[1] },
-      { label: `${month}月${today}日目标`, value: valueTuple[2] },
+      { label: `${yesterday}日目标`, value: valueTuple[2] },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
-      { label: `${yesterday}日累计`, value: valueTuple[0] },
+      { label: `${dayBeYes}日累计`, value: valueTuple[0] },
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
+      { label: `${yesterday}日累计`, value: valueTuple[1] },
-      { label: `${month}月${today}日目标`, value: valueTuple[2] },
+      { label: `${yesterday}日目标`, value: valueTuple[2] },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
@@ -289,8 +306,9 @@ function calculateItems(period, valueTuple, than) {
 </script>
 
 <style scoped>
+
 .double-ring-chart {
-  height: 100%;
+  height: 98%;
   display: flex;
   flex-direction: column;
 }
@@ -305,7 +323,7 @@ function calculateItems(period, valueTuple, than) {
 }
 
 .double-ring-chart__legend {
-  padding: 12px;
+  /* padding: 12px; */
   color: #fff;
   display: flex;
   justify-content: center;
@@ -314,6 +332,7 @@ function calculateItems(period, valueTuple, than) {
 
 .legend-item {
   display: flex;
+  /* font-size:16px; */
   flex-direction: column;
   align-items: flex-start;
 }

src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 16:00:50
- * @LastEditTime: 2024-06-03 16:26:03
+ * @LastEditTime: 2024-07-09 09:09:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -42,10 +42,11 @@ export default {
     return {
       factoryId: 4, // 默认成都
       cityOptions: [
+        "瑞昌",
         // "成都",
         "邯郸",
         // "株洲",
-        "瑞昌",
+
         // "佳木斯",
         // "凯盛光伏",
         // "蚌埠兴科",
@@ -63,7 +64,7 @@ export default {
 <style scoped lang="scss">
 .double-ring-wrapper {
   height: 100%;
-  padding: 12px 24px;
+  padding: 0px 24px;
   display: flex;
   gap: 12px;
   flex-direction: column;

src/views/copilot/yield/components/sub/ring/noDoubleRingWrapper.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-24 15:15:00
- * @LastEditTime: 2024-05-31 16:16:16
+ * @LastEditTime: 2024-07-09 09:27:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -74,7 +74,7 @@ export default {
 <style scoped lang="scss">
 .double-ring-wrapper {
   height: 100%;
-  padding: 12px 24px;
+  padding: 0px 24px;
   display: flex;
   gap: 12px;
   flex-direction: column;

src/views/copilot/yield/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-10 11:10:54
- * @LastEditTime: 2024-06-05 09:49:46
+ * @LastEditTime: 2024-07-09 15:09:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -20,12 +20,12 @@
       </left-container>
     </section>
     <section class="bottom flex">
-      <right-container class="fto-involve" title="FTO投入">
+      <bottom-right-container class="fto-involve" title="FTO投入">
         <fto-invest :period="period" :than="than" />
-      </right-container>
+      </bottom-right-container>
-      <left-container class="chip-involve" title="芯片投入" icon="chip">
+      <bottom-left-container class="chip-involve" title="芯片投入" icon="chip">
         <chip-invest :period="period" :than="than" />
-      </left-container>
+        </bottom-left-container>
     </section>
   </div>
 </template>
@@ -34,7 +34,8 @@
 import twoContainer from "@/views/copilot/components/twoContainer.vue";
 import leftContainer from "@/views/copilot/components/leftContainer.vue";
 import rightContainer from "@/views/copilot/components/rightContainer.vue";
-
+import bottomRightContainer from "@/views/copilot/components/bottomRightContainer.vue";
+import bottomLeftContainer from "@/views/copilot/components/bottomLeftContainer.vue";
 import StdOutput from "./components/StdOutput.vue";
 import ChipOutput from "./components/ChipOutput.vue";
 import FtoInvest from "./components/FtoInvest.vue";
@@ -45,6 +46,8 @@ export default {
   name: "YieldCopilot",
   components: {
     DbContainer: twoContainer,
+    bottomRightContainer,
+    bottomLeftContainer,
     leftContainer,
     rightContainer,
     StdOutput,

src/views/copilot/yield/options/double-ring-chart-options.js

@@ -3,6 +3,8 @@ export default ({
   subtitle,
   previousSum,
   currentSum,
+  subtitleSize,
+  titleSize,
   targetSum,
   currentName,
   preName,
@@ -14,22 +16,29 @@ export default ({
     top: 0,
     containLabel: true,
   },
-  tooltip: {},
+  tooltip: {
+    trigger: "item",
+    // extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+    // backgroundColor: '#001829',
+    // borderColor: '#001829',
+  },
   title: {
     text: titleValue,
-    left: "44%",
+    left: "48.5%",
-    top: "37%",
+    top: "middle",
+    itemGap: 12,
+    textVerticalAlign:'auto',
     textAlign: "center",
     textStyle: {
-      fontWeight: 600,
+      fontWeight: 400,
-      fontSize: 20,
+      fontSize: titleSize,
-      color: "#fffd",
+      color: "rgba(223,241,254,.8)",
     },
     subtext: `\u2002${subtitle}\u2002`,
     subtextStyle: {
-      fontSize: 14,
+      fontSize: subtitleSize,
       fontWeight: 100,
-      color: "#fffd",
+      color: "rgba(255,255,255,.7)",
       align: "right",
     },
   },
@@ -38,8 +47,8 @@ export default ({
     {
       type: "pie",
       name: "当前目标",
-     radius: ["80%", "90%"],
+      radius: ["74%", "86%"],
-      center: ["45%", "52%"],
+      center: ["50%", "48%"],
       emptyCircleStyle: {
         color: "#042c5f33",
       },
@@ -47,8 +56,8 @@ export default ({
     // 数据 series
     {
       type: "pie",
-      radius: ["80%", "90%"],
+      radius: ["74%", "86%"],
-      center: ["45%", "52%"],
+      center: ["50%", "48%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -62,7 +71,15 @@ export default ({
           name: currentName,
           selected: false,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter:`
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+              </div>
+              `
           },
           itemStyle: {
             borderJoin: "round",
@@ -86,7 +103,15 @@ export default ({
           value:(targetSum - currentSum) === 0 ? 1 : (targetSum - currentSum),
           name: currentName,
            tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+              backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+                </div>
+                `
           },
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -96,8 +121,8 @@ export default ({
     // 数据 series2 - 2023累计
     {
       type: "pie",
-      radius: ["70%", "80%"],
+      radius: ["61%", "74%"],
-      center: ["45%", "52%"],
+      center: ["50%", "48%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -111,7 +136,15 @@ export default ({
           name: preName,
           selected: false,
           tooltip: {
-            formatter: `${preName} : ${previousSum}`
+            backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
           },
           itemStyle: {
             borderJoin: "round",
@@ -136,7 +169,15 @@ export default ({
           value:previousSum === 0 ? 1 : 0,
           name: preName,
           tooltip: {
-            formatter: `${preName} : ${previousSum}`
+            backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                   <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
           },
           itemStyle: { color: "transparent" },
           label: { show: false },

src/views/dashboard/charts/ChipInvest.vue

@@ -1,8 +1,9 @@
 <!--
-    filename: chip-invest.vue
+ * @Author: zhp
-    author: liubin
+ * @Date: 2024-06-03 15:38:31
-    date: 2024-04-10 08:59:28
+ * @LastEditTime: 2024-06-21 15:06:39
-    description:
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -34,6 +35,7 @@ export default {
       xAxis: cities,
     };
   },
+
   computed: {
     series() {
       const chipInvest = this.$store.getters.home.chipInvest;

src/views/dashboard/charts/ChipYieldChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-06-05 14:12:31
+ * @LastEditTime: 2024-07-18 16:37:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -53,7 +53,17 @@ export default {
           top: 0,
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "item",
+          // axisPointer: {
+          //   // type: "cross",
+          //   crossStyle: {
+          //     color: "rgba(237,237,237,0.5)",
+          //   },
+          // },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+        },
         title: {
           text: "0%",
           left: "48%",
@@ -66,7 +76,7 @@ export default {
           },
           subtext: `\u2002${year}年累计产出\u2002`,
           subtextStyle: {
-            fontSize: 12,
+            fontSize: 15,
             fontWeight: 100,
             color: "#fffd",
             align: "right",
@@ -102,7 +112,6 @@ export default {
                 name: `${year}累计产出`,
                 selected: false,
                 tooltip: {
-                  formatter: null,
                 },
                 itemStyle: {
                   borderJoin: "round",
@@ -126,7 +135,6 @@ export default {
                 value: 0,
                 name: `${year}目标`,
                 tooltip: {
-                  formatter: null,
                 },
                 itemStyle: { color: "transparent" },
                 label: { show: false },
@@ -151,7 +159,17 @@ export default {
                 name: `${year - 1}累计产出`,
                 selected: false,
                 tooltip: {
-                  formatter: null,
+                  trigger: "item",
+                  // axisPointer: {
+                  //   // type: "cross",
+                  //   crossStyle: {
+                  //     color: "rgba(237,237,237,0.5)",
+                  //   },
+                  // },
+                  backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+                  extraCssText: 'padding:0;border-width:0',
+                  formatter: params => {
+                  },
                 },
                 itemStyle: {
                   borderJoin: "round",
@@ -175,7 +193,15 @@ export default {
                 value: 0,
                 name: `${year - 1}累计产出`,
                 tooltip: {
-                  formatter:null,
+                  trigger: "item",
+                  // axisPointer: {
+                  //   // type: "cross",
+                  //   crossStyle: {
+                  //     color: "rgba(237,237,237,0.5)",
+                  //   },
+                  // },
+                  backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+                  extraCssText: 'padding:0;border-width:0',
                 },
                 itemStyle: { color: "transparent" },
                 label: { show: false },
@@ -221,41 +247,82 @@ export default {
       };
     },
     actualOptions() {
+      console.log('this.output.current / this.output.target', this.output.current/this.output.target);
       const year = new Date().getFullYear()
-      const options = JSON.parse(JSON.stringify(this.options));
+      const options = this.options
       // console.log('options', options);
       // 标题
-      if (!this.output.target) options.title.text = "0%";
+      if (!this.output.target && !this.output.current) options.title.text = "0%";
-      else
+      else if (!this.output.target && this.output.current) options.title.text = "100%";
-        options.title.text =
+      else options.title.text =
-          (this.output.current / this.output.target) * 100 + "%";
+        ((this.output.current / this.output.target).toFixed(2)) * 100 + "%";
       // 外环
       if (
         this.output.current == this.output.target &&
         this.output.current == 0
       ) {
-        options.series[1].data[0].value = 0;
+        this.options.series[1].data[0].value = 0;
-        options.series[1].data[1].value = 1;
+        this.options.series[1].data[1].value = 1;
-        options.series[1].data[0].tooltip.formatter = year + '累计完成:0';
+        this.options.series[1].data[0].tooltip.formatter =
-        options.series[1].data[1].tooltip.formatter = year + '累计完成:0';
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year + '累计完成'}</span>
+             <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${0}</span>
+              </div>`;
+        this.options.series[1].data[1].tooltip.formatter =
+            `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year + '累计完成'}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${0 }</span>
+              </div>`;
       } else {
-        options.series[1].data[0].value = this.output.current;
+        this.options.series[1].data[0].value = this.output.current;
-        options.series[1].data[1].value =
+        this.options.series[1].data[1].value =
           this.output.target - this.output.current;
-        options.series[1].data[0].tooltip.formatter = year + '累计完成:' + this.output.current;
+        this.options.series[1].data[0].tooltip.formatter =
-        options.series[1].data[1].tooltip.formatter = year + '累计完成:' + this.output.current;
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+           <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year + '累计完成'}</span>
+           <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${this.output.current}</span>
+              </div>`;
+        this.options.series[1].data[1].tooltip.formatter =
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+            <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year + '累计完成'}</span>
+            <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${this.output.current}</span>
+              </div>`;
       }
       // 内环
       if (this.output.previous == 0) {
-        options.series[2].data[0].value = 0;
+        this.options.series[2].data[0].value = 0;
-        options.series[2].data[1].value = 1;
+        this.options.series[2].data[1].value = 1;
-        options.series[2].data[0].tooltip.formatter = year-1 + '累计完成:' + 0;
+        this.options.series[2].data[0].tooltip.formatter =
-        options.series[2].data[1].tooltip.formatter = year-1 + '累计完成:' + 0;
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+            <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year - 1 + '累计完成'}</span>
+            <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${0}</span>
+              </div>`;
+        this.options.series[2].data[1].tooltip.formatter =
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+         <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year - 1 + '累计完成'}</span>
+          <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${0}</span>
+              </div>`;
       } else {
-        options.series[2].data[0].value = this.output.previous;
+        this.options.series[2].data[0].value = this.output.previous;
-        options.series[2].data[1].value = 0;
+        this.options.series[2].data[1].value = 0;
-        options.series[2].data[0].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
+        this.options.series[2].data[0].tooltip.formatter =
-        options.series[2].data[1].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+      <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year - 1 + '累计完成'}</span>
+        <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${this.output.previous}</span>
+              </div>`;
+        this.options.series[2].data[1].tooltip.formatter =
+          `<div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+          <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;letter-spacing: 2px;'>${year - 1 + '累计完成'}</span> +
+              <span style='color:rgba(255,255,255,0.65);font-size:16px;letter-spacing: 2px;'>${this.output.previous}</span>
+              </div>`;
       }
       console.log('options', options);
       return options;
@@ -273,6 +340,9 @@ export default {
     factory(val) {
       this.initOptions(this.actualOptions);
     },
+    actualOptions() {
+      this.initOptions(this.actualOptions);
+    }
   },
   mounted() {
     console.log("mounted", this.actualOptions);

src/views/dashboard/charts/Fto.vue

@@ -1,16 +1,10 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-31 16:11:06
+ * @LastEditTime: 2024-06-27 16:30:58
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
-    filename: fto.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description:
--->
 
 <template>
   <left-chart-base

src/views/dashboard/charts/LeftChartBase.vue

@@ -8,19 +8,10 @@
 <template>
   <chart-container class="left-chart-base">
     <div class="legend">
-      <span
+      <span style="color: rgba(223,241,254,.8);" v-for="item in legend" :key="item.label" class="legend-item"
-        v-for="item in legend"
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
-        :key="item.label"
-        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
-        >{{ item.label }}</span
-      >
     </div>
-    <div
+    <div ref="chart" style="max-width: 22vw" :style="{ height: vHeight + 'vh' }"></div>
-      ref="chart"
-      style="max-width: 22vw"
-      :style="{ height: vHeight + 'vh' }"
-    ></div>
   </chart-container>
 </template>
 
@@ -59,14 +50,46 @@ export default {
       actualOptions: null,
       options: {
         grid: {
-          left: "3%",
+          left: "5%",
           right: "4%",
           bottom: "0",
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='display:inline-block;color:rgba(255,255,255,0.85);margin-bottom:8px;font-size:16px;letter-spacing: 2px;'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>` +
+                `<span style='width:60px;display:inline-block;color:rgba(255,255,255,0.65);font-size:16px;text-align: right;letter-spacing: 2px;'>${params[i].value ? params[i].value: 0}</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+            // return res;
+          },
+        },
         xAxis: {
+          type:'category',
           axisTick: {
             show: false,
           },
@@ -76,24 +99,27 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            textStyle: {
-            fontSize: 12,
+              color: "rgba(223,241,254,.8)",
+              fontSize: 16,
+            },
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/片",
+          // position:'left',
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
             align:'right'
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -111,14 +137,14 @@ export default {
           {
             name: '', // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             label: {
               show: true, //开启显示
               align: 'right', //在上方显示
               position: 'top', //在上方显示
               textStyle: { //数值样式
-                color: '#DFF1FE',
+                color: "rgba(223,241,254,.8)",
-                fontSize: 12
+                fontSize: 14
               }
             },
             itemStyle: {
@@ -155,14 +181,14 @@ export default {
           {
             name: '', // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             label: {
               show: true, //开启显示
               align: 'left', //在上方显示
               position: 'top', //在上方显示
               textStyle: { //数值样式
-                color: '#DFF1FE',
+                color: "rgba(223,241,254,.8)",
-                fontSize: 12
+                fontSize: 16
               }
             },
             itemStyle: {
@@ -201,9 +227,9 @@ export default {
       this.actualOptions.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 14;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 14;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 14;
       this.initOptions(this.actualOptions);
     },
     series(val) {
@@ -234,9 +260,25 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.left-chart-base {
+.echarts-tooltip{
-  // position: relative;
+  background: #001829;
+  // background-color: ;
+    box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);
+    opacity: 0.6;
+    border-radius: 4px;
+    .content {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        backdrop-filter: blur(6px);
+        // transition: .3s transform;
+      }
+}
 
+.left-chart-base {
   .legend {
     position: absolute;
     top: 5.2vh;

src/views/dashboard/charts/RightChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-06-04 15:35:54
+ * @LastEditTime: 2024-07-19 15:25:37
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,19 +15,10 @@
 <template>
   <chart-container class="right-chart-base">
     <div class="legend">
-      <span
+      <span style="color: rgba(223,241,254,.8);" v-for="item in legend" :key="item.label" class="legend-item"
-        v-for="item in legend"
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
-        :key="item.label"
-        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
-        >{{ item.label }}</span
-      >
     </div>
-    <div
+    <div ref="chart" style="max-width: 22vw" :style="{ height: vHeight + 'vh' }"></div>
-      ref="chart"
-      style="max-width: 22vw"
-      :style="{ height: vHeight + 'vh' }"
-    ></div>
   </chart-container>
 </template>
 
@@ -65,13 +56,50 @@ export default {
       isFullscreen: false,
       options: {
         grid: {
-          left: "3%",
+          left: "6%",
           right: "4%",
           bottom: "0",
           top: "18%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          confine:true,
+          backgroundColor: 'rgba(50,50,50,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='display:inline-block;color:rgba(255,255,255,0.85);margin-bottom:8px;font-size:16px;letter-spacing: 2px;'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+              `${params[i].seriesType === "line"
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:42.3%;left:4%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:38.82%;left:5%;'></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px;letter-spacing: 2px;'>${params[i].seriesName}</span>`
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
+                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>`
+              }` +
+                `<span style='width:180px;display:inline-block;color:rgba(255,255,255,0.65);font-size:16px;text-align: right;letter-spacing: 2px;'>${params[i].value ? params[i].value : 0 }</span>`;
+            }
+            const htmlContent = `
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                ${res}
+              </div>
+              `;
+
+            return htmlContent;
+          },
+
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -82,24 +110,25 @@ export default {
             },
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           data: this.xAxis,
         },
         yAxis: {
           name: "单位/片",
+          // position: 'left',
           nameTextStyle: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
             align: 'right'
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff",
+            color: "rgba(223,241,254,.8)",
-            fontSize: 12,
+            fontSize: 16,
           },
           axisLine: {
             show: true,
@@ -123,36 +152,36 @@ export default {
             itemStyle: {
               color: "#f3c000",
             },
-            areaStyle: {
+            // areaStyle: {
-              color: {
+            //   color: {
-                type: "linear",
+            //     type: "linear",
-                x: 0,
+            //     x: 0,
-                y: 0,
+            //     y: 0,
-                x2: 0,
+            //     x2: 0,
-                y2: 1,
+            //     y2: 1,
-                colorStops: [
+            //     colorStops: [
-                  {
+            //       {
-                    offset: 0,
+            //         offset: 0,
-                    color: "#f3c000", // 0% 处的颜色
+            //         color: "#f3c000", // 0% 处的颜色
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 0.55,
+            //         offset: 0.55,
-                    color: "#f3c00033",
+            //         color: "#f3c00033",
-                  },
+            //       },
-                  {
+            //       {
-                    offset: 1,
+            //         offset: 1,
-                    color: "transparent", // 100% 处的颜色
+            //         color: "transparent", // 100% 处的颜色
-                  },
+            //       },
-                ],
+            //     ],
-                global: false, // 缺省为 false
+            //     global: false, // 缺省为 false
-              },
+            //   },
-            },
+            // },
             data: [], // this.series[0].data,
           },
           {
             name: "", // "2023年",
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -187,7 +216,7 @@ export default {
           {
             name: "", // "2024年",
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";
@@ -227,9 +256,9 @@ export default {
       this.actualOptions.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 16;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 16;
       this.initOptions(this.actualOptions);
     },
     series(val) {
@@ -292,13 +321,13 @@ export default {
   .legend-item:nth-child(1):before {
     // width: 12px;
     // height: 2px;
-    width: 0.638vw;
+    width: 1vw;
     height: 0.1064vw;
     background-color: #f3c000;
     position: absolute;
     top: 50%;
     // left: -16px;
-    left: -0.851vw;
+    left: -1.2vw;
     transform: translateY(-50%);
   }
   .legend-item:nth-child(1):after {
@@ -308,11 +337,11 @@ export default {
     position: absolute;
     // width: 6px;
     // height: 6px;
-    width: 0.3191vw;
+    width: 0.4vw;
-    height: 0.3191vw;
+    height: 0.4vw;
     border-radius: 100%;
     top: 50%;
-    left: -0.851vw;
+    left: -1.1vw;
     // left: -16px;
     transform: translateY(-50%) translateX(50%);
   }

src/views/dashboard/components/CompanyInfo.vue

@@ -83,7 +83,7 @@ export default {
   // backdrop-filter: blur(2px);
   // border-radius: 4px;
   transform: translate(-50%, -100%);
-  box-shadow: inset 0 0 12px 2px #fff3;
+  // box-shadow: inset 0 0 12px 2px #fff3;
   background: url(../../../assets/images/homeindex/info.png) no-repeat 0 0 / 100% 100%;
     // background: radial-gradient(circle farthest-corner at bottom center,rgba(255,239,162,.7)  10%, #021842 30%);
   // 在这里设置一个总的字体大小 不失为一个好的选择
@@ -92,11 +92,12 @@ export default {
 }
 
 h2 {
-  padding: 0 1vw;
+  // padding: 0 1vw;
   margin: 6px 0;
   font-family: 优设标题黑;
   color: #fff;
-  letter-spacing:5px;
+  letter-spacing:4px;
+  text-align: left;
   // font-size: 24px;
   font-size: 1.276em;
 }
@@ -115,7 +116,7 @@ ul {
 }
 
 li {
-  font-size: 0.851em;
+  font-size: 0.77em;
 }
 
 .corner {

src/views/dashboard/components/Container.vue

@@ -38,7 +38,7 @@
       class="container-head"
       :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
     >
-      <Icon :icon="icon"></Icon>
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
     <div
@@ -82,6 +82,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .dashboard-container {
   height: 0;
   flex: 1;
@@ -90,29 +91,29 @@ export default {
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
 
-  // &::after {
+  &::after {
-  //   content: "";
+    content: "";
-  //   position: absolute;
+    position: absolute;
-  //   display: inline-block;
+    display: inline-block;
-  //   width: 60%;
+    width: 85%;
-  //   height: 0.31415vh;
+    height: 0.31415vh;
-  //   border-radius: 2px;
+    border-radius: 2px;
-  //   left: 8%;
+    left: 8%;
-  //   bottom: 0;
+    bottom: 0;
-  //   background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, #024798, transparent);
-  //   z-index: 0;
+    z-index: 0;
-  // }
+  }
 
   .container-head {
     // height: 40px;
-    height: 3.8vh;
+    height:4vh;
     padding: 8px;
     display: flex;
     align-items: center;
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;
@@ -132,8 +133,8 @@ export default {
     position: absolute;
     // width: 16px;
     // height: 16px;
-    width: 0.95vw;
+    width: 0.7vw;
-    height: 0.95vw;
+    height: 0.7vw;
   }
 
   .corner.tl {

src/views/dashboard/components/ContainerIcon.vue

@@ -51,8 +51,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/dashboard/components/Header.vue

@@ -153,7 +153,7 @@ h1 {
 
 .side {
   position: absolute;
-  font-size: 1.18vw;
+  font-size: 1vw;
   // line-height: 24px;
   line-height: 1.277vw;
   letter-spacing: 2px;

src/views/dashboard/components/leftContainer.vue

@@ -0,0 +1,204 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 13:51:30
+ * @LastEditTime: 2024-07-19 10:43:18
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <div class="dashboard-container">
+    <!-- refresh btn  -->
+    <button
+      v-if="0"
+      style="appearance: none; outline: none; border: none; background: none; color:#fff; cursor: pointer; position: absolute; top: 8px; right: 8px"
+      @click="$emit('refresh')"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+        style="width: 24px; height: 24px"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
+        />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div v-if="side == 'left'" class="corner bl"></div>
+    <div v-if="side == 'right'" class="corner br"></div>
+    <!-- content  -->
+    <div
+      class="container-head"
+      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
+    >
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div
+      class="container-body"
+      :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]"
+    >
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.dashboard-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 85%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 8%;
+    bottom: 0;
+    background: linear-gradient(to right, #024798, transparent);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height:4vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.7vw;
+    height: 0.7vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/index.vue

@@ -17,12 +17,12 @@
         <db-header class="db-header"></db-header>
         <div class="db-body">
           <div class="db-left">
-            <db-container icon="cube" title="FTO投入" @refresh="() => (ftoKey = Math.random())">
+            <left-container icon="cube" title="FTO投入" @refresh="() => (ftoKey = Math.random())">
               <fto-chart :key="ftoKey" />
-            </db-container>
+            </left-container>
-            <db-container icon="chip2" title="芯片投入" @refresh="() => (chipInvestKey = Math.random())">
+            <left-container icon="chip2" title="芯片投入" @refresh="() => (chipInvestKey = Math.random())">
               <chip-invest-chart :key="chipInvestKey" />
-            </db-container>
+            </left-container>
           </div>
           <div class="db-right">
             <db-container side="right" icon="chip" title="芯片产出" @refresh="() => (chipYieldKey = Math.random())">
@@ -53,6 +53,7 @@ import store from "@/store";
 import DashboardHeader from "./dashboard/components/Header.vue";
 import CompanyInfo from "./dashboard/components/CompanyInfo.vue";
 import Container from "./dashboard/components/Container.vue";
+import leftContainer from "./dashboard/components/leftContainer.vue";
 import FtoChart from "./dashboard/charts/Fto.vue";
 import ChipInvestChart from "./dashboard/charts/ChipInvest.vue";
 import BipvChart from "./dashboard/charts/Bipv.vue";
@@ -69,11 +70,11 @@ const LOCATIONS = [
   // 蚌埠2
   // { x: 61, y: 53, tx: 39, ty: 68, path: 'factoryData/ksIndex' },
   // 江西 瑞昌
-  { x: 60, y: 58, tx: 68, ty: 52,lx:61,ly:61.5,ltx:69.5,lty:52, path: 'factoryData/factory-data' },
+  { x: 60, y: 58, tx: 68, ty: 51,lx:61,ly:61.5,ltx:69.3,lty:51.4, path: 'factoryData/factory-data' },
   // 湖南 株洲
   // { x: 56, y: 60, tx: 60, ty: 95, path: 'factoryData/zzIndex' },
   // 邯郸
-  { x: 58, y: 45, tx: 47.4, ty: 34.3, lx: 58.7, ly: 34, ltx: 53.2, lty: 34, path: 'factoryData/hdIndex' },
+  { x: 58, y: 45, tx: 48.5, ty: 34.3, lx: 58.7, ly: 34, ltx: 53.2, lty: 34, path: 'factoryData/hdIndex' },
 ];
 // rcLine.style.left = `66.8%`;
 // rcLine.style.top = `52%`;
@@ -84,6 +85,7 @@ export default {
   name: "Index",
   components: {
     CompanyInfo,
+    leftContainer,
     ksCompanyInfo: CompanyInfo,
     hdCompanyInfo: CompanyInfo,
     bbCompanyInfo: CompanyInfo,
@@ -340,7 +342,7 @@ export default {
   .db-left,
   .db-right {
     // width: 420px;
-    width: 24vw;
+    width: 24.5vw;
     padding: 20px;
     display: flex;
     flex-direction: column;

src/views/login.vue

@@ -10,7 +10,7 @@
           style="
             position: absolute;
             top: 12%;
-            left: 20%;
+            left: 15%;
             user-select: none;
             display: flex;
             flex-direction: column;
@@ -31,7 +31,7 @@
           <p
             style="
               margin: 0;
-              font-size: 26px;
+              font-size: 24px;
               letter-spacing: 1px;
               color: #26b9de;
               opacity: 75%;
@@ -52,8 +52,8 @@
           </p>
         </div>
         <img
-          src="../assets/images/login.png"
+          src="../assets/images/map.png"
-          style="position: absolute; top: 30%; left: 15%; width: 40vw"
+          style="position: absolute; top: 00%; left: 11%; width: 50vw"
           alt=""
         />
       </div>

src/views/produce/data/add-or-updata.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-07 10:28:51
+ * @LastEditTime: 2024-07-05 13:28:38
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-drawer class="drawer" :visible.sync="visible" size="60%" @closed="$emit('destroy')">
+  <el-drawer class="drawer" :visible.sync="visible" size="65%" @closed="$emit('destroy')">
     <small-title slot="title" :no-padding="true">
       {{ '碲化镉工厂生产数据详情' }}
     </small-title>
@@ -14,167 +14,179 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <p class="title">工厂名称</p>
-          <p class="text">{{ dataForm.factory }}</p>
+          <p class="text">{{ factoryList[dataForm.factory] }}</p>
         </el-col>
         <el-col :span="8">
           <p class="title">时间维度</p>
-          <p class="text">{{ date }}</p>
+          <p class="text">{{ ['日', '周', '月', '年'][date] }}</p>
         </el-col>
         <el-col :span="8">
           <p class="title">时间</p>
-          <p class="text">{{ dataForm.reportDate?.length > 0 ? dataForm.reportDate[0] + '年' + dataForm.reportDate[1] + '月' + dataForm.reportDate[2] + '日' : '' }}</p>
+          <p class="text">{{ dataForm.datestr }}</p>
         </el-col>
       </el-row>
       <el-divider></el-divider>
+      <div v-if="glass === 0">
         <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
           {{ '芯片' }}
         </small-title>
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">芯片产量(片)</p>
-          <p class="text">{{ }}</p>
+            <p class="text">{{ dataForm.chipYieldSum }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">芯片良率(%)</p>
-          <p class="text">{{ dataForm.yieldRate }}</p>
+            <p class="text">{{ dataForm.chipYieldRate }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">芯片BOM</p>
-          <p class="text">{{ dataForm.bom }}</p>
+            <p class="text">{{ dataForm.chipBom }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">芯片总功率(MW)</p>
-          <p class="text">{{ dataForm.totalPower }}</p>
+            <p class="text">{{ dataForm.chipTotalPower.toFixed(2) }}</p>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">FTO投入量(片)</p>
-          <p class="text">{{ dataForm.chipInput }}</p>
+            <p class="text">{{ dataForm.ftoInput }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">CSS稼动率(%)</p>
-          <p class="text">{{ dataForm.marriageRate }}</p>
+            <p class="text">{{ dataForm.chipCssMarriageRate }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">芯片段OEE</p>
+            <p class="title">芯片段OEE(%)</p>
-          <p class="text">{{ dataForm.oee }}</p>
+            <p class="text">{{ dataForm.chipOee }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">芯片平均功率(W)</p>
-          <p class="text">{{ dataForm.averagePower }}</p>
+            <p class="text">{{ dataForm.chipAveragePower }}</p>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">芯片人均产量(片/人)</p>
-          <p class="text">{{ dataForm.annualAverageProduction }}</p>
+            <p class="text">{{ dataForm.chipAnnualAverageProduction }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">芯片产能利用率(%)</p>
-          <p class="text">{{ dataForm.capacityUtilizationRate }}</p>
+            <p class="text">{{ parseFloat(dataForm.chipCapacityUtilizationRate.toFixed(2)) }}</p>
           </el-col>
         </el-row>
+      </div>
+      <div v-if="glass === 1">
         <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
           {{ '标准组件' }}
         </small-title>
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">封装BOM</p>
-          <!-- 没参数 -->
+            <p class="text">{{ dataForm.componentBom }}</p>
-          <!-- <p class="text">{{ dataForm.bom }}</p> -->
           </el-col>
           <el-col :span="6">
             <p class="title">封装线OEE(%)</p>
-          <!-- <p class="text">{{ dataForm.code }}</p> -->
+            <p class="text">{{ dataForm.componentOee }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">标准组件良率(%)</p>
-          <!-- <p class="text">{{ dataForm.productName }}</p> -->
+            <p class="text">{{ dataForm.componentYieldRate }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">标准组件产量(片)</p>
-          <!-- <p class="text">{{ dataForm.productName }}</p> -->
+            <p class="text">{{ dataForm.componentYield }}</p>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">标准组件总功率(MW)</p>
-          <p class="text">{{ }}</p>
+            <p class="text">{{ parseFloat(dataForm.componentTotalPower.toFixed(2)) }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">封装产能利用率(%)</p>
-          <!-- <p class="text">{{ dataForm.code }}</p> -->
+            <p class="text">{{ parseFloat(dataForm.componentCapacityUtilizationRate.toFixed(2)) }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">标准组件人均产量</p>
+            <p class="title">标准组件人均产量(片/人)</p>
-          <!-- <p class="text">{{ dataForm.productName }}</p> -->
+            <p class="text">{{ dataForm.componentAnnualAverageProduction }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">标准组件平均功率</p>
+            <p class="title">标准组件平均功率(W)</p>
-          <!-- <p class="text">{{ dataForm.productName }}</p> -->
+            <p class="text">{{ dataForm.componentAveragePower }}</p>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <p class="title">标准组件转化效率</p>
+            <p class="text">{{ dataForm.componentTransRate }}</p>
+          </el-col>
+          <el-col :span="6">
+            <p class="title">芯片投入</p>
+            <p class="text">{{ dataForm.chipInput }}</p>
+          </el-col>
+        </el-row>
+      </div>
+      <div v-if="glass === 2">
         <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
           {{ 'BIPV产品' }}
         </small-title>
         <el-row :gutter="24">
           <el-col :span="6">
-          <p class="title">产品产量</p>
+            <p class="title">产品产量(㎡)</p>
-          <p class="text">{{ }}</p>
+            <p class="text">{{ dataForm.bipvProductOutput }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">人均产量</p>
+            <p class="title">人均产量(㎡/人)</p>
-          <p class="text">{{ dataForm.code }}</p>
+            <p class="text">{{ dataForm.bipvAnnualAverageProduction }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">芯片使用量</p>
+            <p class="title">芯片使用量(片)</p>
-          <p class="text">{{ dataForm.productName }}</p>
+            <p class="text">{{ dataForm.bipvChipUsage }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">芯片使用量</p>
+            <p class="title">芯片利用率(%)</p>
-          <p class="text">{{ dataForm.productName }}</p>
+            <p class="text">{{ dataForm.bipvChipUtilizationRate }}</p>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="6">
-          <p class="title">内部材料成本</p>
+            <p class="title">内部材料成本(元/㎡)</p>
-          <p class="text">{{ }}</p>
+            <p class="text">{{ dataForm.bipvInsideMaterialCost }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">内部材料成本</p>
+            <p class="title">OEM及委外材料成本(元/㎡)</p>
             <p class="text">{{ dataForm.code }}</p>
           </el-col>
           <el-col :span="6">
-          <p class="title">内部材料成本</p>
+            <p class="title">综合材料成本(元/㎡)</p>
-          <p class="text">{{ dataForm.productName }}</p>
+            <p class="text">{{ dataForm.bipvComprehensiveMaterialCost }}</p>
           </el-col>
         </el-row>
       </div>
+      <div v-if="glass === 4">
+        <!-- 铜铟镓硒待完成 -->
+      </div>
+    </div>
   </el-drawer>
 
 </template>
 
 <script>
 // import basicAdd from './basic-add';
-import {
+import { getProduceDataDetail } from "@/api/produceData";
-  getProduceDataDetail
-} from "@/api/produceData";
 // import { getList, } from "@/api/base/qualityScrapType";
 import SmallTitle from './SmallTitle';
+import { factoryList } from "@/utils/constants";
+
 export default {
   components: {
     SmallTitle,
   },
-  // mixins: [basicAdd],
-  props: {
-    date: {
-      type: Number,
-      default: 0
-    }
-  },
   data() {
     return {
+      factoryList,
       urlOptions: {
         isGetCode: false,
         // codeURL: getCode,
@@ -198,6 +210,8 @@ export default {
         }
       ],
       sectionList: [],
+      glass: 0,
+      date: 0,
       visible: false,
       dataForm: {
         id: undefined,
@@ -229,11 +243,16 @@ export default {
     // this.getCurrentTime()
   },
   methods: {
-    init(id) {
+    init(id, type, glass) {
       this.visible = true
-      console.log('打印', id)
+      this.glass = glass
+      this.date = type
+      console.log('打印', id, glass)
       if (id) {
-        getProduceDataDetail(id).then(res => {
+        getProduceDataDetail({
+          id: id,
+          type: type
+        }).then(res => {
           this.dataForm = res.data
           console.log('你好', res.data)
         })

src/views/produce/data/index.vue

@@ -1,53 +1,53 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-07 09:41:56
+ * @LastEditTime: 2024-07-24 14:48:25
  * @LastEditors: DY
  * @Description:
 -->
 <template>
-  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
+  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 200px - 31px)">
     <div class="app-container" style="padding: 16px 24px 0; height: auto; flex-grow: 1;">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="date">
+        <el-form-item label="时间维度" prop="type">
-          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
+          <el-select @change="changType" v-model="listQuery.type" size="small" clearable placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="timestamp" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期" :picker-options="{ firstDayOfWeek: 1 }">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy-MM-dd" placeholder="选择周" :picker-options="{ firstDayOfWeek: 1 }"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy-MM-dd" placeholder="选择周" :picker-options="{ firstDayOfWeek: 1 }"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
-          </span>
+          </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange" value-format="timestamp" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-dd" range-separator="至"
             start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 3" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.start" format="yyyy-MM-dd" value-format="timestamp" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
-            placeholder="开始时间">
+            placeholder="开始时间" @change="getYear">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.end" format="yyyy-MM-dd" value-format="timestamp" type="year" placeholder="结束时间"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year" placeholder="结束时间"
             @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="工厂名称" prop="factorys">
+        <el-form-item label="工厂名称" prop="factory">
-          <el-select size="small" clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple >
+          <el-select size="small" clearable v-model="listQuery.factory" placeholder="请选择工厂名称" multiple >
             <el-option v-for="item in factoryArray" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -58,8 +58,8 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="玻璃类型" prop="type">
+        <el-form-item label="玻璃类型" prop="glass">
-          <el-select size="small" clearable v-model="listQuery.type" multiple placeholder="请选择玻璃类型">
+          <el-select size="small" clearable v-model="listQuery.glass" multiple placeholder="请选择玻璃类型">
             <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -74,7 +74,7 @@
       <!-- <el-row :gutter="24"> -->
       <!-- <el-col :span="12" v-for="item in  dataList" :key="item.id"> -->
       <search-bar :formConfigs="formConfig1" ref="searchBarForm1" style="margin-bottom: 0" />
-      <line-chart class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
+      <line-chart ref="lineChart" class="yearChart" style="height: 45vh;width: 100%"></line-chart>
       <!-- </el-col> -->
       <!-- <el-col :span="12">
             <line-chart :id=" 'second' " class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
@@ -82,19 +82,19 @@
     </div>
     <div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto; padding: 16px;">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" style="margin-bottom: 0" />
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-        :table-data="tableData">
+        :table-data="tableData" :max-height="tableH">
         <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
       <pagination
-        :limit.sync="listQuery.size"
+        :limit.sync="listQuery.pageSize"
-        :page.sync="listQuery.current"
+        :page.sync="listQuery.pageNo"
         :total="listQuery.total"
         @pagination="getDataList"
       />
     </div>
-    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date" @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
+    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
     <!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
       :type="listQuery.reportType" @refreshDataList="getDataList" /> -->
     <!-- <pagination
@@ -106,37 +106,38 @@
 </template>
 
 <script>
-// import { parseTime } from '../../core/mixins/code-filter';
+// import { parseTime } from "@/utils/ruoyi";
-import { getProduceDataPage, prodOutputDataList, exportOutPutExcel } from '@/api/produceData';
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+import { getProduceDataPage, getproddata, exportOutPutExcel } from '@/api/produceData';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
 import ButtonNav from '@/components/ButtonNav'
 import basicPage from '@/mixins/basic-page'
 import AddOrUpdate from './add-or-updata'
-import { factoryList, factoryArray, factoryArray1 } from "@/utils/constants";
+import { factoryList, factoryArray, factoryListabbr } from "@/utils/constants";
 
 export default {
   components: { lineChart, ButtonNav, AddOrUpdate },
-  mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
 	data() {
     return {
       factoryList,
       factoryArray,
-      factoryArray1,
+      factoryListabbr,
       listQuery: {
-        size: 20,
+        pageSize: 20,
-        current: 1,
+        pageNo: 1,
-        factorys: undefined,
+        factory: undefined,
         total: 0,
-        date: 0,
+        type: 0, // 时间维度
-        type:undefined,
+        glass: undefined, // 玻璃类型
         // reportType: 2,
-        beginTime: undefined,
+        startDate: undefined,
-        endTime:undefined,
+        endDate:undefined,
-        reportTime: [],
+        reportTime: null,
-        start: undefined,
+        start: null,
-        end: undefined
+        end: null
       },
       detailOrUpdateVisible:false,
       date1: undefined,
@@ -153,7 +154,7 @@ export default {
       ].filter((v) => v),
       typeList: [
         {
-          name: '芯片',
+          name: '玻璃芯片',
           id: 0,
         },
         {
@@ -164,6 +165,10 @@ export default {
           name: 'BIPV产品',
           id: 2,
         },
+        // {
+        //   name: '定制组件',
+        //   id: 3,
+        // },
       ],
       formConfig: [
         {
@@ -197,16 +202,16 @@ export default {
       ],
       tableProps: [
         {
-          prop: 'groupTime',
+          prop: 'datestr',
           label: '日期',
-          minWidth: 100,
+          minWidth: 120,
           showOverflowtooltip: true
         },
         {
           prop: 'factory',
           label: '工厂名称',
           filter: (val) =>  factoryList[val],
-          minWidth: 200,
+          minWidth: 180,
           showOverflowtooltip: true
         },
         {
@@ -215,51 +220,59 @@ export default {
           filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
         },
         {
-          prop: 'inputNumber',
+          prop: 'inputNum',
           label: '投入数量',
         },
         {
-          prop: 'outputNumber',
+          prop: 'outputNum',
           label: '产出数量',
         },
         {
-          prop: 'goodNumber',
+          prop: 'goodNum',
           label: '良品数量',
         },
         {
-          prop: 'yieldRate',
+          prop: 'goodRatio',
           label: '良品率%',
-          filter: (val) => (val * 100) + '%'
+          filter: (val) => val.toFixed(2) + '%'
         },
       ],
       tableData: [],
       lineData: [],
       chart: null,
-      seriesList: []
+      seriesList: [],
+      colorList: ['#7164FF',  '#63BDFF', '#8EF0AB', '#FFCE6A']
 			// proLineList: [],
 			// all: {}
 		};
   },
-  computed: {
+  // computed: {
-    weekNum() {
+  //   weekNum() {
-      return Math.round((this.listQuery.end - this.listQuery.start) / (24 * 60 * 60 * 1000 * 7)) + 1
+  //     return Math.round((this.listQuery.end - this.listQuery.start) / (24 * 60 * 60 * 1000 * 7)) + 1
-    },
+  //   },
-  },
+  // },
   created() {
     const today = new Date()
-    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    const sevenDaysAgo = new Date(today.getTime() - (6 * 24 * 60 * 60 * 1000))
-    this.listQuery.beginTime = sevenDaysAgo.getTime()
+    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
-    this.listQuery.endTime = today.getTime()
+    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
-    this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime]
+    this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
 	},
 	mounted() {
 	},
   methods: {
+    changType() {
+      this.listQuery.endDate = null
+      this.listQuery.startDate = null
+      this.listQuery.reportTime = null
+      this.listQuery.start = null
+      this.listQuery.end = null
+    },
     otherMethods(val) {
       this.detailOrUpdateVisible = true;
       this.addOrEditTitle = "详情";
       this.$nextTick(() => {
-        this.$refs.detailOrUpdate.init(val.data.id);
+        this.$refs.detailOrUpdate.init(val.data.id, this.listQuery.type, val.data.glassType);
       });
     },
     getYear(e) {
@@ -271,17 +284,14 @@ export default {
         this.listQuery.reportTime = []
         this.listQuery.start = undefined
         this.listQuery.end = undefined
-        // console.log();
       } else {
-        this.listQuery.beginTime = this.listQuery.start
+        this.listQuery.startDate = this.listQuery.start
-        this.listQuery.endTime = this.listQuery.end
+        this.listQuery.endDate = this.listQuery.end
       }
-      // console.log(e);
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
       if (this.listQuery.start && this.listQuery.end) {
-        console.log(this.listQuery.reportTime)
+        // console.log(this.listQuery.start, this.listQuery.end - this.listQuery.start)
         this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
@@ -292,10 +302,18 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.beginTime = this.listQuery.start.getTime() - 24 * 60 * 60 * 1000
+          this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-          this.listQuery.endTime = this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000
+          this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
+        console.log(this.listQuery.startDate, this.listQuery.endDate)
+      } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
+      // if (!this.listQuery.start && !this.listQuery.end) {
+      //   this.listQuery.startDate = undefined
+      //   this.listQuery.endDate = undefined
+      // }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
@@ -310,10 +328,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = this.listQuery.reportTime[0]
+          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endTime = this.listQuery.reportTime[1]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
         }
       } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
     },
     changeTime(value) {
@@ -326,114 +346,117 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = this.listQuery.reportTime[0]
+          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endTime = this.listQuery.reportTime[1]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
         }
       } else {
-        console.log(this.listQuery.reportTime[0])
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
     },
     async getDataList() {
-      const res = await getProduceDataPage(this.listQuery)
+      if (this.listQuery.type === '') {
+        this.$message.warning('请选择时间维度！')
+        return
+      }
+      if (!this.listQuery.startDate || !this.listQuery.endDate) {
+        this.$message.warning('请选择时间范围！')
+      } else {
+        await getProduceDataPage(this.listQuery).then(res => {
           console.log(res)
           if (res.code === 0) {
             this.tableData = res.data.records
             this.listQuery.total = res.data.total
-        // if (this.listQuery.total > 0) {
-        //   this.tableData.forEach(item => {
-        //     item.tableTime = item?.reportDate?.length > 0 ? item.reportDate[0] + '-' + item.reportDate[1] + '-' + item.reportDate[2] : '--'
-        //   })
-        // }
           }
-
+        })
         // 图表
-      await prodOutputDataList({
+        await getproddata(this.listQuery).then(resp => {
-        current: 1,
+          if (resp.data?.length > 0) {
-        size: 99,
+            const chartData = Object.groupBy(resp.data, (member) => member.datestr)
-        beginTime: this.listQuery.beginTime,
+            this.buildChart(chartData, resp.data)
-        endTime: this.listQuery.endTime,
+          } else {
-        factorys: this.listQuery.factorys,
+            this.$refs.lineChart.initChart([], [])
-        date: this.listQuery.date,
-        type: this.listQuery.type
-      }).then(resp => {
-        console.log('Aaa', resp.data)
-        this.lineData = resp?.data || []
-        if (this.lineData.length > 0) {
-          this.buildChart(this.lineData)
           }
         })
-      // this.buildChart(this.tableData)
+      }
     },
-    buildChart(list) {
+    buildChart(data, dataList) {
-      let temp = []
       let xAxisData = []
-      list.forEach(item => {
+      this.seriesList = []
-        temp.push(item.groupTime)
-      })
       // x轴数据
-      xAxisData = Array.from(new Set(temp))
+      xAxisData = Object.keys(data)
 
-      // y轴数据
+      // 构造series
-      for (const y of this.factoryArray1) {
+      // 玻璃类型 ['chipYield', 'componentYield', 'bipvProductOutput']
-        for (const type of this.typeList) {
+      const typeArray = (this.listQuery.glass.length === 0 || this.listQuery.glass.length === 3) ? [0, 1, 2] : this.listQuery.glass
-          const seriesItem = {
+      // 工厂名称 this.factoryListabbr
-            name: y.name,
+      const factoryNameArray = (this.listQuery.factory.length === 0 || this.listQuery.factory.length === this.factoryListabbr.length) ? [0, 1] : this.listQuery.factory
-            record: type.name,
+      const seriesArray = []
+      factoryNameArray.forEach((fac, facIndex) => {
+        typeArray.forEach((type, typeIndex) => {  
+          const series = {
+            data: Array(xAxisData.length).fill(0),
             type: 'bar',
-            emphasis: {
+            stack: String(fac),
-              focus: 'series'
+            barWidth: 16,
+            itemStyle: {
+              color: this.colorList[type]
             },
-            data: Array(xAxisData.length).fill(0)
+            name: this.factoryListabbr[fac] + '-' + type
           }
-          list.forEach(data => {
+          seriesArray.push(series)
-            xAxisData.forEach((x, index) => {
+        })
-              if (x === data.groupTime && y.id === data.factory && type.id === data.glassType) {
+      })
-                seriesItem.data[index] = data.goodNumber
+
+      // 按工厂分
+      const arrayByFacArray = Object.groupBy(dataList, (member) => member.factory)
+      // const seriesDataArray = []
+      let n = 0
+      Object.values(arrayByFacArray).forEach((item) => {
+        typeArray.forEach(type => {
+          const typeName = ['chipYield', 'componentYield', 'bipvProductOutput'][type]
+          let seriesData = Array(xAxisData.length).fill(0)
+          item.forEach(it => {
+            xAxisData.forEach((x, xindex) => {
+              if (x === it['datestr']) {
+                seriesData[xindex] = it[typeName]
               }
             })
           })
-          this.seriesList.push(seriesItem)
+          seriesArray[n].data = seriesData
+          n ++
+        })
+      })
+
+      // 添加工厂
+      const validSeriesArray = []
+      factoryNameArray.forEach(f => {
+        const s = {
+          name: '显示工厂',
+          data: Array(xAxisData.length).fill(0),
+          type: 'bar',
+          stack: String(f),
+          barWidth: 16,
+          label: {
+            show: true,
+            position: 'top',
+            // position: f > 0 ?  [2, -16] : [-10, -16],
+            formatter(params) {
+              return factoryListabbr[f]
             }
           }
-      console.log('啊啊', this.seriesList)
+        }
-      this.$refs.lineChart.initChart(xAxisData, this.seriesList)
+        validSeriesArray.push(s)
-      // const chartList = Object.groupBy(list, (item) => item.tableTime)
+      })
-      // this.xAxis = []
+      this.seriesList = [...seriesArray, ...validSeriesArray]
-      // this.seriesList = []
+      this.$refs.lineChart.initChart(xAxisData, this.seriesList, factoryNameArray)
-      // for (const keyIndex in chartList) {
-      //   // X坐标轴数据
-      //   this.xAxis.push(keyIndex)
-      // }
-      // // y轴数据
-      // for (const y of this.factoryArray) {
-      //   // y: {name: , id: }
-      //   const seriesItem = {
-      //     name: y.name,
-      //       type: 'bar',
-      //       emphasis: {
-      //         focus: 'series'
-      //       },
-      //     data: Array(this.xAxis.length).fill(0)
-      //   }
-      //   for (const a in chartList) {
-      //     for (const z of chartList[a]) {
-      //       this.xAxis.forEach((item, index) => {
-      //         if (z.factory === y.id && a === item) {
-      //           seriesItem.data[index] = z.goodNumber
-      //         }
-      //       })
-      //     }
-      //   }
-      //   this.seriesList.push(seriesItem)
-      // }
-      // this.$refs.lineChart.initChart(this.xAxis, this.seriesList)
     },
 		buttonClick(val) {
 			this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
 			switch (val.btnName) {
 				case 'search':
-					this.listQuery.current = 1;
+					this.listQuery.pageNo = 1;
-					this.listQuery.size = 20;
+					this.listQuery.pageSize = 20;
 					this.getDataList();
 					break;
 				case 'export':
@@ -448,8 +471,8 @@ export default {
       this.$modal.confirm('是否确认导出生产数据?').then(() => {
         // 处理查询参数
         let params = {...this.listQuery};
-        params.current = 1;
+        params.pageNo = 1;
-        params.size = 999;
+        params.pageSize = 999;
         this.exportLoading = true;
         return exportOutPutExcel(params);
       }).then(response => {
@@ -492,11 +515,23 @@ export default {
 };
 </script>
 
-<style scoped>
+<style>
 /* .blueTip { */
 	/* padding-bottom: 10px; */
 /* } */
 /* .blueTi */
+.blueTip .el-date-editor .el-range__icon {
+  font-size: 16px;
+  color: #0b58ff;
+}
+.blueTip .el-input__prefix .el-icon-date {
+  font-size: 16px;
+  color: #0b58ff;
+}
+.blueTip .el-input__prefix .el-icon-time {
+  font-size: 16px;
+  color: #0b58ff;
+}
 .blueTip::before{
   display: inline-block;
   content: '';

src/views/produce/data/lineChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: DY
- * @LastEditTime: 2024-05-30 14:52:05
+ * @LastEditTime: 2024-07-16 18:41:27
  * @Description:
 -->
 <template>
@@ -16,6 +16,8 @@
 import * as echarts from 'echarts'
 import 'echarts/theme/macarons' // echarts theme
 import resize from '@/mixins/resize'
+import { factoryListabbr } from "@/utils/constants";
+
 export default {
   name: 'OverviewBar',
   mixins: [resize],
@@ -38,7 +40,7 @@ export default {
     },
     height: {
       type: String,
-      default: '30vh'
+      default: '35vh'
     },
     legendPosition: {
       type: String,
@@ -71,7 +73,11 @@ export default {
     this.chart = null
   },
   methods: {
-    initChart(xAxis, seriesList) {
+    initChart(xAxis, seriesList, facs) {
+      if (xAxis.length === 0) {
+        this.chart.clear()
+      }
+      else {
         this.chart = echarts.init(document.getElementById(this.id))
         console.log(this.$parent);
         this.chart.setOption({
@@ -79,46 +85,85 @@ export default {
           text: '',
           // subtext: 'Fake Data'
         },
-        tooltip: {
-          trigger: 'axis'
-        },
-        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         legend: {
-          // data: ['工厂1', '工厂2'],
           right: '90px',
           top: '0%',
           icon: 'rect',
           itemWidth: 10,
           itemHeight: 10,
           itemGap: 40,
+          formatter(name) {
+            return ['玻璃芯片', '标准组件', 'BIPV'][name.split('-')[1]]
           },
-        // toolbox: {
+          data: ['瑞昌-0', '瑞昌-1', '瑞昌-2']
-        //   show: true,
+        },
-        //   feature: {
+        tooltip: {
-        //     dataView: { show: true, readOnly: false },
+          trigger: 'axis',
-        //     magicType: { show: true, type: ['line', 'bar'] },
+          axisPointer: {
-        //     restore: { show: true },
+            type: 'shadow',
-        //     saveAsImage: { show: true }
+            color: "rgba(237,237,237,0.5)"
-        //   }
+          },
-        // },
+          formatter(params) {
+            let str = ''
+            facs.forEach(ele => {
+              str += `<div style="width: 60px; text-align: right">${ factoryListabbr[ele] }</div>`
+            })
+            let result = `
+            <div style="width: 270px; display: flex">
+              <div style="width: 150px">${params[0].name}</div>
+              ${ str }
+            </div>`
+            const analyzeArray = params.filter(p => p.seriesName !== '显示工厂').map(item => {
+              const obj = {
+                glass: ['玻璃芯片', '标准组件', 'BIPV'][item.seriesName.split('-')[1]], // 玻璃类型
+                factoryName: item.seriesName.split('-')[0], // 工厂名称
+                value: item.value,
+                name: item.name,
+                marker: item.marker,
+                color: item.color
+              }
+              return obj
+            })
+            const analyzeList = Object.groupBy(analyzeArray, (member) => member.glass)
+            for (let g in analyzeList) {
+              // date => 玻璃类型
+              let oneData = `<div style="width: 270px; display: flex">
+              <div style="width: 150px; display: flex; align-items: center">
+              <div style="background-color: ${analyzeList[g][0].color}; width: 10px; height: 10px; margin-right: 5px"></div>
+              <div>${g}</div></div>`
+                let goodNum = 0
+              for (let ana of analyzeList[g]) {
+                goodNum = ana.value
+                oneData += `<div style="width: 60px; text-align: right">${goodNum}</div>`
+              }
+              result = result + oneData + '</div>'
+            }
+            return result
+          }
+        },
+        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         xAxis: [
           {
             type: 'category',
-            // prettier-ignore
+            name: '日期',
-            data: xAxis
+            data: xAxis,
+            axisLabel: {
+              rotate: 25
+            }
           }
         ],
         yAxis: [
           {
-            type: 'value'
+            type: 'value',
+            name: '单位：片'
           }
         ],
         grid: {
-          top: '20%',
+          top: '10%',
-          left: "1%",
+          left: "2%",
-          right: "3%",
+          right: "5%",
-          bottom: "1%",
+          bottom: "0%",
           containLabel: true
         },
         series: seriesList
@@ -126,9 +171,14 @@ export default {
       }
     }
   }
+}
 </script>
 
 <style scoped>
+.chartTooltipSpan {
+  width: 50px;
+  background: #787878;
+}
 /* .reportChart {
   position: absolute;
   height: 100%;

src/views/produce/target/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-17 16:31:51
- * @LastEditTime: 2024-06-04 16:45:52
+ * @LastEditTime: 2024-06-24 15:43:50
  * @LastEditors: DY
  * @Description:
 -->
@@ -11,7 +11,7 @@
       {{ dataForm.id ? '编辑' : '新增' }}
     </small-title>
     <div class="detailBox">
-      <el-form ref="form" :model="dataForm" label-width="80px" label-position="top">
+      <el-form ref="form" :model="dataForm" label-width="80px" :rules="dataRule" label-position="top">
         <el-row :gutter="24" style="padding: 0 32px;">
           <el-col :span="8">
             <el-form-item v-if="ftype === 0" label="工厂名称" prop="factory">
@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="时间维度" prop="targetType">
-              <el-select v-model="dataForm.targetType" placeholder="请选择时间维度" clearable>
+              <el-select v-model="dataForm.targetType" placeholder="请选择时间维度" clearable @change="clearTime">
                 <!-- <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id"> -->
                 <el-option label="日" :value="0" />
                 <el-option label="周" :value="1" />
@@ -40,19 +40,19 @@
           </el-col>
           <el-col :span="8">
             <el-form-item v-show="dataForm.targetType === 0 || dataForm.targetType === ''" label="时间" prop="reportTime">
-              <el-date-picker v-model="reportTime" value-format="yyyyMMdd" type="date" placeholder="选择日">
+              <el-date-picker v-model="dataForm.reportTime" value-format="yyyyMMdd" type="date" placeholder="选择日">
               </el-date-picker>
             </el-form-item>
-            <el-form-item v-show="dataForm.targetType === 1" label="时间" prop="week">
+            <el-form-item v-show="dataForm.targetType === 1" label="时间" prop="reportTime">
-              <el-date-picker v-model="week" type="week" format="yyyy 第 WW 周" placeholder="选择周">
+              <el-date-picker v-model="week" type="week" format="yyyy 第 WW 周" placeholder="选择周" @change="setReportTime">
               </el-date-picker>
             </el-form-item>
             <el-form-item v-show="dataForm.targetType === 2" label="时间" prop="reportTime">
-              <el-date-picker v-model="reportTime" value-format="yyyyMM" type="month" placeholder="选择月份">
+              <el-date-picker v-model="dataForm.reportTime" value-format="yyyyMM" type="month" placeholder="选择月份">
               </el-date-picker>
             </el-form-item>
             <el-form-item v-show="dataForm.targetType === 3" label="时间" prop="reportTime">
-              <el-date-picker clearable v-model="reportTime" value-format="yyyy" type="year" placeholder="开始时间">
+              <el-date-picker clearable v-model="dataForm.reportTime" value-format="yyyy" type="year" placeholder="开始时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -170,6 +170,11 @@
               <el-input-number v-model="dataForm.componentAveragePower" :precision="2" controls-position="right" placeholder="请输入标准组件平均功率" style="width: 100%" />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件转化效率" prop="componentConversionEfficiency">
+              <el-input-number v-model="dataForm.componentConversionEfficiency" :precision="2" controls-position="right" placeholder="请输入标准组件转化效率" style="width: 100%" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-divider></el-divider>
 
@@ -260,9 +265,10 @@ export default {
       teamList: [],
       sectionList: [],
       visible: false,
-      reportTime: undefined,
+      // reportTime: undefined,
       week: undefined,
       dataForm: {
+        reportTime: undefined,
         factoryType: 0,
         id: undefined,
         factory: undefined,
@@ -293,13 +299,14 @@ export default {
         bipvInsideMaterialCost: undefined,
         bipvOeeMaterialCost: undefined,
         bipvComprehensiveMaterialCost: undefined,
-        molybdenumElectrodeInput: undefined
+        molybdenumElectrodeInput: undefined,
+        componentConversionEfficiency: undefined
       },
       // materialList: [],
       dataRule: {
-        // materialId: [{ required: true, message: "", trigger: "blur" }],
+        factory: [{ required: true, message: "工厂名称不能为空", trigger: "chnage" }],
-        // workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+        reportTime: [{ required: true, message: "时间不能为空", trigger: "change" }],
-        // num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        targetType: [{ required: true, message: "时间维度不能为空", trigger: "change" }]
         // detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
 
         // logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
@@ -310,6 +317,13 @@ export default {
     // this.getCurrentTime()
   },
   methods: {
+    setReportTime() {
+      this.dataForm.reportTime = this.week
+    },
+    clearTime() {
+      this.week = undefined
+      this.dataForm.reportTime = undefined
+    },
     formClear() {
       if (this.$refs.dataForm !== undefined) {
         this.$refs.dataForm.resetFields()
@@ -319,16 +333,19 @@ export default {
     //   this.dataForm.targetTime = undefined
     // }, 
     handleClose() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
           // 新增
           if (this.dataForm.targetType === 1) {
-        this.dataForm.targetTime = this.week ? Number(moment(this.week.getTime()).format('YYYYWW')) : undefined
+            this.dataForm.targetTime = this.week ? Number(moment(this.week.getTime()).format('YYYYWW')) : ''
           } else {
-        this.dataForm.targetTime = this.reportTime ? Number(this.reportTime) : undefined
+            this.dataForm.targetTime = this.dataForm.reportTime ? Number(this.dataForm.reportTime) : ''
           }
           if (this.dataForm.id) {
             // 修改
             updateProduceTarget({
-          ...this.dataForm
+              ...this.dataForm,
+              reportTime: undefined
             }).then(res => {
               if (res.code === 0) {
                 this.$message.success('修改成功！')
@@ -339,7 +356,8 @@ export default {
           } else {
             // 新增
             createProduce({
-          ...this.dataForm
+              ...this.dataForm,
+              reportTime: undefined
             }).then(res => {
               if (res.code === 0) {
                 this.$message.success('新增成功！')
@@ -348,6 +366,8 @@ export default {
               }
             })
           }
+        }
+      })
     },
     init(id) {
       this.dataForm.id = id || undefined
@@ -355,9 +375,15 @@ export default {
       this.visible = true
       if (this.dataForm.id) {
         getProduceTargetDetail(this.dataForm.id).then(res => {
-          this.dataForm = res.data
+          // this.dataForm = res.data
+          for (const i in res.data) {
+            if (res.data[i] !== null) {
+              this.dataForm[i] = res.data[i]
+            }
+          }
           if (this.dataForm.targetType === 0 || this.dataForm.targetType === 2 || this.dataForm.targetType === 3) {
-            this.reportTime = String(this.dataForm.targetTime)
+            // this.dataForm.reportTime = String(this.dataForm.targetTime)
+            this.$set(this.dataForm, 'reportTime', String(this.dataForm.targetTime))
           }
           if (this.dataForm.targetType === 1) {
             const date = new Date()
@@ -366,6 +392,7 @@ export default {
             date.setDate((Number(String(this.dataForm.targetTime).slice(4)) - 1)* 7 + 1)
             // console.log('你好', date, moment(date).format('yyyyWW'), String(this.dataForm.targetTime).slice(4))
             this.week = date
+            this.$set(this.dataForm, 'reportTime', date)
           }
         })
       }

src/views/produce/target/detail-or-updata.vue

@@ -1,14 +1,15 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-04 16:54:46
+ * @LastEditTime: 2024-06-14 10:41:23
  * @LastEditors: DY
  * @Description:
 -->
 <template>
-  <el-drawer class="drawer" :visible.sync="visible" size="58%" @closed="$emit('destroy')">
+  <el-drawer class="drawer" :visible.sync="visible" size="70%" @closed="$emit('destroy')">
     <small-title slot="title" :no-padding="true">
-      {{ ftype === 0 ? '碲化镉工厂生产数据详情' : '铜铟镓硒工厂生产数据详情' }}
+      <!-- {{ ftype === 0 ? '碲化镉工厂生产数据详情' : '铜铟镓硒工厂生产数据详情' }} -->
+      生产目标详情
     </small-title>
     <div class="detailBox">
       <el-row :gutter="24">
@@ -113,6 +114,10 @@
           <p class="title">标准组件平均功率(W)</p>
           <p class="text">{{ dataForm.componentAveragePower }}</p>
         </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件转化效率</p>
+          <p class="text">{{ dataForm.componentConversionEfficiency }}</p>
+        </el-col>
       </el-row>
       <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
         {{ 'BIPV产品' }}
@@ -197,35 +202,9 @@ export default {
       ],
       sectionList: [],
       visible: false,
-      dataForm: {
+      dataForm: {}
-        id: undefined,
-        logTime: undefined,
-        source: 1,
-        detId: undefined,
-        workOrderId: null,
-        teamId: undefined,
-        num: undefined,
-        lineId: undefined,
-        description: undefined,
-        // description: undefined,
-        remark: undefined,
-      },
-      // materialList: [],
-      dataRule: {
-        // materialId: [{ required: true, message: "", trigger: "blur" }],
-        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
-        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
-        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
-
-        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
-      }
     };
   },
-  mounted() {
-    this.getDict()
-    console.log('我看看', this.dataForm)
-    // this.getCurrentTime()
-  },
   methods: {
     init(id) {
       this.visible = true
@@ -235,102 +214,7 @@ export default {
           this.dataForm = res.data
         })
       }
-    },
+    }
-    // getCurrentTime() {
-    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
-    //   this.dataForm.logTime = new Date()
-    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
-    //   console.log(this.dataForm.logTime);
-    // },
-    async getDict() {
-    //   // 物料列表
-    //   const res = await getList()
-    //   this.typeList = res.data
-    //   getWorkOrderList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.workOrderList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getLineList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.lineList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getDetList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.detList = res.data.map((item) => {
-    //       return {
-    //         name: item.content,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getTeamList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.teamList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    // },
-    // async getWorksectionById(lineId) {
-    //   if (lineId) {
-    //     const { code, data } = await this.$axios({
-    //       url: '/base/core-workshop-section/listByParentId',
-    //       method: 'get',
-    //       params: {
-    //         id: lineId,
-    //       },
-    //     });
-    //     if (code == 0) {
-    //       console.log(data)
-    //       this.sectionList = data.map((item) => {
-    //         return {
-    //           name: item.name,
-    //           id: item.id,
-    //         };
-    //       });
-    //     }
-    //   } else {
-    //     this.$axios({
-    //       url: '/base/core-workshop-section/listAll',
-    //       method: 'get',
-    //       // params: {
-    //       //   id: lineId,
-    //       // },
-    //     }).then((res) => {
-    //       // console.log(data)
-    //       this.sectionList = res.data.map((item) => {
-    //         return {
-    //           name: item.name,
-    //           id: item.id,
-    //         };
-    //       });
-    //     })
-    //   }
-    },
   },
 };
 </script>

src/views/produce/target/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-05 16:19:04
+ * @LastEditTime: 2024-07-02 16:35:01
  * @LastEditors: DY
  * @Description:
 -->
@@ -24,7 +24,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="时间维度" prop="date">
-          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="clearTime">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
@@ -144,7 +144,6 @@
 import { parseTime } from '@/utils/ruoyi';
 import { prodTargetDiPage, prodTargetToPage, exportDiTargetExcel, exportToTargetExcel, delTarget, importToTarget, importDiTarget } from '@/api/produceData';
 // import inputTable from './inputTable.vue';
-import lineChart from './lineChart';
 import moment from 'moment'
 import ButtonNav from '@/components/ButtonNav'
 import basicPage from '@/mixins/basic-page'
@@ -157,7 +156,7 @@ import {getBaseHeader} from "@/utils/request";
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
-  components: { lineChart, ButtonNav, detailOrUpdate, addOrUpdate },
+  components: { ButtonNav, detailOrUpdate, addOrUpdate },
   mixins: [basicPage],
 	data() {
     return {
@@ -414,12 +413,12 @@ export default {
         },
       ],
       // timeSelect:'month',
-      startTimeStamp:null, //开始时间
+      // startTimeStamp:null, //开始时间
-      endTimeStamp:null, //结束时间
+      // endTimeStamp:null, //结束时间
       // date:'凯盛玻璃控股成员企业2024生产数据',
 			// reportTime: '',
-			startTimeStamp: '',
+			// startTimeStamp: '',
-			endTimeStamp: '',
+			// endTimeStamp: '',
       tableData: [],
       facType: 0
 			// proLineList: [],
@@ -458,6 +457,13 @@ export default {
     this.changeTime()
 	},
   methods: {
+    clearTime() {
+      this.listQuery.beginTime = undefined
+      this.listQuery.endTime = undefined
+      this.listQuery.reportTime = []
+      this.start = undefined
+      this.end = undefined
+    },
     handleImport() {
       this.upload.title = "生产目标导入";
       this.upload.open = true;
@@ -685,11 +691,22 @@ export default {
 };
 </script>
 
-<style scoped>
+<style>
 /* .blueTip { */
 	/* padding-bottom: 10px; */
 /* } */
-/* .blueTi */
+.blueTip .el-date-editor .el-range__icon {
+  font-size: 16px;
+  color: #0b58ff;
+}
+.blueTip .el-input__prefix .el-icon-date {
+  font-size: 16px;
+  color: #0b58ff;
+}
+.blueTip .el-input__prefix .el-icon-time {
+  font-size: 16px;
+  color: #0b58ff;
+}
 .blueTip::before{
   display: inline-block;
   content: '';

src/views/produce/workOrder/add-or-updata.vue

@@ -1,15 +1,15 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-07 14:15:00
+ * @LastEditTime: 2024-07-08 15:06:49
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <el-drawer class="drawer" :visible.sync="visible" size="85%" @closed="$emit('destroy')">
     <small-title slot="title" :no-padding="true">
       {{ '详情' }}
-      <el-button type="primary" plain size="small" style="float: right" @click="exportDetail">导出</el-button>
+      <!-- <el-button type="primary" plain size="small" style="float: right" @click="exportDetail">导出</el-button> -->
     </small-title>
     <div ref="detail" class="detailBox">
       <el-row :gutter="20">
@@ -23,7 +23,7 @@
         </el-col>
         <el-col :span="3">
           <p class="title">工单类型</p>
-          <p class="text">{{ ['', '芯片订单', '组件类型', 'bipv类型'][dataForm.workOrderType] }}</p>
+          <p class="text">{{ ['', '芯片工单', '组件类型', 'bipv类型'][dataForm.workOrderType] }}</p>
         </el-col>
         <el-col :span="3">
           <p class="title">工单来源</p>
@@ -39,7 +39,7 @@
         </el-col>
         <el-col :span="3">
           <p class="title">工单状态</p>
-          <p class="text">{{ ['未开始', '生产中', '已完成'][dataForm.orderStatus] }}</p>
+          <p class="text">{{ ['', '未开始', '生产中', '已完成'][dataForm.orderStatus] }}</p>
         </el-col>
         <el-col :span="3">
           <p class="title">投入状态</p>
@@ -69,21 +69,59 @@
         </el-col>
         <el-col :span="3">
           <p class="title">开始时间</p>
-          <p class="text">{{ dataForm.startDate?.length > 0 ? dataForm.startDate[0] + '-' + dataForm.startDate[1] + '-' + dataForm.startDate[2] : '' }}</p>
+          <p class="text">{{ dataForm.startDate?.length > 0 ? dataForm.startDate[0] + '-' + dataForm.startDate[1] + '-'
+            + dataForm.startDate[2] : '' }}</p>
         </el-col>
         <el-col :span="3">
           <p class="title">完成时间</p>
-          <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
+          <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' +
+            dataForm.endDate[2] : '' }}</p>
         </el-col>
       </el-row>
-      <el-divider></el-divider>
+      <div v-loading="loading">
-      <div class="chartDiv">
+        <div style="width: 100%; padding: 0 32px">
-        <div ref="bar" :style="{ height: '30vh', width: '40vw' }" />
+          <el-divider style="margin: 0"></el-divider>
-        <div ref="pie" :style="{ height: '30vh', width: '40vw' }" />
         </div>
-      <div class="chartDiv">
+        <el-row :gutter="0" style="margin: 20px 32px">
-        <div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" />
+          <el-col :span="8">
-        <div ref="line" v-show="dataForm.orderStatus === 1" :style="{ height: '30vh', width: '40vw' }" />
+            <div>
+              <small-title slot="title" :no-padding="true">
+                产品良率
+              </small-title>
+              <div ref="pie" :style="{ height: '40vh', width: '100%' }" />
+            </div>
+          </el-col>
+          <el-col :span="16">
+            <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
+              <small-title slot="title" :no-padding="true">
+                待制品分布
+              </small-title>
+              <div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
+            </div>
+          </el-col>
+        </el-row>
+        <div style="width: 100%; padding: 0 32px">
+          <el-divider style="margin: 0"></el-divider>
+        </div>
+        <el-row :gutter="0" style="margin: 20px 32px">
+          <el-col :span="8">
+            <div>
+              <small-title slot="title" :no-padding="true">
+                生产明细
+              </small-title>
+              <div ref="bar" :style="{ height: '40vh', width: '100%' }" />
+            </div>
+          </el-col>
+          <el-col :span="16">
+            <div v-show="dataForm.orderStatus === 2"
+              style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
+              <small-title slot="title" :no-padding="true">
+                历史趋势
+              </small-title>
+              <div ref="line" :style="{ height: '40vh', width: '50vw' }" />
+            </div>
+          </el-col>
+        </el-row>
       </div>
     </div>
   </el-drawer>
@@ -118,7 +156,9 @@ export default {
       barChart: null,
       equipmentLineChart: null,
       visible: false,
-      dataForm: {}
+      loading:true,
+      dataForm: {},
+      colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
     }
   },
   beforeDestroy() {
@@ -163,12 +203,13 @@ export default {
     },
     init(id) {
       this.visible = true
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
-        this.initLineChart()
+      //   this.initLineChart()
-      })
+      // })
       if (id) {
         getWorkOrderDetail(id).then(res => {
           if (res.code === 0) {
+            this.loading = false
             this.dataForm = res.data.prodWorkOrderDO
             this.buildChart(this.dataForm)
             // 在制品
@@ -218,47 +259,56 @@ export default {
       this.initChart(barList)
       // 良品率
       const pieList = [
-        { value: data.actualProduction, name: '实际产出' },
+        { value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
-        { value: data.wasteNum, name: '废品数量' },
+        { value: data.wasteNum ? data.wasteNum : 0, name: '废品数量' },
-        { value: data.reworkNum, name: '待再加工数量' }
+        { value: data.reworkNum ? data.reworkNum :0, name: '待再加工数量' }
       ]
       this.initPieChart(pieList)
     },
     initChart(barData) {
       this.barChart = echarts.init(this.$refs['bar'])
       this.barChart.setOption({
-        title: {
+        // title: {
-          text: '生产明细',
+        //   text: '生产明细',
-          left: 'center'
+        //   left: 'center'
-          // subtext: 'Fake Data'
+        //   // subtext: 'Fake Data'
-        },
+        // },
+        color: ['#3E8EF7'],
         tooltip: {
           trigger: 'axis'
         },
-        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
-          top: '20%',
+          top: '15%',
-          left: "1%",
+          left: 20,
-          right: "3%",
+          right: '10%',
-          bottom: "1%",
+          bottom: 0,
           containLabel: true
         },
         xAxis: {
           type: 'category',
           data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
           axisLabel: {
-            rotate:45
+            rotate: 25
           }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
         },
         series: [
           {
             data: barData,
             type: 'bar',
-            barWidth: '40%'
+            barWidth: 16,
+            label: {
+              show: true,
+              position: 'top'
+            }
           }
         ]
       }, true)
@@ -266,8 +316,9 @@ export default {
     initPieChart(pieData) {
       this.pieChart = echarts.init(this.$refs['pie'])
       this.pieChart.setOption({
+        color: ['#3E8EF7', '#69E6D8', '#F7C739'],
         title: {
-          text: '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%',
+          // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
           left: 'center'
           // subtext: 'Fake Data'
         },
@@ -275,31 +326,38 @@ export default {
           trigger: 'item'
         },
         legend: {
-          top: '5%',
+          bottom: 0,
-          left: 'right',
+          left: 'center'
-          orient: 'vertical'
         },
         series: [
           {
             // name: 'Access From',
             type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['50%', '70%'],
             avoidLabelOverlap: false,
+            data: pieData,
             label: {
-              show: false,
+              show: true,
-              position: 'center'
+              position: 'outside',
+              formatter: (params) => {
+                console.log(params)
+                let res = ''
+                // for (let i in params) {
+                  res += `${params.percent ? params.percent : 0}% \n ${params.name}`
+                // }
+                return res
               },
-            emphasis: {
+              rich: {
-              label: {
+                d: {
-                show: false,
+                  color: 'inherit', // 系列色
-                fontSize: 40,
+                  verticalAlign: 'top'
-                fontWeight: 'bold'
+                },
+                b: {
+                  color: '#8C8C8C',
+                  verticalAlign: 'top'
+                }
+              }
             }
-            },
-            labelLine: {
-              show: false
-            },
-            data: pieData
           }
         ]
       }, true)
@@ -307,39 +365,48 @@ export default {
     initEqLineChart(xAxisList, yAxisList) {
       this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
       this.equipmentLineChart.setOption({
-        title: {
+        // title: {
-          text: '在制品分布',
+        //   text: '待制品分布',
-          left: 'center'
+        //   left: 'center'
-          // subtext: 'Fake Data'
+        //   // subtext: 'Fake Data'
-        },
+        // },
+        color: ['#3E8EF7'],
         tooltip: {
           trigger: 'axis'
         },
-        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
-          top: '20%',
+          top: '15%',
-          left: "1%",
+          left: 30,
-          right: "3%",
+          right: 0,
-          bottom: "1%",
+          bottom: 0,
           containLabel: true
         },
         xAxis: {
           type: 'category',
           data: xAxisList,
           axisLabel: {
-            rotate:45,
+            rotate: 25
             // width: '10%'
           }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
         },
         series: [
           {
             data: yAxisList,
             type: 'bar',
-            barWidth: '40px'
+            barWidth: 16,
+            label: {
+              show: true,
+              position: 'top'
+            }
           }
         ]
       }, true)
@@ -347,24 +414,39 @@ export default {
     initLineChart(xAxisList, seriesList) {
       this.lineChart = echarts.init(this.$refs['line'])
       this.lineChart.setOption({
-        title: {
+        color: ['#3E8EF7'],
-          text: '历史趋势',
+        tooltip: {
-          left: 'center' // 设置标题居中
+          trigger: 'item'
+        },
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
         },
         xAxis: {
           type: 'category',
           data: xAxisList,
           axisLabel: {
-            rotate:45
+            rotate: 25
           }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
         },
         series: [
           {
             data: seriesList,
-            type: 'line'
+            type: 'line',
+            label: {
+              show: true,
+              position: 'top'
+            }
           }
         ]
       }, true)
@@ -378,14 +460,8 @@ export default {
   },
 };
 </script>
+
 <style scoped>
-.chartDiv {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  padding: 5px;
-  padding-left: 30px;
-}
   .drawer >>> .el-drawer {
   border-radius: 8px 0 0 8px;
 }
@@ -402,7 +478,8 @@ export default {
 }
 .detailBox p {
   margin: 0;
-  padding: 0 32px;
+  padding-left: 32px;
+  /* padding: 0 32px; */
 }
 .detailBox .title {
   /* width: 56px; */
@@ -424,6 +501,8 @@ export default {
 }
 .detailBox {
   padding-top: 30px;
-  width: 99%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  /* width: 99%; */
 }
 </style>

src/views/produce/workOrder/dayReportComponents/ExportDayReport.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="dayRepExpBox">
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">产品良率</div>
+        <div class="box2">
+          <productYield ref="productYield" :pieList="pieList" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">待制品分布</div>
+        <div class="box2">
+          <beProcessed ref="beProcess" :beProcessObj="beProcessObj" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">生产明细</div>
+        <div class="box2">
+          <produceDetail ref="produceDetail" :produceData="produceData" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">历史趋势</div>
+        <div class="box2">
+          <hisChart ref="hisChart" :hisObj="hisObj" />
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import hisChart from './dayReportExportChart/hisChart'
+import produceDetail from './dayReportExportChart/produceDetail'
+import productYield from './dayReportExportChart/productYield'
+import beProcessed from './dayReportExportChart/beProcessed.vue'
+export default {
+  name: 'ExportDayReport',
+  components: { hisChart, produceDetail, productYield, beProcessed },
+  props: {
+    produceData: {
+      type: Array,
+      default: () => []
+    },
+    hisObj: {
+      type: Object,
+      default: () => { }
+    },
+    pieList: {
+      type: Array,
+      default: () => []
+    },
+    beProcessObj: {
+      type: Object,
+      default: () => {}
+    },
+  },
+  data() {
+    return {
+    }
+  },
+  watch: {
+    beProcessObj: {
+      handler(newValue, oldValue) {
+        this.$refs.beProcess.canvasReset()
+      }
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      // console.log('beProcessObj', this.beProcessObj);
+      // this.$refs.beProcess.canvasReset()
+      // this.$refs.productYield.canvasReset()
+      // this.$refs.produceDetail.canvasReset()
+      // this.$refs.hisChart.canvasReset()
+
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.dayRepExpBox {
+  width: 595px;
+  height: 842px;
+  padding: 15px 20px 0;
+  background-color: #fff;
+  z-index: 2000;
+  .box2{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    border-left: 0;
+  }
+  .box3{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+  }
+  .box5{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    border-left: 0;
+  }
+  .box6{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    position: relative;
+    .rightTitle{
+      position: absolute;
+      right: 5px;
+      top:2px;
+      font-size: 8px;
+      color: #383838;
+    }
+  }
+}
+</style>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/beProcessed.vue

@@ -0,0 +1,103 @@
+<template>
+  <div id="chipPowerExpChart" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    beProcessObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    beProcessObj: {
+      handler(val) {
+        console.log(val);
+        this.canvasReset()
+      },
+      deep: true //对象内部属性的监听，关键。
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      console.log(this.beProcessObj);
+      this.chart = echarts.init(document.getElementById('chipPowerExpChart'))
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+      let xAxisList = this.beProcessObj.xAxisList
+      let yAxisList = this.beProcessObj.yAxisList
+      var option = {
+        // title: {
+        //   text: '待制品分布',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisList,
+          axisLabel: {
+            rotate: 45
+            // width: '10%'
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: yAxisList,
+            type: 'bar',
+            barWidth: 10,
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/hisChart.vue

@@ -0,0 +1,108 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-09 09:55:27
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="hisChart" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    hisObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    hisObj: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true,
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById('hisChart'))
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+      // const values = Object.values(this.chipPowerDistributionVo)
+      let dateList = this.hisObj.dateList
+      let seriesList = this.hisObj.seriesList
+      var option = {
+        // title: {
+        //   text: '待制品分布',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dateList,
+          axisLabel: {
+            rotate: 45
+            // width: '10%'
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: seriesList,
+            type: 'line',
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/produceDetail.vue

@@ -0,0 +1,107 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-09 09:56:13
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="produceDetail" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    produceData: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    produceData: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true,
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById('produceDetail'), null, { devicePixelRatio: 2 })
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+
+      // const values = Object.values(this.chipPowerDistributionVo)
+      var option = {
+        // title: {
+        //   text: '生产明细',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: '10%',
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: this.produceData,
+            type: 'bar',
+            barWidth: 16,
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue

@@ -0,0 +1,109 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-11 14:48:15
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="productYield" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    pieList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    pieList: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      console.log(this.beProcessObj);
+      this.chart = echarts.init(document.getElementById('productYield'), null, { devicePixelRatio: 2 })
+      // const values = Object.values(this.chipPowerDistributionVo)
+      var option = {
+        color: ['#3E8EF7', '#69E6D8', '#F7C739'],
+        title: {
+          // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
+          left: 'center'
+          // subtext: 'Fake Data'
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          bottom: 0,
+          left: 'center',
+          itemGap:60,
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            center: ['50%', '45%'],
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            data: this.pieList,
+            label: {
+              show: true,
+              position: 'outside',
+              formatter: (params) => {
+                console.log(params)
+                let res = ''
+                // for (let i in params) {
+                res += `${params.percent ? params.percent : 0}% \n ${params.name}`
+                // }
+                return res
+              },
+              rich: {
+                d: {
+                  color: 'inherit', // 系列色
+                  verticalAlign: 'top'
+                },
+                b: {
+                  color: '#8C8C8C',
+                  verticalAlign: 'top'
+                }
+              }
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/index.vue

@@ -1,62 +1,109 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-07 10:35:48
+ * @LastEditTime: 2024-07-09 11:08:43
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 35px)">
-    <div class="app-container" style="margin-top: 8px; padding: 0 16px; height: auto; font-size: 20px; text-align: center;">
+    <el-row :gutter="10">
-      <p style="margin-bottom: 0">数据概览</p>
+      <el-col :span="4">
+        <div class="app-container" style="padding: 16px; height: auto; text-align: left; border-radius: 8px;">
+          <!-- <p style="margin-bottom: 0">数据概览</p> -->
           <div class="view">
-        <div v-for="(item, index) in data" :key="index">
+            <div style="padding: 10px 0; width: 100%">
-          <p style="color: rgb(194,128,255)">{{ item }}</p>
+              <div class="topDiv">
-          <p>{{ index }}</p>
+                <div style="width: 4px; height: 52px; background: #71CC8C; border-radius: 2px;"></div>
+                <div class="centerDiv">
+                  <span style="font-size: 30px; line-height: 30px; color: rgba(0,0,0,0.85);">{{ inputNum }}</span>
+                  <span style="font-size: 14px; color: rgba(0,0,0,0.85);">在制工单数量</span>
+                </div>
+                <svg-icon icon-class="workProcess" style="width: 26px; height: 26px" />
               </div>
             </div>
           </div>
-    <div class="app-container" style="margin-top: 8px; height: auto;">
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <div class="app-container" style="padding: 16px; height: auto; text-align: left; border-radius: 8px;">
+          <!-- <p style="margin-bottom: 0">数据概览</p> -->
+          <div class="view">
+            <div style="padding: 10px 0; width: 100%" v-for="(item, index) in factorys" :key="index">
+              <div class="topDiv">
+                <div style="width: 4px; height: 52px; background: #3A79FF; border-radius: 2px;"></div>
+                <div class="centerDiv">
+                  <span style="font-size: 30px; line-height: 30px; color: rgba(0,0,0,0.85);">{{ factoryNum[index]
+                    }}</span>
+                  <span style="font-size: 14px; color: rgba(0,0,0,0.85);">{{item}}</span>
+                </div>
+                <svg-icon icon-class="factoryWorkOrder" style="width: 26px; height: 26px" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- <div class="app-container" style="margin-top: 8px; height: auto;">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    </div>
+    </div> -->
-    <div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto;">
+    <div class="app-container" style="margin-top: 8px;flex-grow: 1;">
-      <search-bar :formConfigs="formConfig2" ref="searchBarForm" style="margin-bottom: 0" />
+      <!-- <search-bar :formConfigs="formConfig2" ref="searchBarForm" style="margin-bottom: 0" /> -->
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-        :table-data="tableData">
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
+        :max-height="tableH">
         <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
-      <pagination
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-        :limit.sync="listQuery.pageSize"
+        @pagination="getDataList" />
-        :page.sync="listQuery.pageNo"
+    </div>
-        :total="listQuery.total"
+    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date"
-        @pagination="getDataList"
+      @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
-      />
+    <div id="dayRepDom" style="position: absolute;top:0;display: none;">
+      <ExportDayReport :beProcessObj="beProcessObj" :produceData="produceData" :hisObj="hisObj" :pieList="pieList" />
     </div>
-    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date" @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
   </div>
 </template>
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-import { getWorkOrderPage, exportExcel, getOverView } from '@/api/produceData/order';
+import { getWorkOrderPage, exportExcel, getOverView, getWorkOrderDetail } from '@/api/produceData/order';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
+import ExportDayReport from './dayReportComponents/ExportDayReport'
 import moment from 'moment'
+import tableHeightMixin from "@/mixins/tableHeightMixin";
 // import ButtonNav from '@/components/ButtonNav'
 import basicPage from '@/mixins/basic-page'
 import AddOrUpdate from './add-or-updata';
 import { factoryList, factoryArray } from "@/utils/constants";
-import { publicFormatter } from "@/utils/dict";
+// import { publicFormatter } from "@/utils/dict";
-
+import statusChart from "./statusChart.vue";
+import html2canvas from 'html2canvas'
+import JsPDF from 'jspdf'
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
-  components: { lineChart, AddOrUpdate },
+  components: { lineChart, AddOrUpdate, ExportDayReport },
-  mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
 	data() {
     return {
+      factorys: ['瑞昌中建材', '邯郸中建材', '株洲中建材', '佳木斯中建材', '成都中建材', '凯盛光伏', '蚌埠兴科'],
+      factoryNum: [0, 0, 0, 0, 0, 0, 0],
+      inputNum: 0,
+      heightNum: 180,
       factoryList,
+      produceData: [],
+      pieList:[],
+      hisObj: {
+        seriesList: [],
+        dateList:[],
+      },
+      beProcessObj: {
+        xAxisList: [],
+        yAxisList:[]
+      },
       factoryArray,
       listQuery: {
         pageSize: 20,
@@ -72,6 +119,10 @@ export default {
             type: 'detail',
             btnName: '详情',
         },
+        {
+          type: 'export',
+          btnName: '导出',
+        },
         // {
         //     type: 'delete',
         //     btnName: '删除',
@@ -173,12 +224,14 @@ export default {
           prop: 'factory',
           label: '工厂名称',
           filter: (val) => factoryList[val],
-          minWidth: 200,
+          minWidth: 220,
           showOverflowtooltip: true
         },
         {
           prop: 'workOrderNumber',
           label: '工单号',
+          minWidth: 130,
+          showOverflowtooltip: true
           // filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
         },
         {
@@ -206,13 +259,13 @@ export default {
         {
           prop: 'productionProgress',
           label: '生产进度',
-          filter: (val) => (val * 100) + '%'
+          filter: (val) => (val * 100).toFixed(2) + '%'
         },
         {
           prop: 'orderStatus',
           label: '工单状态',
-          filter: publicFormatter('workorder_status')
+          subcomponent: statusChart
-          // filter: (val) => ['未开始', '生产中', '已完成'][val],
+          // filter: (val) => ['', '未开始', '生产中', '已完成'][val],
         },
         {
           prop: 'startTime',
@@ -229,15 +282,15 @@ export default {
       ],
       tableData: [],
       xAxis: [],
-      lineData: {},
+      lineData: {}
-      data: {}
+      // data: {}
 			// proLineList: [],
 			// all: {}
 		};
   },
 	created() {
     const today = new Date()
-    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    const sevenDaysAgo = new Date(today.getTime() - (6 * 24 * 60 * 60 * 1000))
     this.listQuery.time = [moment(sevenDaysAgo).format('yyyy-MM-DD'), moment(today).format('yyyy-MM-DD')]
     this.formConfig[2].defaultSelect = this.listQuery.time
 	},
@@ -245,18 +298,87 @@ export default {
     this.getOverView()
   },
   methods: {
+    exportPDF() {
+      setTimeout(() => {
+        this.$message.success('正在导出，请稍等！')
+        const element = document.getElementById('dayRepDom')
+        element.style.display = 'block'
+        const fileName = '工单数据' + moment().format('yyMMDD') + '.pdf'
+        html2canvas(element, {
+          dpi: 300, // Set to 300 DPI
+          scale: 3 // Adjusts your resolution
+        }).then(function (canvas) {
+          const imgWidth = 595.28
+          const imgHeight = 841.89
+          const pageData = canvas.toDataURL('image/jpeg', 1.0)
+          const PDF = new JsPDF('', 'pt', [imgWidth, imgHeight])
+          PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
+          setTimeout(() => {
+            PDF.save(fileName) // 导出文件名
+          }, 1000)
+        })
+        element.style.display = 'none'
+      }, 3000)
+
+    },
     getOverView() {
       getOverView().then(res => {
-        this.data = res.data
+        // this.data = res.data
-        console.log('aa', res.data)
+        if (res.code === 0) {
+          for(const i in res.data) {
+            if (i === '在制工单数量') {
+              this.inputNum = res.data[i]
+            } else {
+              const index = this.factorys.indexOf(i)
+              if (index > -1) {
+                this.factoryNum[index] = res.data[i]
+              }
+            }
+          }
+        }
       })
     },
     otherMethods(val) {
+      console.log(val)
+      if (val.type === 'detail') {
         this.detailOrUpdateVisible = true;
         // this.addOrEditTitle = "详情";
         this.$nextTick(() => {
           this.$refs.detailOrUpdate.init(val.data.id);
         });
+      } else {
+        getWorkOrderDetail(val.data.id).then((res) => {
+          if (res.code === 0) {
+            // this.loading = false
+
+            const xAxisList = Object.keys(res.data.inProcessDis)
+            const yAxisList = Object.values(res.data.inProcessDis)
+            this.beProcessObj.xAxisList = xAxisList
+            this.beProcessObj.yAxisList = yAxisList
+            // console.log(this.beProcessObj)
+              ; const data = res.data.prodWorkOrderDO
+            const barList = [data.targetProduction, data.plannedInvestment, data.actualInvestment, data.actualProduction, data.wasteNum, data.reworkNum]
+            const seriesList = []
+            const dateList = []
+            res.data.his.forEach(element => {
+              seriesList.push(element.actualProduction)
+              dateList.push(element.recordTime[0] + '-' + element.recordTime[1] + '-' + element.recordTime[2])
+            })
+            this.hisObj.seriesList = seriesList
+            this.hisObj.dateList = dateList
+            this.produceData = barList
+            this.pieList = [
+              { value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
+              { value: data.wasteNum ? data.wasteNum : 0, name: '废品数量' },
+              { value: data.reworkNum ? data.reworkNum : 0, name: '待再加工数量' }
+            ]
+          }
+          this.$nextTick(() => {
+            this.exportPDF()
+          })
+        })
+
+      }
     },
     async getDataList() {
       const res = await getWorkOrderPage(this.listQuery)
@@ -317,10 +439,18 @@ export default {
 </script>
 
 <style scoped>
-/* .blueTip { */
+.centerDiv {
-	/* padding-bottom: 10px; */
+  display: flex;
-/* } */
+  flex-direction: column;
-/* .blueTi */
+  justify-content: flex-start;
+}
+.topDiv {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: flex-start;
+  flex: 1;
+}
 .view {
   display: flex;
   justify-content: space-around;
@@ -342,7 +472,7 @@ export default {
   background-color: #fff;
   border-radius: 4px;
   padding: 16px 16px 0;
-  height: calc(100vh - 134px);
+  height: calc(100vh - 40px);
   overflow: auto;
 }
 </style>

src/views/produce/workOrder/statusChart.vue

@@ -0,0 +1,51 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2024-06-24 15:03:19
+ * @LastEditTime: 2024-07-08 08:48:58
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <span class="dot" :class="myClass"></span>
+    <span>{{ state }}</span>
+  </div>
+</template>
+<script>
+export default {
+  name: "statusChart",
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    state() {
+      return ['未开始', '生产中', '已完成'][this.injectData.orderStatus]
+    },
+    myClass() {
+      return ['yellow', 'blue', 'green'][this.injectData.orderStatus]
+    }
+  },
+};
+</script>
+<style scoped>
+.dot {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 3px;
+  vertical-align: middle;
+  margin-right: 8px;
+}
+.green {
+  background: #10DC76;
+}
+.yellow {
+  background: #FFBD02;
+}
+.blue {
+  background: #3B79FF;
+}
+</style>

src/views/report/chipOEEBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
           ];
@@ -270,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -284,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/chipOutputBM/index.vue

@@ -4,7 +4,7 @@
       <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" />
     </div>
     <div class="containerBottom">
-      <div class="smallTitle">4月芯片产量</div>
+      <div class="smallTitle">芯片产量</div>
       <bm-line-bar
         :chartHeight="chartHeight"
         :legendList="legendList"
@@ -26,16 +26,30 @@
 <script>
 import bmSearchBar from "../components/bmSearchBar.vue";
 import BmLineBar from "../components/bmLineBar.vue";
-const tableProps = [
+import {
+  cPReportByDateRangePage,
+  cPReportByDateRangeExport,
+} from "@/api/report/benchmarking.js";
+import moment from "moment";
+export default {
+  name: "ChipOutputBM",
+  data() {
+    return {
+      factoryList: [
+        { id: 0, name: "瑞昌" },
+        { id: 1, name: "邯郸" },
+      ],
+      tableProps: [],
+      tableProps1: [
         {
           prop: "factory",
           label: "工厂名称",
-    // filter: (val) => factoryList[val],
+          filter: (val) => this.factoryList[val].name,
-    minWidth: 200,
+          minWidth: 150,
           showOverflowtooltip: true,
         },
         {
-    prop: "name",
+          prop: "item",
           label: "科目",
           minWidth: 120,
           showOverflowtooltip: true,
@@ -46,81 +60,27 @@ const tableProps = [
           minWidth: 80,
           showOverflowtooltip: true,
         },
-  {
+      ],
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
-export default {
-  name: "ChipOutputBM",
-  data() {
-    return {
-      tableProps,
       listQuery: {
         current: 1,
-        size: 1000,
+        size: 100,
       },
-      tableData: [
+      tableData: [],
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
       chartHeight: this.tableHeight(269) / 2,
       tableH: this.tableHeight(269) / 2,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
+        { id: 1, name: "", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
+        { id: 2, name: "", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        { id: 3, name: "", type: 1, color: "#288AFF" },
       ],
       chartMsg: {
         color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
+        xData: [],
         yName: "单位/片",
         series: [
           {
-            name: "2024年4月目标值",
+            name: "1",
-            // data: [3000, 2000, 3000],
+            data: [],
-            // data: [6800, 5000, 8900],
-            // data: [12000, 17000, 19000],
-            data: [560000, 540000, 600000],
             type: "line",
             symbol: "circle",
             symbolSize: 6,
@@ -130,30 +90,24 @@ export default {
             },
           },
           {
-            name: "2023年4月",
+            name: "2",
-            // data: [2100, 800, 1500],
+            data: [],
-            // data: [9500, 7200, 9901],
-            // data: [14666, 15000, 17888],
-            data: [550000, 456666, 590000],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
               // position: [-5, -16],
-              // position: [-10, -16],
+              position: [-10, -16],
-              position: [-17, -16],
+              // position: [-17, -16],
               color: "#68C483",
             },
           },
           {
-            name: "2024年4月",
+            name: "3",
-            // data: [2100, 900, 1300],
+            data: [],
-            // data: [9100, 7300, 9700],
-            // data: [14666, 15300, 18000],
-            data: [556666, 456666, 650000],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -188,6 +142,13 @@ export default {
     this.chartHeight = this.tableHeight(269) / 2;
     window.addEventListener("resize", this._setTableHeight);
   },
+  mounted() {
+    this.tableProp = this.tableProp1;
+    this.listQuery.date = 2;
+    this.listQuery.queryTime = moment().format("yyyy-MM-DD");
+    this.listQuery.factorys = [];
+    this.getList();
+  },
   destroyed() {
     window.removeEventListener("resize", this._setTableHeight);
   },
@@ -206,11 +167,159 @@ export default {
       }
     },
     getSearch(val) {
-      console.log(val);
+      this.listQuery.date = val.type;
-      console.log("=========================");
+      this.listQuery.queryTime = val.startDate;
+      this.listQuery.factorys = val.factory;
+      this.getList();
     },
-    handleExport() {
+    getList() {
-      console.log("导出");
+      this.tableProps = [];
+      cPReportByDateRangePage({ ...this.listQuery }).then((res) => {
+        if (res.data && res.data.length > 0) {
+          // 设置表头
+          let msg = res.data[0];
+          let arr = [
+            {
+              prop: "lastone",
+              label: msg.lastone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "currentone",
+              label: msg.currentone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "targetone",
+              label: msg.targetone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+          ];
+          this.tableProps = this.tableProps1.concat(arr);
+          // 整理表格数据
+          let tableArr = [];
+          res.data.forEach((item) => {
+            let obj = {};
+            obj.factory = item.factory;
+            obj.item = "芯片产量";
+            obj.unit = "片";
+            obj.lastone = item.lastone.total;
+            obj.currentone = item.currentone.total;
+            obj.targetone = item.targetone.total;
+            tableArr.push(obj);
+          });
+          this.tableData = tableArr;
+          // 设置图例
+          this.legendList[0].name = msg.targetone.reportTime;
+          this.legendList[1].name = msg.lastone.reportTime;
+          this.legendList[2].name = msg.currentone.reportTime;
+          this.chartMsg.series[0].name = msg.targetone.reportTime;
+          this.chartMsg.series[1].name = msg.lastone.reportTime;
+          this.chartMsg.series[2].name = msg.currentone.reportTime;
+          // 设置偏移量
+          switch (this.listQuery.type) {
+            case 0:
+              this.chartMsg.series[1].label.position = [-5, -16];
+              break;
+            case 1:
+              this.chartMsg.series[1].label.position = [-5, -16];
+              break;
+            case 2:
+              this.chartMsg.series[1].label.position = [-10, -16];
+              break;
+            default:
+              this.chartMsg.series[1].label.position = [-17, -16];
+          }
+          // 设置chartMsg的series的数据
+          this.setChartMsg(res.data);
+        } else {
+          // 重置
+          this.resetMsg();
+        }
+      });
+    },
+    setChartMsg(val) {
+      let xData = [];
+      let lineData = [];
+      let barData1 = [];
+      let barData2 = [];
+      for (let i = 0; i < val.length; i++) {
+        this.factoryList.map((item) => {
+          if (item.id === val[i].factory) {
+            xData.push(item.name);
+          }
+        });
+        lineData.push(val[i].targetone.total || 0);
+        barData1.push(val[i].lastone.total || 0);
+        barData2.push(val[i].currentone.total || 0);
+      }
+      this.chartMsg.xData = xData;
+      this.chartMsg.series[0].data = lineData;
+      this.chartMsg.series[1].data = barData1;
+      this.chartMsg.series[2].data = barData2;
+      this.chartMsg.xData = xData;
+    },
+    resetMsg() {
+      this.tableProps = this.tableProps1;
+      this.tableData = [];
+      this.chartMsg = {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: [],
+        yName: "单位/片",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "line",
+            symbol: "circle",
+            symbolSize: 6,
+            label: {
+              show: true,
+              color: "#FFAE17",
+            },
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+             barWidth: 16,
+            label: {
+              show: true,
+              // position: [-5, -16],
+              // position: [-5, -16],
+              position: [-10, -16],
+              // position: [-17, -16],
+              color: "#68C483",
+            },
+          },
+          {
+            name: "3",
+            data: [],
+            type: "bar",
+             barWidth: 16,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#288AFF",
+            },
+          },
+        ],
+      };
+    },
+    handleExport(val) {
+      this.listQuery.type = val.type;
+      this.listQuery.startDate = val.startDate;
+      this.listQuery.factory = val.factory;
+      let fileName = "芯片产量.xls";
+      cPReportByDateRangeExport({ ...this.listQuery })
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => {});
     },
   },
 };

src/views/report/chipPerCapitaBM/index.vue

@@ -4,7 +4,7 @@
       <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" />
     </div>
     <div class="containerBottom">
-      <div class="smallTitle">4月芯片人均产量</div>
+      <div class="smallTitle">芯片人均产量</div>
       <bm-line-bar
         :chartHeight="chartHeight"
         :legendList="legendList"
@@ -26,16 +26,30 @@
 <script>
 import bmSearchBar from "../components/bmSearchBar.vue";
 import BmLineBar from "../components/bmLineBar.vue";
-const tableProps = [
+import {
+  chipAnnualAverageProductionPage,
+  chipAnnualAverageProductionExport,
+} from "@/api/report/benchmarking.js";
+import moment from "moment";
+export default {
+  name: "ChipPerCapitaBM",
+  data() {
+    return {
+      factoryList: [
+        { id: 0, name: "瑞昌" },
+        { id: 1, name: "邯郸" },
+      ],
+      tableProps: [],
+      tableProps1: [
         {
           prop: "factory",
           label: "工厂名称",
-    // filter: (val) => factoryList[val],
+          filter: (val) => this.factoryList[val].name,
-    minWidth: 200,
+          minWidth: 150,
           showOverflowtooltip: true,
         },
         {
-    prop: "name",
+          prop: "item",
           label: "科目",
           minWidth: 120,
           showOverflowtooltip: true,
@@ -46,81 +60,27 @@ const tableProps = [
           minWidth: 80,
           showOverflowtooltip: true,
         },
-  {
+      ],
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
-export default {
-  name: "ChipPerCapitaBM",
-  data() {
-    return {
-      tableProps,
       listQuery: {
         current: 1,
-        size: 1000,
+        size: 100,
       },
-      tableData: [
+      tableData: [],
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
       chartHeight: this.tableHeight(269) / 2,
       tableH: this.tableHeight(269) / 2,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
+        { id: 1, name: "", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
+        { id: 2, name: "", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        { id: 3, name: "", type: 1, color: "#288AFF" },
       ],
       chartMsg: {
         color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
+        xData: [],
-        yName: "单位/片",
+        yName: "单位:片/人",
         series: [
           {
-            name: "2024年4月目标值",
+            name: "1",
-            // data: [3000, 2000, 3000],
+            data: [],
-            // data: [6800, 5000, 8900],
-            // data: [12000, 17000, 19000],
-            data: [560000, 540000, 600000],
             type: "line",
             symbol: "circle",
             symbolSize: 6,
@@ -130,30 +90,24 @@ export default {
             },
           },
           {
-            name: "2023年4月",
+            name: "2",
-            // data: [2100, 800, 1500],
+            data: [],
-            // data: [9500, 7200, 9901],
-            // data: [14666, 15000, 17888],
-            data: [550000, 456666, 590000],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
               // position: [-5, -16],
-              // position: [-10, -16],
+              position: [-10, -16],
-              position: [-17, -16],
+              // position: [-17, -16],
               color: "#68C483",
             },
           },
           {
-            name: "2024年4月",
+            name: "3",
-            // data: [2100, 900, 1300],
+            data: [],
-            // data: [9100, 7300, 9700],
-            // data: [14666, 15300, 18000],
-            data: [556666, 456666, 650000],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -188,6 +142,13 @@ export default {
     this.chartHeight = this.tableHeight(269) / 2;
     window.addEventListener("resize", this._setTableHeight);
   },
+  mounted() {
+    this.tableProp = this.tableProp1;
+    this.listQuery.type = 2;
+    this.listQuery.startDate = moment().format("yyyy-MM-DD");
+    this.listQuery.factory = [];
+    this.getList();
+  },
   destroyed() {
     window.removeEventListener("resize", this._setTableHeight);
   },
@@ -206,11 +167,146 @@ export default {
       }
     },
     getSearch(val) {
-      console.log(val);
+      this.listQuery.type = val.type;
-      console.log("=========================");
+      this.listQuery.startDate = val.startDate;
+      this.listQuery.factory = val.factory;
+      this.getList();
     },
-    handleExport() {
+    getList() {
-      console.log("导出");
+      this.tableProps = [];
+      chipAnnualAverageProductionPage({ ...this.listQuery }).then((res) => {
+        if (res.data && res.data.records.length > 0) {
+          let msg = res.data.records[0];
+          let arr = [
+            {
+              prop: "yoy",
+              label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "queryValue",
+              label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "target",
+              label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+          ];
+          this.tableProps = this.tableProps1.concat(arr);
+          this.tableData = res.data.records;
+          // 设置图例
+          this.legendList[0].name = msg.targetColumn;
+          this.legendList[1].name = msg.yoyColumn;
+          this.legendList[2].name = msg.queryColumn;
+          this.chartMsg.series[0].name = msg.targetColumn;
+          this.chartMsg.series[1].name = msg.yoyColumn;
+          this.chartMsg.series[2].name = msg.queryColumn;
+          // 设置偏移量
+          switch (this.listQuery.type) {
+            case 0:
+              this.chartMsg.series[1].label.position = [-5, -16];
+              break;
+            case 1:
+              this.chartMsg.series[1].label.position = [-5, -16];
+              break;
+            case 2:
+              this.chartMsg.series[1].label.position = [-10, -16];
+              break;
+            default:
+              this.chartMsg.series[1].label.position = [-17, -16];
+          }
+          // 设置chartMsg的series的数据
+          this.setChartMsg(res.data.records);
+        } else {
+          // 重置
+          this.resetMsg();
+        }
+      });
+    },
+    setChartMsg(val) {
+      let xData = [];
+      let lineData = [];
+      let barData1 = [];
+      let barData2 = [];
+      for (let i = 0; i < val.length; i++) {
+        this.factoryList.map((item) => {
+          if (item.id === val[i].factory) {
+            xData.push(item.name);
+          }
+        });
+        lineData.push(val[i].target || 0);
+        barData1.push(val[i].yoy || 0);
+        barData2.push(val[i].queryValue || 0);
+      }
+      this.chartMsg.xData = xData;
+      this.chartMsg.series[0].data = lineData;
+      this.chartMsg.series[1].data = barData1;
+      this.chartMsg.series[2].data = barData2;
+      this.chartMsg.xData = xData;
+    },
+    resetMsg() {
+      this.tableProps = this.tableProps1;
+      this.tableData = [];
+      this.chartMsg = {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: [],
+        yName: "单位/片",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "line",
+            symbol: "circle",
+            symbolSize: 6,
+            label: {
+              show: true,
+              color: "#FFAE17",
+            },
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+             barWidth: 16,
+            label: {
+              show: true,
+              // position: [-5, -16],
+              // position: [-5, -16],
+              position: [-10, -16],
+              // position: [-17, -16],
+              color: "#68C483",
+            },
+          },
+          {
+            name: "3",
+            data: [],
+            type: "bar",
+             barWidth: 16,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#288AFF",
+            },
+          },
+        ],
+      };
+    },
+    handleExport(val) {
+      this.listQuery.type = val.type;
+      this.listQuery.startDate = val.startDate;
+      this.listQuery.factory = val.factory;
+      let fileName = "芯片人均产量对标.xls";
+      chipAnnualAverageProductionExport({ ...this.listQuery })
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => {});
     },
   },
 };

src/views/report/chipYieldBM/index.vue

@@ -4,7 +4,7 @@
       <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" />
     </div>
     <div class="containerBottom">
-      <div class="smallTitle">4月芯片良率</div>
+      <div class="smallTitle">芯片良率</div>
       <bm-line-bar
         :chartHeight="chartHeight"
         :legendList="legendList"
@@ -26,16 +26,30 @@
 <script>
 import bmSearchBar from "../components/bmSearchBar.vue";
 import BmLineBar from "../components/bmLineBar.vue";
-const tableProps = [
+import {
+  chipyieldRatePage,
+  chipyieldRateExport,
+} from "@/api/report/benchmarking.js";
+import moment from "moment";
+export default {
+  name: "ChipYieldBM",
+  data() {
+    return {
+      factoryList: [
+        { id: 0, name: "瑞昌" },
+        { id: 1, name: "邯郸" },
+      ],
+      tableProps: [],
+      tableProps1: [
         {
           prop: "factory",
           label: "工厂名称",
-    // filter: (val) => factoryList[val],
+          filter: (val) => this.factoryList[val].name,
-    minWidth: 200,
+          minWidth: 150,
           showOverflowtooltip: true,
         },
         {
-    prop: "name",
+          prop: "item",
           label: "科目",
           minWidth: 120,
           showOverflowtooltip: true,
@@ -46,82 +60,27 @@ const tableProps = [
           minWidth: 80,
           showOverflowtooltip: true,
         },
-  {
+      ],
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
-export default {
-  name: "ChipYieldBM",
-  data() {
-    return {
-      tableProps,
       listQuery: {
         current: 1,
-        size: 1000,
+        size: 100,
       },
-      tableData: [
+      tableData: [],
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
       chartHeight: this.tableHeight(269) / 2,
       tableH: this.tableHeight(269) / 2,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
+        { id: 1, name: "", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
+        { id: 2, name: "", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        { id: 3, name: "", type: 1, color: "#288AFF" },
       ],
       chartMsg: {
         color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
+        xData: [],
         yName: "单位/%",
         series: [
           {
-            name: "2024年4月目标值",
+            name: "1",
-            data: [
+            data: [],
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-            ],
             type: "line",
             symbol: "circle",
             symbolSize: 6,
@@ -134,14 +93,10 @@ export default {
             },
           },
           {
-            name: "2023年4月",
+            name: "2",
-            data: [
+            data: [],
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
-            ],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -152,14 +107,10 @@ export default {
             },
           },
           {
-            name: "2024年4月",
+            name: "3",
-            data: [
+            data: [],
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -197,6 +148,13 @@ export default {
     this.chartHeight = this.tableHeight(269) / 2;
     window.addEventListener("resize", this._setTableHeight);
   },
+  mounted() {
+    this.tableProp = this.tableProp1;
+    this.listQuery.type = 2;
+    this.listQuery.startDate = moment().format("yyyy-MM-DD");
+    this.listQuery.factory = [];
+    this.getList();
+  },
   destroyed() {
     window.removeEventListener("resize", this._setTableHeight);
   },
@@ -215,11 +173,144 @@ export default {
       }
     },
     getSearch(val) {
-      console.log(val);
+      this.listQuery.type = val.type;
-      console.log("=========================");
+      this.listQuery.startDate = val.startDate;
+      this.listQuery.factory = val.factory;
+      this.getList();
     },
-    handleExport() {
+    getList() {
-      console.log("导出");
+      this.tableProps = [];
+      chipyieldRatePage({ ...this.listQuery }).then((res) => {
+        if (res.data && res.data.records.length > 0) {
+          let msg = res.data.records[0];
+          let arr = [
+            {
+              prop: "yoy",
+              label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "queryValue",
+              label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "target",
+              label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
+              minWidth: 150,
+            },
+          ];
+          this.tableProps = this.tableProps1.concat(arr);
+          this.tableData = res.data.records;
+          // 设置图例
+          this.legendList[0].name = msg.targetColumn;
+          this.legendList[1].name = msg.yoyColumn;
+          this.legendList[2].name = msg.queryColumn;
+          this.chartMsg.series[0].name = msg.targetColumn;
+          this.chartMsg.series[1].name = msg.yoyColumn;
+          this.chartMsg.series[2].name = msg.queryColumn;
+          // 设置chartMsg的series的数据
+          this.setChartMsg(res.data.records);
+        } else {
+          // 重置
+          this.resetMsg();
+        }
+      });
+    },
+    setChartMsg(val) {
+      let xData = [];
+      let lineData = [];
+      let barData1 = [];
+      let barData2 = [];
+      for (let i = 0; i < val.length; i++) {
+        this.factoryList.map((item) => {
+          if (item.id === val[i].factory) {
+            xData.push(item.name);
+          }
+        });
+        lineData.push({
+          name: "%",
+          value: val[i].target || 0,
+        });
+        barData1.push({ name: "%", value: val[i].yoy || 0 });
+        barData2.push({
+          name: "%",
+          value: val[i].queryValue || 0,
+        });
+      }
+      this.chartMsg.xData = xData;
+      this.chartMsg.series[0].data = lineData;
+      this.chartMsg.series[1].data = barData1;
+      this.chartMsg.series[2].data = barData2;
+      this.chartMsg.xData = xData;
+    },
+    resetMsg() {
+      this.tableProps = this.tableProps1;
+      this.tableData = [];
+      this.chartMsg = {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: [],
+        yName: "单位/%",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "line",
+            symbol: "circle",
+            symbolSize: 6,
+            label: {
+              show: true,
+              color: "#FFAE17",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+            label: {
+              show: true,
+              position: [-18, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "3",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#288AFF",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+        ],
+      };
+    },
+    handleExport(val) {
+      this.listQuery.type = val.type;
+      this.listQuery.startDate = val.startDate;
+      this.listQuery.factory = val.factory;
+      let fileName = "芯片良率对标.xls";
+      chipyieldRateExport({ ...this.listQuery })
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => {});
     },
   },
 };

src/views/report/completionStatusIntrBM/components/baseChart.vue

@@ -0,0 +1,157 @@
+<template>
+  <div
+    :id="chartId"
+    :style="{ width: '100%', height: chartHeight + 'px' }"
+  ></div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "BaseChart",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 70,
+          right: 0,
+          bottom: 30,
+          top: 30,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              res +=
+                "<br/>" +
+                `${
+                  params[i].seriesType === "line"
+                    ? '<img width="10" height="10" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                    : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
+                }` +
+                `<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
+                `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${
+                  params[i].name === "%"
+                    ? (params[i].value ? params[i].value.toFixed(2) : "0.00") +
+                      params[i].name
+                    : String(params[i].value).replace(
+                        /\B(?=(\d{3})+(?!\d))/g,
+                        ","
+                      )
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        yAxis: {
+          type: "value",
+          name: "",
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => {},
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      if (this.myChart) {
+        this.myChart.dispose();
+      }
+      var chartDom = document.getElementById(this.chartId);
+      this.myChart = echarts.init(chartDom);
+      this.option.color = this.chartMsg.color;
+      this.option.xAxis.data = this.chartMsg.xData;
+      this.option.yAxis.name = this.chartMsg.yName;
+      if (
+        this.chartMsg.series.length > 0 &&
+        this.chartMsg.series[0].data[0].name === "%"
+      ) {
+        this.option.yAxis.axisLabel = {
+          formatter: function (value) {
+            return value + ".00%";
+          },
+        };
+      } else {
+        this.option.yAxis.axisLabel = {
+          formatter: function (value) {
+            return value;
+          },
+        };
+      }
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>

src/views/report/completionStatusIntrBM/components/bmBarComplete.vue

@@ -1,19 +1,14 @@
 <!-- 只适用于指标完成情况对标 -->
 <template>
   <div>
-    <!-- 暂无数据 -->
-    <div
-      :style="{ height: chartHeight + 'px' }"
-      v-show="this.chartMsg.series[0].data.length === 0"
-    >
-      <div
-        class="no-data-bg"
-        style="position: relative; left: 50%; transform: translateX(-50%)"
-      ></div>
-    </div>
     <!-- 图例 -->
-    <div v-show="this.chartMsg.series[0].data.length > 0">
+    <div
-      <div class="legend">
+      class="legend"
+      v-show="
+        this.chartMsg1.series[0].data.length > 0 ||
+        this.chartMsg2.series[0].data.length > 0
+      "
+    >
       <span class="item" v-for="item in legendList" :key="item.id">
         <span
           v-if="item.type === 1"
@@ -33,83 +28,71 @@
         {{ item.name }}</span
       >
     </div>
+    <!-- 图 -->
+    <div>
       <div
-        :id="chartId"
+        style="
-        :style="{ width: '100%', height: chartHeight + 'px' }"
+          display: inline-block;
+          width: 79%;
+          vertical-align: top;
+          padding-right: 20px;
+        "
+      >
+        <base-chart
+          v-show="this.chartMsg1.series[0].data.length > 0"
+          :chartHeight="chartHeight"
+          :chartWidth="chartWidth1"
+          :chartMsg="chartMsg1"
+          chartId="targetChartLeft"
+          :chartNum="chartNum"
+        />
+        <!-- 暂无数据 -->
+        <div
+          :style="{ height: chartHeight + 'px' }"
+          v-show="this.chartMsg1.series[0].data.length === 0"
+        >
+          <div
+            class="no-data-bg"
+            style="position: relative; left: 50%; transform: translateX(-50%)"
           ></div>
         </div>
       </div>
+      <div style="display: inline-block; width: 20%; vertical-align: top">
+        <base-chart
+          v-show="this.chartMsg2.series[0].data.length > 0"
+          :chartHeight="chartHeight"
+          :chartWidth="chartWidth2"
+          :chartMsg="chartMsg2"
+          chartId="targetChartRight"
+          :chartNum="chartNum"
+        />
+        <!-- 暂无数据 -->
+        <div
+          :style="{ height: chartHeight + 'px' }"
+          v-show="this.chartMsg2.series[0].data.length === 0"
+        >
+          <div
+            class="no-data-bg"
+            style="
+              position: relative;
+              left: 50%;
+              transform: translateX(-50%);
+              width: 80%;
+            "
+          ></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
-import * as echarts from "echarts";
+import baseChart from "./baseChart.vue";
-import { debounce } from "@/utils/debounce";
 export default {
   name: "bmBarComplete",
   data() {
     return {
-      myChart: "",
+      chartWidth1: "60%",
-      option: {
+      chartWidth2: "20%",
-        color: [],
-        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
-        grid: {
-          left: 70,
-          right: 10,
-          bottom: 30,
-          top: 30,
-        },
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // type: "cross",
-            crossStyle: {
-              color: "rgba(237,237,237,0.5)",
-            },
-          },
-          formatter: function (params) {
-            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
-            for (var i = 0, l = params.length; i < l; i++) {
-              res +=
-                "<br/>" +
-                `${
-                  params[i].seriesType === "line"
-                    ? '<img width="10" height="10" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
-                    : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
-                }` +
-                `<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-                `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${
-                  params[i].name === "%"
-                    ? (params[i].value ? params[i].value.toFixed(2) : "0.00") +
-                      params[i].name
-                    : String(params[i].value).replace(
-                        /\B(?=(\d{3})+(?!\d))/g,
-                        ","
-                      )
-                }</span>`;
-            }
-            return res;
-          },
-        },
-        xAxis: {
-          type: "category",
-          data: [],
-          axisTick: {
-            show: false,
-          },
-          axisPointer: {
-            type: "shadow",
-          },
-        },
-        yAxis: {
-          type: "value",
-          name: "",
-          nameTextStyle: {
-            fontSize: 12,
-            align: "right",
-          },
-          axisLabel: {},
-        },
-        series: [],
-      },
     };
   },
   props: {
@@ -121,74 +104,20 @@ export default {
       type: Array,
       default: () => [],
     },
-    chartMsg: {
+    chartMsg1: {
       type: Object,
       default: () => {},
     },
-    chartId: {
+    chartMsg2: {
-      type: String,
+      type: Object,
-      default: "bmChart",
+      default: () => {},
     },
     chartNum: {
       type: Number,
       default: 1,
     },
   },
-  watch: {
+  components: { baseChart },
-    chartHeight: {
-      handler(newVal) {
-        this.chartHeight = newVal;
-      },
-    },
-    chartNum(val) {
-      this.canvasReset();
-    },
-    chartMsg: {
-      handler(newVal) {
-        this.canvasReset();
-      },
-      deep: true,
-    },
-  },
-  mounted() {
-    this.canvasReset();
-  },
-  methods: {
-    canvasReset() {
-      debounce(() => {
-        this.getMes();
-      }, 500)();
-    },
-    getMes() {
-      if (this.myChart) {
-        this.myChart.dispose();
-      }
-      var chartDom = document.getElementById(this.chartId);
-      this.myChart = echarts.init(chartDom);
-      this.option.color = this.chartMsg.color;
-      this.option.xAxis.data = this.chartMsg.xData;
-      this.option.yAxis.name = this.chartMsg.yName;
-      if (
-        this.chartMsg.series.length > 0 &&
-        this.chartMsg.series[0].data[0].name === "%"
-      ) {
-        this.option.yAxis.axisLabel = {
-          formatter: function (value) {
-            return value + ".00%";
-          },
-        };
-      } else {
-        this.option.yAxis.axisLabel = {
-          formatter: function (value) {
-            return value;
-          },
-        };
-      }
-      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
-      this.option.series = this.chartMsg.series;
-      this.myChart.setOption(this.option);
-    },
-  },
 };
 </script>
 <style lang="scss" scoped>

src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue

@@ -20,29 +20,33 @@
     <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
       <el-date-picker
         size="small"
-        clearable
+        :clearable="false"
         v-model="form.dayTime"
         type="date"
         placeholder="选择日期"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
     <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
       <el-date-picker
         v-model="form.weekTime"
+        :clearable="false"
         type="week"
         format="yyyy-MM-dd"
         placeholder="选择周"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
     <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
       <el-date-picker
         v-model="form.monthTime"
+        :clearable="false"
         type="month"
         placeholder="选择月份"
         value-format="yyyy-MM-dd"
@@ -53,6 +57,7 @@
     <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
       <el-date-picker
         v-model="form.yearTime"
+        :clearable="false"
         type="year"
         placeholder="选择年份"
         value-format="yyyy-MM-dd"
@@ -61,11 +66,15 @@
       </el-date-picker>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" size="small" @click="getDataList"
+      <el-button type="primary" size="small" @click="getDataList('search')"
         >查询</el-button
       >
       <el-divider direction="vertical"></el-divider>
-      <el-button type="primary" size="small" plain @click="handleExport"
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        @click="getDataList('export')"
         >导出</el-button
       >
     </el-form-item>
@@ -90,11 +99,13 @@ export default {
         { id: 2, name: "月" },
         { id: 3, name: "年" },
       ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
     };
   },
   methods: {
-    getDataList() {
+    getDataList(val) {
-      console.log(this.form);
       let params = {};
       switch (this.form.type) {
         case 0:
@@ -113,10 +124,15 @@ export default {
           break;
       }
       params.type = this.form.type;
+      if (!params.startDate) {
+        this.$message.warning("时间不能为空");
+        return;
+      }
+      if (val === "search") {
         this.$emit("getSearch", params);
-    },
+      } else {
-    handleExport() {
+        this.$emit("handleExport", params);
-      this.$emit("handleExport");
+      }
     },
   },
 };

src/views/report/completionStatusIntrBM/index.vue

@@ -11,8 +11,8 @@
       <bm-bar-complete
         :chartHeight="chartHeight"
         :legendList="legendList"
-        :chartMsg="chartMsg"
+        :chartMsg1="chartMsg1"
-        :chartId="chartId"
+        :chartMsg2="chartMsg2"
         :chartNum="chartNum"
       />
       <base-table
@@ -29,90 +29,82 @@
 <script>
 import BmSearchBarComplete from "./components/bmSearchBarComplete.vue";
 import BmBarComplete from "./components/bmBarComplete.vue";
-const tableProps = [
+import {
-  {
+  targetCompletionPage,
-    prop: "factory",
+  targetCompletionExport,
-    label: "指标名称",
+} from "@/api/report/benchmarking.js";
-    // filter: (val) => factoryList[val],
+import moment from "moment";
-  },
-  {
-    prop: "unit",
-    label: "单位",
-  },
-  {
-    prop: "time1",
-    label: "时间1",
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-  },
-];
 export default {
   name: "CompletionStatusIntrBM",
   data() {
     return {
-      tableProps,
+      tableProps: [],
+      tableProps1: [
+        {
+          prop: "item",
+          label: "指标名称",
+          minWidth: 120,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "unit",
+          label: "单位",
+          minWidth: 80,
+          showOverflowtooltip: true,
+        },
+      ],
       listQuery: {
         current: 1,
-        size: 1000,
+        size: 100,
       },
-      tableData: [
+      tableData: [],
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
       chartHeight: this.tableHeight(269) / 2,
       tableH: this.tableHeight(269) / 2,
       legendList: [
-        { id: 1, name: "2023年4月", type: 1, color: "#288AFF33" },
+        { id: 1, name: "", type: 1, color: "#288AFF33" },
-        { id: 2, name: "2024年4月", type: 1, color: "#288AFF" },
+        { id: 2, name: "", type: 1, color: "#288AFF" },
       ],
-      chartMsg: {
+      chartMsg1: {
         color: ["#288AFF33", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
+        xData: [],
         yName: "单位/MW",
         series: [
           {
-            name: "2023年4月",
+            name: "1",
-            data: [5505, 6578, 5500],
+            data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
-            label: {
-              show: true,
-              position: "top",
-              color: "#2789FF",
-            },
           },
           {
-            name: "2024年4月",
+            name: "2",
-            data: [3503, 3456, 4500],
+            data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
+            barGap: "-100%",
+            label: {
+              show: true,
+              position: "top",
+              color: "#288AFF",
+            },
+          },
+        ],
+      },
+      chartMsg2: {
+        color: ["#288AFF33", "#288AFF"],
+        xData: [],
+        yName: "单位/㎡",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+              barWidth: 16,
             barGap: "-100%",
             label: {
               show: true,
@@ -122,7 +114,6 @@ export default {
           },
         ],
       },
-      chartId: "completionStatusIntrBMChart",
       chartNum: 1,
     };
   },
@@ -148,6 +139,12 @@ export default {
     this.chartHeight = this.tableHeight(269) / 2;
     window.addEventListener("resize", this._setTableHeight);
   },
+  mounted() {
+    this.tableProp = this.tableProp1;
+    this.listQuery.type = 2;
+    this.listQuery.startDate = moment().format("yyyy-MM-DD");
+    this.getList();
+  },
   destroyed() {
     window.removeEventListener("resize", this._setTableHeight);
   },
@@ -166,11 +163,154 @@ export default {
       }
     },
     getSearch(val) {
-      console.log(val);
+      this.listQuery.type = val.type;
-      console.log("=========================");
+      this.listQuery.startDate = val.startDate;
+      this.getList();
     },
-    handleExport() {
+    getList() {
-      console.log("导出");
+      this.tableProps = [];
+      targetCompletionPage({ ...this.listQuery }).then((res) => {
+        if (res.data && res.data.records.length > 0) {
+          let msg = res.data.records[0];
+          let arr = [
+            {
+              prop: "queryValue",
+              label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
+              minWidth: 150,
+            },
+            {
+              prop: "target",
+              label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
+              minWidth: 150,
+            },
+          ];
+          this.tableProps = this.tableProps1.concat(arr);
+          this.tableData = res.data.records;
+          // 设置图例
+          this.legendList[0].name = msg.targetColumn;
+          this.legendList[1].name = msg.queryColumn;
+          this.chartMsg1.series[0].name = msg.targetColumn;
+          this.chartMsg1.series[1].name = msg.queryColumn;
+          this.chartMsg2.series[0].name = msg.targetColumn;
+          this.chartMsg2.series[1].name = msg.queryColumn;
+          // 设置偏移量
+          switch (this.listQuery.type) {
+            case 0:
+              this.chartMsg1.series[1].label.position = [-5, -16];
+              this.chartMsg2.series[1].label.position = [-5, -16];
+              break;
+            case 1:
+              this.chartMsg1.series[1].label.position = [-5, -16];
+              this.chartMsg2.series[1].label.position = [-5, -16];
+              break;
+            case 2:
+              this.chartMsg1.series[1].label.position = [-10, -16];
+              this.chartMsg2.series[1].label.position = [-10, -16];
+              break;
+            default:
+              this.chartMsg1.series[1].label.position = [-17, -16];
+              this.chartMsg2.series[1].label.position = [-17, -16];
+          }
+          // 设置chartMsg的series的数据
+          this.setChartMsg(res.data.records);
+        } else {
+          // 重置
+          this.resetMsg();
+        }
+      });
+    },
+    setChartMsg(val) {
+      console.log(val);
+      let xData1 = [];
+      let xData2 = [];
+      let barData1 = [];
+      let barData2 = [];
+      let barData3 = [];
+      let barData4 = [];
+      for (let i = 0; i < val.length; i++) {
+        if (val[i].unit !== "㎡") {
+          xData1.push(val[i].item);
+          barData1.push(val[i].target ? parseFloat(val[i].target.toFixed(2)) : 0);
+          barData2.push(val[i].queryValue ?  parseFloat(val[i].queryValue.toFixed(2)) : 0);
+        } else {
+          xData2.push(val[i].item);
+          barData3.push(val[i].target ? parseFloat(val[i].target.toFixed(2)) : 0);
+          barData4.push(val[i].queryValue ? parseFloat(val[i].queryValue.toFixed(2)) : 0);
+        }
+      }
+      this.chartMsg1.xData = xData1;
+      this.chartMsg2.xData = xData2;
+      this.chartMsg1.series[0].data = barData1;
+      this.chartMsg1.series[1].data = barData2;
+      this.chartMsg2.series[0].data = barData3;
+      this.chartMsg2.series[1].data = barData4;
+    },
+    resetMsg() {
+      this.tableProps = this.tableProps1;
+      this.tableData = [];
+      this.chartMsg1 = {
+        color: ["#288AFF33", "#288AFF"],
+        xData: [],
+        yName: "单位/MW",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+            barGap: "-100%",
+            label: {
+              show: true,
+              position: "top",
+              color: "#288AFF",
+            },
+          },
+        ],
+      };
+      this.chartMsg2 = {
+        color: ["#288AFF33", "#288AFF"],
+        xData: [],
+        yName: "单位/㎡",
+        series: [
+          {
+            name: "1",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+              barWidth: 16,
+            barGap: "-100%",
+            label: {
+              show: true,
+              position: "top",
+              color: "#288AFF",
+            },
+          },
+        ],
+      };
+    },
+    handleExport(val) {
+      this.listQuery.type = val.type;
+      this.listQuery.startDate = val.startDate;
+      let fileName = "指标完成情况对标.xls";
+      targetCompletionExport({ ...this.listQuery })
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => {});
     },
   },
 };

src/views/report/components/bmLineBar.vue

@@ -71,7 +71,7 @@ export default {
                 "<br/>" +
                 `${
                   params[i].seriesType === "line"
-                    ? '<img width="10" height="10" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                    ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
                     : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
                 }` +
                 `<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +

src/views/report/components/bmSearchBar.vue

@@ -19,29 +19,33 @@
     <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
       <el-date-picker
         size="small"
-        clearable
+        :clearable="false"
         v-model="form.dayTime"
         type="date"
         placeholder="选择日期"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
     <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
       <el-date-picker
         v-model="form.weekTime"
+        :clearable="false"
         type="week"
         format="yyyy-MM-dd"
         placeholder="选择周"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
     <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
       <el-date-picker
         v-model="form.monthTime"
+        :clearable="false"
         type="month"
         placeholder="选择月份"
         value-format="yyyy-MM-dd"
@@ -52,6 +56,7 @@
     <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
       <el-date-picker
         v-model="form.yearTime"
+        :clearable="false"
         type="year"
         placeholder="选择年份"
         value-format="yyyy-MM-dd"
@@ -115,11 +120,13 @@ export default {
         { id: 0, name: "瑞昌" },
         { id: 1, name: "邯郸" },
       ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
     };
   },
   methods: {
     getDataList(val) {
-      console.log(this.form);
       let params = {};
       params.factory = this.form.factory;
       switch (this.form.type) {
@@ -139,6 +146,10 @@ export default {
           break;
       }
       params.type = this.form.type;
+      if (!params.startDate) {
+        this.$message.warning("时间不能为空");
+        return;
+      }
       if (val === "search") {
         this.$emit("getSearch", params);
       } else {

src/views/report/components/produceLineBar.vue

@@ -0,0 +1,270 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-07-12 09:12:10
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series[0].data.length === 0"></div>
+    <!-- 图例 -->
+    <div v-show="this.chartMsg.series[0].data.length > 0 ">
+      <div class="legendData" v-if="show">
+        <span class="itemData" v-for="item in legendList" :key="item.id">
+          <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 30,
+          right: 0,
+          bottom: 30,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            console.log('params', params)
+            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              res +=
+                "<br/>" +
+              `${params[i].seriesType === "line"
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
+              }` +
+                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "MW"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡" : (params[i].value ? params[i].value : 0) + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "#F7F7F7",
+            // handleStyle: {
+            //   color: '#D6D6D6'
+            // },
+            handleStyle: {
+              borderColor: '#EBEBEB',
+              color: '#EBEBEB'
+            },
+            moveHandleStyle: {
+              borderColor: '#EBEBEB',
+              color: '#EBEBEB'
+            },
+            emphasis: {
+              handleStyle: {
+                borderColor: '#D6D6D6',
+                color: '#D6D6D6'
+              },
+              moveHandleStyle: {
+                borderColor: '#D6D6D6',
+                color: '#D6D6D6'
+              }
+            },
+            // 设置选中范围的填充颜色
+            fillerColor: "#F7F7F7",
+            // 设置边框颜色
+            borderColor: "#F7F7F7",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "100%",
+            // 设置滚动条高度
+            height: 3,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 14,
+          },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+        ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => {},
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      console.log('222222', this.chartMsg.series);
+      if (this.myChart) {
+        this.myChart.dispose();
+      }
+      var chartDom = document.getElementById(this.chartId);
+      this.myChart = echarts.init(chartDom);
+      this.option.color = this.chartMsg.color;
+      this.option.xAxis.data = this.chartMsg.xData;
+      // this.option.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  top: 0px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>

src/views/report/components/produceLineBarTarget.vue

@@ -0,0 +1,269 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-20 16:13:36
+ * @LastEditTime: 2024-07-09 16:15:10
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"></div>
+    <!-- 图例 -->
+    <div v-show="this.chartMsg.series.length > 0">
+      <div class="legendData" v-if="show">
+        <span class="itemData" v-for="item in legendList" :key="item.id">
+          <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 50,
+          right: 0,
+          bottom: 31,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            // console.log('params', params.data)
+            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+                ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                  ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0) + "MW"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡" : (params[i].data.titleValue ? params[i].data.titleValue : 0) + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        // dataZoom: [//滚动条
+        //   {
+        //     // 设置滚动条的隐藏与显示
+        //     show: true,
+        //     // 设置滚动条类型
+        //     type: "slider",
+        //     // 设置背景颜色
+        //     backgroundColor: "rgb(19, 63, 100)",
+        //     // 设置选中范围的填充颜色
+        //     fillerColor: "rgb(16, 171, 198)",
+        //     // 设置边框颜色
+        //     borderColor: "rgb(19, 63, 100)",
+        //     // 是否显示detail，即拖拽时候显示详细数值信息
+        //     showDetail: false,
+        //     // 数据窗口范围的起始数值
+        //     startValue: 0,
+        //     // 数据窗口范围的结束数值（一页显示多少条数据）
+        //     endValue: 5,
+        //     // empty：当前数据窗口外的数据，被设置为空。
+        //     // 即不会影响其他轴的数据范围
+        //     filterMode: "empty",
+        //     // 设置滚动条宽度，相对于盒子宽度
+        //     width: "50%",
+        //     // 设置滚动条高度
+        //     height: 8,
+        //     // 设置滚动条显示位置
+        //     left: "center",
+        //     // 是否锁定选择区域（或叫做数据窗口）的大小
+        //     zoomLoxk: true,
+        //     // 控制手柄的尺寸
+        //     handleSize: 0,
+        //     // dataZoom-slider组件离容器下侧的距离
+        //     bottom: 3,
+        //   },
+        //   {
+        //     // 没有下面这块的话，只能拖动滚动条，
+        //     // 鼠标滚轮在区域内不能控制外部滚动条
+        //     type: "inside",
+        //     // 滚轮是否触发缩放
+        //     zoomOnMouseWheel: false,
+        //     // 鼠标滚轮触发滚动
+        //     moveOnMouseMove: true,
+        //     moveOnMouseWheel: true,
+        //   },
+
+        // ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    gridLeft: {
+      type: Boolean,
+      default: true,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => { },
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+
+    },
+    // gridLeft(val) {
+    //   if (val === false) {
+    //     this.option.grid.left = 100
+    //   } else {
+    //     this.option.grid.left = -80
+    //   }
+    //   this.canvasReset()
+    // },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      console.log(this.gridLeft)
+
+      // console.log('222222', this.chartMsg);
+      if (this.myChart) {
+        this.myChart.dispose();
+      }
+      var chartDom = document.getElementById(this.chartId);
+      this.myChart = echarts.init(chartDom);
+      this.option.color = this.chartMsg.color;
+      this.option.xAxis.data = this.chartMsg.xData
+      if (this.gridLeft === false) {
+        this.option.grid.left = 50
+      } else {
+        this.option.grid.left = -80
+      }
+      // this.option.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+      console.log(this.option.grid);
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss" >
+
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  // top: 10px;
+  top: 0px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>

src/views/report/components/produceLineBarYearTarget.vue

@@ -0,0 +1,247 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-20 16:13:52
+ * @LastEditTime: 2024-07-11 16:45:08
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series[0].data.length === 0"></div>
+    <!-- 图例 -->
+    <div v-show="this.chartMsg.series[0].data.length > 0">
+      <div class="legendData" v-if="show">
+        <span class="itemData" v-for="item in legendList" :key="item.id">
+          <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 60,
+          right: 0,
+          bottom: 31,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                  ? parseFloat(params[i].value.toFixed(2)) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "MW"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡":(params[i].value ? params[i].value : 0) + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        // dataZoom: [//滚动条
+        //   {
+        //     // 设置滚动条的隐藏与显示
+        //     show: true,
+        //     // 设置滚动条类型
+        //     type: "slider",
+        //     // 设置背景颜色
+        //     backgroundColor: "rgb(19, 63, 100)",
+        //     // 设置选中范围的填充颜色
+        //     fillerColor: "rgb(16, 171, 198)",
+        //     // 设置边框颜色
+        //     borderColor: "rgb(19, 63, 100)",
+        //     // 是否显示detail，即拖拽时候显示详细数值信息
+        //     showDetail: false,
+        //     // 数据窗口范围的起始数值
+        //     startValue: 0,
+        //     // 数据窗口范围的结束数值（一页显示多少条数据）
+        //     endValue: 5,
+        //     // empty：当前数据窗口外的数据，被设置为空。
+        //     // 即不会影响其他轴的数据范围
+        //     filterMode: "empty",
+        //     // 设置滚动条宽度，相对于盒子宽度
+        //     width: "50%",
+        //     // 设置滚动条高度
+        //     height: 8,
+        //     // 设置滚动条显示位置
+        //     left: "center",
+        //     // 是否锁定选择区域（或叫做数据窗口）的大小
+        //     zoomLoxk: true,
+        //     // 控制手柄的尺寸
+        //     handleSize: 0,
+        //     // dataZoom-slider组件离容器下侧的距离
+        //     bottom: 3,
+        //   },
+        //   {
+        //     // 没有下面这块的话，只能拖动滚动条，
+        //     // 鼠标滚轮在区域内不能控制外部滚动条
+        //     type: "inside",
+        //     // 滚轮是否触发缩放
+        //     zoomOnMouseWheel: false,
+        //     // 鼠标滚轮触发滚动
+        //     moveOnMouseMove: true,
+        //     moveOnMouseWheel: true,
+        //   },
+
+        // ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => { },
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      if (this.myChart) {
+        this.myChart.dispose();
+      }
+      var chartDom = document.getElementById(this.chartId);
+      this.myChart = echarts.init(chartDom);
+      this.option.color = this.chartMsg.color;
+      this.option.xAxis.data = this.chartMsg.xData;
+      // this.option.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  top: 0px;
+  // top: -10px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>