logo图标等

Reviewed-on: #27

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-05-22 16:29:35
+ # @LastEditTime: 2024-06-03 08:50:41
  # @LastEditors: DY
  # @Description:
 ###
@@ -9,11 +9,15 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
 VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+# sara
+# VUE_APP_BASE_API = 'http://192.168.1.63:48080'
+# 张一丁
+# VUE_APP_BASE_API = 'http://192.168.4.139:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -22,7 +26,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_TENANT_ENABLE = true
 
 # 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
+VUE_APP_CAPTCHA_ENABLE = false
 
 # 文档的开关
 VUE_APP_DOC_ENABLE = true

.env.front

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
@@ -14,7 +14,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_TENANT_ENABLE = true
 
 # 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
+VUE_APP_CAPTCHA_ENABLE = false
 
 # 文档的开关
 VUE_APP_DOC_ENABLE = true

.env.prod

@@ -2,7 +2,7 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 玻璃控股信息平台
+VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/生产环境
 VUE_APP_BASE_API = ''
@@ -16,7 +16,7 @@ PUBLIC_PATH = ''
 VUE_APP_TENANT_ENABLE = true
 
 # 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
+VUE_APP_CAPTCHA_ENABLE = false
 
 # 文档的开关
 VUE_APP_DOC_ENABLE = false

.env.stage

@@ -1,7 +1,7 @@
 NODE_ENV = production
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 测试环境配置
 ENV = 'staging'
@@ -16,7 +16,7 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 VUE_APP_TENANT_ENABLE = true
 
 # 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
+VUE_APP_CAPTCHA_ENABLE = false
 
 # 文档的开关
 VUE_APP_DOC_ENABLE = false

.env.static

@@ -4,7 +4,7 @@ NODE_ENV = development
 ENV = 'staging'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'
@@ -18,7 +18,7 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
 VUE_APP_TENANT_ENABLE = true
 
 # 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
+VUE_APP_CAPTCHA_ENABLE = false
 
 # 文档的开关
 VUE_APP_DOC_ENABLE = true

package.json

@@ -51,10 +51,14 @@
     "crypto-js": "^4.0.0",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
+    "exceljs": "^4.4.0",
+    "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
     "highlight.js": "^11.9.0",
+    "html2canvas": "^1.4.1",
     "js-beautify": "^1.15.1",
     "jsencrypt": "3.3.1",
+    "jspdf": "^2.5.1",
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "moment": "^2.30.1",
@@ -69,7 +73,8 @@
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.2"
+    "vuex": "3.6.2",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.5.18",

src/api/produceData/index.js

@@ -1,13 +1,13 @@
 /*
  * @Author: zhp
  * @Date: 2024-05-07 08:54:59
- * @LastEditTime: 2024-05-22 16:31:08
+ * @LastEditTime: 2024-06-03 08:52:02
  * @LastEditors: DY
  * @Description:
  */
 import request from '@/utils/request'
 
-// 查询部门列表
+// 查询生产数据管理分页
 export function getProduceDataPage(data) {
   return request({
     url: 'ip/prod-output/prodOutputDataPage',
@@ -33,6 +33,15 @@ export function exportOutPutExcel(data) {
   })
 }
 
+// 获取生产数据管理列表
+export function prodOutputDataList(data) {
+  return request({
+    url: '/ip/prod-output/prodOutputDataList',
+    method: 'post',
+    data: data
+  })
+}
+
 // 获取生产管理生产目标管理碲化镉工厂分页
 export function prodTargetDiPage(data) {
   return request({
@@ -110,7 +119,7 @@ export function importToTarget(data) {
   return request({
     url: '/ip/prod-target/to-target-import-excel',
     method: 'post',
-    data
+    data: data
   })
 }
 
@@ -119,7 +128,7 @@ export function importDiTarget(data) {
   return request({
     url: '/ip/prod-target/di-target-import-excel',
     method: 'post',
-    data
+    data: data
   })
 }
 
@@ -138,3 +147,12 @@ export function cockpitDataMonitor(data) {
     data: data
   })
 }
+
+export function exportFactoryDataExcel(data) {
+  return request({
+    url: '/ip/prod-output-month/export/excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}

src/api/produceData/order.js

@@ -0,0 +1,52 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-05-07 08:54:59
+ * @LastEditTime: 2024-05-31 15:08:27
+ * @LastEditors: DY
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询工单分页
+export function getWorkOrderPage(data) {
+  return request({
+    url: '/ip/prod-work-order/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询工单趋势数据
+export function getDailyTrend(data) {
+  return request({
+    url: '/ip/prod-work-order/getDailyTrend',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得工单
+export function getWorkOrderDetail(id){
+  return request({
+     url: '/ip/prod-work-order/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得工单设备加工数量
+export function getEqNum(id){
+  return request({
+     url: '/ip/prod-work-order/getEqNum?workOrderId=' + id,
+    method: 'get'
+  })
+}
+
+// 导出工单数据
+export function exportExcel(data) {
+  return request({
+    url: '/ip/prod-work-order/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import logoImg from "@/assets/logo/logo.png";
+import logoImg from "@/assets/logo/cnbm.png";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
@@ -70,7 +70,7 @@ export default {
   },
   data() {
     return {
-      title: "玻璃控股信息平台",
+      title: "发电玻璃智能管控平台",
       logo: logoImg,
     };
   },
@@ -104,7 +104,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 10px;
     }
 
     & .sidebar-title {
@@ -113,7 +113,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 19px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/store/modules/home.js

@@ -1,4 +1,3 @@
-
 import axios from "@/utils/request";
 import { deepClone } from "../../utils";
 
@@ -25,10 +24,12 @@ const state = {
       chipOee: {
         current: [],
         previous: [],
+        target:[]
       },
       transformRate: {
         current: [],
         previous: [],
+        target:[]
       },
       chipRate: {
         target: [],
@@ -39,6 +40,7 @@ const state = {
       stdRate: {
         target: [],
         current: [],
+        previous: [],
         outputNumber:[]
       },
     },
@@ -77,7 +79,7 @@ const mutations = {
         state.copilot.energy.elecList = payload.elecList;
         break;
       case "efficiency":
-        state.copilot.efficiency.chipOee = payload.chipOee;
+        state.copilot.efficiency.chipOeeRate = payload.chipOeeRate;
         state.copilot.efficiency.transformRate = payload.transformRate;
         state.copilot.efficiency.chipRate = payload.chipRate;
         state.copilot.efficiency.stdRate = payload.stdRate;
@@ -90,14 +92,15 @@ 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();
-    const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetDO,dataArr.prodOutputFtoDO
-);
+    const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetDO,dataArr.prodOutputFtoDO,preData,preFtoData);
     commit("SET_HOME_INFO", payload);
   },
   /** 初始化驾驶舱数据 */
-  async initCopilot({ commit }, { period, source }) {
+  async initCopilot({ commit }, { period,source,than}) {
     // if (source == "energy") return;
 
     const fetcher = {
@@ -111,25 +114,28 @@ const actions = {
       efficiency: splitCurrentAndPreviousA,
     }[source]
     // 获取产量数据
-    let { data: factoryList, type } = await fetcher(period)
-    let targetList = null;
-    if (source === "yield" || source === "efficiency") {
-      // 获取目标数据
-      let { data } = await fetcher(period, true)
-      targetList = data
-    }
-    if (source == "energy") {
-      let factoryData = factoryList
-      const payload = handler(factoryData)
-      commit("SET_COPILOT_INFO", { type, payload });
-    } else {
+    let { data: factoryList, type } = await fetcher(period,than)
+    // let targetList = null;
+    // if (source === "yield" || source === "efficiency") {
+    //   // 获取目标数据
+    //   let { data } = await fetcher(period,than, true)
+    //   targetList = data
+    // }
+    // if (source == "energy") {
+    //   let factoryData = factoryList
+    //   const payload = handler(factoryData)
+    //   commit("SET_COPILOT_INFO", { type, payload });
+    // } else {
+      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 : []
       let prodOutputFtoDO = factoryList.prodOutputFtoDO ? factoryList.prodOutputFtoDO : []
-      let targetData = targetList.prodTargetDO ? targetList.prodTargetDO : targetList.prodTargetDO
-      const payload = handler(factoryData, targetData,prodOutputFtoDO)
+      let targetData = factoryList.prodTargetOutputDO ? factoryList.prodTargetOutputDO : factoryList.prodTargetRateDO
+      const payload = handler(factoryData,targetData,prodOutputFtoDO,preData,preFtoData)
     commit("SET_COPILOT_INFO", { type, payload });
 
-    }
+    // }
 
   },
 };
@@ -281,11 +287,11 @@ function splitCurrentAndPreviousB(factoryListResponse) {
   }
 }
 
-function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
-  // console.log('工厂',factoryListResponse);
+function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
+  console.log('工厂',targetListResponse);
 
   // 初始数据
-  const { chipOee, transformRate, chipRate, stdRate } = initA();
+  const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
   // factoryListResponse = [
   //   {
   //     factory: 0,
@@ -336,6 +342,23 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
   //     componentYieldRate: 0.73,
   //   },
   // ];
+  if (preData && preData[0] != null) {
+    for (const factory of preData) {
+      const fId = getPreFactoryId(factory);
+         chipInvest.previous[fId] = factory.previousYearInputNumber;
+      // chipOeeRate.current[fId] = factory.oee;
+      chipOeeRate.previous[fId] = factory.previousYearOee;
+      // 转化效率
+      transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
+      // 芯片良率 与 标准组件良率
+      if (![0, 1].includes(factory.glassType)) continue;
+      const _t = [chipRate, stdRate][factory.glassType]
+      // _t.current[fId] = factory.yieldRate ;
+      _t.previous[fId] = factory.previousYearYieldRate ;
+      // }
+      // debugger;
+    }
+  }
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
       const fId = getFactoryId(factory);
@@ -347,27 +370,27 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
           chipOee,
           componentConversionEfficiency,
           componentYield
-        } = getFactoryTargetValueA(targetListResponse, fId);
+        } = getFactoryTargetValueA(targetListResponse, fId)
         stdRate.target[fId] =  componentYieldRate
         chipRate.target[fId] = chipYieldRate
+        chipOeeRate.target[fId] = chipOee
+        transformRate.target[fId] = componentConversionEfficiency
       }
       // 芯片OEE
-      chipOee.current[fId] = factory.oee * 100 ;
-      chipOee.previous[fId] = factory.previousYearOee * 100 ;
+      chipOeeRate.current[fId] = factory.oee;
+      // chipOeeRate.previous[fId] = factory.previousYearOee;
       // 转化效率
-      transformRate.current[fId] =
-        factory.componentConversionEfficiency * 100 ;
-      transformRate.previous[fId] =
-        factory.previousYearComponentConversionEfficiency * 100 ;
+      transformRate.current[fId] = factory.componentConversionEfficiency;
+      // transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency ;
       // 芯片良率 与 标准组件良率
       if (![0, 1].includes(factory.glassType)) continue;
       const _t = [chipRate, stdRate][factory.glassType]
       _t.current[fId] = factory.yieldRate ;
-      _t.previous[fId] = factory.previousYearYieldRate ;
+      // _t.previous[fId] = factory.previousYearYieldRate ;
     }
-
+    // console.log('chipOeeRate',chipOeeRate);
     return {
-      chipOee,
+      chipOeeRate,
       transformRate,
       chipRate,
       stdRate,
@@ -375,21 +398,57 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
   }
 }
 
-function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes) {
-  console.log('prodOutputFtoListRes',prodOutputFtoListRes);
+function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
+  console.log('prodOutputFtoListRes',preData);
   // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init()
    if (prodOutputFtoListRes) {
     for (const factory of prodOutputFtoListRes) {
       console.log(factory);
       const fId = getFactoryId(factory);
+      // const preFId = getPreFactoryId(factory);
+      // if (fId) {
       ftoInvest.current[fId] = factory.chipInput;
+      // }
+      // if (preFId) {
+      // ftoInvest.previous[fId] = factory.previousYearChipInput;
+      // }
+    }
+   }
+   if (preFtoData) {
+    for (const factory of preFtoData) {
+      console.log(factory);
+      const fId = getPreFactoryId(factory);
+      // const preFId = getPreFactoryId(factory);
+      // if (fId) {
       ftoInvest.previous[fId] = factory.previousYearChipInput;
+      // }
+      // if (preFId) {
+      // ftoInvest.previous[fId] = factory.previousYearChipInput;
+      // }
+    }
+   }
+    if (preData && preData[0] != null) {
+    for (const factory of preData) {
+      const fId = getPreFactoryId(factory);
+         chipInvest.previous[fId] = factory.previousYearInputNumber;
+      if (![0, 1, 2].includes(factory.previousGlassType)) continue;
+      const _t = [chipOutput, stdOutput, bipvOutput][factory.previousGlassType];
+      // if (fId) {
+        // _t.current[fId] = factory.outputNumber;
+      // }
+      // if (preFId) {
+          _t.previous[fId] = factory.previousYearOutputNumber
+      // }
+      // debugger;
     }
   }
-  if (factoryListResponse) {
+    // console.log('ftoInvest',ftoInvest)
+  if (factoryListResponse && factoryListResponse[0] != null) {
     for (const factory of factoryListResponse) {
       const fId = getFactoryId(factory);
+      // const preFId = getPreFactoryId(factory);
+
       // 获取目标值
       if (targetListResponse) {
         const { chipYield, componentYield, bipvProductOutput } =
@@ -399,23 +458,14 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
         bipvOutput.target[fId] = bipvProductOutput;
       }
       // 芯片投入
-      chipInvest.current[fId] = factory.inputNumber;
-      chipInvest.previous[fId] = factory.previousYearInputNumber;
-      // FTO投入
-      // if (factory.chipInput || factory.previousYearChipInput) {
-      //     ftoInvest.current[fId] = factory.chipInput;
-      //     ftoInvest.previous[fId] = factory.previousYearChipInput;
-      // }
+          chipInvest.current[fId] = factory.inputNumber;
 
       // 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
       // 因为后端写的垃圾数据，所以这里要做一下判断
       if (![0, 1, 2].includes(factory.glassType)) continue;
       const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
-      _t.current[fId] = factory.outputNumber;
-      _t.previous[fId] = factory.previousYearOutputNumber;
-      // debugger;
+        _t.current[fId] = factory.outputNumber;
     }
-
     return {
       chipInvest,
       // ftoInvest,
@@ -424,27 +474,39 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
       stdOutput,
       bipvOutput,
     };
+  }else{
+      return {
+      chipInvest,
+      // ftoInvest,
+      ftoInvest,
+      chipOutput,
+      stdOutput,
+      bipvOutput,
+    }
   }
 }
 
 function getFactoryId(factory) {
   return factory.factory;
 }
+function getPreFactoryId(factory) {
+  return factory.previousFactory;
+}
 
 function getFactoryTargetValue(targetList, factoryId) {
   const target = targetList.find((item) => item.factory === factoryId);
   if (target) {
     return {
       // 自带模拟数据了.... random_default
-      chipYield: target.chipYield ?? random_default(),
-      componentYield: target.componentYield ?? random_default(),
-      bipvProductOutput: target.bipvProductOutput ?? random_default(),
+      chipYield: target.chipYield ?? 0,
+      componentYield: target.componentYield ?? 0,
+      bipvProductOutput: target.bipvProductOutput ?? 0,
     };
   }
   return {
-    chipYield: random_default(),
-    componentYield: random_default(),
-    bipvProductOutput: random_default(),
+    chipYield: 0,
+    componentYield: 0,
+    bipvProductOutput: 0,
   };
 }
 
@@ -458,15 +520,18 @@ function getFactoryTargetValueA(targetList, factoryId) {
   const target = targetList.find((item) => item.factory === factoryId)
   if (target) {
     return {
-      chipYieldRate: target.chipYieldRate ?? random_default(),
-      componentYieldRate: target.componentYieldRate ?? random_default(),
-      componentYield: target.componentYield ?? random_default(),
+      chipYieldRate: target.chipYieldRate ?? 0,
+      componentYieldRate: target.componentYieldRate ?? 0,
+      componentYield: target.componentYield ?? 0,
+      // componentYield: target.componentYield ?? 0,
+      chipOee: target.chipOee ?? 0,
     };
   }
   return {
     chipYieldRate:0,
     componentYieldRate:0,
-    componentYield:0 ,
+    componentYield: 0,
+    chipOee:0,
   };
 }
 
@@ -480,18 +545,18 @@ function initA() {
     previous: Array(7).fill(0),
   };
   // 芯片OEE
-  const chipOee = deepClone(t_);
   // 转化效率
-  const transformRate = deepClone(t_);
   // 标准组件良率
   const stdRate = {
     ...deepClone(t_),
     target: Array(7).fill(0),
   };
   // 芯片良率
+  const transformRate = deepClone(stdRate);
   const chipRate = deepClone(stdRate);
+  const chipOeeRate = deepClone(stdRate);
   return {
-    chipOee,
+    chipOeeRate,
     transformRate,
     chipRate,
     stdRate,
@@ -544,6 +609,7 @@ async function getHomeInfo() {
   const { code, data } = await axios.post("ip/prod-output/cockpitData", {
     factorys: [],
     date: 4,
+    mode:0
   });
   if (code == 0) {
     return data;
@@ -609,16 +675,16 @@ async function doFetch(copilot_module = "yield", fetch_target, params) {
  * @param {*} target 是否获取目标数据
  * @returns
  */
-function getCopilotYield(period, target = false) {
-  return getCopilotData("yield", period, target);
+function getCopilotYield(period,than,target = false) {
+  return getCopilotData("yield", period,than, target);
 }
 
 function getCopilotEnergy(period, target = false) {
-  return getCopilotData("energy", period, target);
+  return getCopilotData("energy", period,than, target);
 }
 
-function getCopilotEfficiency(period, target = false) {
-  return getCopilotData("efficiency", period, target);
+function getCopilotEfficiency(period,than, target = false) {
+  return getCopilotData("efficiency", period,than, target);
 }
 
 /**
@@ -627,12 +693,13 @@ function getCopilotEfficiency(period, target = false) {
  * @param {*} target 是否获取目标数据：默认 否
  * @returns
  */
-async function getCopilotData(copilot_module, period, target = false) {
+async function getCopilotData(copilot_module, period,than, target = false) {
   if (!copilot_module) copilot_module = "yield";
   // 请求参数，直接一次性获取所有工厂
   let queryParams = {
     factorys: [],
     date: 4,
+    mode:0
   };
 
   switch (period) {
@@ -652,7 +719,14 @@ async function getCopilotData(copilot_module, period, target = false) {
       queryParams.date = 1;
       break;
   }
-
+ switch (than) {
+    case "同比":
+      queryParams.mode = 0;
+      break;
+    case "环比":
+      queryParams.mode = 1;
+      break;
+  }
   return {
     data: await doFetch(copilot_module, target ? true : false, queryParams),
     type: copilot_module,

src/utils/constants.js

@@ -74,9 +74,9 @@ export const SystemDataScopeEnum = {
 /**
  * 工厂名称
  */
-export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司']
+// export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司']
 
-export const dhgfactoryList =[
+export const factoryArray1 =[
   {
     name: '瑞昌中建材光电材料有限公司',
     id: 0
@@ -97,12 +97,43 @@ export const dhgfactoryList =[
     name: '成都中建材光电材料有限公司',
     id: 4
   },
+  {
+    name: '凯盛光伏材料有限公司',
+    id: 5
+  },
   {
     name: '蚌埠兴科玻璃有限公司',
     id: 6
   }
 ]
 
+// export const dhgfactoryList =[
+//   {
+//     name: '瑞昌中建材光电材料有限公司',
+//     id: 0
+//   },
+//   {
+//     name: '邯郸中建材光电材料有限公司',
+//     id: 1
+//   },
+//   {
+//     name: '中建材株洲光电材料有限公司',
+//     id: 2
+//   },
+//   {
+//     name: '佳木斯中建材光电材料有限公司',
+//     id: 3
+//   },
+//   {
+//     name: '成都中建材光电材料有限公司',
+//     id: 4
+//   },
+//   {
+//     name: '蚌埠兴科玻璃有限公司',
+//     id: 6
+//   }
+// ]
+
 export const tyjxfactoryList =[
   {
     name: '凯盛光伏材料有限公司',
@@ -110,6 +141,30 @@ export const tyjxfactoryList =[
   }
 ]
 
+// 暂时只有瑞昌邯郸数据
+export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司']
+export const factoryArray =[
+  {
+    name: '瑞昌中建材光电材料有限公司',
+    id: 0
+  },
+  {
+    name: '邯郸中建材光电材料有限公司',
+    id: 1
+  }
+]
+
+export const dhgfactoryList =[
+  {
+    name: '瑞昌中建材光电材料有限公司',
+    id: 0
+  },
+  {
+    name: '邯郸中建材光电材料有限公司',
+    id: 1
+  }
+]
+
 /**
  * 代码生成模板类型
  */

src/views/copilot/components/BarChartBase.vue

@@ -11,7 +11,7 @@
       <span v-for="item in legend" :key="item.label" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
     </div>
-    <div ref="chart" :style="{ height: '95%',width: width}"></div>
+    <div ref="chart" style="height:94%;width:100%"></div>
   </chart-container>
 </template>
 
@@ -51,7 +51,7 @@ export default {
   },
   data() {
     return {
-      width: '',
+      width: '100%',
       isFullscreen: false,
       actualOptions: null,
       options: {
@@ -184,16 +184,7 @@ export default {
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     isOpen(val) {
       // console.log(val)
-      if (val === true) {
-        console.log('ztl')
-        this.width = 95 + '%'
-        this.canvasReset()
-
-        console.log(this.width)
-      } else {
-        this.watch = 100 + '%'
-        this.canvasReset()
-      }
+      this.canvasReset()
     },
     isFullscreen(val) {
       this.actualOptions.series.map((item) => {
@@ -203,21 +194,14 @@ export default {
       this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
       this.initChart(this.actualOptions);
-      if (val === false && this.isOpen === true) {
-        console.log(val)
-        this.width = 97 + '%'
-        this.canvasReset()
-      } else if (val === false && this.isOpen === false) {
-        this.watch = 100 + '%'
-        this.canvasReset()
-      }
       // this.actualOptions.series.map((item) => {
       //   item.barWidth = val ? 18 : 12;
       // });
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions);
+      // this.initChart(this.actualOptions);
+      this.canvasReset()
     },
     series(val) {
       if (!val) {

src/views/copilot/components/CopilotHeader.vue

@@ -8,39 +8,30 @@
 <template>
   <div class="copilot-header">
     <section class="menu">
-      <CopilotButton
-        v-for="i in ['产量', '效率', '综合']"
-        :key="i"
-        :label="i"
-        :active="i === active"
-        @click="() => $emit('update:active', i)"
-      />
-    </section>
-    <section class="menu">
-      <CopilotButton
-        v-for="i in ['日', '周', '月', '年']"
-        :key="i"
-        :label="i"
-        :active="i === period"
-        @click="() => $emit('update:period', i)"
-      />
-      <div class="btn-group">
-        <button type="button" class="export-btn" />
-        <button
-          type="button"
-          class="fullscreen-btn"
-          :class="[isFullscreen ? 'exit-fullscreen' : '']"
-          @click="toggleFullScreen"
-        />
-      </div>
+      <CopilotButton v-for="i in ['产量', '效率']" :key="i" :label="i" :active="i === active"
+        @click="() => $emit('update:active', i)" />
+      <div class="type-name"></div>
+      <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
+        @click="() => $emit('update:than', i)" />
     </section>
     <div class="page-title">{{ active }}驾驶舱</div>
+    <section class="menu" style="width: 24vw;float: right;">
+      <CopilotButton v-for="i in ['日', '周', '月', '年']" :key="i" :label="i" :active="i === period"
+        @click="() => $emit('update:period', i)" />
+      <div class="btn-group">
+        <!-- <button type="button" class="export-btn" @click="handleExport" /> -->
+        <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
+          @click="toggleFullScreen" />
+        <!-- <button class="times-btn"> {{ times }} </button> -->
+      </div>
+    </section>
   </div>
 </template>
 
 <script>
 import CopilotButton from "./button.vue";
 import screenfull from "screenfull";
+import { exportFactoryDataExcel } from "@/api/produceData";
 
 export default {
   name: "CopilotHeader",
@@ -52,14 +43,70 @@ export default {
     period: {
       type: String,
     },
+    than: {
+      type: String,
+    },
   },
   data() {
     return {
+      times:'',
       isFullscreen: false,
     };
   },
+  mounted () {
+    this.getTimes()
+    this.getTimesInterval();
+  },
   computed: {},
   methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        // factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `生产数据.xls`);
+        // this.exportLoading = false;
+      }).catch(() => { });
+    },
+    getTimes() {
+      setInterval(this.getTimesInterval, 60000);
+    },
+    getTimesInterval() {
+      var now = new Date();
+      var weekDay = now.getDay();
+      var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
+      var week = weeks[weekDay]
+      let _this = this;
+      let year = new Date().getFullYear(); //获取当前时间的年份
+      let month = new Date().getMonth() + 1; //获取当前时间的月份
+      let day = new Date().getDate(); //获取当前时间的天数
+      let hours = new Date().getHours(); //获取当前时间的小时
+      let minutes = new Date().getMinutes(); //获取当前时间的分数
+      // let seconds = new Date().getSeconds(); //获取当前时间的秒数
+      //当小于 10 的是时候，在前面加 0
+      if (hours < 10) {
+        hours = '0' + hours;
+      }
+      if (minutes < 10) {
+        minutes = '0' + minutes;
+      }
+      // if (seconds < 10) {
+      //   seconds = '0' + seconds;
+      // }
+      //拼接格式化当前时间
+      this.times =
+
+        year +
+        '.' +
+        month +
+        '.' +
+      day +
+      "  " + hours +
+      '.' +
+      minutes +
+      '.' +
+      week
+    },
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
       screenfull.toggle(document.querySelector(".copilot-layout"))
@@ -82,10 +129,11 @@ export default {
   display: flex;
   gap: 12px;
   align-items: center;
+  justify-content: space-between;
 }
 
 .copilot-header > section {
-  width: 24vw;
+  width: 26vw;
   display: flex;
   align-items: center;
   gap: 8px;
@@ -99,6 +147,17 @@ export default {
   cursor: pointer;
 }
 
+.times-btn {
+  width: 240px;
+  height: 32px;
+  margin-left: 24px;
+  cursor: pointer;
+  color: white;
+  font-size: 20px;
+  line-height: 30px;
+  float: right;
+  /* margin-bottom: 20px; */
+}
 .export-btn {
   background: url(../../../assets/images/export-icon.png) 0 0 / 100% 100%
     no-repeat;
@@ -112,15 +171,27 @@ export default {
   background: url(../../../assets/images/homeindex/exit-fullscreen.png) 0 0 / 100% 100%
     no-repeat;
 }
-
+    .type-name {
+      /* content: ""; */
+      display: inline-block;
+      width: 1px;
+    height: 59px;
+    border: 1px solid;
+    opacity: 0.9;
+    border-image: linear-gradient(180deg, rgba(0, 176, 243, 0), rgba(88, 194, 255, 1), rgba(0, 120, 228, 0)) 2 2;
+      /* position: absolute; */
+      /* left: 0; */
+      /* top: 10px; */
+    }
 .page-title {
-  flex: 1;
+  width: 25vw;
   font-size: 54px;
   line-height: 70px;
   letter-spacing: 5px;
   font-family: 优设标题黑;
   color: #6db6ff;
-  text-align: right;
+  text-align: center;
   user-select: none;
+  background: url(../../../assets/images/homeindex/page-title.png) 0 0 / 100% 100% no-repeat;
 }
 </style>

src/views/copilot/components/FactoryDataHeader.vue

@@ -1,38 +1,31 @@
 <template>
   <div class="factory-header">
     <section class="menu1">
-      <FactorySelect
-        :companyName="companyName"
-        :companyId="companyId"
-        @updateCompany="updateCompany"
-      />
-    </section>
-    <section class="menu2">
-      <CopilotButton
-        v-for="i in dataList"
-        :key="i.id"
-        :label="i.name"
-        :active="i.id === period"
-        @click="() => $emit('update:period', i.id)"
-      />
+      <!-- <CopilotButton v-for="i in ['产量', '效率']" :key="i" :label="i" :active="i === active"
+        @click="() => $emit('update:active', i)" />
+      <div class="type-name"></div> -->
+      <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
+        @click="() => $emit('update:than', i)" />
       <div class="btn-group">
-        <button type="button" class="export-btn" />
-        <button
-          type="button"
-          class="fullscreen-btn"
-          :class="[isFullscreen ? 'exit-fullscreen' : '']"
-          @click="toggleFullScreen"
-        />
+        <button type="button" class="export-btn" @click="handleExport" />
+        <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
+          @click="toggleFullScreen" />
       </div>
     </section>
     <div class="page-title">{{ companyName }}</div>
+    <section class="menu2">
+      <CopilotButton v-for="i in dataList" :key="i.id" :label="i.name" :active="i.id === period"
+        @click="() => $emit('update:period', i.id)" />
+    </section>
   </div>
 </template>
 
 <script>
-import CopilotButton from "./button.vue";
+// import CopilotButton from "./button.vue";
 import FactorySelect from "./FactorySelect.vue";
 import screenfull from "screenfull";
+import CopilotButton from "./button.vue";
+import { exportFactoryDataExcel } from "@/api/produceData";
 
 export default {
   name: "FactoryDataHeader",
@@ -47,6 +40,9 @@ export default {
     period: {
       type: Number,
     },
+    than: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -61,6 +57,15 @@ export default {
   },
   computed: {},
   methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `${this.companyName}生产数据.xls`);
+      // this.exportLoading = false;
+    }).catch(() => { });
+    },
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
 
@@ -90,13 +95,13 @@ export default {
 }
 
 .factory-header > .menu1 {
-  width: 24vw;
-  /* display: flex;
+  width: 20vw;
+  display: flex;
   align-items: center;
-  gap: 8px; */
+  gap: 8px;
 }
 .factory-header > .menu2 {
-  width: 30vw;
+  width: 26vw;
   display: flex;
   align-items: center;
   gap: 8px;
@@ -125,13 +130,14 @@ export default {
 }
 
 .page-title {
-  flex: 1;
+  flex: 1 1 auto;
   font-size: 40px;
   line-height: 70px;
   letter-spacing: 5px;
   font-family: 优设标题黑;
   color: #6db6ff;
-  text-align: right;
+  text-align: center;
   user-select: none;
+  background: url(../../../assets/images/homeindex/page-title-two.png) 0 0 / 100% 100% no-repeat;
 }
 </style>

src/views/copilot/components/LineChartBase.vue

@@ -367,7 +367,7 @@ export default {
         this.canvasReset()
         console.log(this.width)
       } else {
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
 
       }
@@ -378,7 +378,7 @@ export default {
         this.width = 97 + '%'
         this.canvasReset()
       } else if (val === false && this.isOpen === false) {
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
 
       }

src/views/copilot/components/LineChartWater.vue

@@ -365,7 +365,7 @@ export default {
 
         console.log(this.width)
       } else {
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
       }
     },
@@ -376,7 +376,7 @@ export default {
         this.width = 97 + '%'
         this.canvasReset()
       } else if(val === false && this.isOpen === false) {
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
       }
       // this.actualOptions.series.map((item) => {

src/views/copilot/components/button.vue

@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 13:26:32
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
     filename: button.vue
     author: liubin
     date: 2024-04-16 15:02:34
-    description: 
+    description:
 -->
 
 <template>
@@ -50,7 +57,7 @@ button {
   padding: 12px;
   padding-left: 20px;
   color: #fff;
-  font-size: 22px;
+  font-size: 18px;
   letter-spacing: 10px;
   cursor: pointer;
 }

src/views/copilot/components/ftoBarChartBase.vue

@@ -0,0 +1,292 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-23 15:49:14
+ * @LastEditTime: 2024-05-31 16:06:50
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <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>
+    </div>
+    <div ref="ftoChart" style="height:94%;width:100%"></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "./ChartContainer.vue";
+import { debounce } from "@/utils/debounce";
+// import chartMixin from "@/mixins/chart.js";
+import * as echarts from "echarts";
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer,
+  },
+  // mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      width: '100%',
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "4%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/片",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened
+    },
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isOpen(val) {
+      // console.log(val)
+      this.canvasReset()
+    },
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.initChart(this.actualOptions);
+      // this.actualOptions.series.map((item) => {
+      //   item.barWidth = val ? 18 : 12;
+      // });
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.initChart(this.actualOptions);
+      this.canvasReset()
+    },
+    series(val) {
+      if (!val) {
+        this.initChart(this.options);
+        return;
+      }
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      console.log('actualOptions', this.options)
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val[1].data;
+      actualOptions.series[1].name = val[1].name;
+      this.actualOptions = actualOptions;
+      this.initChart(actualOptions);
+    },
+  },
+  mounted() {
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+    this.actualOptions = this.options
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(this.$refs.ftoChart);
+      this.chart.setOption(this.actualOptions);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 0.67vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+}
+</style>

src/views/copilot/components/gasBarChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-13 14:08:51
- * @LastEditTime: 2024-05-17 09:37:01
+ * @LastEditTime: 2024-05-23 15:18:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -191,7 +191,7 @@ export default {
         console.log(this.width)
       } else {
         console.log('ryf')
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
       }
     },
@@ -201,7 +201,7 @@ export default {
         this.width = 97 + '%'
         this.canvasReset()
       } else if (val === false && this.isOpen === false) {
-        this.watch = 100 + '%'
+        this.width = 100 + '%'
         this.canvasReset()
       }
       // this.actualOptions.series.map((item) => {

src/views/copilot/container.vue

@@ -1,4 +1,3 @@
-
 <!--
     filename: container.vue
     author: liubin
@@ -8,12 +7,13 @@
 
 <template>
   <!-- <div class="copilot-layout" ref="copilot-layout"> -->
-  <div class="copilot-layout" ref="copilot-layout" :class="[page == '效率' ? 'other' : 'produce' ]">
-    <CopilotHeaderVue :active="page" :period="period" @update:active="page = $event" @update:period="period = $event" />
+  <div class="copilot-layout produce" ref="copilot-layout">
+    <CopilotHeaderVue :than="than" :active="page" :period="period" @update:active="updateActive" @update:period="period = $event"
+      @update:than="updateThan" />
 
-    <YieldCopilot v-if="page == '产量'" :period="period" />
-    <EnergyCopilot v-if="page == '综合'" :period="period" />
-    <EfficiencyCopilot v-if="page == '效率'" :period="period" />
+    <YieldCopilot :period="period"  :than="than"  />
+    <!-- <EnergyCopilot v-if="page == '综合'" :period="period" /> -->
+    <!-- <EfficiencyCopilot v-if="page == '效率'" :period="period" /> -->
     <div class="copilot-footer">© 中建材智能自动化研究院有限公司</div>
   </div>
 </template>
@@ -21,24 +21,55 @@
 <script>
 import CopilotHeaderVue from "./components/CopilotHeader.vue";
 import YieldCopilot from "./yield/index.vue";
-import EnergyCopilot from "./energy/index.vue";
-import EfficiencyCopilot from "./efficiency/index.vue";
+// import EnergyCopilot from "./energy/index.vue";
+// import EfficiencyCopilot from "./efficiency/index.vue";
 
 export default {
   name: "CopilotContainer",
   components: {
     CopilotHeaderVue,
     YieldCopilot,
-    EnergyCopilot,
-    EfficiencyCopilot,
+    // EnergyCopilot,
+    // EfficiencyCopilot,
   },
   data() {
     return {
       page: "产量",
-      period: "日",
+      period: "月",
+      than:'同比',
       currentsStyles: '',
     };
   },
+  methods: {
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updateActive(val, oldVal) {
+      console.log(val)
+      if (val === '效率') {
+        this.$router.push({
+          path: 'efficiency-container',
+          query: {
+            name: '效率'
+          }
+        })
+        // this.page = oldVal
+      } else if (val === '产量') {
+        this.$router.push({
+          path: 'main',
+          query: {
+            name: '产量'
+          }
+        })
+        // this.page = oldVal
+      }
+    }
+  },
+  // mounted() {
+  //   this.page = this.$route.query.name
+  // },
   // watch: {
   //   page(val) {
   //     if (val === '产量') {
@@ -65,7 +96,6 @@ export default {
 };
 </script>
 <style>
-
 .copilot-layout {
   padding: 16px;
   background: url(../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
@@ -81,12 +111,14 @@ export default {
   gap: 8px;
 }
 
-.produce{
+.produce {
   height: calc(100% + 38px);
 }
+
 .other {
   height: calc(100% + 240px);
 }
+
 .copilot-footer {
   /** position: absolute;
   bottom: 10px; **/

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

@@ -25,88 +25,256 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
+    chipOeeRate: {
+      type: Object,
+      default:{}
+    }
   },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       xAxis: cities,
     };
   },
   computed: {
     legend() {
-      switch (this.period) {
-        case "日":
-          return [{ label: "昨日", color: "#12f7f1" }];
-        case "周":
-          return [{ label: "本周", color: "#12f7f1" }];
-        case "月": {
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return [
-            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
-            { label: `${year}年${month}月`, color: "#58adfa" },
-          ];
-        }
-        case "年": {
-          const year = new Date().getFullYear();
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
-        }
-        default:
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `去年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `上周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年`, color: "#12f7f1" },
+          { label: `${year}年`, color: "#58adfa" },
+          { label:  `${year}年`, color: "#58adfa" },
+
+          // { label: `${year}年目标`, value: valueTuple[2] },
+        ];
       }
+      return items
+      // switch (this.period) {
+      //   case "日":
+      //     return [{ label: "昨日", color: "#12f7f1" }];
+      //   case "周":
+      //     return [{ label: "本周", color: "#12f7f1" }];
+      //   case "月": {
+      //     const year = new Date().getFullYear();
+      //     const month = new Date().getMonth() + 1;
+      //     return [
+      //       { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+      //       { label: `${year}年${month}月`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   case "年": {
+      //     const year = new Date().getFullYear();
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   default:
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      // }
     },
+    // chipOeeRate() {
+    //    return  this.$store.getters.copilot.efficiency.chipOeeRate
+    // },
     series() {
       // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
-      const { chipOee } = this.$store.getters.copilot.efficiency;
-      let dataList = null;
+      const chipOeeRate = this.chipOeeRate
+      // console.log('chipOee', chipOeeRate)
+      let dataList = null
       switch (this.period) {
         case "日":
-        case "周":
-          dataList = chipOee?.current;
-        case "周":
-          dataList = chipOee?.current;
-          break;
-        default:
           dataList = [];
-          dataList[0] = chipOee?.previous;
-          dataList[1] = chipOee?.current;
+          dataList[0] = chipOeeRate?.previous;
+          dataList[1] = chipOeeRate?.current;
+        case "周":
+          dataList = [];
+          dataList[0] = chipOeeRate?.previous;
+          dataList[1] = chipOeeRate?.current;
+          default:
+          dataList = [];
+          dataList[0] = chipOeeRate?.previous;
+          dataList[1] = chipOeeRate?.current
+          dataList[2] = chipOeeRate?.target
       }
-      // console.log(dataList)
-      return getTemplate(this.period, dataList);
+      console.log(dataList)
+      return getTemplate(this.period, dataList,this.than);
     },
   },
   methods: {},
 };
 
-function getTemplate(period, dataList) {
-  const year = new Date().getFullYear();
+function getTemplate(period, dataList, than) {
+  // console.log('dataList',dataList);
+  let items = [];
+  var day1 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var yesterday = (day1.getMonth() + 1) + "月" + day1.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;
-  // console.log('11111', dataList);
-  return period == "日" || period == "周"
-    ? [
-        {
-          name: period == "日" ? "昨日" : "本周",
-          data: dataList ?? [],
-        },
-      ]
-    : [
-        {
-          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
-          data: dataList ? dataList[0] : [],
-        },
-        {
-          name: period == "年" ? `${year}年` : `${year}年${month}月`,
-          data: dataList ? dataList[1] : [],
-          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-        },
-      ];
+  const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+  const year = new Date().getFullYear();
+  if (period === '日' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月${today}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '日' && than === '环比') {
+    items = [
+      {
+        name: `${yesterday}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '同比') {
+    items = [
+      {
+        name: `去年本周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '环比') {
+    items = [
+      {
+        name: `上周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '环比') {
+    items = [
+      {
+        name: `${lastMonth}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else {
+    items = [
+      {
+        name: `${year - 1}年`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${year}年`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${year}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  }
+  return items
 }
 </script>
 

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

@@ -1,22 +1,15 @@
-<!-- 
-    filename: ChipRate.vue
-    author: liubin
-    date: 2024-04-29 08:50:54
-    description: 芯片良率
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-10 11:10:54
+ * @LastEditTime: 2024-05-31 16:19:45
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="chip-rate">
-    <ChipRateItem
-      :period="period"
-      :cities="['成都', '邯郸', '株洲', '瑞昌']"
-      :color="1"
-    />
-    <ChipRateItem
-      :period="period"
-      :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']"
-      :color="2"
-    />
+    <ChipRateItem :period="period" :than="than" :cities="['邯郸', '瑞昌']" :color="1" />
+    <!-- <ChipRateItem :period="period" :than="than" :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" /> -->
   </div>
 </template>
 
@@ -30,6 +23,10 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: '同比',
+    }
   },
   data() {
     return {};
@@ -46,15 +43,15 @@ export default {
   gap: 5px;
   position: relative;
 
-  &:after {
-    content: "";
-    position: absolute;
-    left: 50%;
-    top: 0;
-    width: 3px;
-    height: 100%;
-    transform: translateX(-50%);
-    background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
-  }
+  // &:after {
+  //   content: "";
+  //   position: absolute;
+  //   left: 50%;
+  //   top: 0;
+  //   width: 3px;
+  //   height: 100%;
+  //   transform: translateX(-50%);
+  //   background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
+  // }
 }
 </style>

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

@@ -1,18 +1,19 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-05-20 10:04:03
+ * @LastEditTime: 2024-05-31 16:38:29
  * @LastEditors: zhp
  * @Description:
 -->
 
 <template>
-  <div class="std-rate">
-    <div class="span-2">
-      <StdRateItem :period="period" :city="cities[5]" />
-    </div>
-    <div class="flex-item" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
-      <StdRateItem :period="period" :city="item" />
+  <!-- <div class="order"> -->
+  <div class="std-rate" style="width: 100%; overflow: hidden scroll; height: 400px">
+    <!-- <div class="span-2">
+        <StdRateItem :period="period" :city="cities[5]" />
+      </div> -->
+    <div class="span-2" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
+      <StdRateItem :period="period" :than="than" :city="item" />
     </div>
   </div>
 </template>
@@ -27,6 +28,10 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   computed: {
     cities() {
@@ -44,8 +49,8 @@ export default {
       //     break;
       // }
       const _cities = [
-        { name: "瑞昌", target: 0, total: 0, current: 0, componentYield: 0, goodNumber:0,},
-        { name: "邯郸", target: 0, total: 0, current: 0, componentYield: 0, goodNumber: 0, },
+        { name: "瑞昌", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
+        { name: "邯郸",target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "株洲", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "佳木斯", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "成都", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
@@ -75,7 +80,10 @@ export default {
       }
       // 删掉凯盛光伏
       // _cities.splice(4, 1);
-      return _cities;
+      let arr = []
+      arr.push(_cities[0])
+      arr.push(_cities[1])
+      return arr;
     },
   },
   data() {
@@ -99,7 +107,7 @@ export default {
 .std-rate {
   display: flex;
   // gap: 1px;
-  flex: 1 1 auto;
+  // flex: 1 1 auto;
 
   // display: -webkit-box;
   flex-wrap: wrap;
@@ -107,6 +115,9 @@ export default {
   // grid-template-columns: repeat(2, 1fr);
   // grid-template-rows: repeat(4, 1fr);
 }
+.std-rate::-webkit-scrollbar {
+  display: none;
+}
 .flex-item{
   // flex: 1 1 auto;
   width: 50%;

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

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "@/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue";
+import BarChartBase from "@/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue";
 export default {
   name: "TransformRate",
   components: { BarChartBase },
@@ -25,85 +25,247 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: '同比',
+    },
+    transformRate: {
+      type: Object,
+      default: {}
+    }
   },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       xAxis: cities,
     };
   },
   computed: {
     legend() {
-      switch (this.period) {
-        case "日":
-          return [{ label: "昨日", color: "#12f7f1" }];
-        case "周":
-          return [{ label: "本周", color: "#12f7f1" }];
-        case "月": {
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return [
-            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
-            { label: `${year}年${month}月`, color: "#58adfa" },
-          ];
-        }
-        case "年": {
-          const year = new Date().getFullYear();
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
-        }
-        default:
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
-      }
-    },
-    series() {
-      const { transformRate } = this.$store.getters.copilot.efficiency;
-      let dataList = null;
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `去年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `上周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年`, color: "#12f7f1" },
+          { label: `${year}年`, color: "#58adfa" },
+          { label: `${year}年`, color: "#58adfa" },
 
+          // { label: `${year}年目标`, value: valueTuple[2] },
+        ];
+      }
+      return items
+    },
+    // transformRate() {
+    //   return this.$store.getters.copilot.efficiency.transformRate
+    // },
+    series() {
+      // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
+      const transformRate = this.transformRate
+      // console.log('chipOee', chipOeeRate)
+      let dataList = null;
       switch (this.period) {
         case "日":
+          dataList = [];
+          dataList[0] = transformRate.previous;
+          dataList[1] = transformRate.current;
         case "周":
-          dataList = transformRate?.current;
-          break;
+          dataList = [];
+          dataList[0] = transformRate.previous;
+          dataList[1] = transformRate.current;
         default:
           dataList = [];
-          dataList[0] = transformRate?.previous;
-          dataList[1] = transformRate?.current;
+          dataList[0] = transformRate.previous;
+          dataList[1] = transformRate.current
+          dataList[2] = transformRate.target
       }
-
-      return getTemplate(this.period, dataList);
+      console.log('transformRate', dataList)
+      return getTemplate(this.period, dataList, this.than);
     },
+    // series() {
+    //   const { transformRate } = this.$store.getters.copilot.efficiency;
+    //   let dataList = null;
+
+    //   switch (this.period) {
+    //     case "日":
+    //     case "周":
+    //       dataList = transformRate?.current;
+    //       break;
+    //     default:
+    //       dataList = [];
+    //       dataList[0] = transformRate?.previous;
+    //       dataList[1] = transformRate?.current;
+    //   }
+
+    //   return getTemplate(this.period, dataList);
+    // },
   },
   methods: {},
 };
 
-function getTemplate(period, dataList) {
-  const year = new Date().getFullYear();
+function getTemplate(period, dataList,than) {
+  // console.log('dataList',dataList);
+  let items = [];
+  var day1 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var yesterday = (day1.getMonth() + 1) + "月" + day1.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;
-  return period == "日" || period == "周"
-    ? [
-        {
-          name: period == "日" ? "昨日" : "本周",
-          data: dataList ?? [],
-        },
-      ]
-    : [
-        {
-          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
-          data: dataList ? dataList[0] : [],
-        },
-        {
-          name: period == "年" ? `${year}年` : `${year}年${month}月`,
-          data: dataList ? dataList[1] : [],
-          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-        },
-      ];
+  const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+  const year = new Date().getFullYear();
+  if (period === '日' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月${today}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '日' && than === '环比') {
+    items = [
+      {
+        name: `${yesterday}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '同比') {
+    items = [
+      {
+        name: `去年本周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '环比') {
+    items = [
+      {
+        name: `上周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '环比') {
+    items = [
+      {
+        name: `${lastMonth}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else {
+    items = [
+      {
+        name: `${year - 1}年`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${year}年`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${year}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  }
+  return items
 }
 </script>
 

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

@@ -1,17 +1,17 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-05-14 08:32:44
+ * @LastEditTime: 2024-05-31 15:55:00
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <chart-container class="bar-chart-base">
     <div class="legend">
-      <span v-for="item in legend" :key="item.label" class="legend-item"
+      <span v-for="(item,index) in legend" :key="index" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
     </div>
-    <div ref="chart" :style="{ height: '100%',width: width}"></div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
   </chart-container>
 </template>
 
@@ -171,6 +171,41 @@ export default {
             },
             data: [], // this.series[1].data,
           },
+          {
+            name: "", // "2024年目标值",
+            type: "line",
+            lineStyle: {
+              color: "#f3c000",
+            },
+            itemStyle: {
+              color: "#f3c000",
+            },
+            areaStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#f3c000", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.55,
+                    color: "#f3c00033",
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
         ],
       },
     };
@@ -182,40 +217,57 @@ export default {
   },
   watch: {
     isOpen(val) {
-      if (val === true) {
-        this.width = '100%-128px'
-        this.canvasReset()
-      } else {
-        this.watch = 100 + '%'
-        this.canvasReset()
-      }
+      this.canvasReset()
     },
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
-    isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
-        item.barWidth = val ? 18 : 12;
-      });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions);
-    },
+    // isFullscreen(val) {
+    //   this.actualOptions.series.map((item) => {
+    //     item.barWidth = val ? 18 : 12;
+    //   });
+    //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   // if (val === false && this.isOpen === true) {
+    //   //   console.log(val)
+    //   //   this.width = 97 + '%'
+    //   //   this.canvasReset()
+    //   // } else if (val === false && this.isOpen === false) {
+    //   //   this.width = 100 + '%'
+    //   //   this.canvasReset()
+    //   // }
+    //   // this.actualOptions.series.map((item) => {
+    //   //   item.barWidth = val ? 18 : 12;
+    //   // });
+    //   // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   this.initChart(this.actualOptions)
+    //   this.canvasReset()
+    // },
     series(val) {
       if (!val) {
         this.initChart(this.options);
         return;
       }
-      console.log(val)
+      // console.log('val', val)
       const actualOptions = JSON.parse(JSON.stringify(this.options))
+      console.log(actualOptions)
       actualOptions.series[0].data = val[0].data;
       actualOptions.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data || [];
-      actualOptions.series[1].name = val?.[1]?.name || "";
+      actualOptions.series[1].data = val?.[1]?.data;
+      actualOptions.series[1].name = val?.[1]?.name;
+      actualOptions.series[2].data = val?.[2]?.data || [];
+      actualOptions.series[2].name = val?.[2]?.name || "";
       this.actualOptions = actualOptions;
       this.initChart(actualOptions);
     },
   },
   mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
     // if (screenfull.isEnabled) {
     //   screenfull.on("change", () => {
     //     this.isFullscreen = screenfull.isFullscreen;
@@ -243,7 +295,7 @@ export default {
       if (this.chart) {
         this.chart.dispose();
       }
-      this.chart = echarts.init(this.$refs.chart);
+      this.chart = echarts.init(this.$refs.oeeChart);
       this.chart.setOption(this.actualOptions);
     },
   },
@@ -263,7 +315,7 @@ export default {
   .legend-item {
     position: relative;
     // font-size: 12px;
-    margin-right: 0.67vw;
+    margin-right: 1.3vw;
 
     &::before {
       content: "";
@@ -275,7 +327,34 @@ export default {
       margin-right: 0.22vw;
     }
   }
+ .legend-item:nth-child(3):before {
+   // width: 12px;
+   // height: 2px;
+   width: 1vw;
+   height: 0.1064vw;
+   background-color: #f3c000;
+   position: absolute;
+   top: 50%;
+   // left: -16px;
+   left: -0.951vw;
+   transform: translateY(-50%);
+ }
 
+ .legend-item:nth-child(3):after {
+   background-color: #f3c000;
+   content: "";
+   display: inline-block;
+   position: absolute;
+   // width: 6px;
+   // height: 6px;
+   width: 0.3191vw;
+   height: 0.3191vw;
+   border-radius: 100%;
+   top: 50%;
+   left: -0.851vw;
+   // left: -16px;
+   transform: translateY(-50%) translateX(50%);
+ }
   .legend-item:nth-child(1):before {
     background-color: #12f7f1;
   }

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

@@ -0,0 +1,366 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-23 15:50:44
+ * @LastEditTime: 2024-05-31 15:54:41
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <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>
+    </div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "../../../../components/ChartContainer.vue";
+// import chartMixin from "@/mixins/chart.js";
+import { debounce } from "@/utils/debounce";
+import * as echarts from "echarts";
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer,
+  },
+  // mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 36,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      width: '100%',
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "0%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/%",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+          {
+            name: "", // "2024年目标值",
+            type: "line",
+            lineStyle: {
+              color: "#f3c000",
+            },
+            itemStyle: {
+              color: "#f3c000",
+            },
+            areaStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#f3c000", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.55,
+                    color: "#f3c00033",
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened
+    },
+  },
+  watch: {
+    isOpen(val) {
+      this.canvasReset()
+    },
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // if (val === false && this.isOpen === true) {
+      //   console.log(val)
+      //   this.width = 97 + '%'
+      //   this.canvasReset()
+      // } else if (val === false && this.isOpen === false) {
+      //   this.width = 100 + '%'
+      //   this.canvasReset()
+      // }
+      // this.actualOptions.series.map((item) => {
+      //   item.barWidth = val ? 18 : 12;
+      // });
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // this.initChart(this.actualOptions)
+      // this.canvasReset()
+    },
+    series(val) {
+      if (!val) {
+        this.initChart(this.options);
+        return;
+      }
+      console.log(val)
+      const actualOptions = JSON.parse(JSON.stringify(this.options))
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].name = val?.[1]?.name || "";
+      actualOptions.series[2].data = val?.[2]?.data || [];
+      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.actualOptions = actualOptions;
+      this.initChart(actualOptions);
+    },
+  },
+  mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    this.actualOptions = this.options
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(this.$refs.oeeChart);
+      this.chart.setOption(this.actualOptions);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right:1.3vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+    .legend-item:nth-child(3):before {
+      // width: 12px;
+      // height: 2px;
+      width: 1vw;
+      height: 0.1064vw;
+      background-color: #f3c000;
+      position: absolute;
+      top: 50%;
+      // left: -16px;
+      left: -0.951vw;
+      transform: translateY(-50%);
+    }
+
+    .legend-item:nth-child(3):after {
+      background-color: #f3c000;
+      content: "";
+      display: inline-block;
+      position: absolute;
+      // width: 6px;
+      // height: 6px;
+      width: 0.3191vw;
+      height: 0.3191vw;
+      border-radius: 100%;
+      top: 50%;
+      left: -0.851vw;
+      // left: -16px;
+      transform: translateY(-50%) translateX(50%);
+    }
+}
+</style>

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

@@ -13,7 +13,7 @@
     <!-- <div style="flex:1;padding: 0 20%;"> -->
     <div class="chart" ref="chart"></div>
     <!-- </div> -->
-    <div class="legend" v-if="period == '月' || period == '年'">
+    <div class="legend" >
       <div class="legend-item" v-for="lgd in legend" :key="lgd.label">
         <span class="legend-item__value">{{ lgd.value }}</span>
         <span class="legend-item__label">{{ lgd.label }}</span>
@@ -46,6 +46,10 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: '同比',
+    }
   },
   data() {
     return {
@@ -75,15 +79,64 @@ export default {
       ];
     },
     options() {
-      const single = this.period === "日" || this.period === "周";
+      // const single = this.period === "日" || this.period === "周";
+      const today = new Date().getDate();
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
       const vt = this.valueTuple;
-      let titleValue = single
-          ? (vt[1] != null && `${vt[1] * 100}%`) || "0%"
-          : vt[0] != null && vt[2] != null && vt[2] !== 0
-          ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-          : "0%",
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `${month}月${today}日良率`, },
+          { label: `去年${month}月${today}日良率` },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${month}月${today}日良率` },
+          { label: `${yesterday}日良率` },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `去年本周良率` },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `上周良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `去年${month}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `${lastMonth}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else {
+        items = [
+          { label: `${year}年良率`, },
+          { label: `${year - 1}年良率` },
+          { label: `${year}年目标良率` },
+        ];
+      }
+      let titleValue = vt[1] === null ? 0 + '%' : this.formatNumber(vt[1]) + '%',
         subtitle = {
           日: "本日良率",
           周: "本周良率",
@@ -92,10 +145,12 @@ export default {
         }[this.period];
 
       const t = getOptions({
-        single,
+        // single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
+        currentName: items[0].label,
+        preName: items[1].label,
         previousSum: vt[0],
         currentSum: vt[1],
         targetSum: vt[2],
@@ -103,21 +158,76 @@ export default {
       return t;
     },
     legend() {
-      const year = new Date().getFullYear();
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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;
-      return [
-        {
-          label:
-            this.period == "月"
-              ? `${year - 1}年${month}月良率`
-              : `${year - 1}年良率`,
-          value: isNaN((this.valueTuple[0] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[0] * 100).toFixed(0) + "%"
-        },
-        {
-          label: this.period == "月" ? `${month}月良率` : `${year}年良率`,
-          value: isNaN((this.valueTuple[1] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[1] * 100).toFixed(0) + "%"
-        },
-      ];
+      const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+      const year = new Date().getFullYear();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日良率`, 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])) + "%" },
+        ];
+      } 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: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+        ];
+      } 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])) + "%" },
+
+        ];
+      } 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])) + "%" },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${year}年良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${year}年目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
+        ];
+      }
+      return items
+      // [
+      //   {
+      //     label:
+      //       this.period == "月"
+      //         ? `${year - 1}年${month}月良率`
+      //         : `${year - 1}年良率`,
+      //     value: isNaN((this.valueTuple[0] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[0] * 100).toFixed(0) + "%"
+      //   },
+      //   {
+      //     label: this.period == "月" ? `${month}月良率` : `${year}年良率`,
+      //     value: isNaN((this.valueTuple[1] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[1] * 100).toFixed(0) + "%"
+      //   },
+      // ];
     },
   },
   mounted() {
@@ -136,6 +246,15 @@ export default {
     },
   },
   methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    },
     handleCityUpdate(id) {
       this.factoryId = id;
     },
@@ -161,12 +280,11 @@ export default {
     .chart {
       // margin-left: 5%;
       // width: 290px;
-      align-self: stretch;
-      // flex: 1 1 auto;
-      // padding: 0 10%;
+      flex: 1 1 auto;
+      padding: 0 15%;
       /* margin: 10%; */
       /* min-width: 300px; */
-      height: 200px;
+      align-self: stretch;
     }
   .legend {
     height: 80px;

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

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: DoubleRingChart.vue
     author: liubin
     date: 2024-04-17 11:01:55
-    description: 
+    description:
 -->
 
 <template>

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

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <div class="progress-bar" :data-title="titleYear" :data-rate="number">
+  <div class="progress-bar" :data-title="title" :data-rate="value + '%'">
     <div class="progress-bar__rate" :style="{ width: dataRate == '-' ? 0 : dataRate }"></div>
   </div>
 </template>
@@ -20,52 +20,25 @@ export default {
       type: Number,
       default: 0,
     },
-    target: {
-      type: Number,
-      default: 0,
-    },
-    goodNumber: {
-      type: Number,
-      default:0
-    },
-    componentYield: {
-      type: Number,
-      default:0
-    },
-    period: {
-      type: String,
-      default:'日',
-    },
+    // total: {
+    //   type: Number,
+    //   default: 0,
+    // },
     title: {
       type: String,
       default: "",
     },
-    city: {
-      type: String,
-      default:""
-    }
   },
   data() {
-    return {
-      number: 0,
-      titleYear:'',
-    };
+    return {};
   },
   computed: {
     dataRate() {
-      if ((this.period === '年' || this.period === '月') && this.target != 0) {
-        // console.log(this.componentYield)
-        this.titleYear = this.title + '  ' + `${(this.target * 100).toFixed(0)}%`
-      } else {
-        this.titleYear = this.title
-      }
-      this.number = this.value == 0
-        ? "-"
-        : `${(this.value * 100).toFixed(0)}%`
-      // console.log(this.period)
       return this.value == 0
         ? "-"
-        : this.value >1 ? 100 + '%' :`${(this.value * 100).toFixed(0)}%`
+        : this.value > 1
+          ?  100 + '%'
+          : `${(parseFloat(this.value)).toFixed(0)}%`;
     },
   },
   methods: {},
@@ -95,7 +68,7 @@ export default {
     color: #fff;
     position: absolute;
     bottom: -200%;
-    right: 10px;
+    right: 0;
     font-size: 12px;
   }
 
@@ -104,6 +77,7 @@ export default {
       color: #11eae3;
     }
   }
+
   &:nth-child(2) {
     &:after {
       color: #0e65fd;
@@ -116,17 +90,20 @@ export default {
     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
-      );
+      background: linear-gradient(to right,
+          #004c5e11 10%,
+          #004c5e,
+          #0ac0c0,
+          #11eae3);
     }
   }
 

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-05-20 09:46:19
+ * @LastEditTime: 2024-05-29 17:03:00
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,28 +11,30 @@
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="title" :value="city.current" />
-      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+      <ProgressBar :period="period" :title="titlePre" :value="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" :value="city.current" />
-      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+      <ProgressBar :period="period" :title="titlePre" :value="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="titleEnd" :target="city.target" :value="city.current" />
-      <ProgressBar :period="period" :title="title" :value="city.previous" />
+      <ProgressBar :period="period" :title="titleTarget" :value="city.target" />
+      <ProgressBar :period="period" :title="titlePre" :value="city.previous" />
+      <ProgressBar :period="period" :title="title" :value="city.current" />
     </div>
   </div>
   <div v-else="period == '年'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
-      <ProgressBar :period="period" :title="titleEnd" :target="city.target" :value="city.current" />
-      <ProgressBar :period="period" :title="title" :value="city.previous" />
+      <ProgressBar :period="period" :title="titleTarget" :value="city.target" />
+      <ProgressBar :period="period" :title="titlePre" :value="city.previous" />
+      <ProgressBar :period="period" :title="title" :value="city.current" />
     </div>
   </div>
 </template>
@@ -52,7 +54,11 @@ export default {
     period: {
       type: String,
       default: "日",
-    }
+    },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
     return {
@@ -60,44 +66,65 @@ export default {
     };
   },
   computed: {
-    title() {
-      switch (this.period) {
-        case "日":
-          return "今日"
-        case "周":
-          return  "本周"
-        case "月":
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return `${year - 1}年${month}月累计`
-        case "年": {
-          const year = new Date().getFullYear();
-          // return [
-           return `${year - 1}年累计`
-          // ];
-        }
-        default:
-         return "今日"
+    titlePre() {
+      console.log(this.city);
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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 `去年${month}月${today}日`
+      } else if (this.period === '日' && this.than === '环比') {
+        return `${yesterday}日`
+      } else if (this.period === '周' && this.than === '同比') {
+        return `去年本周`
+      } else if (this.period === '周' && this.than === '环比') {
+        return `上周`
+      } else if (this.period === '月' && this.than === '同比') {
+        return `去年${month}月`
+      } else if (this.period === '月' && this.than === '环比') {
+        return `${lastMonth}月`
+      } else {
+        return `${year - 1}年`
       }
     },
-    titleEnd() {
-      switch (this.period) {
-        // case "日":
-        //   return "今日"
-        // case "周":
-        //   return "本周"
-        case "月":
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return  `${year}年${month}月目标`
-        case "年": {
-          const year = new Date().getFullYear();
-          // return [
-          return  `${year}年目标`
-          // ];
-        }
+    title() {
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      const today = new Date().getDate();
+      const month = new Date().getMonth() + 1;
+      const year = new Date().getFullYear();
+      if (this.period === '日' && this.than === '同比') {
+        return `${month}月${today}日`
+      } else if (this.period === '日' && this.than === '环比') {
+        return `${month}月${today}日`
+      } else if (this.period === '周' && this.than === '同比') {
+        return `本周`
+      } else if (this.period === '周' && this.than === '环比') {
+        return `本周`
+      } else if (this.period === '月' && this.than === '同比') {
+        return `${month}月`
+      } else if (this.period === '月' && this.than === '环比') {
+        return `${month}月`
+      } else {
+        return `${year}年`
       }
-    }
+    },
+    titleTarget() {
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      const today = new Date().getDate();
+      const month = new Date().getMonth() + 1;
+      const year = new Date().getFullYear();
+      if (this.period === '月') {
+        return `${month}月目标`
+      } else if (this.period === '年') {
+        return `${year}年目标`
+      }
+    },
   },
 };
 </script>

src/views/copilot/efficiency/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-05-17 17:05:36
+ * @LastEditTime: 2024-05-31 13:19:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,16 +9,16 @@
 <template>
   <div class="efficiency-copilot">
     <Container title="芯片良率" icon="chip2">
-      <ChipRate :period="period" />
+      <ChipRate :period="period" :than="than" />
     </Container>
     <Container title="标准组件良率" icon="std">
-      <StdRate :period="period" />
+      <StdRate :period="period" :than="than" />
     </Container>
     <Container title="芯片OEE" icon="chip">
-      <ChipOee :period="period" />
+      <ChipOee :chipOeeRate="chipOeeRate" :period="period" :than="than" />
     </Container>
     <Container title="转化效率" icon="cube">
-      <TransformRate :period="period" />
+      <TransformRate :transformRate="transformRate" :period="period" :than="than" />
     </Container>
   </div>
 </template>
@@ -44,25 +44,45 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
-    return {};
+    return {
+      chipOeeRate: {},
+      transformRate:{}
+    };
   },
   watch: {
     period: {
       handler(val) {
-        val && this.fetchData(val);
+        val && this.fetchData(val,this.than);
+      },
+      immediate: true,
+    },
+    than: {
+      handler(val) {
+        console.log(val)
+        val && this.fetchData(this.period, val);
       },
       immediate: true,
     },
   },
   methods: {
-    fetchData(period = "日") {
+    fetchData(period = "日",than) {
       console.log(`效率驾驶舱，获取${period}数据`);
       this.$store.dispatch("copilot/initCopilot", {
         period,
         source: "efficiency",
-      });
+        than
+      }).then(() => {
+        this.$nextTick(() => {
+          this.chipOeeRate = this.$store.getters.copilot.efficiency.chipOeeRate
+          this.transformRate = this.$store.getters.copilot.efficiency.transformRate
+        })
+      })
     },
   },
 };

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

@@ -1,163 +1,138 @@
-export default function ({
-  single = false,
-  color,
+export default ({
   titleValue,
   subtitle,
   previousSum,
   currentSum,
   targetSum,
-}) {
-  return {
-    grid: {
-      left: 0,
-      right: 0,
-      bottom: 0,
-      top: 0,
-      containLabel: true,
+  currentName,
+  preName,
+}) => ({
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  tooltip: {},
+  title: {
+    text: titleValue,
+    left: "44%",
+    top: "37%",
+    textAlign: "center",
+    textStyle: {
+      fontWeight: 600,
+      fontSize: 32,
+      color: "#fffd",
     },
-    tooltip: {
-      // formatter(params) {
-      //   return `${params.name}: ${(params.value * 100).toFixed(0)}%`;
-      // }
+    subtext: `\u2002${subtitle}\u2002`,
+    subtextStyle: {
+      fontSize: 14,
+      fontWeight: 100,
+      color: "#fffd",
+      align: "right",
     },
-    title: {
-      text: titleValue,
-      left: "49%",
-      top: "39%",
-      textAlign: "center",
-      textStyle: {
-        fontWeight: 600,
-        fontSize: 32,
-        color: "#fffd",
-      },
-      subtext: `\u2002${subtitle}\u2002`,
-      subtextStyle: {
-        fontSize: 14,
-        fontWeight: 100,
-        color: "#fffd",
-        align: "right",
+  },
+  series: [
+    // 背景 series
+    {
+      type: "pie",
+      name: "当前良率",
+      radius: ["70%", "85%"],
+      center: ["45%", "52%"],
+      emptyCircleStyle: {
+        color: "#042c5f33",
       },
     },
-    series: [
-      // 背景 series
-      {
-        type: "pie",
-        name: "当前目标",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        emptyCircleStyle: {
-          color: "#040c5f45",
-        },
+    // 数据 series
+    {
+      type: "pie",
+      radius: ["70%", "85%"],
+      center: ["45%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
       },
-      // 数据 series
-      {
-        type: "pie",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        avoidLabelOvervlap: false,
-        label: {
-          show: false,
-        },
-        labelLine: {
-          show: false,
-        },
-        data: [
-          {
-            value: currentSum,
-            name: "当前良率",
-            selected: false,
-            itemStyle: {
-              borderJoin: "round",
-              borderCap: "round",
-              borderWidth: 12,
-              borderRadius: "50%",
-              color: {
-                type: "linear",
-                x: 1,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: single
-                  ? [
-                      { offset: 0, color: `${color}11` },
-                      { offset: 1, color: `${color}` },
-                    ]
-                  : [
-                      { offset: 0, color: "#4CF0E811" },
-                      { offset: 1, color: "#4CF0E8" },
-                    ],
-              },
-            },
-          },
-          {
-            value:
-              targetSum > currentSum
-                ? targetSum - currentSum
-                : targetSum == 0
-                ? currentSum == 0
-                  ? 1
-                  : 0
-                : targetSum,
-
-            name: "未达成",
-            itemStyle: { color: "transparent" },
-            label: { show: false },
-          },
-        ],
+      labelLine: {
+        show: false,
       },
-      // 数据 series2 - 2023累计
-      single
-        ? null
-        : {
-            type: "pie",
-            radius: ["55%", "70%"],
-            center: ["50%", "52%"],
-            avoidLabelOvervlap: false,
-            label: {
-              show: false,
+      data: [
+        {
+          value: currentSum,
+          name: currentName,
+          selected: false,
+          itemStyle: {
+            borderJoin: "round",
+            borderCap: "round",
+            borderWidth: 12,
+            borderRadius: "50%",
+            color: {
+              type: "linear",
+              x: 1,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                { offset: 0, color: "#4CF0E811" },
+                { offset: 1, color: "#4CF0E8" },
+              ],
             },
-            labelLine: {
-              show: false,
-            },
-            data: [
-              {
-                value: previousSum,
-                name: "上期良率",
-                selected: false,
-                itemStyle: {
-                  borderJoin: "round",
-                  borderCap: "round",
-                  borderWidth: 12,
-                  borderRadius: "50%",
-                  color: {
-                    type: "linear",
-                    x: 1,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                      { offset: 0, color: "#1065ff66" },
-                      { offset: 1, color: "#1065ff" },
-                    ],
-                  },
-                },
-              },
-              {
-                value:
-                  targetSum > previousSum
-                    ? targetSum - previousSum
-                    : previousSum == 0
-                    ? 1
-                    : 0,
-                name: "-",
-                formatter: {
-                  show: false
-                },
-                itemStyle: { color: "transparent" },
-                label: { show: false },
-              },
-            ],
           },
-    ],
-  };
-}
+        },
+        {
+            value:currentSum == 0
+              ? 1
+              : 0,
+          name: "未达成良率",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+    // 数据 series2 - 2023累计
+    {
+      type: "pie",
+      radius: ["55%", "70%"],
+      center: ["45%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
+      },
+      labelLine: {
+        show: false,
+      },
+      data: [
+        {
+          value: previousSum,
+          name: preName,
+          selected: false,
+          itemStyle: {
+            borderJoin: "round",
+            borderCap: "round",
+            borderWidth: 12,
+            borderRadius: "50%",
+            color: {
+              type: "linear",
+              x: 1,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                { offset: 0, color: "#1065ff66" },
+                { offset: 1, color: "#1065ff" },
+              ],
+            },
+          },
+        },
+        {
+          value:previousSum == 0
+              ? 1
+              : 0,
+          name: "-",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+  ],
+});

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

@@ -6,7 +6,7 @@ export default ({
   targetSum,
 }) => ({
   grid: {
-    left: 0,
+    left: '50%',
     right: 0,
     bottom: 0,
     top: 0,

src/views/copilot/efficiencyContainer.vue

@@ -0,0 +1,131 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-20 16:04:18
+ * @LastEditTime: 2024-05-31 13:16:26
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <!-- <div class="copilot-layout" ref="copilot-layout"> -->
+  <div class="copilot-layout" ref="copilot-layout">
+    <CopilotHeaderVue :than="than" :active="page" :period="period" @update:active="updateActive"
+      @update:period="period = $event" @update:than="updateThan" />
+
+    <!-- <YieldCopilot v-if="page == '产量'" :period="period" /> -->
+    <!-- <EnergyCopilot v-if="page == '综合'" :period="period" /> -->
+    <EfficiencyCopilot :period="period"  :than="than" />
+    <div class="copilot-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+
+<script>
+import CopilotHeaderVue from "./components/CopilotHeader.vue";
+// import YieldCopilot from "./yield/index.vue";
+// import EnergyCopilot from "./energy/index.vue";
+import EfficiencyCopilot from "./efficiency/index.vue";
+
+export default {
+  name: "CopilotContainer",
+  components: {
+    CopilotHeaderVue,
+    EfficiencyCopilot,
+  },
+  data() {
+    return {
+      than:'同比',
+      page: "效率",
+      period: "月",
+      currentsStyles: '',
+    };
+  },
+  methods: {
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updateActive(val, oldVal) {
+      console.log(val)
+      if (val === '效率') {
+        this.$router.push({
+          path: 'efficiency-container',
+          query: {
+            name: '效率'
+          }
+        })
+        // this.page = oldVal
+      } else if (val === '产量') {
+        this.$router.push({
+          path: 'main',
+          query: {
+            name: '产量'
+          }
+        })
+        // this.page = oldVal
+      }
+    }
+  },
+  // mounted() {
+  //   this.page = this.$route.query.name
+  // },
+  // watch: {
+  //   page(val) {
+  //     if (val === '产量') {
+  //       console.log(val)
+  //       this.currentsStyles =
+  //         'height: calc(100% + 38px)'
+  //       console.log(this.currentsStyles)
+  //     } else {
+  //       console.log(val)
+  //       this.currentsStyles = 'height:100%+38px'
+  //       console.log(this.currentsStyles)
+  //     }
+  //     immediate: true
+  //   }
+  // }
+  // mounted() {
+  //   document.body.style.minHeight = "1024px";
+  //   document.body.style.minWidth = "1550px";
+  // },
+  // destroyed() {
+  //   document.body.style.minHeight = "1024px";
+  //   document.body.style.minWidth = "1550px";
+  // },
+};
+</script>
+<style>
+
+.copilot-layout {
+  padding: 16px;
+  background: url(../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  left: -16px;
+  /* top: -8px; */
+  height: calc(100% + 240px);
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.produce{
+  height: calc(100% + 38px);
+}
+.other {
+  /* height: calc(100% + 240px); */
+}
+.copilot-footer {
+  /** position: absolute;
+  bottom: 10px; **/
+  height: 10px;
+  width: 100%;
+  color: rgb(80, 80, 80);
+  user-select: none;
+  font-size: 14px;
+  letter-spacing: 1px;
+  display: grid;
+  place-content: center;
+}
+</style>

src/views/copilot/factoryData/bbIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 6,
+      companyName: "蚌埠中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            }else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/factoryData/cdIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 4,
+      companyName: "成都中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            } else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

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

@@ -0,0 +1,417 @@
+<template>
+  <div class="left-chart-base">
+    <!-- <div class="legend">
+      <span v-for="item in legend" :key="item.label" class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }">{{ item.label }}</span>
+    </div> -->
+    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
+  </div>
+</template>
+<script>
+import { debounce } from "@/utils/debounce";
+import * as echarts from "echarts";
+export default {
+  name: "Energy",
+  props: {
+    // legend: {
+    //   type: Array,
+    //   required: true,
+    // },
+    energyCockpits: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      chart: "",
+      options: {
+        color: ["#FFD160", "#2760FF", "#12FFF5"],
+        grid: {
+          left: "7%",
+          right: "7%",
+          bottom: "8%",
+          top: "15%",
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "rgba(255, 255, 255, 0.7)",
+            fontSize: 12,
+          },
+          data: [],
+        },
+        yAxis: {
+            type: "value",
+            name: "单位/片",
+            nameTextStyle: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+              align: "right",
+            },
+            axisTick: {
+              show: false,
+            },
+            axisLabel: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+          },
+        series: [
+          // {
+          //   name: "",
+          //   data: [],
+          //   type: "line",
+          //   areaStyle: {
+          //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //       { offset: 0, color: "#FFD160" + "80" },
+          //       { offset: 0.5, color: "#FFD160" + "20" },
+          //       { offset: 1, color: "#FFD160" + "00" },
+          //     ]),
+          //   },
+          //   lineStyle: {
+          //     width: 2,
+          //   },
+          //   symbol: "circle",
+          //   symbolSize: 8,
+          //   emphasis: {
+          //     focus: "series",
+          //   },
+          // },
+          // {
+          //   name: "",
+          //   data: [],
+          //   type: "line",
+          //   yAxisIndex: 1,
+          //   areaStyle: {
+          //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //       { offset: 0, color: "#2760FF" + "80" },
+          //       { offset: 0.5, color: "#2760FF" + "20" },
+          //       { offset: 1, color: "#2760FF" + "00" },
+          //     ]),
+          //   },
+          //   lineStyle: {
+          //     width: 2,
+          //   },
+          //   symbol: "circle",
+          //   symbolSize: 8,
+          //   emphasis: {
+          //     focus: "series",
+          //   },
+          // },
+          {
+            name: "",
+            data: [],
+            type: "bar",
+            // yAxisIndex: 1,
+            // areaStyle: {
+            //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            //     { offset: 0, color: "#12FFF5" + "80" },
+            //     { offset: 0.5, color: "#12FFF5" + "20" },
+            //     { offset: 1, color: "#12FFF5" + "00" },
+            //   ]),
+            // },
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            symbol: "circle",
+            symbolSize: 8,
+            emphasis: {
+              focus: "series",
+            },
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    // isFullscreen(val) {
+    //   this.actualOptions.series.map((item) => {
+    //     item.barWidth = val ? 18 : 12;
+    //   });
+    //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   this.initOptions(this.actualOptions);
+    // },
+    // series(val) {
+    //   if (!val) {
+    //     this.initOptions(this.options);
+    //     return;
+    //   }
+    //   const actualOptions = JSON.parse(JSON.stringify(this.options));
+    //   actualOptions.series[0].data = val[0].data;
+    //   actualOptions.series[0].name = val[0].name;
+    //   actualOptions.series[1].data = val[1].data;
+    //   actualOptions.series[1].name = val[1].name;
+    //   actualOptions.series[2].data = val[2].data;
+    //   actualOptions.series[2].name = val[2].name;
+    //   this.actualOptions = actualOptions;
+    //   this.initOptions(actualOptions);
+    // },
+    energyCockpits() {
+      this.initChart();
+    },
+    isOpen(val) {
+      this.canvasReset();
+    },
+  },
+  mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      console.log("this.energyCockpits", this.energyCockpits);
+      let orderXAxis = ['目标产量', '计划投入量', '实际投入量', '实际产出量', '废品数量', '待再加工数量'];
+      // let n = 0;
+      let seriesArr =[]
+      seriesArr[0] = this.energyCockpits.length != 0 && this.energyCockpits[0].targetProduction ? this.energyCockpits[0].targetProduction :0
+      seriesArr[1] = this.energyCockpits.length != 0 && this.energyCockpits[0].plannedInvestment ? this.energyCockpits[0].plannedInvestment : 0
+      seriesArr[2] = this.energyCockpits.length != 0 && this.energyCockpits[0].actualInvestment ? this.energyCockpits[0].actualInvestment : 0
+      seriesArr[3] = this.energyCockpits.length != 0 && this.energyCockpits[0].actualProduction ? this.energyCockpits[0].actualProduction : 0
+      seriesArr[4] = this.energyCockpits.length != 0 && this.energyCockpits[0].wasteNum ? this.energyCockpits[0].wasteNum : 0
+      seriesArr[5] = this.energyCockpits.length != 0 && this.energyCockpits[0].reworkNum ? this.energyCockpits[0].reworkNum : 0
+      console.log(seriesArr);
+
+      // let seriesArr = [
+      //   {
+      //     name: "水",
+      //     energyType: 1,
+      //     data: [],
+      //   },
+      //   {
+      //     name: "电",
+      //     energyType: 2,
+      //     data: [],
+      //   },
+      //   {
+      //     name: "气",
+      //     energyType: 3,
+      //     data: [],
+      //   },
+      // ];
+      // if (this.energyCockpits.length > 0) {
+      //   let dataArr = this.energyCockpits.map((item) => {
+      //     return item.groupName;
+      //   });
+      //   energyxAxis = Array.from(new Set(dataArr));
+      //   n = energyxAxis.length;
+      //   seriesArr[0].data = Array.from({ length: n }, () => 0);
+      //   seriesArr[1].data = Array.from({ length: n }, () => 0);
+      //   seriesArr[2].data = Array.from({ length: n }, () => 0);
+      //   for (let i = 0; i < this.energyCockpits.length; i++) {
+      //     for (let j = 0; j < energyxAxis.length; j++) {
+      //       if (this.energyCockpits[i].groupName === energyxAxis[j]) {
+      //         if (this.energyCockpits[i].energyType === 1) {
+      //           seriesArr[0].data[j] = this.energyCockpits[i].totalEnergyValue;
+      //         } else if (this.energyCockpits[i].energyType === 2) {
+      //           seriesArr[1].data[j] = this.energyCockpits[i].totalEnergyValue;
+      //         } else if (this.energyCockpits[i].energyType === 3) {
+      //           seriesArr[2].data[j] = this.energyCockpits[i].totalEnergyValue;
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(document.getElementById("factoryEnergyChart"));
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      actualOptions.xAxis.data = orderXAxis;
+      actualOptions.series[0].data = seriesArr;
+      // actualOptions.series[0].name = seriesArr[0].name;
+      // actualOptions.series[1].data = seriesArr[1].data;
+      // actualOptions.series[1].name = seriesArr[1].name;
+      // actualOptions.series[2].data = seriesArr[2].data;
+      // actualOptions.series[2].name = seriesArr[2].name;
+      this.actualOptions = actualOptions;
+      this.chart.setOption(actualOptions);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.left-chart-base {
+  // position: relative;
+  height: 100%;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 4vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 1.34vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      // width: 10px;
+      // height: 10px;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #ffd160;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+
+  .legend-item:nth-child(1):after {
+    background-color: #ffd160;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+
+  .legend-item:nth-child(2):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #2760ff;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+
+  .legend-item:nth-child(2):after {
+    background-color: #2760ff;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+
+  .legend-item:nth-child(3):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #12fff5;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+
+  .legend-item:nth-child(3):after {
+    background-color: #12fff5;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+}
+</style>

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

@@ -0,0 +1,343 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-30 08:58:39
+ * @LastEditTime: 2024-05-31 15:52:28
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <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>
+    </div>
+    <div ref="oeeChart" style="height:100%"></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "./ChartContainer.vue";
+// import chartMixin from "@/mixins/chart.js";
+import { debounce } from "@/utils/debounce";
+import * as echarts from "echarts";
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer,
+  },
+  // mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 36,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      width: '100%',
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "0%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/片",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "fto", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+          {
+            name: "", // "2024年目标值",
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#f3c000", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#f3c00033",
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened
+    },
+  },
+  watch: {
+    xAxis(val) {
+      this.options.xAxis.data = val
+      this.canvasReset()
+    },
+    isOpen(val) {
+      this.canvasReset()
+    },
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      // if (val === false && this.isOpen === true) {
+      //   console.log(val)
+      //   this.width = 97 + '%'
+      //   this.canvasReset()
+      // } else if (val === false && this.isOpen === false) {
+      //   this.width = 100 + '%'
+      //   this.canvasReset()
+      // }
+      // this.actualOptions.series.map((item) => {
+      //   item.barWidth = val ? 18 : 12;
+      // });
+      // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.initChart(this.actualOptions)
+      this.canvasReset()
+    },
+    series(val) {
+      if (!val) {
+        this.initChart(this.options);
+        return;
+      }
+      // console.log('val', val)
+      const actualOptions = JSON.parse(JSON.stringify(this.options))
+      // actualOptions.xAxis.data = val
+      console.log(actualOptions)
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val?.[1]?.data;
+      actualOptions.series[1].name = val?.[1]?.name;
+      actualOptions.series[2].data = val?.[2]?.data || [];
+      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.actualOptions = actualOptions;
+      this.initChart(actualOptions);
+    },
+  },
+  mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    this.actualOptions = this.options
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(this.$refs.oeeChart);
+      this.chart.setOption(this.actualOptions);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 1.3vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+  .legend-item:nth-child(3):before {
+    background-color: #f3c000;
+  }
+}
+</style>

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

@@ -0,0 +1,69 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-30 09:00:01
+ * @LastEditTime: 2024-05-30 09:50:02
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <div class="chart-container" :class="{ 'no-scroll': noScroll }">
+    <slot />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ChartContainer",
+  components: {},
+  props: {
+    noScroll: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.chart-container {
+  height: 0;
+  flex: 1;
+  overflow-x: scroll;
+}
+
+.no-scroll::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-button {
+  width: 0;
+  height: 0;
+  //   width: 10px;
+  //   height: 10px;
+  //   background: #14305f;
+}
+
+::-webkit-scrollbar-track {
+  background: #14305f;
+  border: 0 none;
+  border-radius: 0;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #004798;
+  border: 0 none;
+  border-radius: 6px;
+}
+</style>

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

@@ -0,0 +1,278 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-29 14:48:06
+ * @LastEditTime: 2024-05-30 10:54:00
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="chipOEE"
+    class="chip-oee"
+  />
+</template>
+
+<script>
+import BarChartBase from "./BarChartChipOEE.vue";
+export default {
+  name: "ChipOEE",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: Number,
+      default:1,
+    },
+    than: {
+      type: String,
+      default: "同比",
+    },
+    companyId: {
+      type: Number,
+      default: 0
+    },
+    data: {
+      type: Object,
+      default:{}
+    }
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["fto投入", "芯片产量", "标准组件产量"];
+    return {
+      // xAxis: cities,
+    };
+  },
+  computed: {
+    xAxis() {
+      console.log(' this.companyId', this.companyId);
+      return this.companyId === 0 ? ["fto投入", "芯片产量", "标准组件产量"] : ["fto投入", "芯片产量", "标准组件产量", 'BIPV产量'];
+    },
+    legend() {
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === 1  && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period ===1 && this.than === '环比') {
+        items = [
+          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === 2 && this.than === '同比') {
+        items = [
+          { label: `去年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === 2 && this.than === '环比') {
+        items = [
+          { label: `上周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === 3 && this.than === '同比') {
+        items = [
+          { label: `去年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else if (this.period === 3 && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          { label: `${month}月目标`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年`, color: "#12f7f1" },
+          { label: `${year}年`, color: "#58adfa" },
+          { label:  `${year}年目标`, color: "#58adfa" },
+
+          // { label: `${year}年目标`, value: valueTuple[2] },
+        ];
+      }
+      return items
+      // switch (this.period) {
+      //   case "日":
+      //     return [{ label: "昨日", color: "#12f7f1" }];
+      //   case "周":
+      //     return [{ label: "本周", color: "#12f7f1" }];
+      //   case "月": {
+      //     const year = new Date().getFullYear();
+      //     const month = new Date().getMonth() + 1;
+      //     return [
+      //       { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+      //       { label: `${year}年${month}月`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   case "年": {
+      //     const year = new Date().getFullYear();
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   default:
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      // }
+    },
+    // chipOeeRate() {
+    //    return  this.$store.getters.copilot.efficiency.chipOeeRate
+    // },
+    series() {
+      // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
+      // const chipOeeRate = this.data
+      // console.log('chipOee', chipOeeRate)
+      let dataList = []
+      dataList[0] = this.data.preDataDetail
+      dataList[1] = this.data.currentDataDetail
+      dataList[2] = this.data.targetDataDetail
+      console.log(dataList)
+      return getTemplate(this.period, dataList,this.than);
+    },
+  },
+  methods: {},
+};
+
+function getTemplate(period, dataList, than) {
+  // console.log('dataList',dataList);
+  let items = [];
+  var day1 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+  if (period === 1 && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月${today}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period ===1 && than === '环比') {
+    items = [
+      {
+        name: `${yesterday}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === 2 && than === '同比') {
+    items = [
+      {
+        name: `去年本周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === 2&& than === '环比') {
+    items = [
+      {
+        name: `上周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === 3 && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === 3 && than === '环比') {
+    items = [
+      {
+        name: `${lastMonth}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${month}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else {
+    items = [
+      {
+        name: `${year - 1}年`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${year}年`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+      {
+        name: `${year}目标`,
+        data: dataList ? dataList[2] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  }
+  return items
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

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

@@ -1,27 +1,38 @@
 <template>
-  <dv-scroll-board
-    v-if="showTable"
-    :config="config"
-    style="width: 100%; height: 100%"
-    ref="orderScrollBoard"
-  />
+  <div class="order-container">
+    <div class="table">
+      <dv-scroll-board v-if="showTable" :config="config" style="width: 100%; height: 100%" ref="orderScrollBoard" />
+    </div>
+    <div class="chart">
+      <div class="chart-title">
+        <span class="title">工单情况</span>
+        <span class="line"></span>
+      </div>
+      <barChartBase :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1"></barChartBase>
+    </div>
+  </div>
+
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
+import barChartBase from './BarChartBase'
 export default {
   name: "Order",
+  components: {
+    barChartBase,
+  },
   data() {
     return {
       showTable: true,
       config: {
-        header: ["序号", "客户名称", "产品名称", "计划加工数量", "加工进度"],
+        header: ["工单号", "工单状态", "计划投入", "实际投入", "目标产量", "实际产量", "生产进度"],
         headerBGC: "rgba(0, 106, 205, 0.22)",
         oddRowBGC: "rgba(0, 106, 205, 0.22)",
         evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
         data: [],
         rowNum: 12,
         waitTime: 3000,
-        columnWidth: [50],
+        columnWidth: [100],
         align: ["center"],
         carousel: "page",
       },
@@ -64,38 +75,50 @@ export default {
       if (this.prodOrder.length > 0) {
         for (let i = 0; i < this.prodOrder.length; i++) {
           let arr = [];
-          arr.push(i + 1);
+          // arr.push(i + 1);
           arr.push(
-            `<span title=${this.prodOrder[i].customerName || ""}>${
-              this.prodOrder[i].customerName || ""
+            `<span title=${this.prodOrder[i].workOrderNumber || ""}>${
+            this.prodOrder[i].workOrderNumber || ""
             }</span>`
           );
           arr.push(
-            `<span title=${this.prodOrder[i].productName || ""}>${
-              this.prodOrder[i].productName || ""
+            `<span title=${this.prodOrder[i].inStatus || ""}>${
+            this.prodOrder[i].inStatus || ""
             }</span>`
           );
           arr.push(
-            `<span title=${this.prodOrder[i].plannedProductionQuantity || ""}>${
-              this.prodOrder[i].plannedProductionQuantity || ""
+            `<span title=${this.prodOrder[i].plannedInvestment || ""}>${
+            this.prodOrder[i].plannedInvestment || ""
+            }</span>`
+          );
+          arr.push(
+            `<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) + "%"
+            ? 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="${
-                this.prodOrder[i].productionProgress
-                  ? this.prodOrder[i].productionProgress.toFixed(0) *
+            this.prodOrder[i].productionProgress
+            ? this.prodOrder[i].productionProgress.toFixed(0) *
                       37.68 *
                       0.01 +
                     "," +
                     (1 -
-                      this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
+              this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
                       37.68
                   : 0 + "," + 37.68
               }"/>
@@ -112,3 +135,55 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.order-container{
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  .table{
+    flex: 1;
+  }
+        .chart {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+
+          // gap: 6px;
+          .chart-title {
+            margin-top: 5px;
+            // flex: 1;
+            // gap: 6px;
+            height: 1.5vw;
+            width: 100%;
+            display: flex;
+            align-items: center;
+
+            // flex-direction: column;
+            // flex-wrap: nowrap;
+            // justify-content: end
+            // margin-top: 10px;
+            .title {
+              // flex: 1;
+              font-weight: 400;
+              font-size: 24px;
+              // width: 5vw;
+              color: #FFFFFF;
+              line-height: 24px;
+              text-align: left;
+              font-style: normal;
+              display: inline-block;
+            }
+
+            .line {
+              flex: 1;
+              // width: 80%;
+              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;
+              backdrop-filter: blur(3px);
+            }
+          }
+        }
+}
+</style>

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

@@ -1,146 +1,143 @@
 <template>
   <div class="prod-monitor">
-    <div class="fto-box">
-      <div class="icon">
-        <img
-          src="./../assets/images/fto.png"
-          alt=""
-          style="width: 2.1875vw; height: 2.2875vw"
-        />
+
+    <div class="data">
+      <div class="fto-box">
+        <div class="icon">
+          <img src="./../assets/images/fto.png" alt="" style="width: 2.1875vw; height: 2.2875vw" />
+        </div>
+        <div class="middle-box">
+          <span class="type">玻璃类型</span>
+          <span class="type-name">FTO投入</span>
+        </div>
+        <div class="right-box">
+          <span class="type">投入数量</span>
+          <span class="num">{{ prodFto[0] ? prodFto[0].chipInput : 0 }}</span>
+        </div>
       </div>
-      <div class="middle-box">
-        <span class="type">玻璃类型</span>
-        <span class="type-name">FTO投入</span>
-      </div>
-      <div class="right-box">
-        <span class="type">投入数量</span>
-        <span class="num">{{ prodFto[0] ? prodFto[0].chipInput : 0 }}</span>
-      </div>
-    </div>
-    <div class="std-box">
-      <div class="icon">
-        <img
-          src="./../assets/images/std.png"
-          alt=""
-          style="width: 2.1875vw; height: 2.1875vw"
-        />
-      </div>
-      <div class="middle-box">
-        <div class="separate">
-          <div>
-            <span class="type">玻璃类型</span>
-            <span class="type-name">标准组检产量</span>
-          </div>
-          <div>
-            <span class="type">良品数量</span>
-            <span class="type-name">{{
+      <div class="std-box">
+        <div class="icon">
+          <img src="./../assets/images/std.png" alt="" style="width: 2.1875vw; height: 2.1875vw" />
+        </div>
+        <div class="middle-box">
+          <div class="separate">
+            <div>
+              <span class="type">玻璃类型</span>
+              <span class="type-name">标准组检产量</span>
+            </div>
+            <div>
+              <span class="type">良品数量</span>
+              <span class="type-name">{{
               msgObj.stand.goodNumber ? msgObj.stand.goodNumber : 0
-            }}</span>
+              }}</span>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="right-box">
-        <div class="separate">
-          <div>
-            <span class="type">生产数量</span>
-            <span class="num">{{
+        <div class="right-box">
+          <div class="separate">
+            <div>
+              <span class="type">生产数量</span>
+              <span class="num">{{
               msgObj.stand.outputNumber ? msgObj.stand.outputNumber : 0
-            }}</span>
-          </div>
-          <div>
-            <span class="type1">良品率</span>
-            <span class="num"
-              >{{ msgObj.stand.yieldRate ? msgObj.stand.yieldRate : 0 }}%</span
-            >
+              }}</span>
+            </div>
+            <div>
+              <span class="type1">良品率</span>
+              <span class="num">{{ msgObj.stand.yieldRate ? msgObj.stand.yieldRate : 0 }}%</span>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="chip-box">
-      <div class="icon">
-        <img
-          src="./../assets/images/chip.png"
-          alt=""
-          style="width: 2.1875vw; height: 2.1875vw"
-        />
-      </div>
-      <div class="middle-box">
-        <div class="separate">
-          <div>
-            <span class="type">玻璃类型</span>
-            <span class="type-name">芯片产量</span>
-          </div>
-          <div>
-            <span class="type">良品数量</span>
-            <span class="type-name">{{
+      <div class="chip-box">
+        <div class="icon">
+          <img src="./../assets/images/chip.png" alt="" style="width: 2.1875vw; height: 2.1875vw" />
+        </div>
+        <div class="middle-box">
+          <div class="separate">
+            <div>
+              <span class="type">玻璃类型</span>
+              <span class="type-name">芯片产量</span>
+            </div>
+            <div>
+              <span class="type">良品数量</span>
+              <span class="type-name">{{
               msgObj.chip.goodNumber ? msgObj.chip.goodNumber : 0
-            }}</span>
+              }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-box">
+          <div class="separate">
+            <div>
+              <span class="type">生产数量</span>
+              <span class="num">{{
+              msgObj.chip.outputNumber ? msgObj.chip.outputNumber : 0
+              }}</span>
+            </div>
+            <div>
+              <span class="type1">良品率</span>
+              <span class="num">{{ msgObj.chip.yieldRate ? msgObj.chip.yieldRate : 0 }}%</span>
+            </div>
           </div>
         </div>
       </div>
-      <div class="right-box">
-        <div class="separate">
-          <div>
-            <span class="type">生产数量</span>
-            <span class="num">{{
-              msgObj.chip.outputNumber ? msgObj.chip.outputNumber : 0
-            }}</span>
+      <div class="bipv-box" v-if="companyId != 0">
+        <div class="icon">
+          <img src="./../assets/images/bipv.png" alt="" style="width: 2.1875vw; height: 2.1875vw" />
+        </div>
+        <div class="middle-box">
+          <div class="separate">
+            <div>
+              <span class="type">玻璃类型</span>
+              <span class="type-name">BIPV产量</span>
+            </div>
+            <div>
+              <span class="type">良品数量</span>
+              <span class="type-name">{{
+              msgObj.bipv.goodNumber ? msgObj.bipv.goodNumber : 0
+              }}</span>
+            </div>
           </div>
-          <div>
-            <span class="type1">良品率</span>
-            <span class="num"
-              >{{ msgObj.chip.yieldRate ? msgObj.chip.yieldRate : 0 }}%</span
-            >
+        </div>
+        <div class="right-box">
+          <div class="separate">
+            <div>
+              <span class="type">生产数量</span>
+              <span class="num">{{
+              msgObj.bipv.outputNumber ? msgObj.bipv.outputNumber : 0
+              }}</span>
+            </div>
+            <div>
+              <span class="type1">良品率</span>
+              <span class="num">{{ msgObj.bipv.yieldRate ? msgObj.bipv.yieldRate : 0 }}%</span>
+            </div>
           </div>
         </div>
       </div>
     </div>
-    <div class="bipv-box">
-      <div class="icon">
-        <img
-          src="./../assets/images/bipv.png"
-          alt=""
-          style="width: 2.1875vw; height: 2.1875vw"
-        />
-      </div>
-      <div class="middle-box">
-        <div class="separate">
-          <div>
-            <span class="type">玻璃类型</span>
-            <span class="type-name">BIPV产量</span>
-          </div>
-          <div>
-            <span class="type">良品数量</span>
-            <span class="type-name">{{
-              msgObj.bipv.goodNumber ? msgObj.bipv.goodNumber : 0
-            }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="right-box">
-        <div class="separate">
-          <div>
-            <span class="type">生产数量</span>
-            <span class="num">{{
-              msgObj.bipv.outputNumber ? msgObj.bipv.outputNumber : 0
-            }}</span>
-          </div>
-          <div>
-            <span class="type1">良品率</span>
-            <span class="num"
-              >{{ msgObj.bipv.yieldRate ? msgObj.bipv.yieldRate : 0 }}%</span
-            >
-          </div>
-        </div>
+    <div class="chart">
+      <div class="chart-title">
+        <span class="title">生产情况</span>
+        <span class="line"></span>
       </div>
+      <barChartBase :companyId="companyId" :than="than" :period="period" :data="factoryData" ref="barChart"
+        style="height: 0;flex:1">
+      </barChartBase>
     </div>
   </div>
 </template>
 <script>
+import { number } from 'echarts';
+import barChartBase from './ChipOee'
+
 export default {
   name: "ProdMonitor",
+  components: {
+    barChartBase,
+  },
   data() {
     return {
+      bipvVis:false,
       msgObj: {
         stand: {},
         chip: {},
@@ -149,6 +146,18 @@ export default {
     };
   },
   props: {
+    period: {
+      type: Number,
+      default: 1,
+    },
+    companyId: {
+      type: Number,
+      default:0
+    },
+    than: {
+      type: String,
+      default: '同比',
+    },
     prodOutPut: {
       type: Array,
       default: [],
@@ -157,6 +166,14 @@ export default {
       type: Array,
       default: [],
     },
+    factoryData: {
+      type: Object,
+      default: {},
+    },
+    showBipv: {
+      type: Boolean,
+      default:true,
+    }
   },
   watch: {
     prodOutPut() {
@@ -168,6 +185,7 @@ export default {
   },
   methods: {
     makeData() {
+      console.log('msgObj', this.msgObj);
       this.msgObj.chip = {};
       this.msgObj.stand = {};
       this.msgObj.bipv = {};
@@ -190,146 +208,195 @@ export default {
 .prod-monitor {
   height: 100%;
   display: flex;
-  gap: 6px;
   flex-direction: column;
-  .fto-box,
-  .std-box,
-  .chip-box,
-  .bipv-box {
-    box-shadow: inset 0 0 12px 2px #fff3;
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-    .icon {
-      flex: 1;
-      text-align: center;
-    }
-    .middle-box {
-      flex: 2.086;
-      position: relative;
-    }
-    .right-box {
-      flex: 2.424;
-      position: relative;
-    }
-    .type {
-      display: inline-block;
-      font-size: 0.9375vw;
-      color: #6db6ff;
-      position: relative;
-      text-align: right;
-      padding-right: 0.417vw;
-      letter-spacing: 2px;
-      width: 6.25vw;
-    }
-    .type1 {
-      display: inline-block;
-      font-size: 0.9375vw;
-      color: #6db6ff;
-      position: relative;
-      text-align: right;
-      padding-right: 0.6vw;
-      width: 6.25vw;
-      padding-left: 1.6vw;
-      text-align: justify;
-      text-align-last: justify;
-    }
-    .type-name {
-      font-size: 1.042vw;
-      color: #fff;
-      position: relative;
-      text-align: left;
-      padding-left: 0.573vw;
-    }
-    .type-name::before {
-      content: "";
-      display: inline-block;
-      width: 1px;
-      height: 1.042vw;
-      border: 1px solid;
-      border-image: linear-gradient(
-          180deg,
-          rgba(0, 176, 243, 0),
-          rgba(31, 143, 255, 1)
-        )
-        2 2;
-      position: absolute;
-      left: 0;
-      top: 4px;
-    }
-    .num {
-      font-size: 1.042vw;
-      color: #fff;
-      position: relative;
-      text-align: left;
-      padding-left: 0.573vw;
-    }
-    .num::before {
-      content: "";
-      display: inline-block;
-      width: 1px;
-      height: 1.042vw;
-      border: 1px solid;
-      border-image: linear-gradient(
-          180deg,
-          rgba(0, 176, 243, 0),
-          rgba(31, 143, 255, 1)
-        )
-        2 2;
-      position: absolute;
-      left: 0;
-      top: 4px;
-    }
-  }
-  .fto-box {
+  .chart{
     flex: 1;
-    .type::before {
-      content: "";
-      display: inline-block;
-      width: 1px;
-      height: 1.6146vw;
-      border: 1px solid;
-      border-image: linear-gradient(
-          135deg,
-          rgba(0, 176, 243, 0),
-          rgba(31, 143, 255, 1),
-          rgba(31, 143, 255, 0)
-        )
-        2 2;
-      position: absolute;
-      left: 0;
-      top: -2px;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    // gap: 6px;
+    .chart-title{
+      margin-top: 5px;
+      // flex: 1;
+      // gap: 6px;
+      height: 1.5vw;
+      width: 100%;
+      display: flex;
+      align-items: center;
+      // flex-direction: column;
+      // flex-wrap: nowrap;
+      // justify-content: end
+      // margin-top: 10px;
+      .title{
+        // flex: 1;
+         font-weight: 400;
+          font-size: 24px;
+          // width: 5vw;
+          color: #FFFFFF;
+          line-height: 24px;
+          text-align: left;
+          font-style: normal;
+          display: inline-block;
+      }
+      .line{
+        flex: 1;
+        // width: 80%;
+        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;
+        backdrop-filter: blur(3px);
+      }
     }
   }
-  .std-box {
-    flex: 1.3;
-  }
-  .chip-box {
-    flex: 1.3;
-  }
-  .bipv-box {
-    flex: 1.3;
-  }
-  .std-box,
-  .chip-box,
-  .bipv-box {
-    .separate::before {
-      content: "";
-      display: inline-block;
-      width: 1px;
-      height: 3.125vw;
-      border: 1px solid;
-      border-image: linear-gradient(
-          135deg,
-          rgba(0, 176, 243, 0),
-          rgba(31, 143, 255, 1),
-          rgba(31, 143, 255, 0)
-        )
-        2 2;
-      position: absolute;
-      left: 0;
-      top: -2px;
-    }
+  .data{
+      flex: 1;
+      display: flex;
+        gap: 6px;
+        flex-direction: column;
+      .fto-box,
+        .std-box,
+        .chip-box,
+        .bipv-box {
+          box-shadow: inset 0 0 12px 2px #fff3;
+          border-radius: 4px;
+          display: flex;
+          align-items: center;
+
+          .icon {
+            flex: 1;
+            text-align: center;
+          }
+
+          .middle-box {
+            flex: 2.086;
+            position: relative;
+          }
+
+          .right-box {
+            flex: 2.424;
+            position: relative;
+          }
+
+          .type {
+            display: inline-block;
+            font-size: 0.9375vw;
+            color: #6db6ff;
+            position: relative;
+            text-align: right;
+            padding-right: 0.417vw;
+            letter-spacing: 2px;
+            width: 6.25vw;
+          }
+
+          .type1 {
+            display: inline-block;
+            font-size: 0.9375vw;
+            color: #6db6ff;
+            position: relative;
+            text-align: right;
+            padding-right: 0.6vw;
+            width: 6.25vw;
+            padding-left: 1.6vw;
+            text-align: justify;
+            text-align-last: justify;
+          }
+
+          .type-name {
+            font-size: 1.042vw;
+            color: #fff;
+            position: relative;
+            text-align: left;
+            padding-left: 0.573vw;
+          }
+
+          .type-name::before {
+            content: "";
+            display: inline-block;
+            width: 1px;
+            height: 1.042vw;
+            border: 1px solid;
+            border-image: linear-gradient(180deg,
+                rgba(0, 176, 243, 0),
+                rgba(31, 143, 255, 1)) 2 2;
+            position: absolute;
+            left: 0;
+            top: 4px;
+          }
+
+          .num {
+            font-size: 1.042vw;
+            color: #fff;
+            position: relative;
+            text-align: left;
+            padding-left: 0.573vw;
+          }
+
+          .num::before {
+            content: "";
+            display: inline-block;
+            width: 1px;
+            height: 1.042vw;
+            border: 1px solid;
+            border-image: linear-gradient(180deg,
+                rgba(0, 176, 243, 0),
+                rgba(31, 143, 255, 1)) 2 2;
+            position: absolute;
+            left: 0;
+            top: 4px;
+          }
+        }
+
+        .fto-box {
+          flex: 1;
+
+          .type::before {
+            content: "";
+            display: inline-block;
+            width: 1px;
+            height: 1.6146vw;
+            border: 1px solid;
+            border-image: linear-gradient(135deg,
+                rgba(0, 176, 243, 0),
+                rgba(31, 143, 255, 1),
+                rgba(31, 143, 255, 0)) 2 2;
+            position: absolute;
+            left: 0;
+            top: -2px;
+          }
+        }
+
+        .std-box {
+          flex: 1.3;
+        }
+
+        .chip-box {
+          flex: 1.3;
+        }
+
+        .bipv-box {
+          flex: 1.3;
+        }
+
+        .std-box,
+        .chip-box,
+        .bipv-box {
+          .separate::before {
+            content: "";
+            display: inline-block;
+            width: 1px;
+            height: 3.125vw;
+            border: 1px solid;
+            border-image: linear-gradient(135deg,
+                rgba(0, 176, 243, 0),
+                rgba(31, 143, 255, 1),
+                rgba(31, 143, 255, 0)) 2 2;
+            position: absolute;
+            left: 0;
+            top: -2px;
+          }
+        }
   }
+
 }
 </style>

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

@@ -0,0 +1,342 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-21 14:25:19
+ * @LastEditTime: 2024-05-21 14:25:19
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="prod-monitor">
+    <div class="fto-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/fto.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.2875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <span class="type">玻璃类型</span>
+        <span class="type-name">FTO投入</span>
+      </div>
+      <div class="right-box">
+        <span class="type">投入数量</span>
+        <span class="num">{{ prodFto[0] ? prodFto[0].chipInput : 0 }}</span>
+      </div>
+    </div>
+    <div class="std-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/std.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">标准组检产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">{{
+              msgObj.stand.goodNumber ? msgObj.stand.goodNumber : 0
+            }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">{{
+              msgObj.stand.outputNumber ? msgObj.stand.outputNumber : 0
+            }}</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num"
+              >{{ msgObj.stand.yieldRate ? msgObj.stand.yieldRate : 0 }}%</span
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="chip-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/chip.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">芯片产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">{{
+              msgObj.chip.goodNumber ? msgObj.chip.goodNumber : 0
+            }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">{{
+              msgObj.chip.outputNumber ? msgObj.chip.outputNumber : 0
+            }}</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num"
+              >{{ msgObj.chip.yieldRate ? msgObj.chip.yieldRate : 0 }}%</span
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bipv-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/bipv.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">BIPV产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">{{
+              msgObj.bipv.goodNumber ? msgObj.bipv.goodNumber : 0
+            }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">{{
+              msgObj.bipv.outputNumber ? msgObj.bipv.outputNumber : 0
+            }}</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num"
+              >{{ msgObj.bipv.yieldRate ? msgObj.bipv.yieldRate : 0 }}%</span
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "ProdMonitor",
+  data() {
+    return {
+      msgObj: {
+        stand: {},
+        chip: {},
+        bipv: {},
+      },
+    };
+  },
+  props: {
+    prodOutPut: {
+      type: Array,
+      default: [],
+    },
+    prodFto: {
+      type: Array,
+      default: [],
+    },
+  },
+  watch: {
+    prodOutPut() {
+      this.makeData();
+    },
+  },
+  mounted() {
+    this.makeData();
+  },
+  methods: {
+    makeData() {
+      this.msgObj.chip = {};
+      this.msgObj.stand = {};
+      this.msgObj.bipv = {};
+      if (this.prodOutPut.length > 0) {
+        this.prodOutPut.map((item) => {
+          if (item.glassType === 0) {
+            this.msgObj.chip = item;
+          } else if (item.glassType === 1) {
+            this.msgObj.stand = item;
+          } else if (item.glassType === 2) {
+            this.msgObj.bipv = item;
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.prod-monitor {
+  height: 100%;
+  display: flex;
+  gap: 6px;
+  flex-direction: column;
+  .fto-box,
+  .std-box,
+  .chip-box,
+  .bipv-box {
+    box-shadow: inset 0 0 12px 2px #fff3;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    .icon {
+      flex: 1;
+      text-align: center;
+    }
+    .middle-box {
+      flex: 2.086;
+      position: relative;
+    }
+    .right-box {
+      flex: 2.424;
+      position: relative;
+    }
+    .type {
+      display: inline-block;
+      font-size: 0.9375vw;
+      color: #6db6ff;
+      position: relative;
+      text-align: right;
+      padding-right: 0.417vw;
+      letter-spacing: 2px;
+      width: 6.25vw;
+    }
+    .type1 {
+      display: inline-block;
+      font-size: 0.9375vw;
+      color: #6db6ff;
+      position: relative;
+      text-align: right;
+      padding-right: 0.6vw;
+      width: 6.25vw;
+      padding-left: 1.6vw;
+      text-align: justify;
+      text-align-last: justify;
+    }
+    .type-name {
+      font-size: 1.042vw;
+      color: #fff;
+      position: relative;
+      text-align: left;
+      padding-left: 0.573vw;
+    }
+    .type-name::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.042vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          180deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: 4px;
+    }
+    .num {
+      font-size: 1.042vw;
+      color: #fff;
+      position: relative;
+      text-align: left;
+      padding-left: 0.573vw;
+    }
+    .num::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.042vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          180deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: 4px;
+    }
+  }
+  .fto-box {
+    flex: 1;
+    .type::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.6146vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          135deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1),
+          rgba(31, 143, 255, 0)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: -2px;
+    }
+  }
+  .std-box {
+    flex: 1.3;
+  }
+  .chip-box {
+    flex: 1.3;
+  }
+  .bipv-box {
+    flex: 1.3;
+  }
+  .std-box,
+  .chip-box,
+  .bipv-box {
+    .separate::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 3.125vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          135deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1),
+          rgba(31, 143, 255, 0)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: -2px;
+    }
+  }
+}
+</style>

src/views/copilot/factoryData/hdIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 1,
+      companyName: "邯郸中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            } else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/factoryData/index.vue

@@ -1,29 +1,25 @@
 <template>
   <div class="factory-layout">
-    <FactoryDataHeader
-      :companyName="companyName"
-      :companyId="companyId"
-      :period="period"
-      @updateCompany="updateCompany"
-      @update:period="updatePeriod"
-    />
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
     <div class="factory-section">
       <section class="top flex">
         <db-container title="生产监控" icon="prod">
-          <prod-monitor :prodOutPut="prodOutPut" :prodFto="prodFto" />
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
         </db-container>
-        <db-container title="仓库监控.当前" icon="store">
-          <store :stock="stock" />
-        </db-container>
-      </section>
-      <section class="bottom flex">
-        <db-container title="能源监控" icon="energy">
-          <energy :legend="energyLegend" :energyCockpits="energyCockpits" />
-        </db-container>
-        <db-container title="订单监控" icon="order">
+        <db-container title="工单监控" icon="order">
           <order :prodOrder="prodOrder" />
         </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
       </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
     </div>
     <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
   </div>
@@ -32,8 +28,9 @@
 import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
 import Container from "./components/Container.vue";
 import ProdMonitor from "./components/ProdMonitor.vue";
-import Store from "./components/Store.vue";
-import Energy from "./components/Energy.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
 import Order from "./components/Order.vue";
 import { cockpitDataMonitor } from "@/api/produceData";
 export default {
@@ -42,8 +39,8 @@ export default {
     FactoryDataHeader,
     DbContainer: Container,
     ProdMonitor,
-    Store,
-    Energy,
+    // Store,
+    // Energy,
     Order,
   },
   data() {
@@ -51,10 +48,18 @@ export default {
       companyId: 0,
       companyName: "瑞昌中建材光电材料有限公司",
       period: 1,
+      show:false,
+      than: '同比',
+      data:{},
       // 接口获取的数据
       prodOutPut: [], //生产
       prodFto: [], //生产
       stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
       energyCockpits: [], //能源
       prodOrder: [], //订单
       energyLegend: [
@@ -73,6 +78,11 @@ export default {
       this.companyName = obj.companyName;
       this.getMes();
     },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
     updatePeriod(val) {
       this.period = val;
       this.getMes();
@@ -81,13 +91,74 @@ export default {
       cockpitDataMonitor({
         factorys: [this.companyId],
         date: this.period,
+        mode:this.than === '同比' ? 0 : 1
       }).then((res) => {
         console.log(res);
         this.prodOutPut = res.data.prodOutputMonitorShDO || [];
         this.prodFto = res.data.prodOutputFtoDO || [];
-        this.stock = res.data.stockDO || {};
-        this.energyCockpits = res.data.energyCockpitsDO || [];
-        this.prodOrder = res.data.prodOrderMonitorDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+              targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+        console.log(' this.factoryData', this.factoryData);
       });
     },
   },

src/views/copilot/factoryData/jmsIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 3,
+      companyName: "佳木斯中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            } else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/factoryData/ksIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 5,
+      companyName: "凯盛中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            } else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/factoryData/oldIndex.vue

@@ -0,0 +1,146 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-21 13:24:03
+ * @LastEditTime: 2024-05-21 13:24:03
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader
+      :companyName="companyName"
+      :companyId="companyId"
+      :period="period"
+      @updateCompany="updateCompany"
+      @update:period="updatePeriod"
+    />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :prodOutPut="prodOutPut" :prodFto="prodFto" />
+        </db-container>
+        <db-container title="仓库监控.当前" icon="store">
+          <store :stock="stock" />
+        </db-container>
+      </section>
+      <section class="bottom flex">
+        <db-container title="能源监控" icon="energy">
+          <energy :legend="energyLegend" :energyCockpits="energyCockpits" />
+        </db-container>
+        <db-container title="订单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+      </section>
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import Store from "./components/Store.vue";
+import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    Store,
+    Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 0,
+      companyName: "邯郸中建材光电材料有限公司",
+      period: 1,
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.stock = res.data.stockDO || {};
+        this.energyCockpits = res.data.energyCockpitsDO || [];
+        this.prodOrder = res.data.prodOrderMonitorDO || [];
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100%
+    no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+    .top > div,
+    .bottom > div {
+      height: 100%;
+    }
+  }
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/factoryData/zzIndex.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader :than="than" :companyName="companyName" :companyId="companyId" :period="period"
+      @update:than="updateThan" @update:period="updatePeriod" />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor :companyId="companyId" :factoryData="factoryData" :than="than" :period="period" :data="data"
+            :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" />
+        </db-container>
+        <db-container title="工单监控" icon="order">
+          <order :prodOrder="prodOrder" />
+        </db-container>
+        <!-- <db-container title="" icon="store"> -->
+        <!-- <store :stock="stock" /> -->
+        <!-- </db-container> -->
+      </section>
+      <!-- <section class="bottom flex"> -->
+      <!-- <db-container title="" icon="energy"> -->
+      <!-- <energy :legend="energyLegend" :energyCockpits="energyCockpits" /> -->
+      <!-- </db-container> -->
+      <!-- </section> -->
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import { deepClone } from "@/utils";
+// import Store from "./components/Store.vue";
+// import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "factoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    // Store,
+    // Energy,
+    Order,
+  },
+  data() {
+    return {
+      companyId: 2,
+      companyName: "株洲中建材光电材料有限公司",
+      period: 1,
+      show: false,
+      than: '同比',
+      data: {},
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      factoryData: {
+        preDataDetail: [],
+        currentDataDetail: {},
+        targetDataDetail: [],
+      },
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+    };
+  },
+  mounted() {
+    this.getMes();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+      this.getMes();
+    },
+    updateThan(val) {
+      console.log(val);
+      this.than = val;
+      // this.getMes();
+    },
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
+      cockpitDataMonitor({
+        factorys: [this.companyId],
+        date: this.period,
+        mode: this.than === '同比' ? 0 : 1
+      }).then((res) => {
+        console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.prodOrder = res.data.prodWorkOrderDO || [];
+        let prodOutputFtoListRes = res.data.prodOutputFtoDO || [];
+        let preFtoData = res.data.previousProdOutputFtoDO || [];
+        let preData = res.data.previousProdOutputMonitorShDO || [];
+        let factoryListResponse = res.data.prodOutputMonitorShDO || [];
+        let targetListResponse = res.data.prodTargetMonitorDO || [];
+        let preDataDetail = []
+        let currentDataDetail = []
+        let targetDataDetail = []
+        if (prodOutputFtoListRes) {
+          for (const factory of prodOutputFtoListRes) {
+            console.log(factory);
+            currentDataDetail[0] = factory.chipInput
+          }
+        }
+        if (preFtoData) {
+          for (const factory of preFtoData) {
+            console.log(factory);
+            // const fId = this.getPreFactoryId(factory);
+            // const preFId = getPreFactoryId(factory);
+            // if (fId) {
+            preDataDetail[0] = factory.previousYearChipInput
+            // }
+            // if (preFId) {
+            // ftoInvest.previous[fId] = factory.previousYearChipInput;
+            // }
+          }
+        }
+        if (preData && preData[0] != null) {
+          for (const factory of preData) {
+            if (factory.previousGlassType === 0) {
+              preDataDetail[1] = factory.previousYearOutputNumber
+            } else if (factory.previousGlassType === 1) {
+              preDataDetail[2] = factory.previousYearOutputNumber
+            } else if (factory.previousYearOutputNumber === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        if (targetListResponse && targetListResponse[0] != null) {
+          for (const factory of targetListResponse) {
+            targetDataDetail[0] = factory.ftoInput
+            // if (factory.previousGlassType === 0) {
+            targetDataDetail[1] = factory.chipYield
+            // } else if (factory.previousGlassType === 1) {
+            targetDataDetail[2] = factory.componentYield
+            targetDataDetail[3] = factory.bipvProductoutput
+            // }
+          }
+        }
+        // console.log('ftoInvest',ftoInvest)
+        if (factoryListResponse && factoryListResponse[0] != null) {
+          for (const factory of factoryListResponse) {
+            // targetDataDetail[0] = factory.ftoInput
+            if (factory.glassType === 0) {
+              currentDataDetail[1] = factory.outputNumber
+            } else if (factory.glassType === 1) {
+              currentDataDetail[2] = factory.outputNumber
+            } else if (factory.glassType === 2) {
+              currentDataDetail[3] = factory.outputNumber
+            }
+          }
+        }
+        this.factoryData.preDataDetail = preDataDetail
+        this.factoryData.currentDataDetail = currentDataDetail
+        this.factoryData.targetDataDetail = targetDataDetail
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+
+    .top>div,
+    .bottom>div {
+      height: 100%;
+    }
+  }
+
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

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

@@ -1,28 +1,37 @@
-<!-- 
-    filename: BipvOutput.vue
-    author: liubin
-    date: 2024-04-17 09:55:12
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:04:53
+ * @LastEditTime: 2024-05-29 13:17:38
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="BIPV产出" :period="period" />
+  <noDoubleRingWrapper data-source="BIPV产出" :period="period" :than="than" />
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+// import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+import noDoubleRingWrapper from "./sub/ring/noDoubleRingWrapper.vue";
+
 
 export default {
   name: "BipvOutput",
-  components: { DoubleRingWrapperVue },
+  components: { noDoubleRingWrapper },
   props: {
     period: {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
-    return {};
+    return {
+      show: false,
+    };
   },
 };
 </script>

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

@@ -23,7 +23,10 @@ export default {
   components: { BarChartBase },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
     return {
       xAxis: cities,
     };
@@ -33,74 +36,215 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   computed: {
     legend() {
-      switch (this.period) {
-        case "日":
-          return [{ label: "昨日", color: "#12f7f1" }];
-        case "周":
-          return [{ label: "本周", color: "#12f7f1" }];
-        case "月": {
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return [
-            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
-            { label: `${year}年${month}月`, color: "#58adfa" },
-          ];
-        }
-        case "年": {
-          const year = new Date().getFullYear();
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
-        }
-        default:
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `去年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `上周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年`, color: "#12f7f1" },
+          { label: `${year}年`, color: "#58adfa" },
+          // { label: `${year}年目标`, value: valueTuple[2] },
+        ];
       }
+      return items
+      // switch (this.period) {
+      //   case "日":
+      //     return [{ label: "昨日", color: "#12f7f1" }];
+      //   case "周":
+      //     return [{ label: "本周", color: "#12f7f1" }];
+      //   case "月": {
+      //     const year = new Date().getFullYear();
+      //     const month = new Date().getMonth() + 1;
+      //     return [
+      //       { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+      //       { label: `${year}年${month}月`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   case "年": {
+      //     const year = new Date().getFullYear();
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   default:
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      // }
     },
     series() {
       const { chipInvest } = this.$store.getters.copilot.yield;
       let dataList = null;
       switch (this.period) {
         case "日":
+          dataList = [];
+          dataList[0] = chipInvest?.previous;
+          dataList[1] = chipInvest?.current;
         case "周":
-          dataList = chipInvest?.current;
+          dataList = []
+          dataList[0] = chipInvest?.previous;
+          dataList[1] = chipInvest?.current;
           break;
         default:
           dataList = [];
           dataList[0] = chipInvest?.previous;
           dataList[1] = chipInvest?.current;
       }
-      return getTemplate(this.period, dataList);
+      return getTemplate(this.period, dataList,this.than);
     },
   },
 };
 
-function getTemplate(period, dataList) {
-  const year = new Date().getFullYear();
+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 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;
-  return period == "日" || period == "周"
-    ? [
-        {
-          name: period == "日" ? "昨日" : "本周",
-          data: dataList ?? [],
-        },
-      ]
-    : [
-        {
-          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
-          data: dataList ? dataList[0] : [],
-        },
-        {
-          name: period == "年" ? `${year}年` : `${year}年${month}月`,
-          data: dataList ? dataList[1] : [],
-          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-        },
-      ];
+  const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+  const year = new Date().getFullYear();
+  if (period === '日' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月${today}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '日' && than === '环比') {
+    items = [
+      {
+        name: `${yesterday}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '同比') {
+    items = [
+      {
+        name: `去年本周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '环比') {
+    items = [
+      {
+        name: `上周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '环比') {
+    items = [
+      {
+        name: `${lastMonth}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else {
+    items = [
+      {
+        name: `${year - 1}年`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${year}年`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  }
+  return items
 }
 </script>

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

@@ -1,12 +1,13 @@
-<!-- 
-    filename: ChipOutput.vue
-    author: liubin
-    date: 2024-04-17 09:55:12
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:04:53
+ * @LastEditTime: 2024-05-27 16:36:29
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="芯片产出" :period="period" />
+  <DoubleRingWrapperVue data-source="芯片产出" :period="period" :than="than" />
 </template>
 
 <script>
@@ -20,6 +21,10 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
     return {};

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

@@ -16,14 +16,17 @@
 </template>
 
 <script>
-import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/components/ftoBarChartBase.vue";
 
 export default {
   name: "FtoInvest",
   components: { BarChartBase },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
     return {
       xAxis: cities,
     };
@@ -33,77 +36,217 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   computed: {
     legend() {
-      switch (this.period) {
-        case "日":
-          return [{ label: "昨日", color: "#12f7f1" }];
-        case "周":
-          return [{ label: "本周", color: "#12f7f1" }];
-        case "月": {
-          const year = new Date().getFullYear();
-          const month = new Date().getMonth() + 1;
-          return [
-            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
-            { label: `${year}年${month}月`, color: "#58adfa" },
-          ];
-        }
-        case "年": {
-          const year = new Date().getFullYear();
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
-        }
-        default:
-          return [
-            { label: `${year - 1}年`, color: "#12f7f1" },
-            { label: `${year}年`, color: "#58adfa" },
-          ];
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月${today}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${yesterday}日`, color: "#12f7f1" },
+          { label: `${month}月${today}日`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `去年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `上周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `去年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${lastMonth}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
+          // { label: `${month}月目标`, value: valueTuple[2] },
+        ];
+      } else {
+        items = [
+          { label: `${year - 1}年`, color: "#12f7f1" },
+          { label: `${year}年`, color: "#58adfa" },
+          // { label: `${year}年目标`, value: valueTuple[2] },
+        ];
       }
+      return items
+      // switch (this.period) {
+      //   case "日":
+      //     return [{ label: "昨日", color: "#12f7f1" }];
+      //   case "周":
+      //     return [{ label: "本周", color: "#12f7f1" }];
+      //   case "月": {
+      //     const year = new Date().getFullYear();
+      //     const month = new Date().getMonth() + 1;
+      //     return [
+      //       { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+      //       { label: `${year}年${month}月`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   case "年": {
+      //     const year = new Date().getFullYear();
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      //   }
+      //   default:
+      //     return [
+      //       { label: `${year - 1}年`, color: "#12f7f1" },
+      //       { label: `${year}年`, color: "#58adfa" },
+      //     ];
+      // }
     },
     series() {
       const { ftoInvest } = this.$store.getters.copilot.yield;
-      console.log('ftoInvest', this.$store.getters.copilot.yield);
+      // console.log('ftoInvest', this.$store.getters.copilot.yield);
       let dataList = null;
-
+      // console.log(ftoInvest)
       switch (this.period) {
         case "日":
+          dataList = [];
+          dataList[0] = ftoInvest?.previous;
+          dataList[1] = ftoInvest?.current;
         case "周":
-          dataList = ftoInvest?.current;
+          dataList = [];
+          dataList[0] = ftoInvest?.previous;
+          dataList[1] = ftoInvest?.current;
           break;
         default:
           dataList = [];
           dataList[0] = ftoInvest?.previous;
           dataList[1] = ftoInvest?.current;
       }
-
-      return getTemplate(this.period, dataList);
+      return getTemplate(this.period, dataList,this.than);
     },
   },
 };
 
-function getTemplate(period, dataList) {
-  const year = new Date().getFullYear();
+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 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;
-  return period == "日" || period == "周"
-    ? [
-        {
-          name: period == "日" ? "昨日" : "本周",
-          data: dataList ?? [],
-        },
-      ]
-    : [
-        {
-          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
-          data: dataList ? dataList[0] : [],
-        },
-        {
-          name: period == "年" ? `${year}年` : `${year}年${month}月`,
-          data: dataList ? dataList[1] : [],
-          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-        },
-      ];
+  const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+  const year = new Date().getFullYear();
+  if (period === '日' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月${today}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '日' && than === '环比') {
+    items = [
+      {
+        name: `${yesterday}日`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月${today}日`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '同比') {
+    items = [
+      {
+        name: `去年本周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '周' && than === '环比') {
+    items = [
+      {
+        name: `上周`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `本周`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '同比') {
+    items = [
+      {
+        name: `去年${month}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else if (period === '月' && than === '环比') {
+    items = [
+      {
+        name: `${lastMonth}月`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${month}月`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  } else {
+    items = [
+      {
+        name: `${year - 1}年`,
+        data: dataList ? dataList[0] : [],
+      },
+      {
+        name: `${year}年`,
+        data: dataList ? dataList[1] : [],
+        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+      },
+    ];
+  }
+  return items
 }
 </script>

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

@@ -1,12 +1,13 @@
-<!-- 
-    filename: StdOutput.vue
-    author: liubin
-    date: 2024-04-17 09:55:12
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:04:53
+ * @LastEditTime: 2024-05-27 14:25:57
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" :than="than" />
 </template>
 
 <script>
@@ -20,6 +21,10 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
     return {};

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

@@ -1,8 +1,9 @@
 <!--
-    filename: DoubleRingChart.vue
-    author: liubin
-    date: 2024-04-17 11:01:55
-    description:
+ * @Author: zhp
+ * @Date: 2024-05-20 13:32:59
+ * @LastEditTime: 2024-05-31 15:05:20
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -45,6 +46,10 @@ export default {
       type: String,
       default: null,
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
     return {
@@ -89,27 +94,84 @@ export default {
     },
 
     options() {
+      const today = new Date().getDate();
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
       const vt = this.valueTuple;
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `${month}月${today}日累计`,},
+          { label: `去年${month}月${today}日累计` },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${month}月${today}日累计`},
+          { label: `${yesterday}日累计`},
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `本周累计`,},
+          { label: `去年本周累计`},
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `本周累计`,},
+          { label: `上周累计`,},
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `${month}月累计`,},
+          { label: `去年${month}月累计`, },
+          { label: `${month}月目标`,},
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${month}月累计`,  },
+          { label: `${lastMonth}月累计`,},
+          { label: `${month}月目标`, },
+        ];
+      } else {
+        items = [
+          { label: `${year}年累计`, },
+          { label: `${year - 1}年累计` },
+          { label: `${year}年目标` },
+        ];
+      }
       let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${vt[1] / vt[2]}%`
-            : "0%",
+           vt[1] != null && vt[2] !== 0
+          ? this.formatNumber((vt[1] / vt[2] * 100)) + '%'
+          : (vt[1] != 0 && vt[1] != null) && vt[2] == 0
+            ? "100%" : '0%',
         subtitle =
-          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
-
+      this.period == "日" ? `${month}月${today}日累计` : this.period == "周" ? `本周` : this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+      console.log(this.valueTuple[0], this.valueTuple[1], this.valueTuple[2],)
+      console.log(items)
       return getOptions({
         titleValue,
         subtitle,
+        currentName: items[0].label,
+        preName: items[1].label,
         previousSum: this.valueTuple[0],
         currentSum: this.valueTuple[1],
-        targetSum: this.valueTuple[2],
+        targetSum: this.valueTuple[2] ? this.valueTuple[2] :0 ,
       });
     },
 
     legendItems() {
-      return calculateItems(this.period, this.valueTuple);
+      return calculateItems(this.period, this.valueTuple,this.than);
     },
   },
   watch: {
@@ -135,6 +197,15 @@ export default {
     }
   },
   methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    }
     // fullscreen mixin 需要的回调
     // fullscreenCallback(isFullscreen) {
     //   console.log("isFullscreen--->", isFullscreen);
@@ -142,39 +213,68 @@ export default {
   },
 };
 
-function calculateItems(period, valueTuple) {
+function calculateItems(period, valueTuple,than) {
   let items = [];
+  var day1 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var yesterday = (day1.getMonth() + 1) + "月" + day1.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();
-  switch (period) {
-    case "日":
-      items = [
-        { label: `${month}月${today}日累计`, value: valueTuple[1] },
-        { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
-      ];
-      break;
-    case "周":
-      items = [
-        { label: `本周累计`, value: valueTuple[1] },
-        { label: `去年本周累计`, value: valueTuple[0] },
-      ];
-      break;
-    case "月":
-      items = [
-        { label: `${month}月累计`, value: valueTuple[1] },
-        { label: `去年${month}月累计`, value: valueTuple[0] },
-        { label: `${month}月目标`, value: valueTuple[2] },
-      ];
-      break;
-    case "年":
-      items = [
-        { label: `${year}年累计`, value: valueTuple[1] },
-        { label: `${year - 1}年累计`, value: valueTuple[0] },
-        { label: `${year}年目标`, value: valueTuple[2] },
-      ];
-      break;
+  if (period === '日' && than === '同比') {
+    items = [
+      { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
+    ];
+  } else if (period === '日' && than === '环比') {
+    items = [
+      { label: `${yesterday}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
+    ];
+  } else if (period === '周' && than === '同比') {
+    items = [
+      { label: `去年本周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
+    ];
+  } else if (period === '周' && than === '环比') {
+    items = [
+      { label: `上周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
+    ];
+  } else if (period === '月' && than === '同比') {
+    items = [
+      { label: `去年${month}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
+      { label: `${month}月目标`, value: valueTuple[2] },
+    ];
+  } else if (period === '月' && than === '环比') {
+    items = [
+      { label: `${lastMonth}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
+      { label: `${month}月目标`, value: valueTuple[2] },
+    ];
+  } else {
+    items = [
+      { label: `${year - 1}年累计`, value: valueTuple[0] },
+      { label: `${year}年累计`, value: valueTuple[1] },
+      { label: `${year}年目标`, value: valueTuple[2] },
+    ];
   }
+  // switch (period) {
+  //   case "年":
+  //     items = [
+  //       { label: `${year}年累计`, value: valueTuple[1] },
+  //       { label: `${year - 1}年累计`, value: valueTuple[0] },
+  //       { label: `${year}年目标`, value: valueTuple[2] },
+  //     ];
+  //     break;
+  // }
   return items;
 }
 </script>
@@ -191,6 +291,7 @@ function calculateItems(period, valueTuple) {
   padding: 0 10%;
   /* margin: 10%; */
   /* min-width: 300px; */
+  align-self: stretch;
   height: 0;
 }
 
@@ -223,17 +324,17 @@ function calculateItems(period, valueTuple) {
   left: -18px;
 }
 
-.legend-item:nth-child(1) .legend-item__label::before {
+.legend-item:nth-child(2) .legend-item__label::before {
   background: #12fff5;
 }
-.legend-item:nth-child(1) .legend-item__value {
+.legend-item:nth-child(2) .legend-item__value {
   color: #12fff5;
 }
 
-.legend-item:nth-child(2) .legend-item__label::before {
+.legend-item:nth-child(1) .legend-item__label::before {
   background: #0f65ff;
 }
-.legend-item:nth-child(2) .legend-item__value {
+.legend-item:nth-child(1) .legend-item__value {
   color: #0f65ff;
 }
 

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

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-30 16:00:50
+ * @LastEditTime: 2024-05-31 16:15:51
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
     filename: DoubleRingWrapper.vue
     author: liubin
@@ -7,22 +14,12 @@
 
 <template>
   <div class="double-ring-wrapper">
-    <template v-if="period == '月' || period == '年'">
-      <copilot-select
-        @update:active="handleActiveUpdate"
-        :options="cityOptions"
-      />
+    <template>
+      <copilot-select @update:active="handleActiveUpdate" :options="cityOptions" />
       <div class="flex-1 stretch">
-        <DoubleRingChartVue
-          :data-source="dataSource"
-          :period="period"
-          :factoryId="factoryId"
-        />
+        <DoubleRingChartVue :data-source="dataSource" :period="period" :than="than" :factoryId="factoryId" />
       </div>
     </template>
-    <template v-else>
-      <CityData :data-source="dataSource" :period="period" />
-    </template>
   </div>
 </template>
 
@@ -43,18 +40,22 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
     return {
       factoryId: 4, // 默认成都
       cityOptions: [
-        "成都",
+        // "成都",
         "邯郸",
-        "株洲",
+        // "株洲",
         "瑞昌",
-        "佳木斯",
-        "凯盛光伏",
-        "蚌埠兴科",
+        // "佳木斯",
+        // "凯盛光伏",
+        // "蚌埠兴科",
       ],
     };
   },

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

@@ -0,0 +1,91 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-24 15:15:00
+ * @LastEditTime: 2024-05-31 16:16:16
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <div class="double-ring-wrapper">
+    <template >
+      <copilot-select
+        @update:active="handleActiveUpdate"
+        :options="cityOptions"
+      />
+      <div class="flex-1 stretch">
+        <DoubleRingChartVue
+          :data-source="dataSource"
+          :than="than"
+          :period="period"
+          :factoryId="factoryId"
+        />
+      </div>
+    </template>
+    <!-- <template v-else>
+      <CityData :data-source="dataSource" :period="period" />
+    </template> -->
+  </div>
+</template>
+
+<script>
+import CopilotSelect from "@/views/copilot/components/select.vue";
+import DoubleRingChartVue from "./DoubleRingChart.vue";
+import CityData from "../city/CityData.vue";
+
+export default {
+  name: "DoubleRingWrapper",
+  components: { CopilotSelect, DoubleRingChartVue, CityData },
+  props: {
+    dataSource: {
+      type: String,
+      default: null,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+    than: {
+      type: String,
+      default: "同比",
+    },
+  },
+  data() {
+    return {
+      factoryId: 4, // 默认成都
+      cityOptions: [
+        // "成都",
+        "邯郸",
+        // "株洲",
+        // "佳木斯",
+        // "凯盛光伏",
+        // "蚌埠兴科",
+      ],
+    };
+  },
+  methods: {
+    handleActiveUpdate(index) {
+      this.factoryId = index;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.double-ring-wrapper {
+  height: 100%;
+  padding: 12px 24px;
+  display: flex;
+  gap: 12px;
+  flex-direction: column;
+  align-items: center;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>

src/views/copilot/yield/index.vue

@@ -1,29 +1,30 @@
 <!--
-    filename: index.vue
-    author: liubin
-    date: 2024-04-16 14:40:15
-    description: 产量驾驶舱
+ * @Author: zhp
+ * @Date: 2024-05-10 11:10:54
+ * @LastEditTime: 2024-05-28 13:36:07
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="yield-copilot">
     <section class="top flex">
       <db-container class="std-yield" title="标准组件产出" icon="std">
-        <std-output :period="period" />
+        <std-output v-if="show" :period="period" :than="than" />
       </db-container>
       <db-container class="chip-yield" title="芯片产出" icon="chip2">
-        <chip-output :period="period" />
+        <chip-output v-if="show" :period="period" :than="than" />
       </db-container>
       <db-container class="bipv-yield" title="BIPV产出" icon="bipv">
-        <bipv-output :period="period" />
+        <bipv-output v-if="show" :period="period" :than="than" />
       </db-container>
     </section>
     <section class="bottom flex">
       <db-container class="fto-involve" title="FTO投入">
-        <fto-invest :period="period" />
+        <fto-invest :period="period" :than="than" />
       </db-container>
       <db-container class="chip-involve" title="芯片投入" icon="chip">
-        <chip-invest :period="period" />
+        <chip-invest :period="period" :than="than" />
       </db-container>
     </section>
   </div>
@@ -52,22 +53,40 @@ export default {
       type: String,
       default: "日",
     },
+    than: {
+      type: String,
+      default: "同比",
+    },
   },
   data() {
-    return {};
+    return {
+      show:false,
+    };
   },
   watch: {
     period: {
       handler(val) {
-        val && this.fetchData(val);
+        val && this.fetchData(val,this.than);
+      },
+      immediate: true,
+    },
+    than: {
+      handler(val) {
+        console.log(val)
+        val && this.fetchData(this.period,val);
       },
       immediate: true,
     },
   },
   methods: {
-    fetchData(period = "日") {
+    fetchData(period = "日", than) {
+      // this.$store.commit('copilot/clearState')
       console.log(`产量驾驶舱，获取${period}数据`);
-      this.$store.dispatch("copilot/initCopilot", { period, source: "yield" });
+      this.$store.dispatch("copilot/initCopilot", { period, source: "yield", than }).then(() => {
+        this.$nextTick(() => {
+          this.show = true
+        })
+      })
     },
   },
 };

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

@@ -4,6 +4,8 @@ export default ({
   previousSum,
   currentSum,
   targetSum,
+  currentName,
+  preName,
 }) => ({
   grid: {
     left: 0,
@@ -57,7 +59,7 @@ export default ({
       data: [
         {
           value: currentSum,
-          name: "当前累计产出",
+          name: currentName,
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -78,15 +80,9 @@ export default ({
           },
         },
         {
-          value:
-            targetSum > currentSum
-              ? targetSum - currentSum
-              : targetSum == 0
-              ? currentSum == 0
-                ? 1
-                : 0
+            value:currentSum == 0
+              ? 1
               : 0,
-
           name: "未达成累计",
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -108,7 +104,7 @@ export default ({
       data: [
         {
           value: previousSum,
-          name: "上期累计产出",
+          name: preName,
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -129,10 +125,7 @@ export default ({
           },
         },
         {
-          value:
-            targetSum > previousSum
-              ? targetSum - previousSum
-              : previousSum == 0
+          value:previousSum == 0
               ? 1
               : 0,
           name: "-",

src/views/dashboard/charts/Bipv.vue

@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 16:14:09
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
     filename: Bipv.vue
     author: liubin
     date: 2024-04-10 15:39:54
-    description: 
+    description:
 -->
 
 <template>
@@ -24,7 +31,10 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
     return {
       legend: [
         { label: `${year}年目标值`, color: "#f3c000" },

src/views/dashboard/charts/ChipInvest.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: chip-invest.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -23,7 +23,9 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       legend: [
         { label: `${year - 1}年`, color: "#12f7f1" },

src/views/dashboard/charts/ChipYield.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ChipYield.vue
     author: liubin
     date: 2024-04-11 10:46:47
-    description: 
+    description:
 -->
 
 <template>
@@ -11,24 +11,24 @@
     <section class="right-part">
       <div class="yield-location">
         <section class="btn-group">
-          <button
+          <!-- <button
             @click="activeLoc = '1'"
             :class="activeLoc === '1' ? 'active' : ''"
           >
             成都
-          </button>
+          </button> -->
           <button
             @click="activeLoc = '2'"
             :class="activeLoc === '2' ? 'active' : ''"
           >
             邯郸
           </button>
-          <button
+          <!-- <button
             @click="activeLoc = '3'"
             :class="activeLoc === '3' ? 'active' : ''"
           >
             株洲
-          </button>
+          </button> -->
           <button
             @click="activeLoc = '4'"
             :class="activeLoc === '4' ? 'active' : ''"
@@ -37,7 +37,7 @@
           </button>
         </section>
         <section class="btn-group">
-          <button
+          <!-- <button
             @click="activeLoc = '5'"
             :class="activeLoc === '5' ? 'active' : ''"
             class="fixwidth"
@@ -55,7 +55,7 @@
             :class="activeLoc === '7' ? 'active' : ''"
           >
             蚌埠兴科
-          </button>
+          </button> -->
         </section>
       </div>
       <div class="yield-summary">
@@ -85,13 +85,14 @@ export default {
   props: {},
   data() {
     return {
-      activeLoc: "1",
+      activeLoc: "2",
     };
   },
   computed: {
     output() {
       // ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"]
       const chipOutput = this.$store.getters.home.chipOutput;
+      console.log('chipOutput', chipOutput);
       if (
         !chipOutput ||
         !chipOutput.target ||

src/views/dashboard/charts/ChipYieldChart.vue

@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 16:11:56
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
     filename: ChipYield.vue
     author: liubin
     date: 2024-04-11 10:46:47
-    description: 
+    description:
 -->
 
 <template>

src/views/dashboard/charts/Fto.vue

@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 16:11:06
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
     filename: fto.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -23,7 +30,9 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       legend: [
         { label: `${year - 1}年`, color: "#12f7f1" },

src/views/dashboard/charts/LeftChartBase.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: left-chart-base
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -113,6 +113,16 @@ export default {
             barWidth: 12,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  textStyle: { //数值样式
+                    color: '#DFF1FE',
+                    fontSize: 16
+                  }
+                }
+              },
               color: {
                 type: "linear",
                 x: 0,
@@ -146,11 +156,6 @@ export default {
             name: '', // this.series[1].name,
             type: "bar",
             barWidth: 12,
-            // tooltip: {
-            //   valueFormatter: function (value) {
-            //     return value + " ml";
-            //   },
-            // },
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {

src/views/dashboard/charts/RightChartBase.vue

@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 16:13:47
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
     filename: right-chart-base
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>

src/views/dashboard/charts/StdChart.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: Bipv.vue
     author: liubin
     date: 2024-04-10 15:39:54
-    description: 
+    description:
 -->
 
 <template>
@@ -25,7 +25,9 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       legend: [
         { label: `${year}年目标值`, color: "#f3c000" },

src/views/dashboard/components/CompanyInfo.vue

@@ -1,12 +1,12 @@
-<!-- 
+<!--
     filename: CompanyInfo.vue
     author: liubin
     date: 2024-04-08 15:27:04
-    description: 
+    description:
 -->
 
 <template>
-  <div class="company-info" :style="styles">
+  <div class="company-info" @click="handleChangeRoute()" :style="styles">
     <div class="corner bl"></div>
     <div class="corner br"></div>
     <h2>{{ info.companyName }}</h2>
@@ -31,7 +31,7 @@ export default {
     position: {
       type: Object,
       required: true,
-      default: () => ({ x: 0, y: 0 }),
+      default: () => ({ tx: 0, ty: 0 }),
     },
   },
   filters: {
@@ -49,16 +49,23 @@ export default {
   computed: {
     styles() {
       return {
-        left: `${this.position.x}%`,
-        top: `${this.position.y}%`,
+        left: `${this.position.tx}%`,
+        top: `${this.position.ty}%`,
       };
     },
   },
-  methods: {},
+  methods: {
+    handleChangeRoute() {
+      this.$router.push({
+        path: this.position.path
+      })
+    }
+  },
 };
 </script>
 
 <style scoped lang="scss">
+
 @font-face {
   font-family: 优设标题黑;
   src: url(../../../assets/YouSheBiaoTiHei-2.ttf);
@@ -71,18 +78,25 @@ export default {
   z-index: 9999;
   // padding: 14px;
   padding: 0.745vw;
-  backdrop-filter: blur(2px);
-  border-radius: 4px;
+  // padding: 0 vw;
+  cursor: pointer;
+  // backdrop-filter: blur(2px);
+  // border-radius: 4px;
   transform: translate(-50%, -100%);
   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%);
   // 在这里设置一个总的字体大小 不失为一个好的选择
   font-size: 1vw;
+  // filter: blur(13);
 }
 
 h2 {
+  padding: 0 1vw;
   margin: 6px 0;
   font-family: 优设标题黑;
   color: #fff;
+  letter-spacing:5px;
   // font-size: 24px;
   font-size: 1.276em;
 }

src/views/index.vue

@@ -1,60 +1,50 @@
 <template>
   <div class="dashboard-factory-all">
     <div id="map-container">
+      <!-- <div v-if="visible" class="cdLine"></div> -->
+      <!-- <div v-if="visible" class="zzLine"></div> -->
+      <div v-if="visible" class="rcLine"></div>
+      <div v-if="visible" class="rcLineTwo"></div>
+      <div v-if="visible" class="hdLine"></div>
+      <div v-if="visible" class="hdLineTwo"></div>
+      <!-- <div v-if="visible" class="ksLine"></div> -->
+      <!-- <div v-if="visible" class="bbLine"></div> -->
+      <!-- <div v-if="visible" class="bbLineTwo"></div> -->
+      <!-- <div v-if="visible" class="bbLineThree"></div> -->
+      <!-- <div v-if="visible" class="jmsLine"></div> -->
+      <!-- <div v-if="visible" class="jmsLineTwo"></div> -->
       <div class="databoard">
         <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())"
-            >
+            <db-container icon="cube" title="FTO投入" @refresh="() => (ftoKey = Math.random())">
               <fto-chart :key="ftoKey" />
             </db-container>
-            <db-container
-              icon="chip2"
-              title="芯片投入"
-              @refresh="() => (chipInvestKey = Math.random())"
-            >
+            <db-container icon="chip2" title="芯片投入" @refresh="() => (chipInvestKey = Math.random())">
               <chip-invest-chart :key="chipInvestKey" />
             </db-container>
           </div>
           <div class="db-right">
-            <db-container
-              side="right"
-              icon="chip"
-              title="芯片产出"
-              @refresh="() => (chipYieldKey = Math.random())"
-            >
+            <db-container side="right" icon="chip" title="芯片产出" @refresh="() => (chipYieldKey = Math.random())">
               <chip-yield-chart :key="chipYieldKey" />
             </db-container>
-            <db-container
-              side="right"
-              icon="std"
-              title="标准组件产出"
-              @refresh="() => (stdKey = Math.random())"
-            >
+            <db-container side="right" icon="std" title="标准组件产出" @refresh="() => (stdKey = Math.random())">
               <std-chart :key="stdKey" />
             </db-container>
-            <db-container
-              side="right"
-              icon="bipv"
-              title="BIPV产出"
-              @refresh="() => (bipvKey = Math.random())"
-            >
+            <db-container side="right" icon="bipv" title="BIPV产出" @refresh="() => (bipvKey = Math.random())">
               <bipv-chart :key="bipvKey" />
             </db-container>
           </div>
         </div>
       </div>
     </div>
-    <company-info
-      v-if="visible"
-      :info="info"
-      :position="hintPosition"
-      @close="closeHint"
-    />
+    <company-info v-if="visible" :info="info" :position="rcHintPosition" />
+    <ks-company-info v-if="visible" :info="ksInfo" :position="ksHintPosition" />
+    <jms-company-info v-if="visible" :info="jmsInfo" :position="jmsHintPosition" />
+    <hd-company-info v-if="visible" :info="hdInfo" :position="hdHintPosition" />
+    <bb-company-info v-if="visible" :info="bbInfo" :position="bbHintPosition" />
+    <cd-company-info v-if="visible" :info="cdInfo" :position="cdHintPosition" />
+    <zz-company-info v-if="visible" :info="zzInfo" :position="zzHintPosition" />
   </div>
 </template>
 
@@ -71,25 +61,31 @@ import StdChart from "./dashboard/charts/StdChart.vue";
 
 const LOCATIONS = [
   // 佳木斯
-  { x: 67, y: 20 },
+  // { x: 67, y: 20, tx: 60, ty: 29, path: 'factoryData/jmsIndex' },
   // 成都
-  { x: 46, y: 56 },
+  // { x: 46, y: 56, tx: 46, ty: 93, path: 'factoryData/cdIndex' },
   // 蚌埠1
-  { x: 60, y: 52 },
+  // { x: 60, y: 52, tx: 35.5, ty: 48.3, path: 'factoryData/bbIndex' },
   // 蚌埠2
-  { x: 61, y: 53 },
+  // { x: 61, y: 53, tx: 39, ty: 68, path: 'factoryData/ksIndex' },
   // 江西 瑞昌
-  { x: 60, y: 58 },
+  { x: 60, y: 58, tx: 68, ty: 52, path: 'factoryData/factory-data' },
   // 湖南 株洲
-  { x: 56, y: 60 },
+  // { x: 56, y: 60, tx: 60, ty: 95, path: 'factoryData/zzIndex' },
   // 邯郸
-  { x: 58, y: 45 },
+  { x: 58, y: 45, tx: 47, ty: 34, path: 'factoryData/hdIndex' },
 ];
 
 export default {
   name: "Index",
   components: {
     CompanyInfo,
+    ksCompanyInfo: CompanyInfo,
+    hdCompanyInfo: CompanyInfo,
+    bbCompanyInfo: CompanyInfo,
+    cdCompanyInfo: CompanyInfo,
+    zzCompanyInfo: CompanyInfo,
+    jmsCompanyInfo: CompanyInfo,
     DbHeader: DashboardHeader,
     DbContainer: Container,
     FtoChart,
@@ -100,8 +96,15 @@ export default {
   },
   data() {
     return {
+      // homeStore:undefined,
       visible: false,
       hintPosition: null,
+      zzHintPosition: null,
+      ksHintPosition: null,
+      bbHintPosition: null,
+      hdHintPosition: null,
+      cdHintPosition: null,
+      jmsHintPosition: null,
       ftoKey: Math.random(),
       chipInvestKey: Math.random(),
       chipYieldKey: Math.random(),
@@ -109,15 +112,28 @@ export default {
       bipvKey: Math.random(),
     };
   },
+  computed: {
+    homeStore() {
+      return this.$store.getters.home
+    }
+  },
   mounted() {
-    this.$store.dispatch("copilot/initHome");
+    // var w = window.screen.width;
+    // var zoom = w / 1920;
+    // let screen = document.getElementById("map-container")
+    // console.log(screen);
+    // screen.style.zoom = zoom
+    //   // "zoom": ,
+    // screen.style.transform = `scale(" + ${zoom} + ")`
+    // };
+    this.$store.dispatch("copilot/initHome").then((res) => {
+      this.$nextTick(() => {
+        this.initPins();
+        // 调整 echarts 大小
+        window.onresize = () => { };
+      })
+    })
 
-    this.$nextTick(() => {
-      this.initPins();
-
-      // 调整 echarts 大小
-      window.onresize = () => {};
-    });
   },
   beforeRouteEnter(to, from, next) {
     next((vm) => {
@@ -126,17 +142,60 @@ export default {
   },
   methods: {
     initPins() {
+      // const cdLine = document.createElement("div");
+      // const zzLine = document.createElement("div");
+      // const rcLine = document.createElement("div");
+      // const rcLineTwo = document.createElement("div");
+      // const hdLine = document.createElement("div");
+      // const ksLine = document.createElement("div");
+      // const bbLine = document.createElement("div");
+      // const bbLineTwo = document.createElement("div");
+      // const bbLineThree = document.createElement("div");
+      // cdLine.className = "cdLine";
+      // cdLine.style.left = `46.71%`;
+      // cdLine.style.top = `59%`;
+      // zzLine.className = "zzLine";
+      // zzLine.style.left = `56.8%`;
+      // zzLine.style.top = `60.8%`;
+      // rcLine.className = "rcLine";
+      // rcLine.style.left = `66.8%`;
+      // rcLine.style.top = `52%`;
+      // rcLineTwo.className = "rcLineTwo";
+      // rcLineTwo.style.left = `58.7%`;
+      // rcLineTwo.style.top = `34%`;
+      // hdLine.className = "hdLine";
+      // ksLine.className = "ksLine";
+      // bbLine.className = "bbLine";
+      // bbLineTwo.className = "bbLineTwo";
+      // bbLineThree.className = "bbLineThree";
+
+      // document.getElementById("map-container").appendChild(cdLine);
+      // document.getElementById("map-container").appendChild(zzLine);
+      // document.getElementById("map-container").appendChild(rcLine);
+      // document.getElementById("map-container").appendChild(rcLineTwo);
+      // document.getElementById("map-container").appendChild(hdLine);
+      // document.getElementById("map-container").appendChild(ksLine);
+      // document.getElementById("map-container").appendChild(bbLine);
+      // document.getElementById("map-container").appendChild(bbLineTwo);
+      // document.getElementById("map-container").appendChild(bbLineThree);
+      // console.log(" this.homeStore", this.$store.getters.home);
       LOCATIONS.map((loc) => {
+        console.log("loc", loc);
         const pin = document.createElement("div");
         pin.className = "pin";
         pin.style.left = `${loc.x}%`;
         pin.style.top = `${loc.y}%`;
-        pin.addEventListener("mouseenter", () => {
+        // pin.addEventListener("mouseenter", () => {
           this.showHint(loc);
-        });
-        pin.addEventListener("mouseleave", () => {
-          this.closeHint();
-        });
+        // });
+        // pin.addEventListener("mouseleave", () => {
+        //   this.closeHint();
+        // });
+        // pin.addEventListener("click", () => {
+        //   this.$router.push({
+        //     path:loc.path
+        //   })
+        // });
         document.getElementById("map-container").appendChild(pin);
       });
     },
@@ -145,8 +204,6 @@ export default {
       this.hintPosition = null;
     },
     showHint(position) {
-      const homeStore = this.$store.getters.home;
-      this.hintPosition = position;
       const templateInfo = {
         companyName: "",
         items: [
@@ -156,53 +213,65 @@ export default {
           { label: "标准组件产出", value: 0 }, // Math.floor(Math.random() * 1000000) },
         ],
       };
-
-      if (position === LOCATIONS[0]) {
-        templateInfo.companyName = "佳木斯中建材光电材料有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[3];
-        templateInfo.items[2].value = homeStore.chipInvest.current[3];
-        templateInfo.items[1].value = homeStore.chipOutput.current[3];
-        templateInfo.items[3].value = homeStore.stdOutput.current[3];
+      if
+        // (position === LOCATIONS[0]) {
+        // templateInfo.companyName = "佳木斯中建材";
+        // this.jmsHintPosition = position;
+        // templateInfo.items[0].value = this.homeStore.ftoInvest.current[3];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[3];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[3];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[3];
+        // this.jmsInfo = templateInfo;
+      // } else if (position === LOCATIONS[1]) {
+        // this.cdHintPosition = position;
+        // templateInfo.companyName = "成都中建材";
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[4];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[4];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[4];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[4];
+        // this.cdInfo = templateInfo;
+      // } else if (position === LOCATIONS[2]) {
+        // this.bbHintPosition = position;
+        // templateInfo.companyName = "蚌埠兴科";
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[6];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[6];
+        // templateInfo.items[1].value = this.homeStore.chipOutput?.current[6];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[6];
+        // this.bbInfo = templateInfo;
+      // } else if (position === LOCATIONS[3]) {
+        // this.ksHintPosition = position;
+        // templateInfo.companyName = "凯盛光伏";
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[5];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[5];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[5];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[5];
+        // this.ksInfo = templateInfo;
+      // }
+      (position === LOCATIONS[0]) {
+        this.rcHintPosition = position;
+        templateInfo.companyName = "瑞昌中建材";
+        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[0];
+        templateInfo.items[2].value = this.homeStore.chipInvest.current[0];
+        templateInfo.items[1].value = this.homeStore.chipOutput.current[0];
+        templateInfo.items[3].value = this.homeStore.stdOutput.current[0];
+        this.info = templateInfo;
+      // } else if (position === LOCATIONS[5]) {
+        // this.zzHintPosition = position;
+        // templateInfo.companyName = "株洲中建材";
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[2];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[2];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[2];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[2];
+        // this.zzInfo = templateInfo;
       } else if (position === LOCATIONS[1]) {
-        templateInfo.companyName = "成都中建材光电材料有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[4];
-        templateInfo.items[2].value = homeStore.chipInvest.current[4];
-        templateInfo.items[1].value = homeStore.chipOutput.current[4];
-        templateInfo.items[3].value = homeStore.stdOutput.current[4];
-      } else if (position === LOCATIONS[2]) {
-        templateInfo.companyName = "蚌埠兴科玻璃有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[6];
-        templateInfo.items[2].value = homeStore.chipInvest.current[6];
-        templateInfo.items[1].value = homeStore.chipOutput.current[6];
-        templateInfo.items[3].value = homeStore.stdOutput.current[6];
-      } else if (position === LOCATIONS[3]) {
-        templateInfo.companyName = "凯盛光伏材料有限公司（本部）";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[5];
-        templateInfo.items[2].value = homeStore.chipInvest.current[5];
-        templateInfo.items[1].value = homeStore.chipOutput.current[5];
-        templateInfo.items[3].value = homeStore.stdOutput.current[5];
-      } else if (position === LOCATIONS[4]) {
-        templateInfo.companyName = "瑞昌中建材光电材料有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[0];
-        templateInfo.items[2].value = homeStore.chipInvest.current[0];
-        templateInfo.items[1].value = homeStore.chipOutput.current[0];
-        templateInfo.items[3].value = homeStore.stdOutput.current[0];
-      } else if (position === LOCATIONS[5]) {
-        templateInfo.companyName = "中建材（株洲）光电材料有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[2];
-        templateInfo.items[2].value = homeStore.chipInvest.current[2];
-        templateInfo.items[1].value = homeStore.chipOutput.current[2];
-        templateInfo.items[3].value = homeStore.stdOutput.current[2];
-      } else if (position === LOCATIONS[6]) {
-        templateInfo.companyName = "中建材（邯郸）光电材料有限公司";
-        templateInfo.items[0].value = homeStore.ftoInvest.current[1];
-        templateInfo.items[2].value = homeStore.chipInvest.current[1];
-        templateInfo.items[1].value = homeStore.chipOutput.current[1];
-        templateInfo.items[3].value = homeStore.stdOutput.current[1];
+        this.hdHintPosition = position;
+        templateInfo.companyName = "邯郸中建材";
+        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[1];
+        templateInfo.items[2].value = this.homeStore.chipInvest.current[1];
+        templateInfo.items[1].value = this.homeStore.chipOutput.current[1];
+        templateInfo.items[3].value = this.homeStore.stdOutput.current[1];
+        this.hdInfo = templateInfo
       }
-
-      this.info = templateInfo;
-
       this.$nextTick(() => {
         this.visible = true;
       });
@@ -225,8 +294,8 @@ export default {
 #map-container {
   height: 100%;
   background: url(../assets/bgearth.png) no-repeat 0 0 / 100% 100%;
+  // background-size: cover;
   position: relative;
-
   .databoard {
     position: absolute;
     top: 0;
@@ -257,6 +326,133 @@ export default {
 </style>
 
 <style>
+.cdLine {
+  display: inline-block;
+  position: absolute;
+  left: 46.71%;
+  width: 2px;
+  top: 59%;
+  height: 148px;
+  border: 2px dashed #FFCF00;
+}
+
+.zzLine {
+  display: inline-block;
+  position: absolute;
+  left: 56.8%;
+  width: 2px;
+  top: 60.8%;
+  /* x: 60, y: 58, */
+  height: 148px;
+  border: 2px dashed #FFCF00;
+}
+
+.rcLine {
+  display: inline-block;
+  position: absolute;
+  left: 61%;
+  width: 100px;
+  top: 61.5%;
+  /* x: 60, y: 58, */
+    height: 1px;
+  border: 2px dashed #FFCF00;
+}
+
+.rcLineTwo {
+  position: absolute;
+  left: 66.8%;
+  width: 1px;
+  top: 52%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 90px;
+  border: 2px dashed #FFCF00;
+}
+
+.hdLine {
+  position: absolute;
+  left: 58.7%;
+  width: 1px;
+  top: 34%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 100px;
+  border: 2px dashed #FFCF00;
+}
+.hdLineTwo {
+  position: absolute;
+  left: 53%;
+  width: 90px;
+  top: 34%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 1px;
+  border: 2px dashed #FFCF00;
+}
+.ksLine {
+  position: absolute;
+  left: 43.2%;
+  width: 350px;
+  top: 56.8%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 1px;
+  border: 2px dashed #FFCF00;
+}
+
+.bbLine {
+  position: absolute;
+  left: 42.4%;
+  width: 350px;
+  top: 55.5%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 1px;
+  border: 2px dashed #FFCF00;
+}
+
+.bbLineTwo {
+  position: absolute;
+  left: 42.4%;
+  width: 1px;
+  top: 48%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 70px;
+  border: 2px dashed #FFCF00;
+}
+
+.jmsLine {
+  position: absolute;
+  left: 67.8%;
+  width: 1px;
+  top: 24%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 40px;
+  border: 2px dashed #FFCF00;
+}
+
+.jmsLineTwo {
+  position: absolute;
+  left: 65.4%;
+  width: 50px;
+  top: 28.5%;
+  display: inline-block;
+    /* // x: 60, y: 58, */
+  height: 1px;
+  border: 2px dashed #FFCF00;
+}
+.bbLineThree {
+  position: absolute;
+  left: 40%;
+  width: 40px;
+  top: 48%;
+  display: inline-block;
+  /* // x: 60, y: 58, */
+  height: 1px;
+  border: 2px dashed #FFCF00;
+}
 .pin {
   display: inline-block;
   position: absolute;

src/views/login.vue

@@ -218,7 +218,7 @@ export default {
   data() {
     return {
       codeUrl: "",
-      captchaEnable: true,
+      captchaEnable: false,
       tenantEnable: true,
       mobileCodeTimer: 0,
       loginForm: {

src/views/produce/data/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-05-22 15:25:11
+ * @LastEditTime: 2024-05-31 19:14:05
  * @LastEditors: DY
  * @Description:
 -->
@@ -10,17 +10,17 @@
     <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-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.mode" 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.mode === 0 || listQuery.mode === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
-            start-placeholder="开始日期" value-format="timestamp" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="timestamp" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.mode === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
@@ -32,12 +32,12 @@
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.mode === 2" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange" value-format="timestamp" 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.mode === 3" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" format="yyyy-MM-dd" value-format="timestamp" type="year"
             placeholder="开始时间">
           </el-date-picker>
@@ -48,7 +48,7 @@
         </el-form-item>
         <el-form-item label="工厂名称" prop="factorys">
           <el-select size="small" clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple >
-            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            <el-option v-for="item in factoryArray" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="玻璃类型" prop="type">
-          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择玻璃类型">
+          <el-select size="small" clearable v-model="listQuery.type" multiple placeholder="请选择玻璃类型">
             <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -94,7 +94,7 @@
         @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" :date="listQuery.mode" @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
     <!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
       :type="listQuery.reportType" @refreshDataList="getDataList" /> -->
     <!-- <pagination
@@ -107,27 +107,29 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-import { getProduceDataPage, exportOutPutExcel } from '@/api/produceData';
+import { getProduceDataPage, prodOutputDataList, 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 AddOrUpdate from './add-or-updata'
+import { factoryList, factoryArray, factoryArray1 } from "@/utils/constants";
 
-// import FileSaver from 'file-saver'
-// import * as XLSX from 'xlsx'
 export default {
   components: { lineChart, ButtonNav, AddOrUpdate },
   mixins: [basicPage],
 	data() {
     return {
+      factoryList,
+      factoryArray,
+      factoryArray1,
       listQuery: {
         size: 20,
         current: 1,
-        factorys: [],
+        factorys: undefined,
         total: 0,
-        date: 1,
+        mode: 0,
         type:undefined,
         // reportType: 2,
         beginTime: undefined,
@@ -163,31 +165,6 @@ export default {
           id: 2,
         },
       ],
-      // weekNum: undefined,
-      dataList: [
-        {
-          id:'first',
-        },
-         {
-          id: 'second',
-        },
-         {
-          id: 'third',
-        },
-         {
-          id: 'fourth',
-        },
-         {
-          id: 'fifth',
-        },
-         {
-          id: 'sixth',
-        },
-      ],
-			urlOptions: {
-				// getDataListURL: getGlassPage,
-				// exportURL: exportGlasscExcel
-      },
       formConfig: [
         {
           type: 'title',
@@ -218,36 +195,6 @@ export default {
           label: '年'
         }
       ],
-      factoryList: [
-        {
-          name: '瑞昌中建材光电材料有限公司',
-          id: 0
-        },
-        {
-          name: '邯郸中建材光电材料有限公司',
-          id: 1
-        },
-        {
-          name: '中建材株洲光电材料有限公司',
-          id: 2
-        },
-        {
-          name:  '佳木斯中建材光电材料有限公司',
-          id: 3
-        },
-        {
-          name:  '成都中建材光电材料有限公司',
-          id: 4
-        },
-        {
-          name:  '凯盛光伏材料有限公司',
-          id: 5
-        },
-        {
-          name:  '蚌埠兴科玻璃有限公司',
-          id: 6
-        }
-      ],
       tableProps: [
         {
           prop: 'tableTime',
@@ -258,7 +205,7 @@ export default {
         {
           prop: 'factory',
           label: '工厂名称',
-          filter: (val) => ['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'][val],
+          filter: (val) => factoryList[val],
           minWidth: 200,
           showOverflowtooltip: true
         },
@@ -282,21 +229,30 @@ export default {
         {
           prop: 'yieldRate',
           label: '良品率%',
+          filter: (val) => val + '%'
         },
       ],
       tableData: [],
-      xAxis: []
+      lineData: [],
+      chart: null,
+      seriesList: []
 			// proLineList: [],
 			// all: {}
-		};
+		}; 
   },
   computed: {
     weekNum() {
       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))
+    this.listQuery.beginTime = sevenDaysAgo.getTime()
+    this.listQuery.endTime = today.getTime()
+    this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime]
+	},
 	mounted() {
-    this.getDataList()
 	},
   methods: {
     otherMethods(val) {
@@ -306,9 +262,6 @@ export default {
         this.$refs.detailOrUpdate.init(val.data.id);
       });
     },
-    // buttonClick() {
-
-    // },
     getYear(e) {
       if (this.listQuery.end - this.listQuery.start > 10*365*24*60*60*1000) {
         this.$message({
@@ -380,75 +333,100 @@ export default {
         console.log(this.listQuery.reportTime[0])
       }
     },
-    // async getDict() {
-			// 产线列表
-			// const res = await getCorePLList();
-			// this.proLineList = res.data;
-		// },
-    // 获取数据列表
-    multipliedByHundred(str) {
-      console.log(str);
-      // console.log(str)
-      if ( str != 0) {
-        let floatVal = parseFloat(str);
-        if (isNaN(floatVal)) {
-          return 0;
-        }
-        floatVal = Math.round(str * 10000) / 100;
-        let strVal = floatVal.toString();
-        let searchVal = strVal.indexOf('.');
-        if (searchVal < 0) {
-          searchVal = strVal.length;
-          strVal += '.';
-        }
-        while (strVal.length <= searchVal + 2) {
-          strVal += '0';
-        }
-        return parseFloat(strVal);
-      }
-
-    },
     async getDataList() {
-      const res = await getProduceDataPage(this.listQuery)
-      console.log(res)
-      this.tableData = res.data.records
-      this.tableData.forEach(item => {
-        item.tableTime = item?.reportDate?.length > 0 ? item.reportDate[0] + '-' + item.reportDate[1] + '-' + item.reportDate[2] : '--'
+      // const res = await getProduceDataPage(this.listQuery)
+      // 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({
+        current: 1,
+        size: 99,
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime,
+        factorys: this.listQuery.factorys,
+        mode: this.listQuery.mode,
+        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.listQuery.total = res.data.total
-      this.buildChart(this.tableData)
+      // this.buildChart(this.tableData)
     },
     buildChart(list) {
-      const chartList = Object.groupBy(list, (item) => item.tableTime)
-      this.xAxis = []
-      this.seriesList = []
-      for (const keyIndex in chartList) {
-        // X坐标轴数据
-        this.xAxis.push(keyIndex)
-      }
+      let temp = []
+      let xAxisData = []
+      list.forEach(item => {
+        temp.push(item.groupTime)
+      })
+      // x轴数据
+      xAxisData = Array.from(new Set(temp))
+      
       // y轴数据
-      for (const y of this.factoryList) {
-        // y: {name: , id: }
-        const seriesItem = {
-          name: y.name,
+      for (const y of this.factoryArray1) {
+        for (const type of this.typeList) {
+          const seriesItem = {
+            name: y.name,
+            record: type.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
+            data: Array(xAxisData.length).fill(0)
+          }
+          list.forEach(data => {
+            xAxisData.forEach((x, index) => {
+              if (x === data.groupTime && y.id === data.factory && type.id === data.glassType) {
+                seriesItem.data[index] = data.goodNumber
               }
             })
-          }
+          })
+          this.seriesList.push(seriesItem)
         }
-        this.seriesList.push(seriesItem)
       }
-      this.$refs.lineChart.initChart(this.xAxis, this.seriesList)
+      console.log('啊啊', this.seriesList)
+      this.$refs.lineChart.initChart(xAxisData, this.seriesList)
+      // const chartList = Object.groupBy(list, (item) => item.tableTime)
+      // this.xAxis = []
+      // this.seriesList = []
+      // 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;

src/views/produce/data/lineChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: DY
- * @LastEditTime: 2024-05-22 13:48:58
+ * @LastEditTime: 2024-05-30 14:52:05
  * @Description:
 -->
 <template>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-17 16:31:51
- * @LastEditTime: 2024-05-20 18:09:09
+ * @LastEditTime: 2024-05-29 14:06:16
  * @LastEditors: DY
  * @Description:
 -->
@@ -29,20 +29,30 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="时间维度" prop="targetType">
-              <el-select v-model="dataForm.targetType" placeholder="请选择时间维度" clearable @change="clearTime">
+              <el-select v-model="dataForm.targetType" placeholder="请选择时间维度" clearable>
                 <!-- <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" />
+                <el-option label="日" :value="0" />
+                <el-option label="周" :value="1" />
+                <el-option label="月" :value="2" />
+                <el-option label="年" :value="3" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-show="dataForm.targetType !== 1" label="时间" prop="reportTime">
-              <el-date-picker v-model="dataForm.reportTime" value-format="yyyy-MM" type="month" placeholder="选择月份">
+            <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>
             </el-form-item>
-            <el-form-item v-show="dataForm.targetType === 1" label="时间" prop="targetYear">
-              <el-date-picker clearable v-model="dataForm.showYear" value-format="yyyy" type="year" placeholder="开始时间">
+            <el-form-item v-show="dataForm.targetType === 1" label="时间" prop="week">
+              <el-date-picker v-model="week" type="week" format="yyyy 第 WW 周" placeholder="选择周">
+              </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>
+            </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>
             </el-form-item>
           </el-col>
@@ -225,6 +235,7 @@
 import SmallTitle from './SmallTitle';
 import { createProduce, getProduceTargetDetail, updateProduceTarget } from '@/api/produceData';
 import { factoryList, tyjxfactoryList, dhgfactoryList } from "@/utils/constants";
+import moment from 'moment'
 
 export default {
   components: {
@@ -247,57 +258,16 @@ export default {
       workOrderList: [],
       detList: [],
       teamList: [],
-      sourceList: [
-        {
-          id: 1,
-          name: '手动',
-        },
-        {
-          id: 2,
-          name: '自动',
-        }
-      ],
-      // factoryList: [
-      //   {
-      //     name: '瑞昌中建材光电材料有限公司',
-      //     id: 0
-      //   },
-      //   {
-      //     name: '邯郸中建材光电材料有限公司',
-      //     id: 1
-      //   },
-      //   {
-      //     name: '中建材株洲光电材料有限公司',
-      //     id: 2
-      //   },
-      //   {
-      //     name: '佳木斯中建材光电材料有限公司',
-      //     id: 3
-      //   },
-      //   {
-      //     name: '成都中建材光电材料有限公司',
-      //     id: 4
-      //   },
-      //   {
-      //     name: '凯盛光伏材料有限公司',
-      //     id: 5
-      //   },
-      //   {
-      //     name: '蚌埠兴科玻璃有限公司',
-      //     id: 6
-      //   }
-      // ],
       sectionList: [],
       visible: false,
+      reportTime: undefined,
+      week: undefined,
       dataForm: {
         factoryType: 0,
         id: undefined,
-        reportTime: undefined, // 月时间
         factory: undefined,
-        targetType: undefined,
-        targetYear: undefined,
-        showYear: undefined,
-        targetMonth: undefined,
+        targetTime: undefined,
+        targetType: 0,
         chipYield: undefined,
         chipYieldRate: undefined,
         chipBom: undefined,
@@ -345,31 +315,20 @@ export default {
         this.$refs.dataForm.resetFields()
       }
     },
-    clearTime() {
-      this.dataForm.targetYear = undefined
-      this.dataForm.targetMonth = undefined
-    },
+    // clearTime() {
+    //   this.dataForm.targetTime = undefined
+    // }, 
     handleClose() {
       // 新增
-      if (this.dataForm.targetType === 0) {
-        const timeArray = this.dataForm.reportTime.split('-')
-        this.dataForm.targetYear = Number(timeArray[0])
-        this.dataForm.targetMonth = Number(timeArray[1])
-      }
       if (this.dataForm.targetType === 1) {
-        this.dataForm.targetYear = Number(this.dataForm.showYear)
+        this.dataForm.targetTime = this.week ? Number(moment(this.week.getTime()).format('YYYYWW')) : undefined
+      } else {
+        this.dataForm.targetTime = this.reportTime ? Number(this.reportTime) : undefined
       }
-      // if (this.dataForm.factory === 5) {
-      //   this.dataForm.factoryType = 1
-      // } else {
-      //   this.dataForm.factoryType = 0
-      // }
       if (this.dataForm.id) {
         // 修改
         updateProduceTarget({
-          ...this.dataForm,
-          showYear: undefined,
-          reportTime: undefined
+          ...this.dataForm
         }).then(res => {
           if (res.code === 0) {
             this.$message.success('修改成功！')
@@ -380,9 +339,7 @@ export default {
       } else {
         // 新增
         createProduce({
-          ...this.dataForm,
-          showYear: undefined,
-          reportTime: undefined
+          ...this.dataForm
         }).then(res => {
           if (res.code === 0) {
             this.$message.success('新增成功！')
@@ -399,19 +356,16 @@ export default {
       if (this.dataForm.id) {
         getProduceTargetDetail(this.dataForm.id).then(res => {
           this.dataForm = res.data
-          if (this.dataForm.targetType === 1) {
-            if (this.dataForm.targetYear) {
-              this.$set(this.dataForm, 'showYear', String(this.dataForm.targetYear))
-            }
+          if (this.dataForm.targetType === 0 || this.dataForm.targetType === 2 || this.dataForm.targetType === 3) {
+            this.reportTime = String(this.dataForm.targetTime)
           }
-          if (this.dataForm.targetType === 0) {
-            if (this.dataForm.targetYear && this.dataForm.targetMonth !== null) {
-              if (this.dataForm.targetMonth < 10) {
-                this.$set(this.dataForm, 'reportTime', String(this.dataForm.targetYear) + '-0' + String(this.dataForm.targetMonth))
-              } else {
-                this.$set(this.dataForm, 'reportTime', String(this.dataForm.targetYear) + '-' + String(this.dataForm.targetMonth))
-              }
-            }
+          if (this.dataForm.targetType === 1) {
+            const date = new Date()
+            date.setFullYear(String(this.dataForm.targetTime).slice(0, 4))
+            date.setMonth(0)
+            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
           }
         })
       }
@@ -424,6 +378,7 @@ export default {
   position: absolute;
   bottom: 1%;
   right: 2%;
+  z-index: 999;
 }
 .drawer-footer {
   width: 100%;

src/views/produce/target/index.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-05-22 16:22:57
+ * @LastEditTime: 2024-05-31 16:41:12
  * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
-    <ButtonNav :menus="['碲化镉工厂', '铜铟镓硒工厂']" :button-mode="true" @change="changeFactory" style="margin-top: -10px">
+    <ButtonNav v-show="false" :menus="['碲化镉工厂', '铜铟镓硒工厂']" :button-mode="true" @change="changeFactory" style="margin-top: -10px">
     </ButtonNav>
     <div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
@@ -29,34 +29,34 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item v-show="timeSelect === 'day'" label="时间范围" prop="reportTime">
-          <el-date-picker v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+        <el-form-item v-show="listQuery.date === 1 || listQuery.date === ''" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyyMMdd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
-        </el-form-item> -->
-        <!-- <el-form-item v-show="timeSelect === 'week'" label="时间范围" prop="reportTime">
-          <el-date-picker v-model="listQuery.reportTime[0]" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+        </el-form-item>
+        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker v-model="listQuery.reportTime[1]" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周"  placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <span v-if="listQuery.reportTime[0] && listQuery.reportTime[1]" style="margin-left: 10px">
+          <span v-if="start && end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span>
-        </el-form-item> -->
-        <el-form-item v-show="listQuery.date !== 4" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="timestamp" range-separator="至" start-placeholder="开始月份"
+        </el-form-item>
+        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
+          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyyMM" range-separator="至" start-placeholder="开始月份"
             end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.date === 4" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" value-format="timestamp" type="year"
+          <el-date-picker size="small" clearable v-model="start" value-format="yyyy" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="end" value-format="timestamp" type="year" placeholder="结束时间"
+          <el-date-picker size="small" clearable v-model="end" value-format="yyyy" type="year" placeholder="结束时间"
             @change="getYear">
           </el-date-picker>
         </el-form-item>
@@ -173,7 +173,7 @@ export default {
         current: 1,
         factorys: null,
         total: 0,
-        date: undefined,
+        date: 1,
         beginTime: undefined,
         endTime: undefined,
         reportTime: []
@@ -314,9 +314,17 @@ export default {
         },
       ],
       timeList: [
+        {
+          value: 1,
+          label: '日'
+        },
+        {
+          value: 2,
+          label: '周'
+        },
         {
           value: 3,
-          label:'月'
+          label: '月'
         },
         {
           value: 4,
@@ -332,13 +340,13 @@ export default {
           showOverflowtooltip: true
         },
         {
-          prop: 'tagertTime',
+          prop: 'targetTime',
           label: '目标时间',
           minWidth: 150,
           showOverflowtooltip: true
         },
         {
-          prop: 'createTime',
+          prop: 'updateTime',
           label: '提交时间',
           filter: parseTime,
           minWidth: 150,
@@ -418,11 +426,11 @@ export default {
 			// all: {}
 		};
   },
-  // computed: {
-  //   weekNum() {
-  //     return Math.round((this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 60 * 60 * 1000 * 7)) + 1
-  //   },
-  // },
+  computed: {
+    weekNum() {
+      return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
+    },
+  },
   watch: {
     facType(value) {
       if (value === 0) {
@@ -569,36 +577,75 @@ export default {
       this.$nextTick(() => {
         this.$refs.detailOrUpdate.init(val.data.id);
       });
-    },
-    buttonClick() {
-
     },
     getYear(e) {
-      if (this.end && e - this.start > 10 * 365*24*60*60*1000) {
+      if (this.end && Number(this.end) - Number(this.start) > 10) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
+        this.start = undefined
+        this.end = undefined
         // console.log();
       } else {
-        if (this.end < this.start) {
+        if (Number(this.end) < Number(this.start)) {
           this.$message({
             message: '结束年份不能小于开始年份',
             type: 'warning'
           });
+          this.start = undefined
+          this.end = undefined
+        } else {
+          this.listQuery.beginTime = Number(this.start)
+          this.listQuery.endTime = Number(this.end)
         }
       }
       // console.log(e);
     },
     changeTime() {
       if (this.listQuery.reportTime) {
-        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0]
-        if (numDays > 2*365*24*60*60*1000) {
+        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        if (numDays > 24) {
           this.$message({
             message: '时间范围不能超过24个月',
             type: 'warning'
           });
           this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
+          this.listQuery.endTime = Number(this.listQuery.reportTime[1])
+        }
+      }
+    },
+    onValueChange(picker, k) { // 选中近k周后触发的操作
+      if (this.start && this.end) {
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.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);
+        if (numDays > 168) {
+          console.log(numDays)
+          this.$message({
+            message: '周范围不能超过24周',
+            type: 'warning'
+          });
+        } else {
+          this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
+          this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
+        }
+      }
+    },
+    changeDayTime() {
+      if (this.listQuery.reportTime) {
+        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        if (numDays > 30) {
+          this.$message({
+            message: '时间范围不能超过30天',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
+          this.listQuery.endTime = Number(this.listQuery.reportTime[1])
         }
       }
     },
@@ -626,27 +673,22 @@ export default {
 
     },
     async getDataList() {
-      if (this.listQuery.date === 3) {
-        if (this.listQuery.reportTime?.length > 0) {
-          this.listQuery.beginTime = this.listQuery.reportTime[0] ? this.listQuery.reportTime[0] : undefined
-          this.listQuery.endTime = this.listQuery.reportTime[1] ? this.listQuery.reportTime[1] : undefined
-        }
-      }
-      if (this.listQuery.date === 4) {
-        if (this.listQuery.reportTime?.length > 0) {
-          this.listQuery.beginTime = this.start ? this.start : undefined
-          this.listQuery.endTime = this.end ? this.end : undefined
-        }
-      }
+      // if (this.listQuery.date === 3) {
+      //   if (this.listQuery.reportTime?.length > 0) {
+      //     this.listQuery.beginTime = this.listQuery.reportTime[0] ? Number(this.listQuery.reportTime[0]) : undefined
+      //     this.listQuery.endTime = this.listQuery.reportTime[1] ? this.listQuery.reportTime[1] : undefined
+      //   }
+      // }
+      // if (this.listQuery.date === 4) {
+      //   if (this.listQuery.reportTime?.length > 0) {
+      //     this.listQuery.beginTime = this.start ? this.start : undefined
+      //     this.listQuery.endTime = this.end ? this.end : undefined
+      //   }
+      // }
       if (this.currentMenu === '碲化镉工厂') {
         await prodTargetDiPage(this.listQuery).then(res => {
           if (res.code === 0) {
             this.tableData = res.data.records
-            this.tableData.forEach(item => {
-                const year = item.targetYear ? item.targetYear + '年' : ''
-                const month = item.targetMonth ? item.targetMonth + '月' : ''
-                item.tagertTime = year + month
-            })
             this.listQuery.total = res.data.total
           }
         })

src/views/produce/workOrder/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

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

@@ -0,0 +1,399 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2024-05-31 16:13:22
+ * @LastEditors: DY
+ * @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>
+    </small-title>
+    <div ref="detail" class="detailBox">
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <p class="title">工单号</p>
+          <p class="text">{{ dataForm.workOrderNumber }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">订单号</p>
+          <p class="text">{{ dataForm.orderNumber }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">工单类型</p>
+          <p class="text">{{ ['', '芯片订单', '组件类型', 'bipv类型'][dataForm.workOrderType] }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">工单来源</p>
+          <p class="text">{{ ['', '手动', 'ERP'][dataForm.source] }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">工艺流程</p>
+          <p class="text">{{ dataForm.process }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">BOM</p>
+          <p class="text">{{ dataForm.bom }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">工单状态</p>
+          <p class="text">{{ ['未开始', '生产中', '已完成'][dataForm.orderStatus] }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">投入状态</p>
+          <p class="text">{{ dataForm.inStatus }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <p class="title">计划投入量</p>
+          <p class="text">{{ dataForm.plannedInvestment }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">目标产量</p>
+          <p class="text">{{ dataForm.targetProduction }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">实际投入</p>
+          <p class="text">{{ dataForm.actualInvestment }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">实际产出</p>
+          <p class="text">{{ dataForm.actualProduction }}</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="title">创建时间</p>
+          <p class="text">{{ parseTime(dataForm.createTime) }}</p>
+        </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>
+        </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>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <div class="chartDiv">
+        <div ref="bar" :style="{ height: '30vh', width: '40vw' }" />
+        <div ref="pie" :style="{ height: '30vh', width: '40vw' }" />
+      </div>
+      <div class="chartDiv">
+        <div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" />
+        <div ref="line" v-show="dataForm.orderStatus === 1" :style="{ height: '30vh', width: '40vw' }" />
+      </div>
+    </div>
+  </el-drawer>
+
+</template>
+
+<script>
+// import basicAdd from './basic-add';
+import * as echarts from 'echarts'
+import resize from '@/mixins/resize'
+import { getWorkOrderDetail, getEqNum, getDailyTrend } from '@/api/produceData/order';
+import SmallTitle from './SmallTitle';
+import jsPDF from 'jspdf';
+import html2canvas from 'html2canvas';
+
+export default {
+  components: {
+    SmallTitle,
+  },
+  mixins: [resize],
+  props: {
+    date: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      lineChart: null,
+      pieChart: null,
+      barChart: null,
+      equipmentLineChart: null,
+      visible: false,
+      dataForm: {}
+    }
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  mounted() {
+    // this.getCurrentTime()
+  },
+  methods: {
+    exportDetail() {
+      // 导出
+      const pdf = new jsPDF('l', 'pt', 'a4');
+      const options = {
+        scale: 2
+      };
+      const element = this.$refs['detail'];
+
+      html2canvas(element, options).then((canvas) => {
+        const imgData = canvas.toDataURL('image/png');
+        pdf.addImage(imgData, 'PNG', 0, 0, pdf.internal.pageSize.getWidth(), pdf.internal.pageSize.getHeight());
+        pdf.save(this.dataForm.workOrderNumber + '详情.pdf');
+      });
+    },
+    init(id) {
+      this.visible = true
+      this.$nextTick(() => {
+        this.initLineChart()
+      })
+      if (id) {
+        getWorkOrderDetail(id).then(res => {
+          this.dataForm = res.data
+          this.buildChart(this.dataForm)
+          if (this.dataForm.orderStatus === 1) {
+            this.trend()
+          }
+        })
+        getEqNum(id).then(response => {
+          if (response.code === 0) {
+            const xAxisList = Object.keys(response.data)
+            const yAxisList = Object.values(response.data)
+            this.initEqLineChart(xAxisList, yAxisList)
+          }
+        })
+        
+      }
+    },
+    trend() {
+      // 趋势图
+      getDailyTrend({ factory: this.dataForm.id }).then(trendRes => {
+        if (trendRes?.data.length > 0) {
+          const seriesList = []
+          const dateList = []
+          trendRes.data.forEach(element => {
+            seriesList.push(element.actualProduction)
+            dateList.push(element.recordTime[0] + '-' + element.recordTime[1] + '-' + element.recordTime[2])
+          })
+          this.initLineChart(dateList, seriesList)
+        }
+      })
+    },
+    buildChart(data) {
+      // 生产明细
+      const barList = [data.targetProduction, data.plannedInvestment, data.actualInvestment, data.actualProduction, data.wasteNum, data.reworkNum]
+      this.initChart(barList)
+      // 良品率
+      const pieList = [
+        { value: data.actualProduction, name: '实际产出' },
+        { value: data.wasteNum, name: '废品数量' },
+        { value: data.reworkNum, name: '待再加工数量' }
+      ]
+      this.initPieChart(pieList)
+    },
+    initChart(barData) {
+      this.barChart = echarts.init(this.$refs['bar'])
+      this.barChart.setOption({
+        title: {
+          text: '生产明细',
+          left: 'center'
+          // subtext: 'Fake Data'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '20%',
+          left: "1%",
+          right: "3%",
+          bottom: "1%",
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
+          axisLabel: {
+            rotate:45
+          }
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: barData,
+            type: 'bar',
+            barWidth: '40%'
+          }
+        ]
+      }, true)
+    },
+    initPieChart(pieData) {
+      this.pieChart = echarts.init(this.$refs['pie'])
+      this.pieChart.setOption({
+        title: {
+          text: '产品良率',
+          left: 'center'
+          // subtext: 'Fake Data'
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          top: '5%',
+          left: 'right',
+          orient: 'vertical'
+        },
+        series: [
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['40%', '70%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: 40,
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data: pieData
+          }
+        ]
+      }, true)
+    },
+    initEqLineChart(xAxisList, yAxisList) {
+      this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
+      this.equipmentLineChart.setOption({
+        title: {
+          text: '在制品分布',
+          left: 'center'
+          // subtext: 'Fake Data'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '20%',
+          left: "1%",
+          right: "3%",
+          bottom: "1%",
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisList,
+          axisLabel: {
+            rotate:45,
+            // width: '10%'
+          }
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: yAxisList,
+            type: 'bar',
+            barWidth: '40px'
+          }
+        ]
+      }, true)
+    },
+    initLineChart(xAxisList, seriesList) {
+      this.lineChart = echarts.init(this.$refs['line'])
+      this.lineChart.setOption({
+        title: {
+          text: '历史趋势',
+          left: 'center' // 设置标题居中
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisList,
+          axisLabel: {
+            rotate:45
+          }
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: seriesList,
+            type: 'line'
+          }
+        ]
+      }, true)
+    }
+    // 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);
+    // },
+  },
+};
+</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;
+}
+
+.drawer >>> .el-form-item__label {
+  padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+  margin: 0;
+  padding: 32px 32px 24px;
+  border-bottom: 1px solid #dcdfe6;
+  /* margin-bottom: 30px; */
+}
+.detailBox p {
+  margin: 0;
+  padding: 0 32px;
+}
+.detailBox .title {
+  /* width: 56px; */
+  /* height: 14px; */
+  font-family: Source Han Sans CN, Source Han Sans CN;
+  font-weight: 400;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.85);
+  line-height: 16px;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+.detailBox .text {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(102,102,102,0.75);
+  padding-bottom: 20px;
+}
+.detailBox {
+  padding-top: 30px;
+  width: 99%;
+}
+</style>

src/views/produce/workOrder/index.vue

@@ -0,0 +1,320 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-15 10:49:13
+ * @LastEditTime: 2024-05-31 17:13:56
+ * @LastEditors: DY
+ * @Description:
+-->
+<template>
+  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
+    <div class="app-container" style="margin-top: 8px;padding: 16px; height: auto;">
+      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    </div>
+    <div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto; padding: 16px;">
+      <search-bar :formConfigs="formConfig2" ref="searchBarForm" style="margin-bottom: 0" />
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+        :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
+          :method-list="tableBtn" @clickBtn="handleClick" />
+      </base-table>
+      <pagination
+        :limit.sync="listQuery.pageSize"
+        :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" />
+  </div>
+</template>
+
+<script>
+// import { parseTime } from '../../core/mixins/code-filter';
+import { getWorkOrderPage, exportExcel } from '@/api/produceData/order';
+// 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 } from "@/utils/constants";
+
+// import FileSaver from 'file-saver'
+// import * as XLSX from 'xlsx'
+export default {
+  components: { lineChart, AddOrUpdate },
+  mixins: [basicPage],
+	data() {
+    return {
+      factoryList,
+      factoryArray,
+      listQuery: {
+        pageSize: 20,
+        pageNo: 1,
+        factorys: undefined,
+        total: 0,
+        time: undefined,
+        orderStatus:undefined
+      },
+      detailOrUpdateVisible:false,
+      tableBtn: [
+          {
+            type: 'detail',
+            btnName: '详情',
+        },
+        // {
+        //     type: 'delete',
+        //     btnName: '删除',
+        //   },
+      ].filter((v) => v),
+      typeList: [
+        {
+          name: '芯片',
+          id: 0,
+        },
+        {
+          name: '标准组件',
+          id: 1,
+        },
+        {
+          name: 'BIPV产品',
+          id: 2,
+        },
+      ],
+      formConfig: [
+        {
+          type: "select",
+          label: "工厂名称",
+          selectOptions: factoryArray,
+          labelField: 'name',
+          valueField: 'id',
+          param: "factory",
+          multiple: true,
+					filterable: true
+        },
+        {
+          type: "select",
+          label: "工单状态",
+          selectOptions: [
+            {
+              label: '未开始',
+              value: 0
+            },
+            {
+              label: '生产中',
+              value: 1
+            },
+            {
+              label: '已完成',
+              value: 2
+            }
+          ],
+          labelField: "label",
+          valueField: "value",
+          param: "orderStatus",
+          multiple: true,
+					filterable: true
+        },
+        {
+          type: "datePicker",
+          label: "时间段",
+          dateType: "daterange",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: "-",
+          startPlaceholder: "开始日期",
+          endPlaceholder: "结束日期",
+          param: "timeSlot",
+          defaultSelect: [],
+          defaultTime: ["00:00:00", "23:59:59"],
+          width: 250,
+        },
+        {
+          type: "button",
+          btnName: "查询",
+          name: "search",
+          color: "primary",
+        },
+        {
+          type: "separate",
+        },
+        {
+          type: "button",
+          btnName: "导出",
+          name: "export",
+          color: "primary",
+          plain: true
+        },
+      ],
+      formConfig2: [
+        {
+          type: 'title',
+          label: '工厂信息',
+        },
+      ],
+      formConfig1: [
+        {
+          type: 'title',
+          label: '良品数量',
+        },
+      ],
+      tableProps: [
+        {
+          prop: 'factory',
+          label: '工厂名称',
+          filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true
+        },
+        {
+          prop: 'workOrderNumber',
+          label: '工单号',
+          // filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
+        },
+        {
+          prop: 'workOrderType',
+          label: '工单类型',
+          filter: (val) => ['', '芯片订单', '组件类型', 'bipv类型'][val],
+        },
+        {
+          prop: 'plannedInvestment',
+          label: '计划投入',
+        },
+        {
+          prop: 'actualInvestment',
+          label: '实际投入',
+        },
+        {
+          prop: 'targetProduction',
+          label: '目标产量',
+        },
+        {
+          prop: 'actualProduction',
+          label: '实际产量',
+        },
+        {
+          prop: 'productionProgress',
+          label: '生产进度',
+          filter: (val) => (val * 100) + '%'
+        },
+        {
+          prop: 'orderStatus',
+          label: '工单状态',
+          filter: (val) => ['未开始', '生产中', '已完成'][val],
+        },
+        {
+          prop: 'startTime',
+          label: '开始时间',
+          minWidth: 100,
+          showOverflowtooltip: true
+        },
+        {
+          prop: 'endTime',
+          label: '完成时间',
+          minWidth: 100,
+          showOverflowtooltip: true
+        }
+      ],
+      tableData: [],
+      xAxis: [],
+      lineData: {}
+			// proLineList: [],
+			// all: {}
+		};
+  },
+	created() {
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 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
+	},
+  methods: {
+    otherMethods(val) {
+      this.detailOrUpdateVisible = true;
+      // this.addOrEditTitle = "详情";
+      this.$nextTick(() => {
+        this.$refs.detailOrUpdate.init(val.data.id);
+      });
+    },
+    async getDataList() {
+      const res = await getWorkOrderPage(this.listQuery)
+      this.tableData = res.data.list
+      this.listQuery.total = res.data.total
+      if (this.listQuery.total > 0) {
+        this.tableData.forEach(item => {
+          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+        })
+      }
+    },
+		buttonClick(val) {
+			this.listQuery.factorys = val.factory?.length > 0 ? val.factory : undefined
+      this.listQuery.orderStatus = val.orderStatus?.length > 0 ? val.orderStatus : undefined
+      this.listQuery.time = val.timeSlot?.length > 0 ? val.timeSlot : undefined
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+          if (this.listQuery.time) {
+            this.getDataList();
+          } else {
+            this.$message.warning('请选择时间范围！')
+          }
+					break;
+				case 'export':
+          if (this.listQuery.time) {
+            this.handleExport();
+          } else {
+            this.$message.warning('请选择时间范围！')
+          }
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		/** 导出按钮操作 */
+    handleExport() {
+      this.$modal.confirm('是否确认导出工单数据?').then(() => {
+        // 处理查询参数
+        // let params = {...this.listQuery};
+        // params.current = 1;
+        // params.size = 999;
+        this.exportLoading = true;
+        return exportExcel({
+          factorys: this.listQuery.factorys,
+          orderStatus: this.listQuery.orderStatus,
+          time: this.listQuery.time
+        });
+      }).then(response => {
+        this.$download.excel(response, '工单数据.xls');
+        this.exportLoading = false;
+      }).catch(() => {})
+    },
+	},
+};
+</script>
+
+<style scoped>
+/* .blueTip { */
+	/* padding-bottom: 10px; */
+/* } */
+/* .blueTi */
+.blueTip::before{
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8PX;
+  margin-top: 8px;
+}
+.app-container {
+  margin: 0 0px 0;
+  background-color: #fff;
+  border-radius: 4px;
+  padding: 16px 16px 0;
+  height: calc(100vh - 134px);
+  overflow: auto;
+}
+</style>

src/views/produce/workOrder/lineChart.vue

@@ -0,0 +1,169 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-01-21 14:43:06
+ * @LastEditors: DY
+ * @LastEditTime: 2024-05-30 09:51:16
+ * @Description:
+-->
+<template>
+  <!-- <div> -->
+  <!-- <div :id="id" :class="className" :style="{ height: '65%', width:width}" /> -->
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
+  <!-- </div> -->
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import 'echarts/theme/macarons' // echarts theme
+import resize from '@/mixins/resize'
+export default {
+  name: 'LineChart',
+  mixins: [resize],
+  props: {
+    id: {
+      type: String,
+      default: 'reportChart'
+    },
+    className: {
+      type: String,
+      default: 'reportChart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    beilv: {
+      type: Number,
+      default: 1
+    },
+    height: {
+      type: String,
+      default: '30vh'
+    },
+    legendPosition: {
+      type: String,
+      default: 'center'
+    },
+    showLegend: {
+      type: Boolean,
+      default: false
+    },
+    legendData: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  // mounted() {
+  //   this.$nextTick(() => {
+  //     this.initChart()
+  //   })
+  // },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart(xAxis, seriesList) {
+      this.chart = echarts.init(document.getElementById(this.id))
+      console.log(this.$parent);
+      this.chart.setOption({
+        title: {
+          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,
+        },
+        // toolbox: {
+        //   show: true,
+        //   feature: {
+        //     dataView: { show: true, readOnly: false },
+        //     magicType: { show: true, type: ['line', 'bar'] },
+        //     restore: { show: true },
+        //     saveAsImage: { show: true }
+        //   }
+        // },
+        calculable: true,
+        xAxis: [
+          {
+            type: 'category',
+            // prettier-ignore
+            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        grid: {
+          top: '20%',
+          left: "1%",
+          right: "3%",
+          bottom: "1%",
+          containLabel: true
+        },
+        series: [
+          {
+            name: 'Email',
+            type: 'line',
+            stack: 'Total',
+            data: [120, 132, 101, 134, 90, 230, 210]
+          },
+          {
+            name: 'Union Ads',
+            type: 'line',
+            stack: 'Total',
+            data: [220, 182, 191, 234, 290, 330, 310]
+          },
+          {
+            name: 'Video Ads',
+            type: 'line',
+            stack: 'Total',
+            data: [150, 232, 201, 154, 190, 330, 410]
+          },
+          {
+            name: 'Direct',
+            type: 'line',
+            stack: 'Total',
+            data: [320, 332, 301, 334, 390, 330, 320]
+          },
+          {
+            name: 'Search Engine',
+            type: 'line',
+            stack: 'Total',
+            data: [820, 932, 901, 934, 1290, 1330, 1320]
+          }
+        ]
+      }, true)
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* .reportChart {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: 10px;
+} */
+</style>

src/views/report/yearData/index.vue

@@ -6,60 +6,143 @@
  * @Description:
 -->
 <template>
-  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
-    <div class="app-container" style="padding: 16px 24px 0; max-height: 45vh; flex-grow: 1;">
+  <div
+    style="
+      display: flex;
+      flex-direction: column;
+      min-height: calc(100vh - 96px - 31px);
+    "
+  >
+    <div
+      class="app-container"
+      style="padding: 16px; max-height: 45vh; flex-grow: 1"
+    >
       <!-- <div style="position: relative;z-index: 999;"> -->
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="reportTime">
-          <el-select clearable v-model="timeSelect" placeholder="请选择">
-            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            clearable
+            v-model="timeSelect"
+            placeholder="请选择"
+            style="width: 80px"
+          >
+            <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="timeSelect === 'month'" label="时间范围" prop="reportTime">
-          <el-date-picker clearable v-model="listQuery.reportTime" type="monthrange" range-separator="至"
-            start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
+        <el-form-item
+          v-show="timeSelect === 'month'"
+          label="时间范围"
+          prop="reportTime"
+        >
+          <el-date-picker
+            clearable
+            v-model="listQuery.reportTime"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始月份"
+            end-placeholder="结束月份"
+            @change="changeTime"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'year'" label="时间范围" prop="reportTime">
-          <el-date-picker clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
-            placeholder="开始时间">
+        <el-form-item
+          v-show="timeSelect === 'year'"
+          label="时间范围"
+          prop="reportTime"
+        >
+          <el-date-picker
+            clearable
+            v-model="listQuery.reportTime[0]"
+            value-format="yyyy"
+            type="year"
+            placeholder="开始时间"
+          >
           </el-date-picker>
           ~
-          <el-date-picker v-model="listQuery.reportTime[1]" value-format="yyyy" type="year" placeholder="结束时间"
-            @change="getYear">
+          <el-date-picker
+            v-model="listQuery.reportTime[1]"
+            value-format="yyyy"
+            type="year"
+            placeholder="结束时间"
+            @change="getYear"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="工厂名称" prop="factoryId">
-          <el-select clearable v-model="listQuery.factoryId" placeholder="请选择工厂名称">
-            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+          <el-select
+            multiple
+            collapse-tags
+            v-model="listQuery.factoryId"
+            placeholder="请选择工厂名称"
+          >
+            <el-option
+              v-for="item in factoryList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="玻璃类型" prop="type">
-          <el-select clearable v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
+          <el-select
+            clearable
+            v-model="listQuery.type"
+            placeholder="请选择玻璃类型"
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
+          <el-button type="primary" size="small" @click="getDataList"
+            >查询</el-button
+          >
+          <el-button type="primary" size="small" plain @click="handleExport"
+            >导出</el-button
+          >
         </el-form-item>
       </el-form>
       <!-- </div> -->
       <!-- <el-row style="height: 500px;"> -->
       <!-- <div> -->
-      <line-chart class="yearChart" ref="lineChart" style="height: 35vh;width: 100%"></line-chart>
+      <line-chart
+        class="yearChart"
+        ref="lineChart"
+        style="height: 35vh; width: 100%"
+      ></line-chart>
       <!-- </div> -->
       <!-- </el-row> -->
     </div>
     <!-- <el-row style="height: 400px;"> -->
     <!-- </el-row> -->
-    <div class="app-container" style="margin-top: 18px; height: unset; flex-grow: 1; padding: 16px;">
-      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-        :table-data="tableData">
+    <div
+      class="app-container"
+      style="margin-top: 18px; height: unset; flex-grow: 1; padding: 16px"
+    >
+      <search-bar
+        :formConfigs="formConfig"
+        ref="searchBarForm"
+        @headBtnClick="buttonClick"
+      />
+      <base-table
+        :table-props="tableProps"
+        :page="listQuery.pageNo"
+        :limit="listQuery.pageSize"
+        :table-data="tableData"
+      >
       </base-table>
     </div>
   </div>
@@ -69,14 +152,14 @@
 // import { parseTime } from '../../core/mixins/code-filter';
 // import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
 // import inputTable from './inputTable.vue';
-import { report } from 'process';
-import lineChart from './lineChart';
-import moment from 'moment'
+import { report } from "process";
+import lineChart from "./lineChart";
+import moment from "moment";
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
   components: { lineChart },
-	data() {
+  data() {
     return {
       listQuery: {
         pageSize: 10,
@@ -85,50 +168,62 @@ export default {
         total: 0,
         type: null,
         // reportType: 2,
-        reportTime: []
+        reportTime: [],
       },
       // startDatePicker: this.beginDate(),
       // endDatePicker: this.processDate(),
-      yeartsStart: '',
-      yeartsEnd: '',
-			urlOptions: {
-				// getDataListURL: getGlassPage,
-				// exportURL: exportGlasscExcel
+      yeartsStart: "",
+      yeartsEnd: "",
+      urlOptions: {
+        // getDataListURL: getGlassPage,
+        // exportURL: exportGlasscExcel
       },
       timeList: [
         {
-          value: 'month',
-          label:'月'
+          value: "day",
+          label: "日",
         },
         {
-          value: 'year',
-          label: '年'
-        }
+          value: "week",
+          label: "周",
+        },
+        {
+          value: "month",
+          label: "月",
+        },
+        {
+          value: "year",
+          label: "年",
+        },
       ],
       factoryList: [
         {
-          name: '测试',
-          id:1
-        }
-      ],
-      typeList: [
-        {
-          name: '芯片',
-          id:0,
-        },
-        {
-          name: '标准组件',
+          name: "瑞昌",
           id: 1,
         },
         {
-          name: 'BIPV产品',
+          name: "邯郸",
+          id: 2,
+        },
+      ],
+      typeList: [
+        {
+          name: "芯片",
+          id: 0,
+        },
+        {
+          name: "标准组件",
+          id: 1,
+        },
+        {
+          name: "BIPV产品",
           id: 2,
         },
       ],
       formConfig: [
         {
-          type: 'title',
-          label: '报表管理',
+          type: "title",
+          label: "报表管理",
         },
       ],
       tableProps: [
@@ -140,69 +235,72 @@ export default {
         // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
         // },
         {
-          prop: 'userName',
-          label: '科目',
+          prop: "userName",
+          label: "科目",
         },
         {
-          prop: 'nickName',
-          label: '类别',
+          prop: "nickName",
+          label: "类别",
         },
         {
-          prop: 'datas',
-          label: '数值',
+          prop: "datas",
+          label: "数值",
           // subcomponent: row
         },
         {
-          prop: 'unit',
-          label: '单位',
+          prop: "unit",
+          label: "单位",
           // subcomponent: row
         },
         {
-          prop: 'remark',
-          label: '备注',
+          prop: "remark",
+          label: "备注",
           // subcomponent: row
-        }
+        },
       ],
-      timeSelect:'month',
-      startTimeStamp:null, //开始时间
-      endTimeStamp:null, //结束时间
-      date:'凯盛玻璃控股成员企业2024生产数据',
-			// reportTime: '',
-			startTimeStamp: '',
-			endTimeStamp: '',
+      timeSelect: "month",
+      startTimeStamp: null, //开始时间
+      endTimeStamp: null, //结束时间
+      date: "凯盛玻璃控股成员企业2024生产数据",
+      // reportTime: '',
+      startTimeStamp: "",
+      endTimeStamp: "",
       tableData: [
         {
-          userName: 'userName',
-          nickName: '用户名',
-          datas:'111111'
+          userName: "userName",
+          nickName: "用户名",
+          datas: "111111",
         },
         {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
+          userName: "userName",
+          nickName: "用户名",
+          datas: "111111",
         },
         {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
+          userName: "userName",
+          nickName: "用户名",
+          datas: "111111",
           // subcomponent: row
-        }
+        },
       ],
-			// proLineList: [],
-			// all: {}
-		};
-	},
-	mounted() {
-    this.getDict()
+      // proLineList: [],
+      // all: {}
+    };
+  },
+  mounted() {
+    this.getDict();
     // this.getCurrentYearFirst()
     // this.getDataList()
-	},
+  },
   methods: {
     getYear(e) {
-      if (this.listQuery.reportTime[0] && e - this.listQuery.reportTime[0] > 10) {
+      if (
+        this.listQuery.reportTime[0] &&
+        e - this.listQuery.reportTime[0] > 10
+      ) {
         this.$message({
-          message: '年份起止时间不能超过十年',
-          type: 'warning'
+          message: "年份起止时间不能超过十年",
+          type: "warning",
         });
         // console.log();
       }
@@ -210,59 +308,67 @@ export default {
     },
     changeTime() {
       if (this.listQuery.reportTime) {
-        this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
-        this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
-        const numDays = (new Date(this.listQuery.reportTime[1]).getTime() - new Date(this.listQuery.reportTime[0]).getTime()) / (24 * 3600 * 1000); if (numDays > 730) {
+        this.createStartDate = moment(
+          new Date(this.listQuery.reportTime[0]),
+          "yyyy-MM-dd hh:mm:ss"
+        );
+        this.createEndDate = moment(
+          new Date(this.listQuery.reportTime[1]),
+          "yyyy-MM-dd hh:mm:ss"
+        );
+        const numDays =
+          (new Date(this.listQuery.reportTime[1]).getTime() -
+            new Date(this.listQuery.reportTime[0]).getTime()) /
+          (24 * 3600 * 1000);
+        if (numDays > 730) {
           this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
+            message: "时间范围不能超过24个月",
+            type: "warning",
           });
           this.listQuery.reportTime = [];
-          this.createStartDate = '';
-          this.createEndDate = '';
+          this.createStartDate = "";
+          this.createEndDate = "";
         }
       } else {
-        this.createStartDate = '';
-        this.createEndDate = '';
+        this.createStartDate = "";
+        this.createEndDate = "";
       }
     },
     async getDict() {
-      this.$refs.lineChart.initChart()
-			// 产线列表
-			// const res = await getCorePLList();
-			// this.proLineList = res.data;
-		},
+      this.$refs.lineChart.initChart();
+      // 产线列表
+      // const res = await getCorePLList();
+      // this.proLineList = res.data;
+    },
     // 获取数据列表
     multipliedByHundred(str) {
       console.log(str);
       // console.log(str)
-      if ( str != 0) {
+      if (str != 0) {
         let floatVal = parseFloat(str);
         if (isNaN(floatVal)) {
           return 0;
         }
         floatVal = Math.round(str * 10000) / 100;
         let strVal = floatVal.toString();
-        let searchVal = strVal.indexOf('.');
+        let searchVal = strVal.indexOf(".");
         if (searchVal < 0) {
           searchVal = strVal.length;
-          strVal += '.';
+          strVal += ".";
         }
         while (strVal.length <= searchVal + 2) {
-          strVal += '0';
+          strVal += "0";
         }
         return parseFloat(strVal);
       }
-
-    },
-    async getDataList() {
     },
+    async getDataList() {},
     add0(m) {
-      return m < 10 ? '0' + m : m
+      return m < 10 ? "0" + m : m;
     },
     format(shijianchuo) {
       //shijianchuo是整数，否则要parseInt转换
-      var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
+      var time = moment(new Date(shijianchuo)).format("YYYY-MM-DD HH:mm:ss");
       // console.log(time)
       // var y = time.getFullYear();
       // var m = time.getMonth() + 1;
@@ -270,9 +376,9 @@ export default {
       // var h = time.getHours();
       // var mm = time.getMinutes();
       // var s = time.getSeconds();
-      return time
+      return time;
     },
-		// changeTime(val) {
+    // changeTime(val) {
     //   if (val) {
     //     // console.log(val)
     //     // console.log(val.setHours(7, 0, 0))
@@ -284,35 +390,41 @@ export default {
     //     this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
     //     this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
     //     console.log(this.listQuery.reportTime);
-		// 	} else {
-		// 			this.listQuery.reportTime = []
-		// 	}
-		// },
+    // 	} else {
+    // 			this.listQuery.reportTime = []
+    // 	}
+    // },
 
-		//时间戳转为yy-mm-dd hh:mm:ss
-		timeFun(unixtimestamp) {
-				var unixtimestamp = new Date(unixtimestamp);
-				var year = 1900 + unixtimestamp.getYear();
-				var month = "0" + (unixtimestamp.getMonth() + 1);
-				var date = "0" + unixtimestamp.getDate();
-				return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
-		},
-		buttonClick(val) {
-			this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		/** 导出按钮操作 */
+    //时间戳转为yy-mm-dd hh:mm:ss
+    timeFun(unixtimestamp) {
+      var unixtimestamp = new Date(unixtimestamp);
+      var year = 1900 + unixtimestamp.getYear();
+      var month = "0" + (unixtimestamp.getMonth() + 1);
+      var date = "0" + unixtimestamp.getDate();
+      return (
+        year +
+        "-" +
+        month.substring(month.length - 2, month.length) +
+        "-" +
+        date.substring(date.length - 2, date.length)
+      );
+    },
+    buttonClick(val) {
+      this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.pageNo = 1;
+          this.listQuery.pageSize = 10;
+          this.getDataList();
+          break;
+        case "export":
+          this.handleExport();
+          break;
+        default:
+          console.log(val);
+      }
+    },
+    /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
       // var xlsxParam = { raw: true };
@@ -344,25 +456,23 @@ export default {
       //   return wbout;
       //   //do something......
       // })
-
     },
-	},
+  },
 };
 </script>
 
 <style scoped>
-.blueTip::before{
+.blueTip::before {
   display: inline-block;
-  content: '';
+  content: "";
   width: 4px;
   height: 18px;
-  background: #0B58FF;
+  background: #0b58ff;
   border-radius: 1px;
-  margin-right: 8PX;
+  margin-right: 8px;
   margin-top: 8px;
 }
 .app-container {
-  margin: 0 16px 0;
   background-color: #fff;
   border-radius: 4px;
   padding: 16px 16px 0;

src/views/system/user/index.vue

@@ -714,7 +714,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
         username: undefined,
         mobile: undefined,
         status: undefined,