From 1b8f2522c12a2ce67a72f82cf6455d9af8e9dd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Sun, 28 Apr 2024 11:04:33 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   2 +-
 src/api/cost/index.js                         |  32 ++
 src/api/energy/index.js                       |  15 +
 src/api/greenest/index.js                     |  32 ++
 src/views/cost/index.vue                      |  24 +-
 src/views/energy/index.vue                    |  12 +-
 src/views/greenest/index.vue                  |  18 +-
 src/views/produce/data/index.vue              |   3 +-
 src/views/produce/target/add-or-updata.vue    | 347 ++++++++++-------
 src/views/produce/target/detail-or-updata.vue | 365 ++++++++++++++++++
 src/views/produce/target/index.vue            |  86 ++++-
 11 files changed, 752 insertions(+), 184 deletions(-)
 create mode 100644 src/api/cost/index.js
 create mode 100644 src/api/energy/index.js
 create mode 100644 src/api/greenest/index.js
 create mode 100644 src/views/produce/target/detail-or-updata.vue

diff --git a/.env.dev b/.env.dev
index a0f83b9..6ee8268 100644
--- a/.env.dev
+++ b/.env.dev
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.30:48080'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/cost/index.js b/src/api/cost/index.js
new file mode 100644
index 0000000..b0e2ff6
--- /dev/null
+++ b/src/api/cost/index.js
@@ -0,0 +1,32 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-26 14:53:45
+ * @LastEditTime: 2024-04-26 15:01:12
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询部门列表
+export function getOrderList(data) {
+  return request({
+    url: 'ip/prod-order/prodOrderList',
+    method: 'post',
+    data: data
+  })
+}
+export function getCostPage(data) {
+  return request({
+    url: 'ip/cost/costPage',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCostList(data) {
+  return request({
+    url: 'ip/cost/costList',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/energy/index.js b/src/api/energy/index.js
new file mode 100644
index 0000000..b96d2fa
--- /dev/null
+++ b/src/api/energy/index.js
@@ -0,0 +1,15 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-28 09:28:12
+ * @LastEditTime: 2024-04-28 09:43:40
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+export function getEnergyPage(data) {
+  return request({
+    url: 'ip/energy/page',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/greenest/index.js b/src/api/greenest/index.js
new file mode 100644
index 0000000..2a527df
--- /dev/null
+++ b/src/api/greenest/index.js
@@ -0,0 +1,32 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-26 14:53:45
+ * @LastEditTime: 2024-04-26 15:09:10
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询部门列表
+export function getOrderList(data) {
+  return request({
+    url: 'ip/prod-order/prodOrderList',
+    method: 'post',
+    data: data
+  })
+}
+export function getEpPage(data) {
+  return request({
+    url: 'ip/environment-protection/environmentPage',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCostList(data) {
+  return request({
+    url: 'ip/cost/costList',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/cost/index.vue b/src/views/cost/index.vue
index e7a1f9d..765c7cb 100644
--- a/src/views/cost/index.vue
+++ b/src/views/cost/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:51
+ * @LastEditTime: 2024-04-26 15:06:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getOrderList, getCostPage } from '@/api/cost/index';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -47,8 +47,8 @@ export default {
 	data() {
     return {
       listQuery: {
-        pageSize: 10,
-        pageNo: 1,
+        current: 1,
+        size: 10,
         factoryId: null,
         total: 0,
         type: null,
@@ -230,7 +230,7 @@ export default {
 	mounted() {
     this.getDict()
     // this.getCurrentYearFirst()
-    // this.getDataList()
+    this.getDataList()
 	},
   methods: {
     buttonClick() {
@@ -264,10 +264,14 @@ export default {
       }
     },
     async getDict() {
-      this.$refs.lineChart.initChart()
+      // this.$refs.lineChart.initChart()
 			// 产线列表
-			// const res = await getCorePLList();
-			// this.proLineList = res.data;
+      const res = await getOrderList({
+        current:1,
+        size:999,
+      });
+      console.log(res)
+			this.mainFormConfig[0].selectOptions = res.data;
 		},
     // 获取数据列表
     multipliedByHundred(str) {
@@ -293,6 +297,10 @@ export default {
 
     },
     async getDataList() {
+        const res = await getCostPage({
+        current: 1,
+        size: 999,
+      });
     },
     add0(m) {
       return m < 10 ? '0' + m : m
diff --git a/src/views/energy/index.vue b/src/views/energy/index.vue
index 5185fda..d398a00 100644
--- a/src/views/energy/index.vue
+++ b/src/views/energy/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:31
+ * @LastEditTime: 2024-04-28 10:19:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
     <div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
       <div style="background: #fff; height: 70px; width:100%">
-        <ButtonNav :menus="['水', '电', '气']" :button-mode="true" @change="currentMenu = $event">
+        <ButtonNav :menus="['水', '电', '气']" :button-mode="true" @change="handleChange">
         </ButtonNav>
       </div>
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
@@ -94,7 +94,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getEnergyPage } from '@/api/energy';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -303,9 +303,12 @@ export default {
 	mounted() {
     this.getDict()
     // this.getCurrentYearFirst()
-    // this.getDataList()
+    this.getDataList()
 	},
   methods: {
+    handleChange(e) {
+      console.log(e);
+    },
     buttonClick() {
 
     },
@@ -461,6 +464,7 @@ export default {
 
     },
     async getDataList() {
+      const res = await getEnergyPage(this.listQuery)
     },
     add0(m) {
       return m < 10 ? '0' + m : m
diff --git a/src/views/greenest/index.vue b/src/views/greenest/index.vue
index 8dc1623..431eb7c 100644
--- a/src/views/greenest/index.vue
+++ b/src/views/greenest/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:01
+ * @LastEditTime: 2024-04-26 15:18:15
  * @LastEditors: zhp
  * @Description:
 -->
@@ -72,7 +72,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getEpPage } from '@/api/greenest/index';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -83,11 +83,11 @@ export default {
 	data() {
     return {
       listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        factoryId: null,
-        total: 0,
-        type: null,
+        current: 1,
+        size: 999,
+        // factoryId: null,
+        // total: 0,
+        // type: null,
         // reportType: 2,
         reportTime: []
       },
@@ -199,7 +199,7 @@ export default {
 	},
 	mounted() {
     this.getDict()
-    // this.getCurrentYearFirst()
+    this.getCurrentYearFirst()
     // this.getDataList()
 	},
   methods: {
@@ -264,6 +264,8 @@ export default {
 
     },
     async getDataList() {
+      const res = getEpPage(this.listQuery)
+      console.log(res)
     },
     add0(m) {
       return m < 10 ? '0' + m : m
diff --git a/src/views/produce/data/index.vue b/src/views/produce/data/index.vue
index a86b7db..d63140f 100644
--- a/src/views/produce/data/index.vue
+++ b/src/views/produce/data/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:13:47
+ * @LastEditTime: 2024-04-17 16:32:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -76,7 +76,6 @@
       <!-- <el-col :span="12">
             <line-chart :id=" 'second' " class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
           </el-col> -->
-      </el-row>
     </div>
     <div class="app-container" style="margin-top: 18px;flex-grow: 1; height: auto; padding: 16px;">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
diff --git a/src/views/produce/target/add-or-updata.vue b/src/views/produce/target/add-or-updata.vue
index 495598a..2e01e68 100644
--- a/src/views/produce/target/add-or-updata.vue
+++ b/src/views/produce/target/add-or-updata.vue
@@ -1,154 +1,202 @@
 <!--
  * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-17 15:37:39
+ * @Date: 2024-04-17 16:31:51
+ * @LastEditTime: 2024-04-17 17:01:14
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <el-drawer class="drawer" :visible.sync="visible" size="50%">
     <small-title slot="title" :no-padding="true">
-      {{ '碲化镉工厂生产数据详情' }}
+      {{ '新增' }}
     </small-title>
     <div class="detailBox">
-      <el-row :gutter="24">
-        <el-col :span="8">
-          <p class="title">工厂名称</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="8">
-          <p class="title">时间维度</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="8">
-          <p class="title">时间</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ '芯片' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">芯片产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片良率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片良率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片总功率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">FTO投入量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">CSS稼动率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片段OEE</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片平均功率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">芯片人均产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片产能利用率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-      </el-row>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ '标准组件' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">封装BOM</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">封装线OEE</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件良率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">标准组件总功率</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">封装产能利用率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件人均产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件人均产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ 'BIPV产品' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">产品产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">人均产量</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片使用量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片使用量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
+      <el-form ref="form" :model="dataForm" label-width="80px" label-position="top">
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ '芯片' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="芯片产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片良率"></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片BOM" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片BOM"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片总功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="FTO投入量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入FTO投入量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="CSS稼动率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入CSS稼动率"></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片段OEE" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片段OEE"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片平均功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片平均功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="芯片人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ '标准组件' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="封装BOM" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入封装BOM"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="封装线OEE" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入封装线OEE"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件良率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件良率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="标准组件总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件总功率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件总功率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件平均功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件平均功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ 'BIPV产品' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="产品产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入产品产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片使用量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片使用量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片利用率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片利用率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="内部材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入内部材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="OEM及委外材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入OEM及委外材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="综合材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入综合材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="footer">
+      <el-button @click="cancelForm">取 消</el-button>
+      <el-button type="primary" @click="handleClose()">确 定</el-button>
     </div>
   </el-drawer>
 
@@ -191,6 +239,7 @@ export default {
           name: '自动',
         }
       ],
+      factoryList:[],
       sectionList: [],
       visible: false,
       dataForm: {
@@ -325,6 +374,22 @@ export default {
 };
 </script>
 <style scoped>
+.footer {
+  position: absolute;
+  bottom: 1%;
+  right: 2%;
+}
+.drawer-footer {
+  width: 100%;
+  margin-top: 50px;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 50px;
+  text-align: left;
+  background: #fff;
+}
+.el-divider--horizontal{
+  margin: 0;
+}
   .drawer >>> .el-drawer {
   border-radius: 8px 0 0 8px;
 }
diff --git a/src/views/produce/target/detail-or-updata.vue b/src/views/produce/target/detail-or-updata.vue
new file mode 100644
index 0000000..c35e5d5
--- /dev/null
+++ b/src/views/produce/target/detail-or-updata.vue
@@ -0,0 +1,365 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2024-04-17 16:40:01
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-drawer class="drawer" :visible.sync="visible" size="50%">
+    <small-title slot="title" :no-padding="true">
+      {{ '碲化镉工厂生产数据详情' }}
+    </small-title>
+    <div class="detailBox">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <p class="title">工厂名称</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="8">
+          <p class="title">时间维度</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="8">
+          <p class="title">时间</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ '芯片' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">芯片产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片良率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片良率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片总功率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">FTO投入量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">CSS稼动率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片段OEE</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片平均功率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">芯片人均产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片产能利用率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+      </el-row>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ '标准组件' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">封装BOM</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">封装线OEE</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件良率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">标准组件总功率</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">封装产能利用率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件人均产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件人均产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ 'BIPV产品' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">产品产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">人均产量</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片使用量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片使用量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+    </div>
+  </el-drawer>
+
+</template>
+
+<script>
+// import basicAdd from './basic-add';
+// import {
+//   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+//   getTeamList, getDetList, getLineList
+// } from "@/api/base/qualityScrapLog";
+// import { getList, } from "@/api/base/qualityScrapType";
+import SmallTitle from './SmallTitle';
+export default {
+  components: {
+    SmallTitle,
+  },
+  // mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        isGetCode: false,
+        // codeURL: getCode,
+        // createURL: createQualityScrapLog,
+        // updateURL: updateQualityScrapLog,
+        // infoURL: getQualityScrapLog,
+      },
+      lineList: [],
+      typeList: [],
+      workOrderList: [],
+      detList: [],
+      teamList: [],
+      sourceList: [
+        {
+          id: 1,
+          name: '手动',
+        },
+        {
+          id: 2,
+          name: '自动',
+        }
+      ],
+      sectionList: [],
+      visible: false,
+      dataForm: {
+        id: undefined,
+        logTime: undefined,
+        source: 1,
+        detId: undefined,
+        workOrderId: null,
+        teamId: undefined,
+        num: undefined,
+        lineId: undefined,
+        description: undefined,
+        // description: undefined,
+        remark: undefined,
+      },
+      // materialList: [],
+      dataRule: {
+        // materialId: [{ required: true, message: "", trigger: "blur" }],
+        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+
+        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+      }
+    };
+  },
+  mounted() {
+    this.getDict()
+    console.log('我看看', this.dataForm)
+    // this.getCurrentTime()
+  },
+  methods: {
+    init() {
+      this.visible = 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);
+    // },
+    async getDict() {
+    //   // 物料列表
+    //   const res = await getList()
+    //   this.typeList = res.data
+    //   getWorkOrderList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.workOrderList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getLineList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.lineList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getDetList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.detList = res.data.map((item) => {
+    //       return {
+    //         name: item.content,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getTeamList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.teamList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    // },
+    // async getWorksectionById(lineId) {
+    //   if (lineId) {
+    //     const { code, data } = await this.$axios({
+    //       url: '/base/core-workshop-section/listByParentId',
+    //       method: 'get',
+    //       params: {
+    //         id: lineId,
+    //       },
+    //     });
+    //     if (code == 0) {
+    //       console.log(data)
+    //       this.sectionList = data.map((item) => {
+    //         return {
+    //           name: item.name,
+    //           id: item.id,
+    //         };
+    //       });
+    //     }
+    //   } else {
+    //     this.$axios({
+    //       url: '/base/core-workshop-section/listAll',
+    //       method: 'get',
+    //       // params: {
+    //       //   id: lineId,
+    //       // },
+    //     }).then((res) => {
+    //       // console.log(data)
+    //       this.sectionList = res.data.map((item) => {
+    //         return {
+    //           name: item.name,
+    //           id: item.id,
+    //         };
+    //       });
+    //     })
+    //   }
+    },
+  },
+};
+</script>
+<style scoped>
+  .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;
+}
+
+</style>
diff --git a/src/views/produce/target/index.vue b/src/views/produce/target/index.vue
index c6b7d2c..cb6c5ba 100644
--- a/src/views/produce/target/index.vue
+++ b/src/views/produce/target/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:12:20
+ * @LastEditTime: 2024-04-17 16:37:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -77,7 +77,8 @@
         <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
-      <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+      <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="successSubmit" />
 
       <!-- <el-row :gutter="24"> -->
       <!-- <el-col :span="12" v-for="item in  dataList" :key="item.id"> -->
@@ -86,7 +87,7 @@
       <!-- <el-col :span="12">
             <line-chart :id=" 'second' " class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
           </el-col> -->
-      </el-row>
+
     </div>
 
     <!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
@@ -107,12 +108,14 @@ 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 detailOrUpdate from './detail-or-updata';
+import addOrUpdate from './add-or-updata';
+
 
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
-  components: { lineChart, ButtonNav, AddOrUpdate },
+  components: { lineChart, ButtonNav, detailOrUpdate,addOrUpdate },
   mixins: [basicPage],
 	data() {
     return {
@@ -125,18 +128,23 @@ export default {
         // reportType: 2,
         reportTime: []
       },
-      detailOrUpdateVisible:false,
+      detailOrUpdateVisible: false,
+      addOrUpdateVisible:false,
       date1: undefined,
       date2: undefined,
       tableBtn: [
-          {
+        {
             type: 'detail',
             btnName: '详情',
         },
-        // {
-        //     type: 'delete',
-        //     btnName: '删除',
-        //   },
+        {
+          type: 'edit',
+          btnName: '修改',
+        },
+        {
+            type: 'delete',
+            btnName: '删除',
+          },
       ].filter((v) => v),
       typeList: [
         {
@@ -297,33 +305,58 @@ export default {
         // 	width: 180,
         // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
         // },
-        {
-          prop: 'userName',
-          label: '日期',
-        },
+
         {
           prop: 'nickName',
           label: '工厂名称',
         },
+        {
+          prop: 'userName',
+          label: '目标时间',
+        },
         {
           prop: 'type',
-          label: '玻璃类型',
+          label: '提交时间',
         },
         {
           prop: 'inNum',
-          label: '投入数量',
+          label: '钼电极投入量(片)',
         },
         {
           prop: 'putNum',
-          label: '产出数量',
+          label: '芯片产量(片)',
         },
         {
           prop: 'goodNum',
-          label: '良品数量',
+          label: '芯片平均功率(W)',
         },
         {
           prop: 'goodYelid',
-          label: '良品率%',
+          label: '芯片良率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片总功率(KW)',
+        },
+        {
+          prop: 'goodYelid',
+          label: 'PID6稼动率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片段OEE(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片产能利用率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片人均产量（片/人）',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片BOM',
         },
       ],
       timeSelect:'month',
@@ -366,6 +399,19 @@ export default {
     // this.getDataList()
 	},
   methods: {
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        // this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else {
+        this.otherMethods(val)
+      }
+    },
     otherMethods(val) {
       this.detailOrUpdateVisible = true;
       this.addOrEditTitle = "详情";

From 5ed4eed5de3346e320076966370a3483be6e42fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 13:26:38 +0800
Subject: [PATCH 02/10] update efficiency

---
 src/views/copilot/{yield => }/assets/icon.png | Bin
 .../copilot/efficiency/components/ChipOee.vue |  25 ++++++
 .../efficiency/components/ChipRate.vue        |  27 ++++++
 .../copilot/efficiency/components/StdRate.vue |  65 ++++++++++++++
 .../efficiency/components/TransformRate.vue   |  25 ++++++
 .../efficiency/components/sub/CityName.vue    |  68 +++++++++++++++
 .../efficiency/components/sub/ProgressBar.vue |  82 ++++++++++++++++++
 .../efficiency/components/sub/StdRateItem.vue |  65 ++++++++++++++
 src/views/copilot/efficiency/index.vue        |  34 ++++++--
 .../yield/components/sub/city/CityName.vue    |   2 +-
 10 files changed, 386 insertions(+), 7 deletions(-)
 rename src/views/copilot/{yield => }/assets/icon.png (100%)
 create mode 100644 src/views/copilot/efficiency/components/ChipOee.vue
 create mode 100644 src/views/copilot/efficiency/components/ChipRate.vue
 create mode 100644 src/views/copilot/efficiency/components/StdRate.vue
 create mode 100644 src/views/copilot/efficiency/components/TransformRate.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/CityName.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/ProgressBar.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/StdRateItem.vue

diff --git a/src/views/copilot/yield/assets/icon.png b/src/views/copilot/assets/icon.png
similarity index 100%
rename from src/views/copilot/yield/assets/icon.png
rename to src/views/copilot/assets/icon.png
diff --git a/src/views/copilot/efficiency/components/ChipOee.vue b/src/views/copilot/efficiency/components/ChipOee.vue
new file mode 100644
index 0000000..5eb554e
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -0,0 +1,25 @@
+<!-- 
+    filename: ChipOee.vue
+    author: liubin
+    date: 2024-04-29 08:51:04
+    description: 芯片OEE
+-->
+
+<template></template>
+
+<script>
+export default {
+    name: "ChipOEE",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
new file mode 100644
index 0000000..d1fed9e
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -0,0 +1,27 @@
+<!-- 
+    filename: ChipRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:54
+    description: 芯片良率
+-->
+
+<template>
+
+</template>
+
+<script>
+export default {
+    name: "ChipRate",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
new file mode 100644
index 0000000..7563fdc
--- /dev/null
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -0,0 +1,65 @@
+<!-- 
+    filename: StdRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:43
+    description: 标准组件良率
+-->
+
+<template>
+  <div class="std-rate">
+    <div class="span-2">
+      <StdRateItem
+        :city="cities[5].name"
+        :target="cities[5].target"
+        :total="cities[5].total"
+      />
+    </div>
+    <div
+      v-for="item in cities.filter((val, index) => index != 5)"
+      :key="item.name"
+    >
+      <StdRateItem
+        :city="item.name"
+        :target="item.target"
+        :total="item.total"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import StdRateItem from "./sub/StdRateItem.vue";
+export default {
+  name: "StdRate",
+  components: { StdRateItem },
+  props: {},
+  data() {
+    return {
+      cities: [
+        { name: "A", target: 100, total: 200 },
+        { name: "B", target: 200, total: 300 },
+        { name: "C", target: 300, total: 400 },
+        { name: "D", target: 400, total: 500 },
+        { name: "E", target: 500, total: 600 },
+        { name: "F", target: 400, total: 500 },
+        { name: "G", target: 500, total: 600 },
+      ],
+    };
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.std-rate {
+  display: grid;
+  gap: 8px;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(4, 1fr);
+}
+
+.span-2 {
+  grid-column: span 2;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/TransformRate.vue b/src/views/copilot/efficiency/components/TransformRate.vue
new file mode 100644
index 0000000..e68597b
--- /dev/null
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -0,0 +1,25 @@
+<!-- 
+    filename: TransformRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:34
+    description: 转化效率
+-->
+
+<template></template>
+
+<script>
+export default {
+    name: "TransformRate",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/CityName.vue
new file mode 100644
index 0000000..6483fce
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/CityName.vue
@@ -0,0 +1,68 @@
+<!-- 
+    filename: CityName.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-name">
+    <img :src="Icon" alt="city icon" />
+    <span>{{ value }}</span>
+  </div>
+</template>
+
+<script>
+import Icon from "@/views/copilot/assets/icon.png";
+
+export default {
+  name: "CityName",
+  props: {
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return { Icon };
+  },
+};
+</script>
+
+<style scoped>
+.city-name {
+  min-width: 80px;
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  position: relative;
+}
+
+.city-name::after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 0;
+  height: 0;
+  border-top: 8px solid transparent;
+  border-bottom: 8px solid transparent;
+  border-left: 8px solid #002f6b;
+  transform: translateY(-50%);
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
new file mode 100644
index 0000000..b0c16be
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
@@ -0,0 +1,82 @@
+<!-- 
+    filename: ProgressBar.vue
+    author: liubin
+    date: 2024-04-29 09:18:30
+    description: 
+-->
+
+<template>
+  <div class="progress-bar" :data-title="title" :data-rate="dataRate">
+    <div
+      class="progress-bar__rate"
+      :style="{ width: dataRate == '-' ? 0 : dataRate }"
+    ></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ProgressBar",
+  components: {},
+  props: {
+    value: {
+      type: Number,
+      default: 0,
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    dataRate() {
+      return this.total == 0 ? "-" : `${parseInt(this.value / this.total)}%`;
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.progress-bar {
+  height: 8px;
+  background-color: #002f6b;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  position: relative;
+
+  &:before {
+    content: attr(data-title);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -18px;
+    font-size: 12px;
+  }
+
+  &:after {
+    content: attr(data-rate);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -18px;
+    right: 0;
+    font-size: 12px;
+  }
+
+  .progress-bar__rate {
+    display: inline-block;
+    height: 100%;
+    width: 0;
+    background-color: #11e8e2;
+    border-radius: 4px;
+  }
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
new file mode 100644
index 0000000..6b3ed7c
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
@@ -0,0 +1,65 @@
+<!-- 
+    filename: StdRateItem.vue
+    author: liubin
+    date: 2024-04-29 08:59:33
+    description: 
+-->
+
+<template>
+  <div class="std-rate-item">
+    <CityName :value="city" />
+    <div class="std-rate-item__value">
+      <ProgressBar title="24年目标" :total="100" :value="10" />
+      <ProgressBar title="24年目标" :total="100" :value="10" />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityName from "./CityName.vue";
+import ProgressBar from "./ProgressBar.vue";
+
+export default {
+  name: "StdRateItem",
+  components: { CityName, ProgressBar },
+  props: {
+    city: {
+      type: String,
+      default: "",
+    },
+    target: {
+      type: Number,
+      default: 0,
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.std-rate-item {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 12px;
+}
+
+.std-rate-item__value {
+  flex: 1;
+  margin: 6px;
+  display: flex;
+  gap: 2px;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 7ea9aab..5303c81 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -7,18 +7,37 @@
 
 <template>
   <div class="efficiency-copilot">
-    <Container title="芯片良率" icon="chip2"></Container>
-    <Container title="标准组件良率" icon="std"></Container>
-    <Container title="芯片OEE" icon="chip"></Container>
-    <Container title="转化效率" icon="cube"></Container>
+    <Container title="芯片良率" icon="chip2">
+      <ChipRate />
+    </Container>
+    <Container title="标准组件良率" icon="std">
+      <StdRate />
+    </Container>
+    <Container title="芯片OEE" icon="chip">
+      <ChipOee />
+    </Container>
+    <Container title="转化效率" icon="cube">
+      <TransformRate />
+    </Container>
   </div>
 </template>
 
 <script>
 import Container from "@/views/copilot/components/Container.vue";
+import ChipOeeVue from "./components/ChipOee.vue";
+import ChipRateVue from "./components/ChipRate.vue";
+import StdRateVue from "./components/StdRate.vue";
+import TransformRateVue from "./components/TransformRate.vue";
+
 export default {
   name: "EfficiencyCopilot",
-  components: { Container },
+  components: {
+    Container,
+    ChipOee: ChipOeeVue,
+    ChipRate: ChipRateVue,
+    StdRate: StdRateVue,
+    TransformRate: TransformRateVue,
+  },
   props: {
     period: {
       type: String,
@@ -39,7 +58,10 @@ export default {
   methods: {
     fetchData(period = "日") {
       console.log(`效率驾驶舱，获取${period}数据`);
-      this.$store.dispatch("copilot/initCopilot", { period, source: "efficiency" });
+      this.$store.dispatch("copilot/initCopilot", {
+        period,
+        source: "efficiency",
+      });
     },
   },
 };
diff --git a/src/views/copilot/yield/components/sub/city/CityName.vue b/src/views/copilot/yield/components/sub/city/CityName.vue
index bf3ffd1..44371e2 100644
--- a/src/views/copilot/yield/components/sub/city/CityName.vue
+++ b/src/views/copilot/yield/components/sub/city/CityName.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import Icon from "../../../assets/icon.png";
+import Icon from "@/views/copilot/assets/icon.png";
 
 export default {
   name: "CityName",

From b6820fd61fcc9ed3344ff0acc38390fa666cac58 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 14:18:52 +0800
Subject: [PATCH 03/10] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=89=AF=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../copilot/efficiency/components/StdRate.vue | 26 ++++-------
 .../efficiency/components/sub/CityName.vue    |  8 ++--
 .../efficiency/components/sub/ProgressBar.vue | 43 ++++++++++++++++---
 .../efficiency/components/sub/StdRateItem.vue | 27 +++++-------
 4 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
index 7563fdc..42aaa3f 100644
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -8,21 +8,13 @@
 <template>
   <div class="std-rate">
     <div class="span-2">
-      <StdRateItem
-        :city="cities[5].name"
-        :target="cities[5].target"
-        :total="cities[5].total"
-      />
+      <StdRateItem :city="cities[5]" />
     </div>
     <div
       v-for="item in cities.filter((val, index) => index != 5)"
       :key="item.name"
     >
-      <StdRateItem
-        :city="item.name"
-        :target="item.target"
-        :total="item.total"
-      />
+      <StdRateItem :city="item" />
     </div>
   </div>
 </template>
@@ -36,13 +28,13 @@ export default {
   data() {
     return {
       cities: [
-        { name: "A", target: 100, total: 200 },
-        { name: "B", target: 200, total: 300 },
-        { name: "C", target: 300, total: 400 },
-        { name: "D", target: 400, total: 500 },
-        { name: "E", target: 500, total: 600 },
-        { name: "F", target: 400, total: 500 },
-        { name: "G", target: 500, total: 600 },
+        { name: "瑞昌", target: 100, total: 200, thisYear: 20 },
+        { name: "邯郸", target: 200, total: 300, thisYear: 20 },
+        { name: "株洲", target: 300, total: 400, thisYear: 20 },
+        { name: "佳木斯", target: 400, total: 500, thisYear: 20 },
+        { name: "成都", target: 500, total: 600, thisYear: 20 },
+        { name: "凯盛光伏", target: 400, total: 500, thisYear: 20 },
+        { name: "蚌埠", target: 500, total: 600, thisYear: 20 },
       ],
     };
   },
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/CityName.vue
index 6483fce..f157336 100644
--- a/src/views/copilot/efficiency/components/sub/CityName.vue
+++ b/src/views/copilot/efficiency/components/sub/CityName.vue
@@ -46,11 +46,9 @@ export default {
   position: absolute;
   top: 50%;
   right: 0;
-  width: 0;
-  height: 0;
-  border-top: 8px solid transparent;
-  border-bottom: 8px solid transparent;
-  border-left: 8px solid #002f6b;
+  width: 2px;
+  background: linear-gradient(to top, transparent, #0b5be1ee, transparent);
+  height: 100%;
   transform: translateY(-50%);
 }
 
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
index b0c16be..4ae66f0 100644
--- a/src/views/copilot/efficiency/components/sub/ProgressBar.vue
+++ b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
@@ -37,7 +37,9 @@ export default {
   },
   computed: {
     dataRate() {
-      return this.total == 0 ? "-" : `${parseInt(this.value / this.total)}%`;
+      return this.total == 0
+        ? "-"
+        : `${(parseFloat(this.value / this.total) * 100).toFixed(0)}%`;
     },
   },
   methods: {},
@@ -46,10 +48,10 @@ export default {
 
 <style scoped lang="scss">
 .progress-bar {
-  height: 8px;
+  height: 10px;
   background-color: #002f6b;
   border-radius: 4px;
-  margin-bottom: 20px;
+  margin-bottom: 12px;
   position: relative;
 
   &:before {
@@ -57,7 +59,7 @@ export default {
     display: inline-block;
     color: #fff;
     position: absolute;
-    bottom: -18px;
+    bottom: -200%;
     font-size: 12px;
   }
 
@@ -66,17 +68,46 @@ export default {
     display: inline-block;
     color: #fff;
     position: absolute;
-    bottom: -18px;
+    bottom: -200%;
     right: 0;
     font-size: 12px;
   }
 
+  &:first-child {
+    &:after {
+      color: #11eae3;
+    }
+  }
+  &:nth-child(2) {
+    &:after {
+      color: #0e65fd;
+    }
+  }
+
   .progress-bar__rate {
+    position: absolute;
     display: inline-block;
     height: 100%;
     width: 0;
-    background-color: #11e8e2;
     border-radius: 4px;
   }
+
+  &:first-child {
+    .progress-bar__rate {
+      background: linear-gradient(
+        to right,
+        #004c5e11 10%,
+        #004c5e,
+        #0ac0c0,
+        #11eae3
+      );
+    }
+  }
+
+  &:nth-child(2) {
+    .progress-bar__rate {
+      background: linear-gradient(to right, #0048a811, #0048a8, #0e65fd);
+    }
+  }
 }
 </style>
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
index 6b3ed7c..e9422c1 100644
--- a/src/views/copilot/efficiency/components/sub/StdRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
@@ -7,10 +7,14 @@
 
 <template>
   <div class="std-rate-item">
-    <CityName :value="city" />
+    <CityName :value="city.name" />
     <div class="std-rate-item__value">
-      <ProgressBar title="24年目标" :total="100" :value="10" />
-      <ProgressBar title="24年目标" :total="100" :value="10" />
+      <ProgressBar title="24年目标" :total="city.target" :value="city.target" />
+      <ProgressBar
+        title="24年累计"
+        :total="city.target"
+        :value="city.thisYear"
+      />
     </div>
   </div>
 </template>
@@ -24,23 +28,13 @@ export default {
   components: { CityName, ProgressBar },
   props: {
     city: {
-      type: String,
-      default: "",
-    },
-    target: {
-      type: Number,
-      default: 0,
-    },
-    total: {
-      type: Number,
-      default: 0,
+      type: Object,
+      required: true,
     },
   },
   data() {
     return {};
   },
-  computed: {},
-  methods: {},
 };
 </script>
 
@@ -58,7 +52,8 @@ export default {
   flex: 1;
   margin: 6px;
   display: flex;
-  gap: 2px;
+  gap: 12px;
+  height: 60px;
   flex-direction: column;
   justify-content: center;
 }

From e066a7c4c7f29ecce63afa058b3f7b762f51532e Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 16:00:07 +0800
Subject: [PATCH 04/10] =?UTF-8?q?update=20=E8=8A=AF=E7=89=87=E8=89=AF?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../efficiency/components/ChipRate.vue        |  40 +++--
 .../copilot/efficiency/components/StdRate.vue |   2 +-
 .../components/sub/chip/ChipRateItem.vue      | 139 ++++++++++++++++
 .../components/sub/{ => std}/CityName.vue     |   0
 .../components/sub/{ => std}/ProgressBar.vue  |   0
 .../components/sub/{ => std}/StdRateItem.vue  |   0
 .../copilot/efficiency/options/chipOptions.js | 156 ++++++++++++++++++
 7 files changed, 326 insertions(+), 11 deletions(-)
 create mode 100644 src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
 rename src/views/copilot/efficiency/components/sub/{ => std}/CityName.vue (100%)
 rename src/views/copilot/efficiency/components/sub/{ => std}/ProgressBar.vue (100%)
 rename src/views/copilot/efficiency/components/sub/{ => std}/StdRateItem.vue (100%)
 create mode 100644 src/views/copilot/efficiency/options/chipOptions.js

diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
index d1fed9e..8d71f73 100644
--- a/src/views/copilot/efficiency/components/ChipRate.vue
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -6,22 +6,42 @@
 -->
 
 <template>
-
+  <div class="chip-rate">
+    <ChipRateItem :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
+    <ChipRateItem :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+  </div>
 </template>
 
 <script>
+import ChipRateItemVue from "./sub/chip/ChipRateItem.vue";
 export default {
-    name: "ChipRate",
-    components: {},
-    props: {},
-    data() {
-        return {}
-    },
-    computed: {},
-    methods: {},
-}
+  name: "ChipRate",
+  components: { ChipRateItem: ChipRateItemVue },
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
 </script>
 
 <style scoped lang="scss">
+.chip-rate {
+  flex: 1;
+  display: flex;
+  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);
+  }
+}
 </style>
diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
index 42aaa3f..42d7d26 100644
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import StdRateItem from "./sub/StdRateItem.vue";
+import StdRateItem from "./sub/std/StdRateItem.vue";
 export default {
   name: "StdRate",
   components: { StdRateItem },
diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
new file mode 100644
index 0000000..f3bc1d1
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -0,0 +1,139 @@
+<!-- 
+    filename: ChipRateItem.vue
+    author: liubin
+    date: 2024-04-29 14:25:18
+    description: 
+-->
+
+<template>
+  <div class="chip-rate-item">
+    <div class="cities">
+      <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
+    </div>
+    <div class="chart" ref="chart"></div>
+    <div class="legend" v-if="1">
+      <div class="legend-item">
+        <span class="legend-item__value">20%</span>
+        <span class="legend-item__label">2023年累计</span>
+      </div>
+      <div class="legend-item">
+        <span class="legend-item__value">20%</span>
+        <span class="legend-item__label">2024年累计</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CopilotButtons from "@/views/copilot/components/select.vue";
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/chipOptions.js";
+
+export default {
+  name: "ChipRateItem",
+  components: { CopilotButtons },
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    cities: {
+      type: Array,
+      default: () => [],
+    },
+    color: {
+      type: Number,
+      default: 1,
+    },
+  },
+  data() {
+    return {
+      period: "月",
+      valueTuple: [100, 100, 200],
+    };
+  },
+  computed: {
+    options() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue =
+          vt[0] != null && vt[2] != null && vt[2] !== 0
+            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+
+      return getOptions({
+        single: true,
+        color: this.color == 1 ? "#4CF0E8" : "#1065ff",
+        titleValue,
+        subtitle,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
+      });
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  methods: {
+    handleCityUpdate() {},
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.chip-rate-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  backdrop-filter: blur(24px);
+
+  .cities {
+    height: 40px;
+  }
+
+  .chart {
+    align-self: stretch;
+    height: 280px;
+  }
+
+  .legend {
+    height: 80px;
+    display: flex;
+    gap: 40px;
+    justify-content: space-around;
+  }
+
+  .legend-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 3px;
+
+    &:first-child {
+      .legend-item__value {
+        color: #0e61f5;
+      }
+    }
+
+    &:nth-child(2) {
+      .legend-item__value {
+        color: #0fd5d1;
+      }
+    }
+  }
+
+  .legend-item__value {
+    font-size: 24px;
+    font-weight: 600;
+  }
+}
+</style>
+l
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/std/CityName.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/CityName.vue
rename to src/views/copilot/efficiency/components/sub/std/CityName.vue
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/ProgressBar.vue
rename to src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/StdRateItem.vue
rename to src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
diff --git a/src/views/copilot/efficiency/options/chipOptions.js b/src/views/copilot/efficiency/options/chipOptions.js
new file mode 100644
index 0000000..bb27d43
--- /dev/null
+++ b/src/views/copilot/efficiency/options/chipOptions.js
@@ -0,0 +1,156 @@
+export default function ({
+  single = false,
+  color,
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) {
+  return {
+    grid: {
+      left: 0,
+      right: 0,
+      bottom: 0,
+      top: 0,
+      containLabel: true,
+    },
+    tooltip: {},
+    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: ["50%", "52%"],
+        emptyCircleStyle: {
+          color: "#040c5f45",
+        },
+      },
+      // 数据 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
+                : 0,
+
+            name: "未达成累计",
+            itemStyle: { color: "transparent" },
+            label: { show: false },
+          },
+        ],
+      },
+      // 数据 series2 - 2023累计
+      single
+        ? null
+        : {
+            type: "pie",
+            radius: ["55%", "70%"],
+            center: ["50%", "52%"],
+            avoidLabelOvervlap: false,
+            label: {
+              show: false,
+            },
+            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: "-",
+                itemStyle: { color: "transparent" },
+                label: { show: false },
+              },
+            ],
+          },
+    ],
+  };
+}

From bc3a68a9a730817e66c557492a16d18e503777cd Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 16:06:59 +0800
Subject: [PATCH 05/10] =?UTF-8?q?update=20=E8=8A=AF=E7=89=87OEE=E5=92=8C?=
 =?UTF-8?q?=E8=BD=AC=E5=8C=96=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/copilot/components/BarChartBase.vue | 257 ++++++++++++++++++
 .../copilot/efficiency/components/ChipOee.vue | 107 +++++++-
 .../efficiency/components/TransformRate.vue   | 107 +++++++-
 src/views/copilot/efficiency/index.vue        |   4 +-
 .../copilot/yield/components/FtoInvest.vue    |   2 +-
 5 files changed, 452 insertions(+), 25 deletions(-)
 create mode 100644 src/views/copilot/components/BarChartBase.vue

diff --git a/src/views/copilot/components/BarChartBase.vue b/src/views/copilot/components/BarChartBase.vue
new file mode 100644
index 0000000..ea5cfdf
--- /dev/null
+++ b/src/views/copilot/components/BarChartBase.vue
@@ -0,0 +1,257 @@
+<!-- 
+    filename: BarChartBase.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    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="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "./ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+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 {
+      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,
+          },
+        ],
+      },
+    };
+  },
+  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 || "";
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</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>
diff --git a/src/views/copilot/efficiency/components/ChipOee.vue b/src/views/copilot/efficiency/components/ChipOee.vue
index 5eb554e..5bc43db 100644
--- a/src/views/copilot/efficiency/components/ChipOee.vue
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -5,21 +5,106 @@
     description: 芯片OEE
 -->
 
-<template></template>
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="chipOEE"
+    class="chip-oee"
+  />
+</template>
 
 <script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 export default {
-    name: "ChipOEE",
-    components: {},
-    props: {},
-    data() {
-        return {}
+  name: "ChipOEE",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
     },
-    computed: {},
-    methods: {},
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
 }
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/efficiency/components/TransformRate.vue b/src/views/copilot/efficiency/components/TransformRate.vue
index e68597b..73ccb90 100644
--- a/src/views/copilot/efficiency/components/TransformRate.vue
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -5,21 +5,106 @@
     description: 转化效率
 -->
 
-<template></template>
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="chipOEE"
+    class="chip-oee"
+  />
+</template>
 
 <script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 export default {
-    name: "TransformRate",
-    components: {},
-    props: {},
-    data() {
-        return {}
+  name: "TransformRate",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
     },
-    computed: {},
-    methods: {},
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
 }
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 5303c81..c07ffbd 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -14,10 +14,10 @@
       <StdRate />
     </Container>
     <Container title="芯片OEE" icon="chip">
-      <ChipOee />
+      <ChipOee :period="period" />
     </Container>
     <Container title="转化效率" icon="cube">
-      <TransformRate />
+      <TransformRate :period="period" />
     </Container>
   </div>
 </template>
diff --git a/src/views/copilot/yield/components/FtoInvest.vue b/src/views/copilot/yield/components/FtoInvest.vue
index b41bd1b..c56adce 100644
--- a/src/views/copilot/yield/components/FtoInvest.vue
+++ b/src/views/copilot/yield/components/FtoInvest.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./sub/bar/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 
 export default {
   name: "FtoInvest",

From 646eb9c27063ba57a56df95d48cb6455bcef99c1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 17:00:53 +0800
Subject: [PATCH 06/10] =?UTF-8?q?update=20=E7=BB=BC=E5=90=88=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     |   4 +-
 .../copilot/components/CopilotHeader.vue      |   2 +-
 src/views/copilot/container.vue               |   2 +-
 .../copilot/energy/components/ElecCost.vue    |  30 ++
 .../copilot/energy/components/NatGas.vue      |  30 ++
 .../energy/components/StockMonitor.vue        |  30 ++
 .../copilot/energy/components/WaterCost.vue   |  30 ++
 src/views/copilot/energy/index.vue            |  71 ++++-
 .../copilot/yield/components/ChipInvest.vue   |   2 +-
 .../yield/components/sub/bar/BarChartBase.vue | 257 ------------------
 10 files changed, 190 insertions(+), 268 deletions(-)
 create mode 100644 src/views/copilot/energy/components/ElecCost.vue
 create mode 100644 src/views/copilot/energy/components/NatGas.vue
 create mode 100644 src/views/copilot/energy/components/StockMonitor.vue
 create mode 100644 src/views/copilot/energy/components/WaterCost.vue
 delete mode 100644 src/views/copilot/yield/components/sub/bar/BarChartBase.vue

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index ca92d85..fc0d0bf 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -64,9 +64,11 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
+    if (source == 'comprehensive') return;
+    
     const fetcher = {
       yield: getCopilotYield,
-      energy: getCopilotEnergy,
+      comprehensive: getCopilotEnergy,
       efficiency: getCopilotEfficiency,
     }[source];
     // 获取产量数据
diff --git a/src/views/copilot/components/CopilotHeader.vue b/src/views/copilot/components/CopilotHeader.vue
index 8ee26cf..40ced8d 100644
--- a/src/views/copilot/components/CopilotHeader.vue
+++ b/src/views/copilot/components/CopilotHeader.vue
@@ -9,7 +9,7 @@
   <div class="copilot-header">
     <section class="menu">
       <CopilotButton
-        v-for="i in ['产量', '效率', '能源']"
+        v-for="i in ['产量', '效率', '综合']"
         :key="i"
         :label="i"
         :active="i === active"
diff --git a/src/views/copilot/container.vue b/src/views/copilot/container.vue
index 2bb12b8..4dd3478 100644
--- a/src/views/copilot/container.vue
+++ b/src/views/copilot/container.vue
@@ -15,7 +15,7 @@
     />
 
     <YieldCopilot v-if="page == '产量'" :period="period" />
-    <EnergyCopilot v-if="page == '能源'" :period="period" />
+    <EnergyCopilot v-if="page == '综合'" :period="period" />
     <EfficiencyCopilot v-if="page == '效率'" :period="period" />
 
     <div class="copilot-footer">© 中建材智能自动化研究院有限公司</div>
diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue
new file mode 100644
index 0000000..9e4152a
--- /dev/null
+++ b/src/views/copilot/energy/components/ElecCost.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: ElecCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:01
+    description: 电能耗
+-->
+
+<template>
+  <div class="elec-cost">elec cost</div>
+</template>
+
+<script>
+export default {
+  name: "ElecCost",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.elec-cost {
+  background: #cc03;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/NatGas.vue b/src/views/copilot/energy/components/NatGas.vue
new file mode 100644
index 0000000..2c0ff1d
--- /dev/null
+++ b/src/views/copilot/energy/components/NatGas.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: NatGas.vue
+    author: liubin
+    date: 2024-04-29 16:36:27
+    description: 天然气能耗
+-->
+
+<template>
+  <div class="nat-gas">nat-gas</div>
+</template>
+
+<script>
+export default {
+  name: "NatGas",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.nat-gas {
+  background: #31f2;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/StockMonitor.vue b/src/views/copilot/energy/components/StockMonitor.vue
new file mode 100644
index 0000000..ea4ce6c
--- /dev/null
+++ b/src/views/copilot/energy/components/StockMonitor.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: StockMonitor.vue
+    author: liubin
+    date: 2024-04-29 16:35:40
+    description: 仓库监控·当前
+-->
+
+<template>
+  <div class="stock-monitor">仓库监控</div>
+</template>
+
+<script>
+export default {
+  name: "StockMonitor",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.stock-monitor {
+  background: #fff2;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/WaterCost.vue b/src/views/copilot/energy/components/WaterCost.vue
new file mode 100644
index 0000000..dab648f
--- /dev/null
+++ b/src/views/copilot/energy/components/WaterCost.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: WaterCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:34
+    description: 水能耗
+-->
+
+<template>
+  <div class="water-cost">water cost</div>
+</template>
+
+<script>
+export default {
+  name: "WaterCost",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.water-cost {
+  background: #f002;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/index.vue b/src/views/copilot/energy/index.vue
index 5e4ae78..21bc61f 100644
--- a/src/views/copilot/energy/index.vue
+++ b/src/views/copilot/energy/index.vue
@@ -2,24 +2,81 @@
     filename: index.vue
     author: liubin
     date: 2024-04-16 14:40:15
-    description: 能源驾驶舱
+    description: 综合驾驶舱
 -->
 
 <template>
-  <div class="energy-copilot">能源驾驶舱</div>
+  <div class="energy-copilot">
+    <Container title="仓库监控·当前" icon="chip2">
+      <StockMonitorVue />
+    </Container>
+    <Container title="天然气能耗" icon="std">
+      <NatGasVue />
+    </Container>
+    <Container title="电能耗" icon="chip">
+      <ElecCostVue :period="period" />
+    </Container>
+    <Container title="水能耗" icon="cube">
+      <WaterCostVue :period="period" />
+    </Container>
+  </div>
 </template>
 
 <script>
+import Container from "@/views/copilot/components/Container.vue";
+import StockMonitorVue from "./components/StockMonitor.vue";
+import ElecCostVue from "./components/ElecCost.vue";
+import NatGasVue from "./components/NatGas.vue";
+import WaterCostVue from "./components/WaterCost.vue";
+
 export default {
   name: "EnergyCopilot",
-  components: {},
-  props: {},
+  components: {
+    Container,
+    StockMonitorVue,
+    ElecCostVue,
+    NatGasVue,
+    WaterCostVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {};
   },
-  computed: {},
-  methods: {},
+  watch: {
+    period: {
+      handler(val) {
+        val && this.fetchData(val);
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    fetchData(period = "日") {
+      console.log(`效率驾驶舱，获取${period}数据`);
+      this.$store.dispatch("copilot/initCopilot", {
+        period,
+        source: "comprehensive",
+      });
+    },
+  },
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.energy-copilot {
+  flex: 1;
+  display: grid;
+  gap: 16px;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+}
+
+.energy-copilot > div {
+  height: 100%;
+}
+</style>
diff --git a/src/views/copilot/yield/components/ChipInvest.vue b/src/views/copilot/yield/components/ChipInvest.vue
index 9fea832..52e8938 100644
--- a/src/views/copilot/yield/components/ChipInvest.vue
+++ b/src/views/copilot/yield/components/ChipInvest.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./sub/bar/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 
 export default {
   name: "ChipInvest",
diff --git a/src/views/copilot/yield/components/sub/bar/BarChartBase.vue b/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
deleted file mode 100644
index 5369183..0000000
--- a/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<!-- 
-    filename: BarChartBase.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    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="chart"
-      style="max-width: 50vw"
-      :style="{ height: vHeight + 'vh' }"
-    ></div>
-  </chart-container>
-</template>
-
-<script>
-import screenfull from "screenfull";
-import ChartContainer from "../../../../components/ChartContainer.vue";
-import chartMixin from "@/mixins/chart.js";
-
-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 {
-      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,
-          },
-        ],
-      },
-    };
-  },
-  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 || "";
-      this.actualOptions = actualOptions;
-      this.initOptions(actualOptions);
-    },
-  },
-  mounted() {
-    this.actualOptions = this.options;
-    this.initOptions(this.options);
-
-    if (screenfull.isEnabled) {
-      screenfull.on("change", () => {
-        this.isFullscreen = screenfull.isFullscreen;
-      });
-    }
-  },
-};
-</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>

From ea63cb5730f3188974f7556b3b3835a780ac3146 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Tue, 30 Apr 2024 09:35:44 +0800
Subject: [PATCH 07/10] =?UTF-8?q?update=20=E7=BB=BC=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/copilot/components/Container.vue    |   8 +-
 .../copilot/components/LineChartBase.vue      | 296 ++++++++++++++++++
 .../copilot/energy/components/ElecCost.vue    | 112 ++++++-
 .../copilot/energy/components/NatGas.vue      | 101 +++++-
 .../energy/components/StockMonitor.vue        |  41 ++-
 .../copilot/energy/components/WaterCost.vue   | 112 ++++++-
 .../components/sub/monitor/MonitorItem.vue    | 139 ++++++++
 src/views/copilot/energy/index.vue            |   4 +-
 .../copilot/energy/options/monitorOptions.js  | 156 +++++++++
 9 files changed, 940 insertions(+), 29 deletions(-)
 create mode 100644 src/views/copilot/components/LineChartBase.vue
 create mode 100644 src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
 create mode 100644 src/views/copilot/energy/options/monitorOptions.js

diff --git a/src/views/copilot/components/Container.vue b/src/views/copilot/components/Container.vue
index 1e59c2c..58af7bc 100644
--- a/src/views/copilot/components/Container.vue
+++ b/src/views/copilot/components/Container.vue
@@ -9,6 +9,7 @@
   <div class="copilot-container">
     <!-- refresh btn  -->
     <button
+      v-if="0"
       style="
         appearance: none;
         outline: none;
@@ -109,7 +110,12 @@ export default {
     border-radius: 2px;
     top: 0%;
     left: 0;
-    background: radial-gradient(circle at center , #024798 2%, #024798 30%, transparent);
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 30%,
+      transparent
+    );
     z-index: 1;
   }
 
diff --git a/src/views/copilot/components/LineChartBase.vue b/src/views/copilot/components/LineChartBase.vue
new file mode 100644
index 0000000..c4eca81
--- /dev/null
+++ b/src/views/copilot/components/LineChartBase.vue
@@ -0,0 +1,296 @@
+<!-- 
+    filename: LineChartBase.vue
+    author: liubin
+    date: 2024-04-30 08:59:28
+    description: 
+-->
+
+<template>
+  <chart-container class="line-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="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "./ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "LineChartBase",
+  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 {
+      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,
+          },
+        ],
+      },
+    };
+  },
+  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 || "";
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.line-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.432vw;
+      height: 0.432vw;
+      border-radius: 100%;
+      margin-right: 0.4vw;
+    }
+
+    &::after {
+      content: "";
+      display: inline-block;
+      width: 1vw;
+      height: 0.125vw;
+      position: absolute;
+      top: 54%;
+      left: -15%;
+      transform: translateY(-50%);
+      border-radius: 100;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):after,
+  .legend-item:nth-child(1):before {
+    background-color: #fad162;
+  }
+
+  .legend-item:nth-child(2):after,
+  .legend-item:nth-child(2):before {
+    background-color: #2160f3;
+  }
+
+  .legend-item:nth-child(3):after,
+  .legend-item:nth-child(3):before {
+    background-color: #13dbf3;
+  }
+
+  .legend-item:nth-child(4):after,
+  .legend-item:nth-child(4):before {
+    background-color: #88ca67;
+  }
+
+  .legend-item:nth-child(5):after,
+  .legend-item:nth-child(5):before {
+    background-color: #5c97fc;
+  }
+
+  .legend-item:nth-child(6):after,
+  .legend-item:nth-child(6):before {
+    background-color: #f48900;
+  }
+
+  .legend-item:nth-child(7):after,
+  .legend-item:nth-child(7):before {
+    background-color: #776bf0;
+  }
+}
+</style>
diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue
index 9e4152a..b6c7a17 100644
--- a/src/views/copilot/energy/components/ElecCost.vue
+++ b/src/views/copilot/energy/components/ElecCost.vue
@@ -6,25 +6,123 @@
 -->
 
 <template>
-  <div class="elec-cost">elec cost</div>
+  <LineChartBase
+    v-if="1"
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="elecCost"
+    class="elec-cost"
+  />
+  <BarChartBase
+    v-else
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="elecCost"
+    class="elec-cost"
+  />
 </template>
 
 <script>
+import BarChartBaseVue from "@/views/copilot/components/BarChartBase.vue";
+import LineChartBaseVue from "@/views/copilot/components/LineChartBase.vue";
+
 export default {
   name: "ElecCost",
-  components: {},
-  props: {},
-  data() {
-    return {};
+  components: {
+    BarChartBase: BarChartBaseVue,
+    LineChartBase: LineChartBaseVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
   },
-  computed: {},
   methods: {},
 };
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
+}
 </script>
 
 <style scoped lang="scss">
 .elec-cost {
-  background: #cc03;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/NatGas.vue b/src/views/copilot/energy/components/NatGas.vue
index 2c0ff1d..eb9febd 100644
--- a/src/views/copilot/energy/components/NatGas.vue
+++ b/src/views/copilot/energy/components/NatGas.vue
@@ -6,25 +6,110 @@
 -->
 
 <template>
-  <div class="nat-gas">nat-gas</div>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="nat-gas"
+    class="nat-gas"
+  />
 </template>
 
 <script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+
 export default {
-  name: "NatGas",
-  components: {},
-  props: {},
-  data() {
-    return {};
+  name: "NatGasCost",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
   },
-  computed: {},
   methods: {},
 };
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
+}
 </script>
 
 <style scoped lang="scss">
 .nat-gas {
-  background: #31f2;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/StockMonitor.vue b/src/views/copilot/energy/components/StockMonitor.vue
index ea4ce6c..d5ada52 100644
--- a/src/views/copilot/energy/components/StockMonitor.vue
+++ b/src/views/copilot/energy/components/StockMonitor.vue
@@ -6,16 +6,36 @@
 -->
 
 <template>
-  <div class="stock-monitor">仓库监控</div>
+  <div class="stock-monitor">
+    <MonitorItem
+      :cities="['成都', '邯郸', '株洲', '瑞昌', '佳木斯']"
+      :legendList="dhgList"
+    />
+    <MonitorItem :cities="['凯盛光伏', '蚌埠兴科']" :legendList="otherList" />
+  </div>
 </template>
 
 <script>
+import MonitorItemVue from "./sub/monitor/MonitorItem.vue";
+
 export default {
   name: "StockMonitor",
-  components: {},
+  components: { MonitorItem: MonitorItemVue },
   props: {},
   data() {
-    return {};
+    return {
+      dhgList: [
+        { name: "总库存", value: "1000" },
+        { name: "已用库存", value: "500" },
+        { name: "剩余库存", value: "500" },
+      ],
+      otherList: [
+        { name: "分类1", value: "1000" },
+        { name: "分类2", value: "1000" },
+        { name: "分类3", value: "1000" },
+        { name: "分类4", value: "1000" },
+      ],
+    };
   },
   computed: {},
   methods: {},
@@ -24,7 +44,20 @@ export default {
 
 <style scoped lang="scss">
 .stock-monitor {
-  background: #fff2;
   flex: 1;
+  display: flex;
+  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);
+  }
 }
 </style>
diff --git a/src/views/copilot/energy/components/WaterCost.vue b/src/views/copilot/energy/components/WaterCost.vue
index dab648f..0adfd9d 100644
--- a/src/views/copilot/energy/components/WaterCost.vue
+++ b/src/views/copilot/energy/components/WaterCost.vue
@@ -6,25 +6,123 @@
 -->
 
 <template>
-  <div class="water-cost">water cost</div>
+  <LineChartBase
+    v-if="0"
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="waterCost"
+    class="water-cost"
+  />
+  <BarChartBase
+    v-else
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="waterCost"
+    class="water-cost"
+  />
 </template>
 
 <script>
+import BarChartBaseVue from "@/views/copilot/components/BarChartBase.vue";
+import LineChartBaseVue from "@/views/copilot/components/LineChartBase.vue";
+
 export default {
   name: "WaterCost",
-  components: {},
-  props: {},
-  data() {
-    return {};
+  components: {
+    BarChartBase: BarChartBaseVue,
+    LineChartBase: LineChartBaseVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
   },
-  computed: {},
   methods: {},
 };
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
+}
 </script>
 
 <style scoped lang="scss">
 .water-cost {
-  background: #f002;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue b/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
new file mode 100644
index 0000000..10df11b
--- /dev/null
+++ b/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
@@ -0,0 +1,139 @@
+<!-- 
+    filename: ChipRateItem.vue
+    author: liubin
+    date: 2024-04-29 14:25:18
+    description: 
+-->
+
+<template>
+  <div class="monitor-item">
+    <div class="cities">
+      <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
+    </div>
+    <div class="chart" ref="chart"></div>
+    <div class="legend" v-if="1">
+      <div class="legend-item" v-for="lgd in legendList" :key="lgd.name">
+        <span class="legend-item__label">{{ lgd.name }}</span>
+        <span class="legend-item__value">{{ lgd.value }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CopilotButtons from "@/views/copilot/components/select.vue";
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/monitorOptions.js";
+
+export default {
+  name: "ChipRateItem",
+  components: { CopilotButtons },
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    cities: {
+      type: Array,
+      default: () => [],
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    color: {
+      type: Number,
+      default: 1,
+    },
+  },
+  data() {
+    return {
+      period: "月",
+      valueTuple: [100, 100, 200],
+    };
+  },
+  computed: {
+    options() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue =
+          vt[0] != null && vt[2] != null && vt[2] !== 0
+            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+
+      return getOptions({
+        single: true,
+        color: this.color == 1 ? "#4CF0E8" : "#1065ff",
+        titleValue,
+        subtitle,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
+      });
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  methods: {
+    handleCityUpdate() {},
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.monitor-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  backdrop-filter: blur(24px);
+
+  .cities {
+    height: 40px;
+  }
+
+  .chart {
+    align-self: stretch;
+    height: 280px;
+  }
+
+  .legend {
+    height: 80px;
+    display: flex;
+    gap: 40px;
+    justify-content: space-around;
+  }
+
+  .legend-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 3px;
+
+    &:first-child {
+      .legend-item__value {
+        color: #0e61f5;
+      }
+    }
+
+    &:nth-child(2) {
+      .legend-item__value {
+        color: #0fd5d1;
+      }
+    }
+  }
+
+  .legend-item__value {
+    font-size: 24px;
+    font-weight: 600;
+  }
+}
+</style>
+l
diff --git a/src/views/copilot/energy/index.vue b/src/views/copilot/energy/index.vue
index 21bc61f..e92d39b 100644
--- a/src/views/copilot/energy/index.vue
+++ b/src/views/copilot/energy/index.vue
@@ -8,10 +8,10 @@
 <template>
   <div class="energy-copilot">
     <Container title="仓库监控·当前" icon="chip2">
-      <StockMonitorVue />
+      <StockMonitorVue :period="period" />
     </Container>
     <Container title="天然气能耗" icon="std">
-      <NatGasVue />
+      <NatGasVue :period="period" />
     </Container>
     <Container title="电能耗" icon="chip">
       <ElecCostVue :period="period" />
diff --git a/src/views/copilot/energy/options/monitorOptions.js b/src/views/copilot/energy/options/monitorOptions.js
new file mode 100644
index 0000000..a503461
--- /dev/null
+++ b/src/views/copilot/energy/options/monitorOptions.js
@@ -0,0 +1,156 @@
+export default function ({
+  single = false,
+  color,
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) {
+  return {
+    grid: {
+      left: 0,
+      right: 0,
+      bottom: 0,
+      top: 0,
+      containLabel: true,
+    },
+    tooltip: {},
+    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: ["50%", "52%"],
+        emptyCircleStyle: {
+          color: "#040c5f45",
+        },
+      },
+      // 数据 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
+                : 0,
+
+            name: "未达成累计",
+            itemStyle: { color: "transparent" },
+            label: { show: false },
+          },
+        ],
+      },
+      // 数据 series2 - 2023累计
+      single
+        ? null
+        : {
+            type: "pie",
+            radius: ["55%", "70%"],
+            center: ["50%", "52%"],
+            avoidLabelOvervlap: false,
+            label: {
+              show: false,
+            },
+            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: "-",
+                itemStyle: { color: "transparent" },
+                label: { show: false },
+              },
+            ],
+          },
+    ],
+  };
+}

From fdf71145e85334f16a7f730861d005d2a2c35ef7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Tue, 30 Apr 2024 16:22:15 +0800
Subject: [PATCH 08/10] 1

---
 src/store/modules/home.js                     | 196 ++++++++++++++++--
 .../efficiency/components/ChipRate.vue        |  19 +-
 .../components/sub/chip/ChipRateItem.vue      | 105 +++++++---
 src/views/copilot/efficiency/index.vue        |   4 +-
 .../copilot/efficiency/options/chipOptions.js |  17 +-
 5 files changed, 291 insertions(+), 50 deletions(-)

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index fc0d0bf..ad7a7bd 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -15,7 +15,25 @@ const state = {
     /* 能源驾驶舱 */
     energy: {},
     /* 效率驾驶舱 */
-    efficiency: {},
+    efficiency: {
+      chipOee: {
+        current: [],
+        previous: [],
+      },
+      transformRate: {
+        current: [],
+        previous: [],
+      },
+      chipRate: {
+        target: [],
+        current: [],
+        previous: [],
+      },
+      stdRate: {
+        target: [],
+        current: [],
+      },
+    },
   },
   home: {
     /** 主页状态 */
@@ -48,7 +66,10 @@ const mutations = {
         state.copilot.energy = payload.data;
         break;
       case "efficiency":
-        state.copilot.efficiency = payload.data;
+        state.copilot.efficiency.chipOee = payload.chipOee;
+        state.copilot.efficiency.transformRate = payload.transformRate;
+        state.copilot.efficiency.chipRate = payload.chipRate;
+        state.copilot.efficiency.stdRate = payload.stdRate;
         break;
     }
   },
@@ -64,13 +85,18 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
-    if (source == 'comprehensive') return;
-    
+    if (source == "comprehensive") return;
+
     const fetcher = {
       yield: getCopilotYield,
       comprehensive: getCopilotEnergy,
       efficiency: getCopilotEfficiency,
     }[source];
+    const handler = {
+      yield: splitCurrentAndPrevious,
+      comprehensive: () => null,
+      efficiency: splitCurrentAndPreviousA,
+    }[source];
     // 获取产量数据
     let { data: factoryList, type } = await fetcher(period);
     let targetList = null;
@@ -79,7 +105,7 @@ const actions = {
       let { data } = await fetcher(period, true);
       targetList = data;
     }
-    const payload = splitCurrentAndPrevious(factoryList, targetList);
+    const payload = handler(factoryList, targetList);
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -91,8 +117,99 @@ export default {
   actions,
 };
 
+function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
+  // 初始数据
+  const { chipOee, transformRate, chipRate, stdRate } = initA();
+  factoryListResponse = [
+    {
+      factory: 0,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 1,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 2,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 3,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+  ];
+  if (factoryListResponse) {
+    for (const factory of factoryListResponse) {
+      const fId = getFactoryId(factory);
+      // 获取目标值
+      if (targetListResponse) {
+        const {
+          chipYieldRate,
+          componentYieldRate,
+          chipOee,
+          componentConversionEfficiency,
+        } = getFactoryTargetValueA(targetListResponse, fId);
+        stdRate.target[fId] = chipYieldRate;
+        chipRate.target[fId] = componentYieldRate;
+      }
+      // 芯片OEE
+      chipOee.current[fId] = factory.oee || random_default();
+      chipOee.previous[fId] = factory.previousYearOee || random_default();
+      // 转化效率
+      transformRate.current[fId] =
+        factory.componentConversionEfficiency || random_default();
+      transformRate.previous[fId] =
+        factory.previousYearComponentConversionEfficiency || random_default();
+      // 芯片良率 与 标准组件良率
+      if (![0, 1].includes(factory.glassType)) continue;
+      const _t = [chipRate, stdRate][factory.glassType];
+      _t.current[fId] = factory.yieldRate || random_default();
+      _t.previous[fId] = factory.previousYearYieldRate || random_default();
+    }
+
+    return {
+      chipOee,
+      transformRate,
+      chipRate,
+      stdRate,
+    };
+  }
+}
+
 function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
-  // 初始数据 
+  // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
@@ -152,8 +269,57 @@ function getFactoryTargetValue(targetList, factoryId) {
 }
 
 /**
- * 
- * @returns 初始化状态值
+ * 获取 芯片良率目标值 和 标准组件良率目标值
+ * @param {*} targetList 目标值列表
+ * @param {*} factoryId 工厂ID
+ * @returns
+ */
+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(),
+    };
+  }
+  return {
+    chipYieldRate: random_default(),
+    componentYieldRate: random_default(),
+  };
+}
+
+/**
+ *
+ * @returns 初始化 效率模块里 初始状态值
+ */
+function initA() {
+  const t_ = {
+    current: Array(7).fill(0),
+    previous: Array(7).fill(0),
+  };
+  // 芯片OEE
+  const chipOee = deepClone(t_);
+  // 转化效率
+  const transformRate = deepClone(t_);
+  // 标准组件良率
+  const stdRate = {
+    ...deepClone(t_),
+    target: Array(7).fill(0),
+  };
+  // 芯片良率
+  const chipRate = deepClone(stdRate);
+
+  return {
+    chipOee,
+    transformRate,
+    chipRate,
+    stdRate,
+  };
+}
+
+/**
+ *
+ * @returns 初始化 产量模块里 初始状态值
  */
 function init() {
   const t_ = {
@@ -183,11 +349,11 @@ function init() {
   };
 }
 
-function random_default() {
-  return 0;
-  let a = Math.floor(Math.random() * 1000);
-  while (a < 600) {
-    a = Math.floor(Math.random() * 1000);
+function random_default(min = 0, max = 1) {
+  // return 0;
+  let a = Math.floor(Math.random() * max);
+  while (a < min) {
+    a = Math.floor(Math.random() * max);
   }
   return a;
 }
@@ -256,10 +422,10 @@ async function doFetch(copilot_module = "yield", fetch_target, params) {
 }
 
 /**
- * 
+ *
  * @param {*} period 日周月年1,2,3,4
  * @param {*} target 是否获取目标数据
- * @returns 
+ * @returns
  */
 function getCopilotYield(period, target = false) {
   return getCopilotData("yield", period, target);
diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
index 8d71f73..425ea68 100644
--- a/src/views/copilot/efficiency/components/ChipRate.vue
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -7,8 +7,16 @@
 
 <template>
   <div class="chip-rate">
-    <ChipRateItem :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
-    <ChipRateItem :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+    <ChipRateItem
+      :period="period"
+      :cities="['成都', '邯郸', '株洲', '瑞昌']"
+      :color="1"
+    />
+    <ChipRateItem
+      :period="period"
+      :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']"
+      :color="2"
+    />
   </div>
 </template>
 
@@ -17,7 +25,12 @@ import ChipRateItemVue from "./sub/chip/ChipRateItem.vue";
 export default {
   name: "ChipRate",
   components: { ChipRateItem: ChipRateItemVue },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {};
   },
diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
index f3bc1d1..69df63e 100644
--- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -11,14 +11,10 @@
       <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
     </div>
     <div class="chart" ref="chart"></div>
-    <div class="legend" v-if="1">
-      <div class="legend-item">
-        <span class="legend-item__value">20%</span>
-        <span class="legend-item__label">2023年累计</span>
-      </div>
-      <div class="legend-item">
-        <span class="legend-item__value">20%</span>
-        <span class="legend-item__label">2024年累计</span>
+    <div class="legend" v-if="period == '月' || period == '年'">
+      <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>
       </div>
     </div>
   </div>
@@ -29,6 +25,7 @@ import CopilotButtons from "@/views/copilot/components/select.vue";
 import chartMixin from "@/mixins/chart.js";
 import fullscreenMixin from "@/mixins/fullscreen.js";
 import getOptions from "../../../options/chipOptions.js";
+import { mapGetters } from "vuex";
 
 export default {
   name: "ChipRateItem",
@@ -43,44 +40,102 @@ export default {
       type: Number,
       default: 1,
     },
+    period: {
+      type: String,
+      default: "日",
+    },
   },
   data() {
     return {
-      period: "月",
-      valueTuple: [100, 100, 200],
+      factoryId: 0,
+      count: 1,
     };
   },
   computed: {
+    chipRate() {
+      return this.$store.getters.copilot.efficiency.chipRate;
+    },
+    valueTuple() {
+      const getter = this.chipRate;
+      if (this.period === "日" || this.period === "周") {
+        return [
+          getter.previous[this.factoryId],
+          getter.current[this.factoryId],
+          0,
+        ];
+      }
+      // [100, 200, 200]
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
     options() {
+      const single = this.period === "日" || this.period === "周";
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
       const vt = this.valueTuple;
-      let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-            : "0%",
-        subtitle =
-          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+      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%",
+        subtitle = {
+          日: "本日良率",
+          周: "本周良率",
+          月: `${month}月良率`,
+          年: `${year}良率`,
+        }[this.period];
 
-      return getOptions({
-        single: true,
+      const t = getOptions({
+        single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
-        previousSum: this.valueTuple[0],
-        currentSum: this.valueTuple[1],
-        targetSum: this.valueTuple[2],
+        previousSum: vt[0],
+        currentSum: vt[1],
+        targetSum: vt[2],
       });
+      return t;
+    },
+    legend() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      return [
+        {
+          label:
+            this.period == "月"
+              ? `${year - 1}年${month}月良率`
+              : `${year - 1}年良率`,
+          value: (this.valueTuple[0] * 100).toFixed(0) + "%",
+        },
+        {
+          label: this.period == "月" ? `${month}月良率` : `${year}年良率`,
+          value:  (this.valueTuple[1] * 100).toFixed(0) + "%",
+        },
+      ];
     },
   },
   mounted() {
     this.initOptions(this.options);
   },
-  methods: {
-    handleCityUpdate() {},
-    fullscreenCallback(isFullscreen) {
-      console.log("isFullscreen--->", isFullscreen);
+  watch: {
+    period() {
+      this.initOptions(this.options);
     },
+    factoryId() {
+      this.initOptions(this.options);
+    },
+    chipRate() {
+      this.initOptions(this.options);
+    },
+  },
+  methods: {
+    handleCityUpdate(id) {
+      this.factoryId = id;
+    },
+    fullscreenCallback(isFullscreen) {},
   },
 };
 </script>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index c07ffbd..a87fd3c 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -8,10 +8,10 @@
 <template>
   <div class="efficiency-copilot">
     <Container title="芯片良率" icon="chip2">
-      <ChipRate />
+      <ChipRate :period="period" />
     </Container>
     <Container title="标准组件良率" icon="std">
-      <StdRate />
+      <StdRate :period="period" />
     </Container>
     <Container title="芯片OEE" icon="chip">
       <ChipOee :period="period" />
diff --git a/src/views/copilot/efficiency/options/chipOptions.js b/src/views/copilot/efficiency/options/chipOptions.js
index bb27d43..2c11b26 100644
--- a/src/views/copilot/efficiency/options/chipOptions.js
+++ b/src/views/copilot/efficiency/options/chipOptions.js
@@ -15,7 +15,11 @@ export default function ({
       top: 0,
       containLabel: true,
     },
-    tooltip: {},
+    tooltip: {
+      // formatter(params) {
+      //   return `${params.name}: ${(params.value * 100).toFixed(0)}%`;
+      // }
+    },
     title: {
       text: titleValue,
       left: "49%",
@@ -60,7 +64,7 @@ export default function ({
         data: [
           {
             value: currentSum,
-            name: "当前累计产出",
+            name: "当前良率",
             selected: false,
             itemStyle: {
               borderJoin: "round",
@@ -93,9 +97,9 @@ export default function ({
                 ? currentSum == 0
                   ? 1
                   : 0
-                : 0,
+                : targetSum,
 
-            name: "未达成累计",
+            name: "未达成",
             itemStyle: { color: "transparent" },
             label: { show: false },
           },
@@ -118,7 +122,7 @@ export default function ({
             data: [
               {
                 value: previousSum,
-                name: "上期累计产出",
+                name: "上期良率",
                 selected: false,
                 itemStyle: {
                   borderJoin: "round",
@@ -146,6 +150,9 @@ export default function ({
                     ? 1
                     : 0,
                 name: "-",
+                formatter: {
+                  show: false
+                },
                 itemStyle: { color: "transparent" },
                 label: { show: false },
               },

From 6cf8eb70b48bb28d9e3360b26937216bac473f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 7 May 2024 10:23:38 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     |   8 +-
 src/views/copilot/efficiency/assets/icon.png  | Bin 0 -> 5165 bytes
 .../efficiency/components/BipvOutput.vue      |  38 +++
 .../efficiency/components/ChipInvest.vue      | 106 ++++++++
 .../efficiency/components/ChipOutput.vue      |  38 +++
 .../efficiency/components/FtoInvest.vue       | 108 ++++++++
 .../efficiency/components/StdOutput.vue       |  38 +++
 .../components/sub/bar/BarChartBase.vue       | 257 ++++++++++++++++++
 .../components/sub/city/CityData.vue          | 149 ++++++++++
 .../components/sub/city/CityItem.vue          |  59 ++++
 .../components/sub/city/CityName.vue          |  55 ++++
 .../components/sub/city/CityValue.vue         | 127 +++++++++
 .../components/sub/gradient/GradientText.vue  |  64 +++++
 .../components/sub/ring/DoubleRingChart.vue   | 221 +++++++++++++++
 .../components/sub/ring/DoubleRingWrapper.vue |  86 ++++++
 src/views/copilot/efficiency/index.vue        |  19 +-
 .../options/double-ring-chart-options.js      | 145 ++++++++++
 17 files changed, 1507 insertions(+), 11 deletions(-)
 create mode 100644 src/views/copilot/efficiency/assets/icon.png
 create mode 100644 src/views/copilot/efficiency/components/BipvOutput.vue
 create mode 100644 src/views/copilot/efficiency/components/ChipInvest.vue
 create mode 100644 src/views/copilot/efficiency/components/ChipOutput.vue
 create mode 100644 src/views/copilot/efficiency/components/FtoInvest.vue
 create mode 100644 src/views/copilot/efficiency/components/StdOutput.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/bar/BarChartBase.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/city/CityData.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/city/CityItem.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/city/CityName.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/city/CityValue.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/gradient/GradientText.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/ring/DoubleRingWrapper.vue
 create mode 100644 src/views/copilot/efficiency/options/double-ring-chart-options.js

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index ca92d85..5046842 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -90,7 +90,7 @@ export default {
 };
 
 function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
-  // 初始数据 
+  // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
@@ -150,7 +150,7 @@ function getFactoryTargetValue(targetList, factoryId) {
 }
 
 /**
- * 
+ *
  * @returns 初始化状态值
  */
 function init() {
@@ -254,10 +254,10 @@ async function doFetch(copilot_module = "yield", fetch_target, params) {
 }
 
 /**
- * 
+ *
  * @param {*} period 日周月年1,2,3,4
  * @param {*} target 是否获取目标数据
- * @returns 
+ * @returns
  */
 function getCopilotYield(period, target = false) {
   return getCopilotData("yield", period, target);
diff --git a/src/views/copilot/efficiency/assets/icon.png b/src/views/copilot/efficiency/assets/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..03c1a4cdea4f91a7d1cf0b62a3d8e06a0a97b81e
GIT binary patch
literal 5165
zcmYLtcQhPc)a^8#A$k~$65SvYhKOFHg~$)lTM$Hv-g_IJL>ml|NKrC~-s|X56TJqB
zZuI)edvAU3thLwP=d69#UH9H~?jI-iskSNwDHACG0H9D;Q_{O-wSOQc1OR{>f5S&^
z6NsI>mOKD}O(MIrB)H9;Yz@_4YH0!ZZ#6Lh0%QXGs{(H!17!YRtpel)fd5Y&1OP-k
z03iR*qkYT&BKa2o*8E=vVL<=uP{V-#zy4=EXD<J9OC+vpMsENB`g{KXRM+F$0|00Y
z)RpA*eSj0_;N;xrzC9;9S6E9$1&|<jsz?kwhEaioP%q{FAXUVrh0;^Tkv?R6b?#*K
zSmCoa_2MJSo>w!U#h$PjE2}0KsxV{|(-MymDzbB9*u&%$xJbCz9fMM~cABn&hURx0
z)&qC_Pv)CqOJ&4{9}oKu;V-1u8+V(Sc|9H~)EE+2Y8l$zjarJZ&H3`ZCUBWemcRR+
z!L^S|i%JB|hP+&*a{HSI{3c$HgWYN^XZ{46^DxiE9L;w=EoF*bG*&j@LL)8%m+A&e
z7c=*?l51gQNzo5LzteR@p~N*<4z*b>h5JoGHl<6IYqS?t9xtoN**cHj&>z$@WYMr?
z%1LC6SJqX@<Yks92+klI%{%m#0+s|L5Enz;Nik5l#ouKLz|!@qTHlDdi6fl<`Zej&
zHNK(YbDG$!KsRWqv3}9<2pf|eUYuz|<7KuY!~XOe9k<{P)yMl*K!K)%z+`n+Tp&R~
z#hw#;+f3YvN4d}NBi0d;R)M~AL;??w35{a-!gl@wK1eHiz$$*Fy8{wk{IqNomPb=&
zUwX6An%BFW%T=U+P_iP9OyjDp`TFAVbg;Ywc1@Us<RXR&8JX0ibA4KzI%CR9`$abM
zStgu5MRE?oSa}byV%k0yITo=_CQP5lb10Q!7U^V~cZkwXh~eeks~1sXZ%YV$Px;{q
zHgvnaO)eoIc`b-J?liP$@gAS~C$~aZIYU~IQtr5l$FFaMigATg1?_4XlM)0R_@(V)
z6|qPcdTQWjtg&daU($~|1^q9j1!f%-$742-Cq)*`xQ`+7uLz(CA6m12-qnRLY7r5#
z(Q7ht)C-@F(edPY;fwiP!S-NnD*PuAgwJR)uSHdrleMQDZM!Lv`K<do4V(G(E?8I^
z#SvJk!a1YmoXx~96nL;96~A@U_0dJveVbrG&PeS_M6&=0E!&N1T?Dg-U~8W8H#PYk
z9vRrKLI))^j3Zl0l9bwxWs5^ust{W?dO<&PH|L2~n#ufco`N$HDSq?{lcn+6I0Y~G
zt{=r^Fot8q-}0@Sok}JENE^5sX$Y1q2Ll6;{6EQeX7Hz7-ZEX=8pDx^#oi+0W6uTk
zloo%s%kvG4;$n+Mi%C<!i6zZdyJPO(o;=t*9Qme5_FosE@jJ3$h3|fq|2o}B&=;*c
zEQOv*$J{}`CfR)hqDY=54QZ?Qs)(i*MLE&ee~>oTWc4e08I7}qn2}Q9z#NcRP#4ll
zi<y0xDh_@9Sivh^@+aSsJt;+$KJ$4opM9W4Ri@Hk(DG4ctLGvp|6aiRAD_Fr-PD-B
zDbi+3Iv*775m>t0JwxRx(5p*`7dr5IrK$wxMt8num+F1J7(0Vq65&V(BbS-lh?zxU
z{v!dJa+ANB4zZ#AWHj8@ZUzMx9Bw+!AB{de-#u%a9i@2DBMP*s)cP#G6;zdtWGJuo
z=veHCv~shonx~fxSQVkehsWZ#TiuWFAa{6rO9^v84L{ZEJqt^p)7I>hyx^<y{DpY8
zY=AG=V?*=1v+Tf9M|7=hEv6PtOz1>96(Yh2$_ku|)|OeXE_be3Yt~8%wBAl=@vd1*
zM<+rYxQ^$Itdq(<@B{mvUC`@1UUz<GHgoVGA<lU<=e4o;BU%xk!uv)2;LG*KgM+0d
zOL8}XgBO&`t%DmSBoV4~!cI5uMG3wy6&#%meKp~J+35LsahX*2uf<-UC-~&oXjyd2
zjWB7HgjwFav<bAc?M0$41HW-NODZXR-rw&d`h{uZ@x<FmD~C{zj_1KPJt)*}%W}y>
z>cY{oJzNlKskHq^=V+&ThCTVW>y=$2zOZ#6?|TL^gxNsgh?xHLk3gG+9jhC3`vmE0
zY}Vtk;YRZZCqf6b+=qDrt0A?rsar~5CkmqxVVhCT4wn(6ky@p7j1VR+E#kA#4|E2B
z4{j<S2aq;eO5>%B`9eU9W8|2al~dkeQ*nK2yHJ7!(r!43=AwU2y~@Xpj7e4WdCIl#
z^hCvoz9XpUxB9R94ZoU#+gr7$wP8a3{}$QvPdy_IVPsDMx`-sKty4`n^%TGjLxB>R
zrXW^CTJ`^OY@r=7fT+_girpuA6y^nT_au%pYZVQ3CFpc4u}+eS-G0$cH|hQ+hE6Eb
z3iN6*pDPVY{Ko~RDD<05Qmj^@mR7PFraVvYOA@8JRu<=Ch-Cs8SBK}B%Lhp5VgR^r
zS1`|=YJ*7q9C1dE$XQM_AuAc9A|E2y-hRIu6m~E<s*~3N{+48VvGimS$H{DC!ma|N
z#t8Qy`xA5YkF8vn^%F3kq&b0YU!~w9>fzlUjnEq(P@ApjpMrg)doruFsZYV-ov}Ab
zBYK=!c2&Bss{C*a^UYSuw&w>eXAL`64i2Rat||tl-QfES9<igKGRTz}ckSmKl1M-m
z?zRv16@zs*vi6L~qSGCPXo?x;IDg%JW?2%VKm~E{Wuer}_iHOGh1#GwdETPNpa12B
zYtsSg$_*<w&-=!k%Te0$M@JnqW@oz-=DtU&U-SL<^U51d%$0~3CnIaUBDR)!2&(zf
zg;M2zk`377!#*erNFZ>8VtaU==JSoC-CB)J6W4dYAGSZRHX-2e+$S_v5QoP{UThRe
zzVY)P&c@q2Sx&U88$em4aZ);-F2E_p_ZrDieH(zy{>qmm*PH+j+VF(`5LatD!K}g?
zRf4)A+9Cb%U-LHe%Oz%OG3M6}%Ycl97U#$qBs}0jBob33<#M)Xt}`~gIaYGCNM~ol
z$z;^>Wf^VoEKfNgpD+u*qm?WT1!-oAuP|NZ-BfWq6TGE}aX&$yVU1gmR@!&Sx8~e^
zdc4f>`rsajoCy34C#5>*_L&q4MAWsK?UuH$T&TsMPWm6UC2u!dK1uiE5vpEIdTp}D
zHv);^gz4R$6D?%5DfdMI{=lWe_FVMw=gH4x8BWcwu0mTTq~ueiulI8SWFg>#aL<UZ
z!(ik5^_hr^NH{dbnS<)i-^ynXJ=3D;t}23?u4fP0)a{1r=vCYlc6q)>vhCy>OKXgs
zdUB&R4Tz2GK?6Y)9M&KXk&RO|$7~RF-%Hbxe6Jm!OPzNn8ERi--_nXRud-0l6-E%d
zPV~r8rRO?xGTLMVdo6fw+h?}UYohHrUI4XBFw#uD$5xGKuw@h*u7`l!#|k?cx@umn
z5^^J9_1<bxTuXOVm>UfTxce2Sh9y%=r|LMlFiugtAxL>B3;7%HBX~-IAC8^IMZlP%
z+_0ZAh6R(MhI~#z)WsN{FAq^VW~WIQkRN_rNVy<a{_Q`$xBXK#>f~n2V|3KQA>jw;
zk;JWtg?x!_(8up@D>tibv-E&#&#&6x7xPLYG7$DpNKB&zS3X3^qD^FgyS1J&PI;Cy
zvP?nJ3B~ZYg0IEsw_0^5`P~PuWAV~iTq*8#FoU6NzT8>`dVBFgHPB^(OQMRI<m@<_
z>xVJ?KGBoXx$p1PX72H#!yqdmzvzAR!CCr~*+jg@hgGvF`-JJ~=Byh;ux}JHu_Y4G
zdVCT;3@xRBbp?_SW%@QcPJYKa<1u1CrcE7V@1&KHzZKE4(2uDT*51;MoP9D8w`9&|
zUnf~blk5-TnP*Y~RlJ$R)Y(<=^qxoRd7m=ep>}}!0xjV{(=eTT|2~@=C+Sy04MEb~
zQpsBPl7hrBvrW6Lx()oN8fP96vpkL3ns<&#bnfKwa#`ecn)n3~sNbbp2od!1u?VXQ
zFNb&-dXJ3-H<IG5>0I&~V+k*I*lA0)I5pwO*5v%Ysi+A(5SLwXe2D5+<<JH=lr3NT
z)Z*_E*p7JL3)lZh4$i2Yd4ws#-i4!RRER<Z{qiakDR=Jk4@+a24PppD%aNp*5-6|8
zVG3_{%3U{7A6QmGkRJnaC$LNSTs_h?LPTEf5t*!Dj%4yiEr1O!pDca7M<C4Qs2ZO>
zwL!%Drq!LZa!A(g@9Lj>?|u1Hk%Lz2Wj&J~7V#nLpF>pMB@Ww}j7Uo*Nw5xULs-V9
zM9r9!w$n=}jpC--I!SssJuKT8S{|LHdkenMD>+1rJ-W8Kl98$dUkpC~(y{QT1#<}`
zIW^&GFgI{t%AR4g{%uG~OZv3Nxn9J2seSa!-0&!LxwE&%VLLv3ce3T@$Ih9o@hHMN
z%2S0M{F4F`!JLg+wH2YKiqX7bu5Lmvj<y<U=6xpT&Kc6gU=uf8hAia4kC#hBa_Cpz
zd19py@lFu?8o3>+bWGaJWn8qEiSeJD<A*FP48n{<LHf~AgvYX#OJ$`C7k}Ry->jH>
zk8j&-cfZ<a3P>&eyNwSu{3PX(4&$Xtg7<_t#b<jFmXg{;L&f<9!iE<fu27)L{ENOe
zh?sWu9t9nKpVN7L+Ib<1@3W@FbBC90?+IwrJ8=yc`@U26aO~)Si8dR2TN|=m&73k1
z&zqbM!;;#pu&Ps?jsB)=_85y8)4nNw$!g|Xbc2^YtNh9~F4gvan3+zVX~n<&L>Uc{
z>U}xxFf-~w>rr&Y%-VxGMOw|r>$XApK)qmwu25>&Q2(x3CH~#P_?S#qvB$;-bD2GJ
zjiGD1(kX;`PXp5e<^1njL)?snjJ(-KxQhx4c7ll+<F~rE=Ip(2t*R5aBb-0N(K9H#
zc^t0YNHSm?MiWcG0=FK0SSWznx#&u060`g5HPrvL<%&{g*1aRUo}HnKfu}9|qZ%R|
zMdO`vRgd&w!==UDBzMX@7>q6eUo<!V8D0q7ET1f2*MKxzT_93>0ysSpZ8mM&f0iS5
z0|Lo}bKLhc*rtoFoNHyPgKswT=UivB9BpIdh;h5yTSeYu%I^D(m5^7occpO6Y3(sd
z=GV{Ap2Xit{1bPkuT$8}g1WC#d)R_Z1T{N@vLpbZopNo<EJfc*+}j(612!icmtpf*
z=iE5_Cz}nb;P3G_=|mLnx_AomyUhu878`Y6t(eSaJrO0p-eb%qGh9x`qhGU5%kFLQ
zN)%{+ZnW%vLU)vWO>#*od_8)i{WC5}u#P#`yU;!i#3;B5I-89)EkS!6uo;T5ddpND
zm<_7abGb3J<|?L2=biPN&0so<pJYN{4D~;ZJ~{2)teGvDJ6O8z#LcV^nFNgq`8le}
z0&nlze|<t&a7Lf`3oFdfZK0jd{D)OFN=V0!03N~!BflJH`C(e7i6YQ)F+X$BL49PT
z?PdW{Bq0D5K`OP@!3P^J-~8fb;Md`t|B;s<Aaj1$gcp$5TQ3ik^}p0eApNd)(%Bm<
z+`K)eyZVZ)O#W#C_yi<PD;GwVTa;?`33%*0^#IO2rzjs!8&wIlh$i!DY|RbNqk%Wu
z*l}9ReAyvfjZ;)qeCx>;u->PJ&^Yj0<nX0g_JjD+S1c;nqSD{urJDti+R$_x*O;WZ
z#DTi_J5~!oUCl!^dVdQO{nc!`nAZty``&+aB2MiIX>k>uf0v89okB|%Ll_eVVJVCx
zqD(711b$dk1{nm^CP3O_{|{y*WbW+??GS5cqb&?`z{Y&<_IW+`+zK+5nW-}>Fluf>
zIwU-PeJ_5^PW2HMoP^8rT4Lnm7B}L&3z&AqIvI`=0cYO%vigenP&E9qS?T|Py_r_p
zms{R{S%4~qRIqf0k+uIq_z+ccp0m3>?y9bKB$s6AHDZF135Mx-(W|hiQF&P5mMSNo
z%UG5`<4|GRXcvWbI<*QCt}v3~lo-_VL}o@t`tKJB+Z*-%yrdyeH_AUc18Z%=;MI!E
zRLAF-^gSduLXfiooXAkJ0+}AsanWQBK6q_==tIwoh)W~Q_z<?ZdoJDObN_54!DTa<
zu_vM!PCQuu2zM-4{$cVd^9A&kvmA9#rQ9H_yEp4N%R9qWbD%OFwZysND<(^EsfR_r
z&Miq<F@o=kzrPa<Q9nQc9A_z-xs;>G=<^odFKhf%pN1Z6x4Bpn)rmACS5k_6$6h{@
zW6-qW<*h)FdjS~US?R&?Mvmabz?-Bw1?x<%ClZ}HR8rwKa}RyzLd;A6tEQSM@(fwk
z1-Ze`M*Dv4^Ck-~`*>7vk#9?Kb^-B#vsxcSrZ24!+39!Kdx=6r!H1U%x)t?8>)Z67
zj1(?^-fX_`JEI`Q-9$kLB?kGbGio^Zr96zIDxS1(;@{Q%ri&3D>{v)a&p^e5Rektk
z1UAUht$Vx~%{JP1Tba%rLV_FrEZCn;fqV}|`{tHWStBQjxYeML*F-Ry96JxEV}~rK
z)aoSG`&gLUnYTa?#}eDQP4FUK;|pHBiFZ0HtpiR9`3+ExTD|(XDYw{g4xz&vZ9*zY
zs2OC?RnF7ps;4-nMSuJ<XumJz3Ogu6Z9JusO~71)gmz1lk3RNbte>|`A^BC?V`GVq
z2((ij$o$zyv^no8{uV8FbC4xOeZZIF7TTC>aJ8jjW&(?YAnomE!er=UoD+X0TDyia
z_HwGkb<MIwk^4<*-BT8U#*EC}Ns@VGHvCs@yM_>5MB{Z3Pa7eMGRiH25Ah?Yq#59>
z*3Cx)sP&tLsx(g+g7(eWzI~9iIBkq_II2tfV^bc>OiJ(HOYZe4(C@Q2TPvxQEAyFQ
W*R65rJI{afH+5xgr7{JJu>S!L;;Q`s

literal 0
HcmV?d00001

diff --git a/src/views/copilot/efficiency/components/BipvOutput.vue b/src/views/copilot/efficiency/components/BipvOutput.vue
new file mode 100644
index 0000000..1f77c21
--- /dev/null
+++ b/src/views/copilot/efficiency/components/BipvOutput.vue
@@ -0,0 +1,38 @@
+<!-- 
+    filename: BipvOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="BIPV产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "BipvOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/ChipInvest.vue b/src/views/copilot/efficiency/components/ChipInvest.vue
new file mode 100644
index 0000000..9fea832
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipInvest.vue
@@ -0,0 +1,106 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ChipInvest"
+    class="chip-invest-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./sub/bar/BarChartBase.vue";
+
+export default {
+  name: "ChipInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      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" },
+          ];
+      }
+    },
+    series() {
+      const { chipInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = chipInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = chipInvest?.pervious;
+          dataList[1] = chipInvest?.current;
+      }
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
+}
+</script>
diff --git a/src/views/copilot/efficiency/components/ChipOutput.vue b/src/views/copilot/efficiency/components/ChipOutput.vue
new file mode 100644
index 0000000..9286c61
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipOutput.vue
@@ -0,0 +1,38 @@
+<!-- 
+    filename: ChipOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="芯片产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "ChipOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/FtoInvest.vue b/src/views/copilot/efficiency/components/FtoInvest.vue
new file mode 100644
index 0000000..b41bd1b
--- /dev/null
+++ b/src/views/copilot/efficiency/components/FtoInvest.vue
@@ -0,0 +1,108 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ftoInvest"
+    class="fto-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./sub/bar/BarChartBase.vue";
+
+export default {
+  name: "FtoInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      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" },
+          ];
+      }
+    },
+    series() {
+      const { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  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)),
+        },
+      ];
+}
+</script>
diff --git a/src/views/copilot/efficiency/components/StdOutput.vue b/src/views/copilot/efficiency/components/StdOutput.vue
new file mode 100644
index 0000000..ca0a8f2
--- /dev/null
+++ b/src/views/copilot/efficiency/components/StdOutput.vue
@@ -0,0 +1,38 @@
+<!-- 
+    filename: StdOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "StdOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartBase.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartBase.vue
new file mode 100644
index 0000000..5369183
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartBase.vue
@@ -0,0 +1,257 @@
+<!-- 
+    filename: BarChartBase.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    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="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "../../../../components/ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+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 {
+      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,
+          },
+        ],
+      },
+    };
+  },
+  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 || "";
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</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>
diff --git a/src/views/copilot/efficiency/components/sub/city/CityData.vue b/src/views/copilot/efficiency/components/sub/city/CityData.vue
new file mode 100644
index 0000000..dca4e9c
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/city/CityData.vue
@@ -0,0 +1,149 @@
+<!-- 
+    filename: CityData.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-data">
+    <div class="headquarter">
+      <div class="inner-shadow w-1"></div>
+      <div class="inner-shadow flex-1 flex">
+        <CityName value="凯盛光伏" />
+        <CityValue :value="headquarterValue" horizontal :period="period" />
+      </div>
+      <div class="inner-shadow w-1"></div>
+    </div>
+
+    <div class="city-item-container">
+      <CityItem
+        v-for="city in cities"
+        :key="city.name"
+        :location="city.name"
+        :value="city.value"
+        :period="period"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityItemVue from "./CityItem.vue";
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
+
+export default {
+  name: "CityData",
+  components: {
+    CityItem: CityItemVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
+  props: {
+    dataSource: {
+      type: String,
+      default: null,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    headquarterValue() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件产出":
+          getterName = "stdOutput";
+          break;
+        case "芯片产出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV产出":
+          getterName = "bipvOutput";
+          break;
+      }
+      return (
+        "" + (this.$store.getters.copilot.yield[getterName]?.current?.[5] ?? 0)
+      );
+    },
+    cities() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件产出":
+          getterName = "stdOutput";
+          break;
+        case "芯片产出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV产出":
+          getterName = "bipvOutput";
+          break;
+      }
+      const _cities = [
+        { name: "瑞昌", value: 0 },
+        { name: "邯郸", value: 0 },
+        { name: "株洲", value: 0 },
+        { name: "佳木斯", value: 0 },
+        { name: "成都", value: 0 },
+        { name: "凯盛光伏", value: 0 },
+        { name: "蚌埠兴科", value: 0 },
+      ];
+      this.$store.getters.copilot.yield[getterName]?.current?.forEach(
+        (v, idx) => {
+          _cities[idx].value = v ?? 0;
+        }
+      );
+      // 删掉凯盛光伏
+      _cities.splice(4, 1);
+      return _cities;
+    },
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-data {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.headquarter {
+  flex: 1;
+  display: flex;
+  gap: 8px;
+}
+
+.w-1 {
+  width: 70px;
+}
+
+.flex {
+  display: flex;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+
+.city-item-container {
+  flex: 3;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 8px;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/city/CityItem.vue b/src/views/copilot/efficiency/components/sub/city/CityItem.vue
new file mode 100644
index 0000000..9145f26
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/city/CityItem.vue
@@ -0,0 +1,59 @@
+<!-- 
+    filename: CityItem.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-item inner-shadow">
+    <CityName :value="location" />
+    <CityValue :value="value + ''" :period="period" />
+  </div>
+</template>
+
+<script>
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
+
+export default {
+  name: "CityItem",
+  components: {
+    GradientTextVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
+  props: {
+    location: {
+      type: String,
+      default: "",
+    },
+    value: {
+      type: Number,
+      default: 0,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-item {
+  display: flex;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/city/CityName.vue b/src/views/copilot/efficiency/components/sub/city/CityName.vue
new file mode 100644
index 0000000..bf3ffd1
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/city/CityName.vue
@@ -0,0 +1,55 @@
+<!-- 
+    filename: CityName.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-name">
+    <img :src="Icon" alt="city icon" />
+    <span>{{ value }}</span>
+  </div>
+</template>
+
+<script>
+import Icon from "../../../assets/icon.png";
+
+export default {
+  name: "CityName",
+  props: {
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return { Icon };
+  },
+};
+</script>
+
+<style scoped>
+.city-name {
+  min-width: 80px;
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 1;
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/city/CityValue.vue b/src/views/copilot/efficiency/components/sub/city/CityValue.vue
new file mode 100644
index 0000000..2521efc
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/city/CityValue.vue
@@ -0,0 +1,127 @@
+<!-- 
+    filename: CityValue.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-value" :class="[horizontal ? 'horizontal' : '']">
+    <span class="hint" :class="[horizontal ? 'horizontal' : '']">{{
+      period == "周" ? "本周产出" : "今日产出"
+    }}</span>
+    <span class="value" :class="[horizontal ? 'horizontal' : '']">{{
+      value | numberFilter
+    }}</span>
+    <!-- <GradientTextVue :text="value" :size="horizontal ? 32 : 26" /> -->
+  </div>
+</template>
+
+<script>
+import GradientTextVue from "../gradient/GradientText.vue";
+
+export default {
+  name: "CityValue",
+  components: { GradientTextVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+    horizontal: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped>
+.city-value {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 2;
+  position: relative;
+}
+
+.city-value.horizontal {
+  flex-direction: row;
+}
+
+.city-value::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1px;
+  height: 100%;
+  background: linear-gradient(
+    to bottom,
+    transparent 20%,
+    #fff 50%,
+    transparent 80%
+  );
+}
+
+span.hint {
+  margin: 0 0.77vw;
+  font-size: 0.77vw;
+  order: 2;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+span.hint.horizontal {
+  margin: 0 1.235vw;
+  width: 1.543vw;
+  order: 1;
+  font-size: 0.77vw;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+.value {
+  color: #4dd2fe;
+  text-align: center;
+  font-size: 1.132vw;
+  order: 1;
+}
+.value.horizontal {
+  text-align: left;
+  flex: 1;
+  font-size: 1.543vw;
+  order: 2;
+}
+
+svg,
+.value {
+  width: 100px;
+  order: 1;
+}
+
+.value.horizontal,
+svg.horizontal {
+  order: 2;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/gradient/GradientText.vue b/src/views/copilot/efficiency/components/sub/gradient/GradientText.vue
new file mode 100644
index 0000000..bb45881
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/gradient/GradientText.vue
@@ -0,0 +1,64 @@
+<!-- 
+    filename: GradientText.vue
+    author: liubin
+    date: 2024-04-24 16:33:25
+    description: 
+-->
+
+<template>
+  <svg :height="size + 8" width="100%">
+    <defs>
+      <linearGradient id="smoke-text" x1="0%" y1="0%" x2="0%" y2="100%">
+        <stop offset="0%" style="stop-color: #00fff4; stop-opacity: 1" />
+        <stop offset="100%" style="stop-color: #37bdfe; stop-opacity: 1" />
+      </linearGradient>
+    </defs>
+    <text
+      x="0"
+      :y="size"
+      fill="url(#smoke-text)"
+      :style="{
+        fontSize: `${size}px`,
+        letterSpacing: spacing || '2px',
+        fontFamily: 'Calibri, Verdana, sans-serif',
+      }"
+    >
+      {{ text | numberFilter }}
+    </text>
+  </svg>
+</template>
+
+<script>
+export default {
+  name: "GradientText",
+  components: {},
+  props: {
+    text: {
+      type: String,
+      default: "Test",
+    },
+    spacing: {
+      type: String,
+      default: "1px",
+    },
+    size: {
+      type: Number,
+      default: 24,
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue b/src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue
new file mode 100644
index 0000000..760946b
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue
@@ -0,0 +1,221 @@
+<!-- 
+    filename: DoubleRingChart.vue
+    author: liubin
+    date: 2024-04-17 11:01:55
+    description: 
+-->
+
+<template>
+  <div class="double-ring-chart">
+    <div ref="chart" class="double-ring-chart__container"></div>
+    <!-- style="{ height: vHeight + 'vh' }" -->
+    <div class="double-ring-chart__legend">
+      <div v-for="item in legendItems" :key="item.label" class="legend-item">
+        <span class="legend-item__label">{{ item.label }}</span>
+        <span class="legend-item__value">{{ item.value | numberFilter }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/double-ring-chart-options";
+
+export default {
+  name: "DoubleRingChart",
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 24,
+    },
+    factoryId: {
+      type: Number,
+      required: true,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+    dataSource: {
+      type: String,
+      default: null,
+    },
+  },
+  data() {
+    return {};
+  },
+  filters: {
+    numberFilter(val) {
+      if (!isNaN(val)) {
+        return (+val).toLocaleString();
+      }
+      return 0;
+    },
+  },
+  computed: {
+    dataSourceField() {
+      switch (this.dataSource) {
+        case "标准组件产出":
+          return "stdOutput";
+        case "芯片产出":
+          return "chipOutput";
+        case "BIPV产出":
+          return "bipvOutput";
+      }
+    },
+    valueTuple() {
+      // [previousValue, currentValue, sumValue?]
+      const getter = this.$store.getters.copilot.yield[this.dataSourceField];
+      if (this.period === "日" || this.period === "周") {
+        return [
+          getter.previous[this.factoryId],
+          getter.current[this.factoryId],
+        ];
+      }
+      // [100, 200, 200]
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
+
+    options() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue =
+          vt[0] != null && vt[2] != null && vt[2] !== 0
+            ? `${vt[1] / vt[2]}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+
+      return getOptions({
+        titleValue,
+        subtitle,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
+      });
+    },
+
+    legendItems() {
+      return calculateItems(this.period, this.valueTuple);
+    },
+  },
+  watch: {
+    legendItems() {
+      this.initOptions(this.options);
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  methods: {
+    // fullscreen mixin 需要的回调
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+
+function calculateItems(period, valueTuple) {
+  let items = [];
+  const today = new Date().getDate();
+  const month = new Date().getMonth() + 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;
+  }
+  return items;
+}
+</script>
+
+<style scoped>
+.double-ring-chart {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.double-ring-chart__container {
+  flex: 1;
+  height: 0;
+}
+
+.double-ring-chart__legend {
+  padding: 12px;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  gap: 32px;
+}
+
+.legend-item {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.legend-item__label {
+  position: relative;
+}
+
+.legend-item__label::before {
+  content: "";
+  position: absolute;
+  width: 12px;
+  height: 12px;
+  background: #ccc;
+  border-radius: 2px;
+  top: 6px;
+  left: -18px;
+}
+
+.legend-item:nth-child(1) .legend-item__label::before {
+  background: #12fff5;
+}
+.legend-item:nth-child(1) .legend-item__value {
+  color: #12fff5;
+}
+
+.legend-item:nth-child(2) .legend-item__label::before {
+  background: #0f65ff;
+}
+.legend-item:nth-child(2) .legend-item__value {
+  color: #0f65ff;
+}
+
+.legend-item:nth-child(3) .legend-item__label::before {
+  background: #003982;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/ring/DoubleRingWrapper.vue b/src/views/copilot/efficiency/components/sub/ring/DoubleRingWrapper.vue
new file mode 100644
index 0000000..d7348c1
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/ring/DoubleRingWrapper.vue
@@ -0,0 +1,86 @@
+<!-- 
+    filename: DoubleRingWrapper.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="double-ring-wrapper">
+    <template v-if="period == '月' || period == '年'">
+      <copilot-select
+        @update:active="handleActiveUpdate"
+        :options="cityOptions"
+      />
+      <div class="flex-1 stretch">
+        <DoubleRingChartVue
+          :data-source="dataSource"
+          :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: "日",
+    },
+  },
+  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>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 7ea9aab..1afd590 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -1,13 +1,16 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2024-04-16 14:40:15
-    description: 效率驾驶舱
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:04:53
+ * @LastEditTime: 2024-05-07 10:20:17
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="efficiency-copilot">
-    <Container title="芯片良率" icon="chip2"></Container>
+    <Container title="芯片良率" icon="chip2">
+      <std-output :period="period" />
+    </Container>
     <Container title="标准组件良率" icon="std"></Container>
     <Container title="芯片OEE" icon="chip"></Container>
     <Container title="转化效率" icon="cube"></Container>
@@ -16,9 +19,11 @@
 
 <script>
 import Container from "@/views/copilot/components/Container.vue";
+import StdOutput from "./components/StdOutput.vue";
+
 export default {
   name: "EfficiencyCopilot",
-  components: { Container },
+  components: { Container, StdOutput },
   props: {
     period: {
       type: String,
diff --git a/src/views/copilot/efficiency/options/double-ring-chart-options.js b/src/views/copilot/efficiency/options/double-ring-chart-options.js
new file mode 100644
index 0000000..743f820
--- /dev/null
+++ b/src/views/copilot/efficiency/options/double-ring-chart-options.js
@@ -0,0 +1,145 @@
+export default ({
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) => ({
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  tooltip: {},
+  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: ["50%", "52%"],
+      emptyCircleStyle: {
+        color: "#042c5f33",
+      },
+    },
+    // 数据 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: [
+                { offset: 0, color: "#4CF0E811" },
+                { offset: 1, color: "#4CF0E8" },
+              ],
+            },
+          },
+        },
+        {
+          value:
+            targetSum > currentSum
+              ? targetSum - currentSum
+              : targetSum == 0
+              ? currentSum == 0
+                ? 1
+                : 0
+              : 0,
+
+          name: "未达成累计",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+    // 数据 series2 - 2023累计
+    {
+      type: "pie",
+      radius: ["55%", "70%"],
+      center: ["50%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
+      },
+      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: "-",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+  ],
+});

From 9c9dba5452afb16dee3c35c64cfdaa47b6ca7bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 8 May 2024 16:38:05 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   2 +-
 src/assets/images/homeindex/flash-icon.png    | Bin 0 -> 662 bytes
 src/assets/images/homeindex/gas-icon.png      | Bin 0 -> 796 bytes
 src/assets/images/homeindex/ware-icon.png     | Bin 0 -> 269 bytes
 src/assets/images/homeindex/water-icon.png    | Bin 0 -> 592 bytes
 src/layout/components/AppMain.vue             |   2 +-
 src/store/modules/home.js                     | 199 ++++++++++++++++-
 src/views/copilot/components/BarChartBase.vue |   7 +-
 src/views/copilot/components/Container.vue    |   4 +-
 .../copilot/components/ContainerIcon.vue      |  20 +-
 .../copilot/components/CopilotHeader.vue      |   6 +-
 src/views/copilot/container.vue               |  16 +-
 .../copilot/efficiency/components/ChipOee.vue |  15 +-
 .../copilot/efficiency/components/StdRate.vue |  33 +--
 .../efficiency/components/TransformRate.vue   |  12 +-
 .../components/sub/bar/BarChartChipOEE.vue    |   7 +-
 .../components/sub/chip/ChipRateItem.vue      |   2 +-
 .../components/sub/std/CityName.vue           |   4 +-
 .../components/sub/std/ProgressBar.vue        |   4 +-
 .../components/sub/std/StdRateItem.vue        |  90 ++++++--
 src/views/copilot/efficiency/index.vue        |   4 +-
 .../energy/components/StockMonitor.vue        |  25 ++-
 .../components/sub/monitor/MonitorItem.vue    |  58 +++--
 src/views/copilot/energy/index.vue            |  21 +-
 .../copilot/energy/options/monitorOptions.js  | 210 ++++++------------
 .../copilot/yield/components/ChipInvest.vue   |   6 +-
 .../copilot/yield/components/FtoInvest.vue    |   6 +-
 .../components/sub/ring/DoubleRingChart.vue   |   5 +-
 src/views/copilot/yield/index.vue             |   2 +-
 src/views/index.vue                           |  12 +-
 src/views/playground.vue                      |   2 +-
 31 files changed, 483 insertions(+), 291 deletions(-)
 create mode 100644 src/assets/images/homeindex/flash-icon.png
 create mode 100644 src/assets/images/homeindex/gas-icon.png
 create mode 100644 src/assets/images/homeindex/ware-icon.png
 create mode 100644 src/assets/images/homeindex/water-icon.png

diff --git a/.env.dev b/.env.dev
index cabceec..4e87f52 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-04-28 13:43:03
+ # @LastEditTime: 2024-05-08 08:57:33
  # @LastEditors: zhp
  # @Description:
 ###
diff --git a/src/assets/images/homeindex/flash-icon.png b/src/assets/images/homeindex/flash-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..14e31ae3edb777dc774812ae245cc960722e7c96
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%P)S5VR9HvtmQARRQ51!rB`I!9#J~V06XhEDDPh1(Ap_}BCe$tY=_Y1Gp=5$|
z#Xv?TL`o6Lhyj`SD@yrEQ6dzQpDgF-ySLMu?>p!1ySfH<PriD;{jRmn+WX!6h#?LQ
zF+alsYB^wg5zq~c%#?1gq}L_oEf!#VBJd38$N*oFw5)_Y=F}0e57?an{sGLA^mtGO
z*d7DC1jc88`y}<2k{3H*dkb(Z1N<JC9t6bS;>ec3_6Xn!FfD`HE2*!Txsg~RU^Q?q
z0~~AKDe33G5O5oqn*m-S>2h82Y!BF80Nf}5eha(-)<}9(kUx;pvIMp-0xN3(9+0%F
zMt<`-V0$X?6o^e&5+8y2gXVzkPT*eQu=)xtm2|U2X_}KOK^&>GlNaJ1m{B2#({Gie
zOYynwallz%LXsDIq+8Obs=(}L*#Cm<nEL{loPhia&(=#io#dSadXk*)z>;R})DbW*
z*nF#Uf^CwHCgfefwMyA~B%NwjnmPgw0oxOx{gU=1<YR${z?3BCaIk$xtG*}_@E7|}
zNZOnNhjo2C%z{l7viraWNq5_Fz;<f?8DL#FeXReVussuqWYq(`1LjD2-mZXt`>)2q
z6oyUg{DH6?FDV;=Q9vxqXy7xjI9yKdv{iz{{#QVkq%X|?8%{g`z5#JRTyI4l|I7A3
z!~XbbEtK@36<}E1@z%5xSS#s#j=WUB*05?Xlw2}x$3=8RQWRViB@T47vc1xX%OxEw
wVs0d51(br>o>bye6>rc4lnNad@ZUM`8;&==A!w~m+5i9m07*qoM6N<$g5P8<761SM

literal 0
HcmV?d00001

diff --git a/src/assets/images/homeindex/gas-icon.png b/src/assets/images/homeindex/gas-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdcac2e9ec6cfbec09eb5f8491e43469c80ef64a
GIT binary patch
literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%)=5M`R9HvtmRpEUVHAd+*C9oeTu9LnH%d`L4u#~9Lr5Z$+@K*Yrj%oe8{8qs
zTOx_1q#QztLXuNLrYJ;-<j~-?*R)5w-9IyX|731vUH<>xYdzmu@As}P+Bnq4^=SvF
zsspyq0GEJ0lKeMgtQMdS*a=(&=1TffEkv~di-4m*oc<axNz%`1AgTq}2y9Oa2E=+v
zJN^rR?T)|`U|^=;E1*Wwud)!OJ79Yguq{`pA%G;kjNfgK1R5mWZ4IatfbIFfaiBvk
zag3plq_-)+MBqG7Cuwg>5QPD3&jd~ZopTAJ?Jpz^YWm%F<oyKf2kIs5YYw6ifbGe^
zS)faWL~;7HlJ;Z(x&sd+)!055S60&VN)W9A*d75~Ns@G}kRVQfEAfMIl73_WmI9+B
z)!Ob2tV#sBr8I!;{=n_T@p@I5c@%$>7O&3~@0PwZOVYDc6T2m?sRrOWFs4HB@4#nZ
zyrf6j|7{-vo=V!477xK5khHuMfb9jT;`8r)NN+*7-<@3Xb-++bi!&XWoqELXvH+p@
zxw)4@*&)QKlCI{8F9BAhwj3P_Kj;KR7iUO%Ul!m#FeLNRx5R+L1(!*RJ@6-NPXMCz
zV<o-IoIZr7B(|2mhPF=tVLVOo6*!WgrR|<Tj3Tz;y-e}x0Shc_X;C$M4Q($3j%5Ho
z0)r*J&YeD%(#IyzrL7+hYycKXY8*#39SFy}kr+@Ui?|?ZN<NY87}aP=aVui(HNatD
zPLc0~7LCYuY`n`rzeL@qCC#e<5RTWV725%QF7bzz%{gEG{UT1-Hxc7WU;xlxQfMJ7
zz=yyvNe#BcY+?(>4k#3@0;DGkGg+OE;c*TiKFz{-4kx!EEPI-yxG{yI5I{?rZ1+ft
z-UMoab&^8;h2yUQ(hh}IV*me;G`Mi}Fo`k`x6+ANSTXy}lH!xCQ2aB1Le(lf)DF<*
a9rz74dKfSpc=SyG0000<MNUMnLSTa5ePh4?

literal 0
HcmV?d00001

diff --git a/src/assets/images/homeindex/ware-icon.png b/src/assets/images/homeindex/ware-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f746f08d806703ab76e15a2e8b226ddcf8916e5
GIT binary patch
literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$30yfLn7SY
zPP64=G8AyTe?2miyUG0nSJav?xue`Ss+i9!iE)X&Qq0*ZxJCT5V6^8o`LxI*p3<Mr
zo<42ha%E3QaV?Vqj|%UMNMQ+U^A|pszFHcyUtsJz$Dr%^oZ*Kib30engHO{KpC4LU
zc+)W@EjHm1i}BPg{;5+Lc^a1rJH%f)#+|^IW1L`{Fy%%utA@(jV1_g^hOkiPI}O3d
z9HcWsct7|?@33=ZXleX!7{Jh-zizh0XNkDo{canBA5J&?sLRj1ReA?=x=V)Q-$_Zw
QfL>zoboFyt=akR{0I&~WX#fBK

literal 0
HcmV?d00001

diff --git a/src/assets/images/homeindex/water-icon.png b/src/assets/images/homeindex/water-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89f9558943be274da996fc818747eb2aa15c2d2
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%3Q0skR9HvtmdmS-Q54314-*qcQc6;e5=t&Zid>Vy=@cf)fa5YUa{dSgO35t)
z86lT}IygizWT243L`umB0}~$as`snY>Ac^*P+#io;rs5j)^9)i*?TWB;GqH6X9nQ^
zR>1aHcu3O8S}#>AVEZ6&sVzJz>2eK36@cyCz#U+ATl5z&Ea`43L@|Kv)xc9=?v!HR
zfsK-0mOvB%*q#r(02X%?`3S6&^febE8^HD~U>w+<NPZvKCFyq#L<ztNAlL0<l1}|I
z0NX2C>F4Am1%9?$@g_AtO99&xz}8f<DgPfz+Lnq*0@&UG+)E|u_`g$9c%pOU06YMa
zE9s~(A*ruv`vTZr0DK1G1k{W;2@55C=?YE(i~u)lDo=_Tk#xHj;3#me4SowOuYfrw
z>3l7~9^g9gLDEoj4aZ7`3nBJOx={<T5_km|SPBdQVak%RO492pfC#evt}T2<(sA2Y
zf&G~T?<Fn!+haHiTm-_=aTz@W&H{&`7fFB|melJRrk$Ef5DLVb{{+|o`~YH4$8E0x
zZUIX=AOdugr05muFQRrE;y!rX7&6|3P~sX8&OQySohEy{0h{}s|6WW|f!;*h^O{TL
z0<f=-^kLS3J0j^@j!&`yCV{L64m4fS7GP2P{ZrEoJp!&sdY)6bSb>tHC3A}vC`q0(
ecLreK3j6`IG?F1-FIPDL0000<MNUMnLSTXqs`%3Y

literal 0
HcmV?d00001

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 324b6e3..44fc12f 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-12 11:13:06
- * @LastEditTime: 2024-04-15 13:52:16
+ * @LastEditTime: 2024-05-08 13:37:05
  * @LastEditors: zhp
  * @Description:
 -->
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index 5046842..56b3e64 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -1,3 +1,4 @@
+
 import axios from "@/utils/request";
 import { deepClone } from "../../utils";
 
@@ -15,7 +16,25 @@ const state = {
     /* 能源驾驶舱 */
     energy: {},
     /* 效率驾驶舱 */
-    efficiency: {},
+    efficiency: {
+      chipOee: {
+        current: [],
+        previous: [],
+      },
+      transformRate: {
+        current: [],
+        previous: [],
+      },
+      chipRate: {
+        target: [],
+        current: [],
+        previous: [],
+      },
+      stdRate: {
+        target: [],
+        current: [],
+      },
+    },
   },
   home: {
     /** 主页状态 */
@@ -48,7 +67,11 @@ const mutations = {
         state.copilot.energy = payload.data;
         break;
       case "efficiency":
-        state.copilot.efficiency = payload.data;
+        console.log('222222', payload.chipOee)
+        state.copilot.efficiency.chipOee = payload.chipOee;
+        state.copilot.efficiency.transformRate = payload.transformRate;
+        state.copilot.efficiency.chipRate = payload.chipRate;
+        state.copilot.efficiency.stdRate = payload.stdRate;
         break;
     }
   },
@@ -64,20 +87,29 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
+    if (source == "comprehensive") return;
+
     const fetcher = {
       yield: getCopilotYield,
-      energy: getCopilotEnergy,
+      comprehensive: getCopilotEnergy,
       efficiency: getCopilotEfficiency,
     }[source];
+    const handler = {
+      yield: splitCurrentAndPrevious,
+      comprehensive: () => null,
+      efficiency: splitCurrentAndPreviousA,
+    }[source];
     // 获取产量数据
+    // console.log('qqqqqq',handler)
     let { data: factoryList, type } = await fetcher(period);
     let targetList = null;
     if (source === "yield" || source === "efficiency") {
       // 获取目标数据
-      let { data } = await fetcher(period, true);
+      let { data } = await fetcher(period, true)
+      console.log('11111',data)
       targetList = data;
     }
-    const payload = splitCurrentAndPrevious(factoryList, targetList);
+    const payload = handler(factoryList, targetList);
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -89,7 +121,103 @@ export default {
   actions,
 };
 
+function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
+  console.log('工厂',factoryListResponse);
+  // console.log('工厂',factoryListResponse);
+
+  // 初始数据
+  const { chipOee, transformRate, chipRate, stdRate } = initA();
+  factoryListResponse = [
+    {
+      factory: 0,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 1,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 2,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 3,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+  ];
+  if (factoryListResponse) {
+    for (const factory of factoryListResponse) {
+      const fId = getFactoryId(factory);
+      // 获取目标值
+      if (targetListResponse) {
+        const {
+          chipYieldRate,
+          componentYieldRate,
+          chipOee,
+          componentConversionEfficiency,
+        } = getFactoryTargetValueA(targetListResponse, fId);
+        stdRate.target[fId] = chipYieldRate;
+        chipRate.target[fId] = componentYieldRate;
+      }
+      // 芯片OEE
+      chipOee.current[fId] = factory.oee * 100 || random_default();
+      chipOee.previous[fId] = factory.previousYearOee * 100 || random_default();
+      // 转化效率
+      transformRate.current[fId] =
+        factory.componentConversionEfficiency * 100 || random_default();
+      transformRate.previous[fId] =
+        factory.previousYearComponentConversionEfficiency * 100 || random_default();
+      // 芯片良率 与 标准组件良率
+      if (![0, 1].includes(factory.glassType)) continue;
+      const _t = [chipRate, stdRate][factory.glassType];
+      _t.current[fId] = factory.yieldRate || random_default();
+      _t.previous[fId] = factory.previousYearYieldRate || random_default();
+    }
+
+    return {
+      chipOee,
+      transformRate,
+      chipRate,
+      stdRate,
+    };
+  }
+}
+
 function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
+  console.log('工厂',factoryListResponse);
+
   // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
   if (factoryListResponse) {
@@ -149,9 +277,58 @@ function getFactoryTargetValue(targetList, factoryId) {
   };
 }
 
+/**
+ * 获取 芯片良率目标值 和 标准组件良率目标值
+ * @param {*} targetList 目标值列表
+ * @param {*} factoryId 工厂ID
+ * @returns
+ */
+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(),
+    };
+  }
+  return {
+    chipYieldRate: random_default(),
+    componentYieldRate: random_default(),
+  };
+}
+
 /**
  *
- * @returns 初始化状态值
+ * @returns 初始化 效率模块里 初始状态值
+ */
+function initA() {
+  const t_ = {
+    current: Array(7).fill(0),
+    previous: Array(7).fill(0),
+  };
+  // 芯片OEE
+  const chipOee = deepClone(t_);
+  // 转化效率
+  const transformRate = deepClone(t_);
+  // 标准组件良率
+  const stdRate = {
+    ...deepClone(t_),
+    target: Array(7).fill(0),
+  };
+  // 芯片良率
+  const chipRate = deepClone(stdRate);
+
+  return {
+    chipOee,
+    transformRate,
+    chipRate,
+    stdRate,
+  };
+}
+
+/**
+ *
+ * @returns 初始化 产量模块里 初始状态值
  */
 function init() {
   const t_ = {
@@ -181,11 +358,11 @@ function init() {
   };
 }
 
-function random_default() {
-  return 0;
-  let a = Math.floor(Math.random() * 1000);
-  while (a < 600) {
-    a = Math.floor(Math.random() * 1000);
+function random_default(min = 0, max = 1) {
+  // return 0;
+  let a = Math.floor(Math.random() * max);
+  while (a < min) {
+    a = Math.floor(Math.random() * max);
   }
   return a;
 }
diff --git a/src/views/copilot/components/BarChartBase.vue b/src/views/copilot/components/BarChartBase.vue
index ea5cfdf..528cfd5 100644
--- a/src/views/copilot/components/BarChartBase.vue
+++ b/src/views/copilot/components/BarChartBase.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: BarChartBase.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -18,7 +18,7 @@
     </div>
     <div
       ref="chart"
-      style="max-width: 50vw"
+      style="max-width: 40vw"
       :style="{ height: vHeight + 'vh' }"
     ></div>
   </chart-container>
@@ -199,6 +199,7 @@ export default {
         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 || [];
diff --git a/src/views/copilot/components/Container.vue b/src/views/copilot/components/Container.vue
index 58af7bc..cfeb685 100644
--- a/src/views/copilot/components/Container.vue
+++ b/src/views/copilot/components/Container.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: Container.vue
     author: liubin
     date: 2024-04-09 10:44:09
-    description: 
+    description:
 -->
 
 <template>
diff --git a/src/views/copilot/components/ContainerIcon.vue b/src/views/copilot/components/ContainerIcon.vue
index 0158a5a..c61c77a 100644
--- a/src/views/copilot/components/ContainerIcon.vue
+++ b/src/views/copilot/components/ContainerIcon.vue
@@ -1,8 +1,9 @@
-<!-- 
-    filename: ContainerIcon.vue
-    author: liubin
-    date: 2024-04-09 16:41:36
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-07 16:54:54
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -14,8 +15,13 @@ import cube from "@/assets/images/homeindex/fto-icon.png";
 import chip from "@/assets/images/homeindex/chip-icon.png";
 import chip2 from "@/assets/images/homeindex/chip-icon-2.png";
 import bipv from "@/assets/images/homeindex/bipv-icon.png";
+import water from "@/assets/images/homeindex/water-icon.png";
+import gas from "@/assets/images/homeindex/gas-icon.png";
+import ware from "@/assets/images/homeindex/ware-icon.png";
+import flash from "@/assets/images/homeindex/flash-icon.png";
 import std from "@/assets/images/homeindex/std-icon.png";
 
+
 export default {
   name: "ContainerIcon",
   components: {},
@@ -40,6 +46,10 @@ export default {
         bipv:
           "background: url(" + bipv + ") no-repeat center center / 100% 100%",
         std: "background: url(" + std + ") no-repeat center center / 100% 100%",
+        water: "background: url(" + water + ") no-repeat center center / 100% 100%",
+        gas: "background: url(" + gas + ") no-repeat center center / 100% 100%",
+        flash: "background: url(" + flash + ") no-repeat center center / 100% 100%",
+        ware: "background: url(" + ware + ") no-repeat center center / 100% 100%",
       }[this.icon];
     },
   },
diff --git a/src/views/copilot/components/CopilotHeader.vue b/src/views/copilot/components/CopilotHeader.vue
index 40ced8d..49e00f5 100644
--- a/src/views/copilot/components/CopilotHeader.vue
+++ b/src/views/copilot/components/CopilotHeader.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: CopilotHeader.vue
     author: liubin
     date: 2024-04-16 15:14:01
-    description: 
+    description:
 -->
 
 <template>
@@ -63,7 +63,7 @@ export default {
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
 
-      screenfull.toggle(document.querySelector(".copilot-layout"));
+      screenfull.toggle(document.querySelector(".copilot-layout"))
       // 矫正宽度
       // const el = document.querySelector(".copilot-layout");
       // el.style.width = this.isFullscreen ? "100vw" : "calc(100vw - 54px)";
diff --git a/src/views/copilot/container.vue b/src/views/copilot/container.vue
index 4dd3478..45435d8 100644
--- a/src/views/copilot/container.vue
+++ b/src/views/copilot/container.vue
@@ -1,18 +1,14 @@
-<!-- 
+
+<!--
     filename: container.vue
     author: liubin
     date: 2024-04-16 14:51:25
-    description: 
+    description:
 -->
 
 <template>
-  <div class="copilot-layout">
-    <CopilotHeaderVue
-      :active="page"
-      :period="period"
-      @update:active="page = $event"
-      @update:period="period = $event"
-    />
+  <div class="copilot-layout" ref="copilot-layout">
+    <CopilotHeaderVue :active="page" :period="period" @update:active="page = $event" @update:period="period = $event" />
 
     <YieldCopilot v-if="page == '产量'" :period="period" />
     <EnergyCopilot v-if="page == '综合'" :period="period" />
@@ -52,8 +48,8 @@ export default {
   // },
 };
 </script>
-
 <style>
+
 .copilot-layout {
   padding: 16px;
   background: url(../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
diff --git a/src/views/copilot/efficiency/components/ChipOee.vue b/src/views/copilot/efficiency/components/ChipOee.vue
index f645336..6d5bc28 100644
--- a/src/views/copilot/efficiency/components/ChipOee.vue
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -63,20 +63,22 @@ export default {
       }
     },
     series() {
-      const { ftoInvest } = this.$store.getters.copilot.efficiency.chipOee;
+      // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
+      const { chipOee } = this.$store.getters.copilot.efficiency;
       let dataList = null;
-
       switch (this.period) {
         case "日":
         case "周":
-          dataList = ftoInvest?.current;
+          dataList = chipOee?.current;
+        case "周":
+          dataList = chipOee?.current;
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
-          dataList[1] = ftoInvest?.current;
+          dataList[0] = chipOee?.previous;
+          dataList[1] = chipOee?.current;
       }
-
+      // console.log(dataList)
       return getTemplate(this.period, dataList);
     },
   },
@@ -86,6 +88,7 @@ export default {
 function getTemplate(period, dataList) {
   const year = new Date().getFullYear();
   const month = new Date().getMonth() + 1;
+  console.log('11111', dataList);
   return period == "日" || period == "周"
     ? [
         {
diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
index 42d7d26..fe4cc09 100644
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -1,20 +1,18 @@
-<!-- 
-    filename: StdRate.vue
-    author: liubin
-    date: 2024-04-29 08:50:43
-    description: 标准组件良率
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 15:55:24
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="std-rate">
     <div class="span-2">
-      <StdRateItem :city="cities[5]" />
+      <StdRateItem :period="period" :city="cities[5]" />
     </div>
-    <div
-      v-for="item in cities.filter((val, index) => index != 5)"
-      :key="item.name"
-    >
-      <StdRateItem :city="item" />
+    <div v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
+      <StdRateItem :period="period" :city="item" />
     </div>
   </div>
 </template>
@@ -24,7 +22,12 @@ import StdRateItem from "./sub/std/StdRateItem.vue";
 export default {
   name: "StdRate",
   components: { StdRateItem },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {
       cities: [
@@ -38,7 +41,9 @@ export default {
       ],
     };
   },
-  computed: {},
+  computed: {
+
+  },
   methods: {},
 };
 </script>
@@ -48,7 +53,7 @@ export default {
   display: grid;
   gap: 8px;
   grid-template-columns: repeat(2, 1fr);
-  grid-template-rows: repeat(4, 1fr);
+  grid-template-rows: repeat(1, 1fr);
 }
 
 .span-2 {
diff --git a/src/views/copilot/efficiency/components/TransformRate.vue b/src/views/copilot/efficiency/components/TransformRate.vue
index 73ccb90..715f4a4 100644
--- a/src/views/copilot/efficiency/components/TransformRate.vue
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: TransformRate.vue
     author: liubin
     date: 2024-04-29 08:50:34
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue";
 export default {
   name: "TransformRate",
   components: { BarChartBase },
@@ -63,18 +63,18 @@ export default {
       }
     },
     series() {
-      const { ftoInvest } = this.$store.getters.copilot.yield;
+      const { transformRate } = this.$store.getters.copilot.efficiency;
       let dataList = null;
 
       switch (this.period) {
         case "日":
         case "周":
-          dataList = ftoInvest?.current;
+          dataList = transformRate?.current;
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
-          dataList[1] = ftoInvest?.current;
+          dataList[0] = transformRate?.previous;
+          dataList[1] = transformRate?.current;
       }
 
       return getTemplate(this.period, dataList);
diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
index 8ab9eb7..6f95c2e 100644
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-05-07 13:29:55
+ * @LastEditTime: 2024-05-08 15:52:09
  * @LastEditors: zhp
  * @Description:
 -->
@@ -18,7 +18,7 @@
     </div>
     <div
       ref="chart"
-      style="max-width: 50vw"
+      style="max-width: 40vw"
       :style="{ height: vHeight + 'vh' }"
     ></div>
   </chart-container>
@@ -198,7 +198,8 @@ export default {
         this.initOptions(this.options);
         return;
       }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      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 || [];
diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
index a084331..70b9fe2 100644
--- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -192,4 +192,4 @@ export default {
   }
 }
 </style>
-l
+
diff --git a/src/views/copilot/efficiency/components/sub/std/CityName.vue b/src/views/copilot/efficiency/components/sub/std/CityName.vue
index f157336..6f04c36 100644
--- a/src/views/copilot/efficiency/components/sub/std/CityName.vue
+++ b/src/views/copilot/efficiency/components/sub/std/CityName.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: CityName.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
diff --git a/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
index 4ae66f0..f7df2a0 100644
--- a/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
+++ b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ProgressBar.vue
     author: liubin
     date: 2024-04-29 09:18:30
-    description: 
+    description:
 -->
 
 <template>
diff --git a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
index e9422c1..9ec55e5 100644
--- a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
@@ -1,20 +1,38 @@
-<!-- 
-    filename: StdRateItem.vue
-    author: liubin
-    date: 2024-04-29 08:59:33
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 14:54:24
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
-  <div class="std-rate-item">
+  <div v-if="period == '日'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
-      <ProgressBar title="24年目标" :total="city.target" :value="city.target" />
-      <ProgressBar
-        title="24年累计"
-        :total="city.target"
-        :value="city.thisYear"
-      />
+      <ProgressBar :title="title" :total="city.target" :value="city.target" />
+      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+    </div>
+  </div>
+  <div v-else-if="period == '周'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="title" :total="city.target" :value="city.target" />
+      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+    </div>
+  </div>
+  <div v-else-if="period == '月'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="titleEnd" :total="city.target" :value="city.target" />
+      <ProgressBar :title="title" :total="city.target" :value="city.thisYear" />
+    </div>
+  </div>
+  <div v-else="period == '年'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="titleEnd" :total="city.target" :value="city.target" />
+      <ProgressBar :title="title" :total="city.target" :value="city.thisYear" />
     </div>
   </div>
 </template>
@@ -31,9 +49,55 @@ export default {
       type: Object,
       required: true,
     },
+    period: {
+      type: String,
+      default: "日",
+    }
   },
   data() {
-    return {};
+    return {
+      showDay:true,
+    };
+  },
+  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 "今日"
+      }
+    },
+    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}年目标`
+          // ];
+        }
+      }
+    }
   },
 };
 </script>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index f8f0571..c2c4687 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-05-07 10:25:55
+ * @LastEditTime: 2024-05-08 15:58:14
  * @LastEditors: zhp
  * @Description:
 -->
@@ -74,7 +74,7 @@ export default {
   display: grid;
   gap: 16px;
   grid-template-columns: 1fr 1fr;
-  grid-template-rows: 1fr 1fr;
+  grid-template-rows: .5fr .5fr;
 }
 
 .efficiency-copilot > div {
diff --git a/src/views/copilot/energy/components/StockMonitor.vue b/src/views/copilot/energy/components/StockMonitor.vue
index d5ada52..6b6d364 100644
--- a/src/views/copilot/energy/components/StockMonitor.vue
+++ b/src/views/copilot/energy/components/StockMonitor.vue
@@ -1,8 +1,9 @@
-<!-- 
-    filename: StockMonitor.vue
-    author: liubin
-    date: 2024-04-29 16:35:40
-    description: 仓库监控·当前
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 09:39:15
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -25,15 +26,15 @@ export default {
   data() {
     return {
       dhgList: [
-        { name: "总库存", value: "1000" },
-        { name: "已用库存", value: "500" },
-        { name: "剩余库存", value: "500" },
+        { name: "总库存", value: 1000 },
+        { name: "已用库存", value: 500 },
+        { name: "剩余库存", value: 500 },
       ],
       otherList: [
-        { name: "分类1", value: "1000" },
-        { name: "分类2", value: "1000" },
-        { name: "分类3", value: "1000" },
-        { name: "分类4", value: "1000" },
+        { name: "分类1", value: 1000 },
+        { name: "分类2", value: 1000 },
+        { name: "分类3", value: 1000 },
+        { name: "分类4", value: 1000 },
       ],
     };
   },
diff --git a/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue b/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
index 10df11b..4b231b4 100644
--- a/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
+++ b/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ChipRateItem.vue
     author: liubin
     date: 2024-04-29 14:25:18
-    description: 
+    description:
 -->
 
 <template>
@@ -12,9 +12,12 @@
     </div>
     <div class="chart" ref="chart"></div>
     <div class="legend" v-if="1">
-      <div class="legend-item" v-for="lgd in legendList" :key="lgd.name">
-        <span class="legend-item__label">{{ lgd.name }}</span>
-        <span class="legend-item__value">{{ lgd.value }}</span>
+      <div class="legend-item" v-for="(lgd,index) in legendList" :key="lgd.name">
+        <div >
+          <span :style="'backgroundColor:' + colors[index%5]" class="legend-item__chart"></span>
+          <span :style="'color:' + colors[index%5]" class="legend-item__label">{{ lgd.name }}</span>
+        </div>
+        <div :style="'color:' + colors[index%5]" class="legend-item__value">{{ lgd.value }}</div>
       </div>
     </div>
   </div>
@@ -47,6 +50,7 @@ export default {
   data() {
     return {
       period: "月",
+      colors:['#2760FF', '#5996F7', '#8BC566', '#11FAF0', '#F3C000'],
       valueTuple: [100, 100, 200],
     };
   },
@@ -54,19 +58,23 @@ export default {
     options() {
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
-      const vt = this.valueTuple;
-      let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-            : "0%",
-        subtitle =
-          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+      let arr = []
+      this.legendList.forEach(ele => {
+        arr.push(ele.value)
+      });
+      let vt = arr
+      console.log(arr)
+      let titleValue = vt.reduce(function (prev, cur, index, arr) {
+        return prev + cur
+      })
+      let subtitle = `总计/片`;
 
       return getOptions({
         single: true,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
+        dataList:this.legendList,
         previousSum: this.valueTuple[0],
         currentSum: this.valueTuple[1],
         targetSum: this.valueTuple[2],
@@ -107,27 +115,31 @@ export default {
   .legend {
     height: 80px;
     display: flex;
-    gap: 40px;
+    gap: 20px;
     justify-content: space-around;
   }
 
   .legend-item {
     display: flex;
+    // width: 90px;
     flex-direction: column;
+    // justify-content: space-around;
+    // justify-content: space-between;
     align-items: center;
+    flex-wrap: wrap;
     gap: 3px;
-
-    &:first-child {
-      .legend-item__value {
-        color: #0e61f5;
-      }
+    .legend-item__chart{
+      display: inline-block;
+      width: 14px;
+      height: 14px;
+      background: #2760FF;
+      border-radius: 2px;
+      // margin-right: 8px;
     }
-
-    &:nth-child(2) {
-      .legend-item__value {
-        color: #0fd5d1;
-      }
+   .legend-item__label {
+      margin-left: 8px;
     }
+    // }
   }
 
   .legend-item__value {
diff --git a/src/views/copilot/energy/index.vue b/src/views/copilot/energy/index.vue
index e92d39b..504ea5f 100644
--- a/src/views/copilot/energy/index.vue
+++ b/src/views/copilot/energy/index.vue
@@ -1,22 +1,23 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2024-04-16 14:40:15
-    description: 综合驾驶舱
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 15:29:28
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="energy-copilot">
-    <Container title="仓库监控·当前" icon="chip2">
+    <Container title="仓库监控·当前" icon="ware">
       <StockMonitorVue :period="period" />
     </Container>
-    <Container title="天然气能耗" icon="std">
+    <Container title="天然气能耗" icon="gas">
       <NatGasVue :period="period" />
     </Container>
-    <Container title="电能耗" icon="chip">
+    <Container title="电能耗" icon="flash">
       <ElecCostVue :period="period" />
     </Container>
-    <Container title="水能耗" icon="cube">
+    <Container title="水能耗" icon="water">
       <WaterCostVue :period="period" />
     </Container>
   </div>
@@ -73,7 +74,7 @@ export default {
   display: grid;
   gap: 16px;
   grid-template-columns: 1fr 1fr;
-  grid-template-rows: 1fr 1fr;
+  /* grid-template-rows: 1fr 1fr; */
 }
 
 .energy-copilot > div {
diff --git a/src/views/copilot/energy/options/monitorOptions.js b/src/views/copilot/energy/options/monitorOptions.js
index a503461..b391b9e 100644
--- a/src/views/copilot/energy/options/monitorOptions.js
+++ b/src/views/copilot/energy/options/monitorOptions.js
@@ -1,156 +1,84 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 10:30:06
+ * @LastEditors: zhp
+ * @Description:
+ */
 export default function ({
   single = false,
-  color,
+  colors = ['#2760FF', '#5996F7', '#8BC566', '#11FAF0','#F3C000'],
   titleValue,
   subtitle,
+  dataList,
   previousSum,
   currentSum,
   targetSum,
 }) {
   return {
-    grid: {
-      left: 0,
-      right: 0,
-      bottom: 0,
-      top: 0,
-      containLabel: true,
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  // tooltip: {},
+  title: {
+    text: titleValue,
+    left: "49%",
+    top: "39%",
+    textAlign: "center",
+    textStyle: {
+      fontWeight: 600,
+      fontSize: 32,
+      color: "#fffd",
     },
-    tooltip: {},
-    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",
-      },
+    subtext: `\u2002${subtitle}\u2002`,
+    subtextStyle: {
+      fontSize: 14,
+      fontWeight: 100,
+      color: "#fffd",
+      align: "right",
     },
-    series: [
-      // 背景 series
-      {
-        type: "pie",
-        name: "当前目标",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        emptyCircleStyle: {
-          color: "#040c5f45",
-        },
-      },
-      // 数据 series
-      {
-        type: "pie",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        avoidLabelOvervlap: false,
-        label: {
-          show: false,
-        },
+  },
+  // legend: {
+  //   top: '5%',
+  //   left: 'center'
+  // },
+  series: [
+    {
+      name: 'Access From',
+      type: 'pie',
+    	// center: ['50%', '40%'],
+			radius: ['60%', '90%'],
+      avoidLabelOverlap: 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
-                : 0,
-
-            name: "未达成累计",
-            itemStyle: { color: "transparent" },
-            label: { show: false },
-          },
-        ],
+        show: false
       },
-      // 数据 series2 - 2023累计
-      single
-        ? null
-        : {
-            type: "pie",
-            radius: ["55%", "70%"],
-            center: ["50%", "52%"],
-            avoidLabelOvervlap: false,
-            label: {
-              show: false,
-            },
-            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: "-",
-                itemStyle: { color: "transparent" },
-                label: { show: false },
-              },
-            ],
-          },
-    ],
+      label: {
+        show: false
+      },
+      data: dataList && dataList.length > 0 && dataList.map((item, index) => ({
+						name:item.name,
+            value: item.value,
+
+						itemStyle:{
+							color:{
+								type: 'linear',
+								x: 0,
+								y: 0,
+								x2: 0,
+								y2: 1,
+								global: false,
+								colorStops:[
+									{offset: 0,color:colors[index%5]},
+									{offset: 1,color:colors[index%5]+'33'}
+								]
+							}
+						}
+            }))
+    }
+  ]
   };
 }
diff --git a/src/views/copilot/yield/components/ChipInvest.vue b/src/views/copilot/yield/components/ChipInvest.vue
index 52e8938..f82d49a 100644
--- a/src/views/copilot/yield/components/ChipInvest.vue
+++ b/src/views/copilot/yield/components/ChipInvest.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: FtoInvest.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -73,7 +73,7 @@ export default {
           break;
         default:
           dataList = [];
-          dataList[0] = chipInvest?.pervious;
+          dataList[0] = chipInvest?.previous;
           dataList[1] = chipInvest?.current;
       }
       return getTemplate(this.period, dataList);
diff --git a/src/views/copilot/yield/components/FtoInvest.vue b/src/views/copilot/yield/components/FtoInvest.vue
index c56adce..8463fa5 100644
--- a/src/views/copilot/yield/components/FtoInvest.vue
+++ b/src/views/copilot/yield/components/FtoInvest.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: FtoInvest.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -74,7 +74,7 @@ export default {
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
+          dataList[0] = ftoInvest?.previous;
           dataList[1] = ftoInvest?.current;
       }
 
diff --git a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
index 760946b..1f75104 100644
--- a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: DoubleRingChart.vue
     author: liubin
     date: 2024-04-17 11:01:55
-    description: 
+    description:
 -->
 
 <template>
@@ -70,6 +70,7 @@ export default {
       // [previousValue, currentValue, sumValue?]
       const getter = this.$store.getters.copilot.yield[this.dataSourceField];
       if (this.period === "日" || this.period === "周") {
+        console.log(this.period)
         return [
           getter.previous[this.factoryId],
           getter.current[this.factoryId],
diff --git a/src/views/copilot/yield/index.vue b/src/views/copilot/yield/index.vue
index 7816343..6a0d042 100644
--- a/src/views/copilot/yield/index.vue
+++ b/src/views/copilot/yield/index.vue
@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2024-04-16 14:40:15
diff --git a/src/views/index.vue b/src/views/index.vue
index 86a9e06..9312d40 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -210,14 +210,6 @@ export default {
   },
 };
 </script>
-
-<style>
-.hideSidebar.mobile .dashboard-factory-all {
-  left: 0 !important;
-  width: 100vw !important;
-}
-</style>
-
 <style lang="scss" scoped>
 .dashboard-factory-all {
   background: #151516;
@@ -271,9 +263,9 @@ export default {
   z-index: 9998;
   width: 1.702vw;
   height: 1.702vw;
-  /* 
+  /*
   width: 32px;
-  height: 32px; 
+  height: 32px;
   */
   background: url(../assets/pinicon.png) no-repeat 0 0 / 100% 100%;
   transition: transform 0.1s linear;
diff --git a/src/views/playground.vue b/src/views/playground.vue
index 313b1fd..ff7a18f 100644
--- a/src/views/playground.vue
+++ b/src/views/playground.vue
@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: playground.vue
     author: liubin
     date: 2024-04-02 09:42:43