logo图标等

Reviewed-on: #27

.env.dev

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

.env.front

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

.env.prod

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

.env.stage

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

.env.static

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

package.json

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

src/api/produceData/index.js

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

src/api/produceData/order.js

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

src/layout/components/Sidebar/Logo.vue

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

src/mixins/chart.js

@@ -4,16 +4,16 @@ function __resizeHandler(entries) {
   console.log(entries)
   for (const entry of entries) {
     if (entry.contentBoxSize) {
-    const contentBoxSize = Array.isArray(entry.contentBoxSize)
+    // const contentBoxSize = Array.isArray(entry.contentBoxSize)
-          ? entry.contentBoxSize[0]
+    //       ? entry.contentBoxSize[0]
-          : entry.contentBoxSize;
+    //       : entry.contentBoxSize;
-        this.chart_mixin_chartInstance.resize({
+    //     this.chart_mixin_chartInstance.resize({
-          width:
+    //       width:
-            contentBoxSize.inlineSize < this.MIN_WIDTH
+    //         contentBoxSize.inlineSize < this.MIN_WIDTH
-              ? this.MIN_WIDTH
+    //           ? this.MIN_WIDTH
-              : contentBoxSize.inlineSize,
+    //           : contentBoxSize.inlineSize,
-          height: contentBoxSize.blockSize,
+    //       height: contentBoxSize.blockSize,
-        });
+    //     });
     } else {
       // manipulate contentRect
       this.chart_mixin_chartInstance.resize({

src/store/modules/home.js

@@ -92,10 +92,11 @@ const actions = {
   /** 初始化首页数据 */
   async initHome({ commit }) {
     const dataArr = await getHomeInfo();
-    console.log('dataArr',dataArr);
+    console.log('dataArr', dataArr);
+      let preData = dataArr.previousProdOutputOutDO
+      let preFtoData = dataArr.previousProdOutputFtoDO
     // const targetArr = await getHomeInfo();
-    const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetDO,dataArr.prodOutputFtoDO
+    const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetDO,dataArr.prodOutputFtoDO,preData,preFtoData);
-);
     commit("SET_HOME_INFO", payload);
   },
   /** 初始化驾驶舱数据 */
@@ -125,6 +126,7 @@ const actions = {
     //   const payload = handler(factoryData)
     //   commit("SET_COPILOT_INFO", { type, payload });
     // } else {
+      console.log('factoryList',factoryList)
       let factoryData = factoryList.prodOutputOutDO ? factoryList.prodOutputOutDO : factoryList.prodOutputRateDO
       let preData = factoryList.previousProdOutputOutDO ? factoryList.previousProdOutputOutDO : factoryList.previousProdOutputRateDO
       let preFtoData = factoryList.previousProdOutputFtoDO ? factoryList.previousProdOutputFtoDO : []

src/utils/constants.js

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

src/views/copilot/components/CopilotHeader.vue

@@ -19,7 +19,7 @@
       <CopilotButton v-for="i in ['日', '周', '月', '年']" :key="i" :label="i" :active="i === period"
         @click="() => $emit('update:period', i)" />
       <div class="btn-group">
-        <button type="button" class="export-btn" />
+        <!-- <button type="button" class="export-btn" @click="handleExport" /> -->
         <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
           @click="toggleFullScreen" />
         <!-- <button class="times-btn"> {{ times }} </button> -->
@@ -31,6 +31,7 @@
 <script>
 import CopilotButton from "./button.vue";
 import screenfull from "screenfull";
+import { exportFactoryDataExcel } from "@/api/produceData";
 
 export default {
   name: "CopilotHeader",
@@ -58,6 +59,15 @@ export default {
   },
   computed: {},
   methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        // factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `生产数据.xls`);
+        // this.exportLoading = false;
+      }).catch(() => { });
+    },
     getTimes() {
       setInterval(this.getTimesInterval, 60000);
     },

src/views/copilot/components/FactoryDataHeader.vue

@@ -7,7 +7,7 @@
       <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
         @click="() => $emit('update:than', i)" />
       <div class="btn-group">
-        <button type="button" class="export-btn" />
+        <button type="button" class="export-btn" @click="handleExport" />
         <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
           @click="toggleFullScreen" />
       </div>
@@ -25,6 +25,8 @@
 import FactorySelect from "./FactorySelect.vue";
 import screenfull from "screenfull";
 import CopilotButton from "./button.vue";
+import { exportFactoryDataExcel } from "@/api/produceData";
+
 export default {
   name: "FactoryDataHeader",
   components: { CopilotButton, FactorySelect },
@@ -55,6 +57,15 @@ export default {
   },
   computed: {},
   methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `${this.companyName}生产数据.xls`);
+      // this.exportLoading = false;
+    }).catch(() => { });
+    },
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
 

src/views/copilot/components/button.vue

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

src/views/copilot/components/ftoBarChartBase.vue

@@ -1,16 +1,10 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-05-29 10:56:21
+ * @LastEditTime: 2024-05-31 16:06:50
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
-    filename: BarChartBase.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description:
--->
 
 <template>
   <chart-container class="bar-chart-base">

src/views/copilot/container.vue

@@ -35,7 +35,7 @@ export default {
   data() {
     return {
       page: "产量",
-      period: "日",
+      period: "月",
       than:'同比',
       currentsStyles: '',
     };

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

@@ -36,7 +36,9 @@ export default {
   },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       xAxis: cities,
     };

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

@@ -1,15 +1,15 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-10 11:10:54
- * @LastEditTime: 2024-05-30 13:23:03
+ * @LastEditTime: 2024-05-31 16:19:45
  * @LastEditors: zhp
  * @Description:
 -->
 
 <template>
   <div class="chip-rate">
-    <ChipRateItem :period="period" :than="than" :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
+    <ChipRateItem :period="period" :than="than" :cities="['邯郸', '瑞昌']" :color="1" />
-    <ChipRateItem :period="period" :than="than" :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+    <!-- <ChipRateItem :period="period" :than="than" :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" /> -->
   </div>
 </template>
 
@@ -43,15 +43,15 @@ export default {
   gap: 5px;
   position: relative;
 
-  &:after {
+  // &:after {
-    content: "";
+  //   content: "";
-    position: absolute;
+  //   position: absolute;
-    left: 50%;
+  //   left: 50%;
-    top: 0;
+  //   top: 0;
-    width: 3px;
+  //   width: 3px;
-    height: 100%;
+  //   height: 100%;
-    transform: translateX(-50%);
+  //   transform: translateX(-50%);
-    background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
+  //   background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
-  }
+  // }
 }
 </style>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-05-30 11:19:51
+ * @LastEditTime: 2024-05-31 16:38:29
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,10 +9,10 @@
 <template>
   <!-- <div class="order"> -->
   <div class="std-rate" style="width: 100%; overflow: hidden scroll; height: 400px">
-      <div class="span-2">
+    <!-- <div class="span-2">
         <StdRateItem :period="period" :city="cities[5]" />
-      </div>
+      </div> -->
-      <div class="flex-item" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
+    <div class="span-2" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
       <StdRateItem :period="period" :than="than" :city="item" />
     </div>
   </div>
@@ -49,8 +49,8 @@ export default {
       //     break;
       // }
       const _cities = [
-        { name: "瑞昌", target: 0, total: 0, current: 0, componentYield: 0, goodNumber:0,},
+        { name: "瑞昌", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
-        { name: "邯郸", target: 0, total: 0, current: 0, componentYield: 0, goodNumber: 0, },
+        { name: "邯郸",target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "株洲", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "佳木斯", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
         { name: "成都", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
@@ -80,7 +80,10 @@ export default {
       }
       // 删掉凯盛光伏
       // _cities.splice(4, 1);
-      return _cities;
+      let arr = []
+      arr.push(_cities[0])
+      arr.push(_cities[1])
+      return arr;
     },
   },
   data() {

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

@@ -36,7 +36,9 @@ export default {
   },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       xAxis: cities,
     };

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-29 14:09:08
+ * @LastEditTime: 2024-05-31 15:55:00
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,7 +11,7 @@
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
     </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
   </chart-container>
 </template>
 
@@ -220,30 +220,30 @@ export default {
       this.canvasReset()
     },
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
-    isFullscreen(val) {
+    // isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
-        item.barWidth = val ? 18 : 12;
-      });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      // if (val === false && this.isOpen === true) {
-      //   console.log(val)
-      //   this.width = 97 + '%'
-      //   this.canvasReset()
-      // } else if (val === false && this.isOpen === false) {
-      //   this.width = 100 + '%'
-      //   this.canvasReset()
-      // }
     //   this.actualOptions.series.map((item) => {
     //     item.barWidth = val ? 18 : 12;
     //   });
     //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
     //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
     //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions)
+    //   // if (val === false && this.isOpen === true) {
-      this.canvasReset()
+    //   //   console.log(val)
-    },
+    //   //   this.width = 97 + '%'
+    //   //   this.canvasReset()
+    //   // } else if (val === false && this.isOpen === false) {
+    //   //   this.width = 100 + '%'
+    //   //   this.canvasReset()
+    //   // }
+    //   // this.actualOptions.series.map((item) => {
+    //   //   item.barWidth = val ? 18 : 12;
+    //   // });
+    //   // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   this.initChart(this.actualOptions)
+    //   this.canvasReset()
+    // },
     series(val) {
       if (!val) {
         this.initChart(this.options);

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-05-29 14:25:10
+ * @LastEditTime: 2024-05-31 15:54:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,7 +11,7 @@
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
     </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
   </chart-container>
 </template>
 
@@ -241,7 +241,7 @@ export default {
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions)
+      // this.initChart(this.actualOptions)
       // this.canvasReset()
     },
     series(val) {

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

@@ -79,15 +79,64 @@ export default {
       ];
     },
     options() {
-      const single = this.period === "日" || this.period === "周";
+      // const single = this.period === "日" || this.period === "周";
+      const today = new Date().getDate();
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
       const vt = this.valueTuple;
-      let titleValue = single
+      let items = [];
-          ? (vt[1] != null && `${vt[1] * 100}%`) || "0%"
+      var day1 = new Date();
-          : vt[0] != null && vt[2] != null && vt[2] !== 0
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
-          ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
-          : "0%",
+      //今天的时间
+      // var day2 = new Date();
+      // day2.setTime(day2.getTime());
+      // var s2 = (day2.getMonth() + 1) + "月" + day2.getDate() + '日';
+      // const today = new Date().getDate();
+      // let yesterday = new Date().getDate() -1;
+      // const month = new Date().getMonth() + 1;
+      const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+      // const year = new Date().getFullYear();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `${month}月${today}日良率`, },
+          { label: `去年${month}月${today}日良率` },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${month}月${today}日良率` },
+          { label: `${yesterday}日良率` },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `去年本周良率` },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `上周良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `去年${month}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `${lastMonth}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else {
+        items = [
+          { label: `${year}年良率`, },
+          { label: `${year - 1}年良率` },
+          { label: `${year}年目标良率` },
+        ];
+      }
+      let titleValue = vt[1] === null ? 0 + '%' : this.formatNumber(vt[1]) + '%',
         subtitle = {
           日: "本日良率",
           周: "本周良率",
@@ -96,10 +145,12 @@ export default {
         }[this.period];
 
       const t = getOptions({
-        single,
+        // single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
+        currentName: items[0].label,
+        preName: items[1].label,
         previousSum: vt[0],
         currentSum: vt[1],
         targetSum: vt[2],
@@ -122,41 +173,45 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `去年${month}月${today}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0]) ) + "%" },
-          { label: `去年${month}月${today}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
-          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `去年本周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `去年本周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
-          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `上周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `上周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
-          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `去年${month}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `去年${month}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '月' && this.than === '环比') {
         items = [
-          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `${lastMonth}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
-          { label: `${lastMonth}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else {
         items = [
-          { label: `${year}年良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
+          { label: `${year - 1}年良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${year - 1}年良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null  ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${year}年良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${year}年目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+
+          { label: `${year}年目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       }
       return items
@@ -191,6 +246,15 @@ export default {
     },
   },
   methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    },
     handleCityUpdate(id) {
       this.factoryId = id;
     },
@@ -216,14 +280,11 @@ export default {
     .chart {
       // margin-left: 5%;
       // width: 290px;
-      align-self: stretch;
+      flex: 1 1 auto;
-      // flex: 1 1 auto;
+      padding: 0 15%;
-    // align-items: center;
-      // margin:0 auto;
-      // padding: 0 10%;;
       /* margin: 10%; */
       /* min-width: 300px; */
-      height: 200px;
+      align-self: stretch;
     }
   .legend {
     height: 80px;

src/views/copilot/efficiency/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-05-30 11:13:01
+ * @LastEditTime: 2024-05-31 13:19:34
  * @LastEditors: zhp
  * @Description:
 -->

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

@@ -1,13 +1,12 @@
-export default function ({
+export default ({
-  single = false,
-  color,
   titleValue,
   subtitle,
   previousSum,
   currentSum,
   targetSum,
-}) {
+  currentName,
-  return {
+  preName,
+}) => ({
   grid: {
     left: 0,
     right: 0,
@@ -15,15 +14,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%",
+    left: "44%",
-      top: "39%",
+    top: "37%",
     textAlign: "center",
     textStyle: {
       fontWeight: 600,
@@ -42,18 +37,18 @@ export default function ({
     // 背景 series
     {
       type: "pie",
-        name: "当前目标",
+      name: "当前良率",
       radius: ["70%", "85%"],
-        center: ["50%", "52%"],
+      center: ["45%", "52%"],
       emptyCircleStyle: {
-          color: "#040c5f45",
+        color: "#042c5f33",
       },
     },
     // 数据 series
     {
       type: "pie",
       radius: ["70%", "85%"],
-        center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -64,7 +59,7 @@ export default function ({
       data: [
         {
           value: currentSum,
-            name: "当前良率",
+          name: currentName,
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -77,12 +72,7 @@ export default function ({
               y: 0,
               x2: 0,
               y2: 1,
-                colorStops: single
+              colorStops: [
-                  ? [
-                      { offset: 0, color: `${color}11` },
-                      { offset: 1, color: `${color}` },
-                    ]
-                  : [
                 { offset: 0, color: "#4CF0E811" },
                 { offset: 1, color: "#4CF0E8" },
               ],
@@ -90,28 +80,20 @@ export default function ({
           },
         },
         {
-            value:
+            value:currentSum == 0
-              targetSum > currentSum
-                ? targetSum - currentSum
-                : targetSum == 0
-                ? currentSum == 0
               ? 1
-                  : 0
+              : 0,
-                : targetSum,
+          name: "未达成良率",
-
-            name: "未达成",
           itemStyle: { color: "transparent" },
           label: { show: false },
         },
       ],
     },
     // 数据 series2 - 2023累计
-      single
+    {
-        ? null
-        : {
       type: "pie",
       radius: ["55%", "70%"],
-            center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -122,7 +104,7 @@ export default function ({
       data: [
         {
           value: previousSum,
-                name: "上期良率",
+          name: preName,
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -143,21 +125,14 @@ export default function ({
           },
         },
         {
-                value:
+          value:previousSum == 0
-                  targetSum > previousSum
-                    ? targetSum - previousSum
-                    : previousSum == 0
               ? 1
               : 0,
           name: "-",
-                formatter: {
-                  show: false
-                },
           itemStyle: { color: "transparent" },
           label: { show: false },
         },
       ],
     },
   ],
-  };
+});
-}

src/views/copilot/efficiencyContainer.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-20 16:04:18
- * @LastEditTime: 2024-05-30 11:14:17
+ * @LastEditTime: 2024-05-31 13:16:26
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <!-- <div class="copilot-layout" ref="copilot-layout"> -->
-  <div class="copilot-layout other" ref="copilot-layout">
+  <div class="copilot-layout" ref="copilot-layout">
     <CopilotHeaderVue :than="than" :active="page" :period="period" @update:active="updateActive"
       @update:period="period = $event" @update:than="updateThan" />
 
@@ -34,7 +34,7 @@ export default {
     return {
       than:'同比',
       page: "效率",
-      period: "日",
+      period: "月",
       currentsStyles: '',
     };
   },
@@ -101,7 +101,7 @@ export default {
   position: absolute;
   left: -16px;
   /* top: -8px; */
-  /* height: calc(100% + 38px); */
+  height: calc(100% + 240px);
   width: calc(100% + 30px);
   z-index: 1001;
   color: #fff;
@@ -114,7 +114,7 @@ export default {
   height: calc(100% + 38px);
 }
 .other {
-  height: calc(100% + 240px);
+  /* height: calc(100% + 240px); */
 }
 .copilot-footer {
   /** position: absolute;

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-05-30 10:38:32
+ * @LastEditTime: 2024-05-31 15:52:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,7 +11,7 @@
       <span v-for="(item,index) in legend" :key="index" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
     </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%"></div>
   </chart-container>
 </template>
 
@@ -79,7 +79,7 @@ export default {
           data: this.xAxis,
         },
         yAxis: {
-          name: "单位/%",
+          name: "单位/片",
           nameTextStyle: {
             color: "#fff",
             fontSize: 12,

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

@@ -5,7 +5,7 @@
     </div>
     <div class="chart">
       <div class="chart-title">
-        <span class="title">生产情况</span>
+        <span class="title">工单情况</span>
         <span class="line"></span>
       </div>
       <barChartBase :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1"></barChartBase>

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

@@ -23,7 +23,10 @@ export default {
   components: { BarChartBase },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
     return {
       xAxis: cities,
     };

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

@@ -23,7 +23,10 @@ export default {
   components: { BarChartBase },
   data() {
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
     return {
       xAxis: cities,
     };

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-20 13:32:59
- * @LastEditTime: 2024-05-30 13:35:00
+ * @LastEditTime: 2024-05-31 15:05:20
  * @LastEditors: zhp
  * @Description:
 -->
@@ -151,9 +151,10 @@ export default {
         ];
       }
       let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
+           vt[1] != null && vt[2] !== 0
-            ? `${vt[1] / vt[2]}%`
+          ? this.formatNumber((vt[1] / vt[2] * 100)) + '%'
-            : "0%",
+          : (vt[1] != 0 && vt[1] != null) && vt[2] == 0
+            ? "100%" : '0%',
         subtitle =
       this.period == "日" ? `${month}月${today}日累计` : this.period == "周" ? `本周` : this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
       console.log(this.valueTuple[0], this.valueTuple[1], this.valueTuple[2],)
@@ -196,6 +197,15 @@ export default {
     }
   },
   methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    }
     // fullscreen mixin 需要的回调
     // fullscreenCallback(isFullscreen) {
     //   console.log("isFullscreen--->", isFullscreen);
@@ -219,40 +229,40 @@ function calculateItems(period, valueTuple,than) {
   const year = new Date().getFullYear();
   if (period === '日' && than === '同比') {
     items = [
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
       { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
       { label: `${yesterday}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
-      { label: `本周累计`, value: valueTuple[1] },
       { label: `去年本周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
     ];
   } else if (period === '周' && than === '环比') {
     items = [
-      { label: `本周累计`, value: valueTuple[1] },
       { label: `上周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
     ];
   } else if (period === '月' && than === '同比') {
     items = [
-      { label: `${month}月累计`, value: valueTuple[1] },
       { label: `去年${month}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
       { label: `${month}月目标`, value: valueTuple[2] },
     ];
   } else if (period === '月' && than === '环比') {
     items = [
-      { label: `${month}月累计`, value: valueTuple[1] },
       { label: `${lastMonth}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
       { label: `${month}月目标`, value: valueTuple[2] },
     ];
   } else {
     items = [
-      { label: `${year}年累计`, value: valueTuple[1] },
       { label: `${year - 1}年累计`, value: valueTuple[0] },
+      { label: `${year}年累计`, value: valueTuple[1] },
       { label: `${year}年目标`, value: valueTuple[2] },
     ];
   }
@@ -314,17 +324,17 @@ function calculateItems(period, valueTuple,than) {
   left: -18px;
 }
 
-.legend-item:nth-child(1) .legend-item__label::before {
+.legend-item:nth-child(2) .legend-item__label::before {
   background: #12fff5;
 }
-.legend-item:nth-child(1) .legend-item__value {
+.legend-item:nth-child(2) .legend-item__value {
   color: #12fff5;
 }
 
-.legend-item:nth-child(2) .legend-item__label::before {
+.legend-item:nth-child(1) .legend-item__label::before {
   background: #0f65ff;
 }
-.legend-item:nth-child(2) .legend-item__value {
+.legend-item:nth-child(1) .legend-item__value {
   color: #0f65ff;
 }
 

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

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-30 16:00:50
+ * @LastEditTime: 2024-05-31 16:15:51
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
     filename: DoubleRingWrapper.vue
     author: liubin
@@ -42,13 +49,13 @@ export default {
     return {
       factoryId: 4, // 默认成都
       cityOptions: [
-        "成都",
+        // "成都",
         "邯郸",
-        "株洲",
+        // "株洲",
         "瑞昌",
-        "佳木斯",
+        // "佳木斯",
-        "凯盛光伏",
+        // "凯盛光伏",
-        "蚌埠兴科",
+        // "蚌埠兴科",
       ],
     };
   },

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-24 15:15:00
- * @LastEditTime: 2024-05-28 08:42:36
+ * @LastEditTime: 2024-05-31 16:16:16
  * @LastEditors: zhp
  * @Description:
 -->
@@ -54,12 +54,12 @@ export default {
     return {
       factoryId: 4, // 默认成都
       cityOptions: [
-        "成都",
+        // "成都",
         "邯郸",
-        "株洲",
+        // "株洲",
-        "佳木斯",
+        // "佳木斯",
-        "凯盛光伏",
+        // "凯盛光伏",
-        "蚌埠兴科",
+        // "蚌埠兴科",
       ],
     };
   },

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

@@ -80,15 +80,9 @@ export default ({
           },
         },
         {
-          value:
+            value:currentSum == 0
-            targetSum > currentSum
-              ? targetSum - currentSum
-              : targetSum == 0
-              ? currentSum == 0
               ? 1
-                : 0
               : 0,
-
           name: "未达成累计",
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -131,10 +125,7 @@ export default ({
           },
         },
         {
-          value:
+          value:previousSum == 0
-            targetSum > previousSum
-              ? targetSum - previousSum
-              : previousSum == 0
               ? 1
               : 0,
           name: "-",

src/views/dashboard/charts/Bipv.vue

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

src/views/dashboard/charts/ChipInvest.vue

@@ -23,7 +23,9 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       legend: [
         { label: `${year - 1}年`, color: "#12f7f1" },

src/views/dashboard/charts/ChipYield.vue

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

src/views/dashboard/charts/ChipYieldChart.vue

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

src/views/dashboard/charts/Fto.vue

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

src/views/dashboard/charts/LeftChartBase.vue

@@ -113,6 +113,16 @@ export default {
             barWidth: 12,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  textStyle: { //数值样式
+                    color: '#DFF1FE',
+                    fontSize: 16
+                  }
+                }
+              },
               color: {
                 type: "linear",
                 x: 0,
@@ -146,11 +156,6 @@ export default {
             name: '', // this.series[1].name,
             type: "bar",
             barWidth: 12,
-            // tooltip: {
-            //   valueFormatter: function (value) {
-            //     return value + " ml";
-            //   },
-            // },
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {

src/views/dashboard/charts/RightChartBase.vue

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

src/views/dashboard/charts/StdChart.vue

@@ -25,7 +25,9 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
     return {
       legend: [
         { label: `${year}年目标值`, color: "#f3c000" },

src/views/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="dashboard-factory-all">
     <div id="map-container">
-      <div v-if="visible" class="cdLine"></div>
+      <!-- <div v-if="visible" class="cdLine"></div> -->
-      <div v-if="visible" class="zzLine"></div>
+      <!-- <div v-if="visible" class="zzLine"></div> -->
       <div v-if="visible" class="rcLine"></div>
       <div v-if="visible" class="rcLineTwo"></div>
       <div v-if="visible" class="hdLine"></div>
       <div v-if="visible" class="hdLineTwo"></div>
-      <div v-if="visible" class="ksLine"></div>
+      <!-- <div v-if="visible" class="ksLine"></div> -->
-      <div v-if="visible" class="bbLine"></div>
+      <!-- <div v-if="visible" class="bbLine"></div> -->
-      <div v-if="visible" class="bbLineTwo"></div>
+      <!-- <div v-if="visible" class="bbLineTwo"></div> -->
-      <div v-if="visible" class="bbLineThree"></div>
+      <!-- <div v-if="visible" class="bbLineThree"></div> -->
-      <div v-if="visible" class="jmsLine"></div>
+      <!-- <div v-if="visible" class="jmsLine"></div> -->
-      <div v-if="visible" class="jmsLineTwo"></div>
+      <!-- <div v-if="visible" class="jmsLineTwo"></div> -->
       <div class="databoard">
         <db-header class="db-header"></db-header>
         <div class="db-body">
@@ -61,19 +61,19 @@ import StdChart from "./dashboard/charts/StdChart.vue";
 
 const LOCATIONS = [
   // 佳木斯
-  { x: 67, y: 20, tx: 60, ty: 29,  path: 'copilot/jmsIndex' },
+  // { x: 67, y: 20, tx: 60, ty: 29, path: 'factoryData/jmsIndex' },
   // 成都
-  { x: 46, y: 56,tx:46,ty:93, path: 'copilot/cdIndex' },
+  // { x: 46, y: 56, tx: 46, ty: 93, path: 'factoryData/cdIndex' },
   // 蚌埠1
-  { x: 60, y: 52, tx: 35.5, ty: 48.3, path: 'copilot/bbIndex' },
+  // { x: 60, y: 52, tx: 35.5, ty: 48.3, path: 'factoryData/bbIndex' },
   // 蚌埠2
-  { x: 61, y: 53,tx:39,ty:68, path: 'copilot/ksIndex' },
+  // { x: 61, y: 53, tx: 39, ty: 68, path: 'factoryData/ksIndex' },
   // 江西 瑞昌
-  { x: 60, y: 58, tx: 68, ty: 52, path: 'copilot/factory-data' },
+  { x: 60, y: 58, tx: 68, ty: 52, path: 'factoryData/factory-data' },
   // 湖南 株洲
-  { x: 56, y: 60, tx: 60, ty: 95, path: 'copilot/zzIndex' },
+  // { x: 56, y: 60, tx: 60, ty: 95, path: 'factoryData/zzIndex' },
   // 邯郸
-  { x: 58, y: 45, tx: 47, ty: 34, path: 'copilot/hdIndex' },
+  { x: 58, y: 45, tx: 47, ty: 34, path: 'factoryData/hdIndex' },
 ];
 
 export default {
@@ -213,39 +213,41 @@ export default {
           { label: "标准组件产出", value: 0 }, // Math.floor(Math.random() * 1000000) },
         ],
       };
-      if (position === LOCATIONS[0]) {
+      if
-        templateInfo.companyName = "佳木斯中建材";
+        // (position === LOCATIONS[0]) {
-        this.jmsHintPosition = position;
+        // templateInfo.companyName = "佳木斯中建材";
-        templateInfo.items[0].value = this.homeStore.ftoInvest.current[3];
+        // this.jmsHintPosition = position;
-        templateInfo.items[2].value = this.homeStore.chipInvest.current[3];
+        // templateInfo.items[0].value = this.homeStore.ftoInvest.current[3];
-        templateInfo.items[1].value = this.homeStore.chipOutput.current[3];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[3];
-        templateInfo.items[3].value = this.homeStore.stdOutput.current[3];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[3];
-        this.jmsInfo = templateInfo;
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[3];
-      } else if (position === LOCATIONS[1]) {
+        // this.jmsInfo = templateInfo;
-        this.cdHintPosition = position;
+      // } else if (position === LOCATIONS[1]) {
-        templateInfo.companyName = "成都中建材";
+        // this.cdHintPosition = position;
-        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[4];
+        // templateInfo.companyName = "成都中建材";
-        templateInfo.items[2].value = this.homeStore.chipInvest.current[4];
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[4];
-        templateInfo.items[1].value = this.homeStore.chipOutput.current[4];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[4];
-        templateInfo.items[3].value = this.homeStore.stdOutput.current[4];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[4];
-        this.cdInfo = templateInfo;
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[4];
-      } else if (position === LOCATIONS[2]) {
+        // this.cdInfo = templateInfo;
-        this.bbHintPosition = position;
+      // } else if (position === LOCATIONS[2]) {
-        templateInfo.companyName = "蚌埠兴科";
+        // this.bbHintPosition = position;
-        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[6];
+        // templateInfo.companyName = "蚌埠兴科";
-        templateInfo.items[2].value = this.homeStore.chipInvest.current[6];
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[6];
-        templateInfo.items[1].value = this.homeStore.chipOutput?.current[6];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[6];
-        templateInfo.items[3].value = this.homeStore.stdOutput.current[6];
+        // templateInfo.items[1].value = this.homeStore.chipOutput?.current[6];
-        this.bbInfo = templateInfo;
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[6];
-      } else if (position === LOCATIONS[3]) {
+        // this.bbInfo = templateInfo;
-        this.ksHintPosition = position;
+      // } else if (position === LOCATIONS[3]) {
-        templateInfo.companyName = "凯盛光伏";
+        // this.ksHintPosition = position;
-        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[5];
+        // templateInfo.companyName = "凯盛光伏";
-        templateInfo.items[2].value = this.homeStore.chipInvest.current[5];
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[5];
-        templateInfo.items[1].value = this.homeStore.chipOutput.current[5];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[5];
-        templateInfo.items[3].value = this.homeStore.stdOutput.current[5];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[5];
-        this.ksInfo = templateInfo;
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[5];
-      } else if (position === LOCATIONS[4]) {
+        // this.ksInfo = templateInfo;
+      // }
+      (position === LOCATIONS[0]) {
         this.rcHintPosition = position;
         templateInfo.companyName = "瑞昌中建材";
         templateInfo.items[0].value = this.homeStore.ftoInvest?.current[0];
@@ -253,15 +255,15 @@ export default {
         templateInfo.items[1].value = this.homeStore.chipOutput.current[0];
         templateInfo.items[3].value = this.homeStore.stdOutput.current[0];
         this.info = templateInfo;
-      } else if (position === LOCATIONS[5]) {
+      // } else if (position === LOCATIONS[5]) {
-        this.zzHintPosition = position;
+        // this.zzHintPosition = position;
-        templateInfo.companyName = "株洲中建材";
+        // templateInfo.companyName = "株洲中建材";
-        templateInfo.items[0].value = this.homeStore.ftoInvest?.current[2];
+        // templateInfo.items[0].value = this.homeStore.ftoInvest?.current[2];
-        templateInfo.items[2].value = this.homeStore.chipInvest.current[2];
+        // templateInfo.items[2].value = this.homeStore.chipInvest.current[2];
-        templateInfo.items[1].value = this.homeStore.chipOutput.current[2];
+        // templateInfo.items[1].value = this.homeStore.chipOutput.current[2];
-        templateInfo.items[3].value = this.homeStore.stdOutput.current[2];
+        // templateInfo.items[3].value = this.homeStore.stdOutput.current[2];
-        this.zzInfo = templateInfo;
+        // this.zzInfo = templateInfo;
-      } else if (position === LOCATIONS[6]) {
+      } else if (position === LOCATIONS[1]) {
         this.hdHintPosition = position;
         templateInfo.companyName = "邯郸中建材";
         templateInfo.items[0].value = this.homeStore.ftoInvest?.current[1];

src/views/login.vue

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

src/views/produce/data/index.vue

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

src/views/produce/data/lineChart.vue

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

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

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

src/views/produce/target/index.vue

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

src/views/produce/workOrder/SmallTitle.vue

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

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

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

src/views/produce/workOrder/index.vue

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

src/views/produce/workOrder/lineChart.vue

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

src/views/report/yearData/index.vue

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

src/views/system/user/index.vue

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