Merge pull request '更新' (#439) from projects/zg-zwq into projects/zg-test

Reviewed-on: #439

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-11-25 14:31:39
+ # @LastEditTime: 2025-03-05 16:46:35
  # @LastEditors: zwq
  # @Description:
 ###
@@ -9,11 +9,16 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 智能监控分析系统
+VUE_APP_TITLE = 成本管理系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
-VUE_APP_BASE_API = 'http://172.16.33.65:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+# VUE_APP_BASE_API = 'http://line-sczg.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://100.64.0.45:48080'
+# VUE_APP_BASE_API = 'http://172.16.33.10:48080'
+
+# ws地址
+VUE_APP_WS_API = 'ws://100.64.0.45:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -2,14 +2,14 @@
  # @Author: zwq
  # @Date: 2024-03-27 15:49:55
  # @LastEditors: zwq
- # @LastEditTime: 2024-10-30 11:08:47
+ # @LastEditTime: 2025-03-05 16:30:45
  # @Description:
 ###
 # 生产环境配置
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 智能监控分析系统
+VUE_APP_TITLE = 成本管理系统
 
 # 芋道管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
@@ -20,6 +20,9 @@ VUE_APP_BASE_API = ''
 # PUBLIC_PATH = 'http://192.168.0.33:8888/'
 PUBLIC_PATH = ''
 
+# ws地址
+VUE_APP_WS_API = 'ws://10.1.17.10:48080'
+
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 

.gitignore

@@ -21,3 +21,5 @@ selenium-debug.log
 
 package-lock.json
 echarts.js
+sync_line_sczg_prod.bat
+sync_line_sczg_aliyun.bat

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
     "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
@@ -42,19 +42,16 @@
   },
   "dependencies": {
     "@babel/parser": "7.18.4",
-    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
-    "chinese-lunar": "^0.1.4",
     "clipboard": "2.0.8",
     "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
-    "el-tree-transfer": "^2.4.7",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",

src/api/base/equipmentPlc.js

@@ -1,10 +1,3 @@
-/*
- * @Author: zwq
- * @Date: 2024-10-29 09:47:40
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-26 16:27:48
- * @Description:
- */
 import request from '@/utils/request'
 
 // 创建实时数据采集配置
@@ -59,11 +52,3 @@ export function exportEquipmentPlcExcel(query) {
     responseType: 'blob'
   })
 }
-
-// 获得code
-export function getCode() {
-  return request({
-    url: '/base/equipment-group/getCode',
-    method: 'get'
-  })
-}

src/api/base/factory.js

@@ -1,10 +1,3 @@
-/*
- * @Author: zwq
- * @Date: 2024-10-29 09:47:40
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-12 09:25:11
- * @Description:
- */
 import request from '@/utils/request'
 // 获得工厂产线工段设备树形结构
 export function getTree() {

src/api/base/groupClasses.js

@@ -51,13 +51,6 @@ export function getCode() {
   })
 }
 
-// 获得可用的班次列表
-export function listClassesEnabled() {
-  return request({
-    url: '/base/group-classes/listEnable',
-    method: 'get'
-  })
-}
 // 导出班次基础信息 Excel
 export function exportGroupClassesExcel(query) {
   return request({

src/api/base/groupSchedulingPlan.js

@@ -1,125 +0,0 @@
-import request from '@/utils/request'
-
-// 创建排班计划配置基础信息
-export function createGroupPlan(data) {
-  return request({
-    url: '/base/group-scheduling-plan/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新排班计划配置基础信息
-export function updateGroupPlan(data) {
-  return request({
-    url: '/base/group-scheduling-plan/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除排班计划配置基础信息
-export function deleteGroupPlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得排班计划配置基础信息
-export function getGroupPlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得排班计划配置基础信息分页
-export function getGroupPlanPage(query) {
-  return request({
-    url: '/base/group-scheduling-plan/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有排班计划列表
-export function groupPlanList() {
-  return request({
-    url: '/base/group-scheduling-plan/listAll',
-    method: 'get'
-  })
-}
-// 获得排班计划相关班组列表
-export function groupPlanTeamList(id) {
-  return request({
-    url: '/base/group-scheduling-plan-team/teamListByPlanId?planId=' + id,
-    method: 'get'
-  })
-}
-// 获得排班计划相关班次列表
-export function groupPlanClassesList(id) {
-  return request({
-    url: '/base/group-scheduling-plan-classes/classesListByPlanId?planId=' + id,
-    method: 'get'
-  })
-}
-// 获取code
-export function getCode() {
-  return request({
-    url: '/base/group-scheduling-plan/getCode',
-    method: 'get'
-  })
-}
-
-// 导出排班计划配置基础信息 Excel
-export function exportGroupPlanExcel(query) {
-  return request({
-    url: '/base/group-scheduling-plan/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 获得产线工段树形结构
-export function getGroupPlanTree() {
-  return request({
-    url: '/base/group-scheduling-plan/getLineSectionTree',
-    method: 'get'
-  })
-}
-
-// 创建排班计划产线工段
-export function createGroupPlanLine(data) {
-  return request({
-    url: '/base/group-scheduling-plan-line-section/createPlanLineSection',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新排班计划产线工段
-export function updateGroupPlanLine(data) {
-  return request({
-    url: '/base/group-scheduling-plan-line-section/updatePlanLineSection',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得排班计划配置基础信息
-export function getGroupPlanLine(id) {
-  return request({
-    url: '/base/group-scheduling-plan-line-section/getLineSectionByPlanId?planId=' + id,
-    method: 'get'
-  })
-}
-
-// 获得当前登录用户所在部门id
-export function getLoginUserDeptId() {
-  return request({
-    url: '/base/group-scheduling-plan-line-section/getLoginUserDeptId',
-    method: 'get'
-  })
-}

src/api/base/groupSchedulingRule.js

@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 创建排班规则基础信息
-export function createGroupRule(data) {
-  return request({
-    url: '/base/group-scheduling-rule/create',
-    method: 'post',
-    data: data
-  })
-}
-// 作废排班规则
-export function disableGroupRule(id) {
-  return request({
-    url: '/base/group-scheduling-rule/disable?id=' + id,
-    method: 'post',
-  })
-}
-// 更新排班规则基础信息
-export function updateGroupRule(data) {
-  return request({
-    url: '/base/group-scheduling-rule/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除排班规则基础信息
-export function deleteGroupRule(id) {
-  return request({
-    url: '/base/group-scheduling-rule/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得排班规则基础信息
-export function getGroupRule(id) {
-  return request({
-    url: '/base/group-scheduling-rule/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得排班规则基础信息分页
-export function getGroupRulePage(query) {
-  return request({
-    url: '/base/group-scheduling-rule/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出排班规则基础信息 Excel
-export function exportGroupRuleExcel(query) {
-  return request({
-    url: '/base/group-scheduling-rule/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/base/groupTeam.js

@@ -58,49 +58,3 @@ export function listEnabled() {
     method: 'get'
   })
 }
-
-// 获得班组组员信息分页
-export function groupTeamPage(query) {
-  return request({
-    url: '/base/group-team-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得班组组员信息
-export function groupTeamDet(query) {
-  return request({
-    url: '/base/group-team-det/get',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 创建班组组员信息
-export function teamDetCreate(data) {
-  return request({
-    url: '/base/group-team-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新班组组员信息
-export function teamDetUpdate(data) {
-  return request({
-    url: '/base/group-team-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除班组组员信息
-export function teamDetDelete(query) {
-  return request({
-    url: '/base/group-team-det/delete',
-    method: 'delete',
-    params: query
-  })
-}

src/api/base/groupTeamScheduling.js

@@ -8,14 +8,7 @@ export function getPreset(query) {
     params: query
   })
 }
-// 获取某月预排班
-export function getScheduling(query) {
-  return request({
-    url: '/base/group-team-scheduling/getScheduling',
-    method: 'get',
-    params: query
-  })
-}
+
 // 批量创建-更新排班信息
 export function createOrUpdateList(data) {
   return request({
@@ -33,22 +26,3 @@ export function autoSet(query) {
     params: query
   })
 }
-
-// 获得排班信息分页
-export function schedulingPage(query) {
-  return request({
-    url: '/base/group-team-scheduling/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出Excel
-export function exportSchedulingExcel(query) {
-  return request({
-    url: '/base/group-team-scheduling/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/base/worker.js

@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-// 获得所有员工列表
-export function getWorkerList() {
-  return request({
-    url: '/base/core-worker/listAll',
-    method: 'get'
-  })
-}
-
-// 获得员工
-export function getWorker(query) {
-  return request({
-    url: '/base/core-worker/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得该班组其他可选组员列表(除去现有组员)
-export function otherWorkerList(query) {
-  return request({
-    url: '/base/group-team-det/otherWorkerList',
-    method: 'get',
-    params: query
-  })
-}

src/api/core/analysis/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2025-01-08 15:47:17
- * @LastEditors: zwq
+ * @LastEditTime: 2023-09-13 09:53:45
+ * @LastEditors: zhp
  * @Description:
  */
 import request from '@/utils/request'
@@ -22,27 +22,3 @@ export function getCT(data) {
     data: data
   })
 }
-// 获取产线平衡分析数据（new）
-export function getNewCTNow(data) {
-  return request({
-		url: '/analysis/production-analysis/getNewCTNow',
-		method: 'post',
-		data: data,
-	});
-}
-// 获取产线平衡分析数据趋势图（new）
-export function getNewCTCharts(data) {
-  return request({
-    url: '/analysis/production-analysis/getNewCTCharts',
-    method: 'post',
-    data: data
-  })
-}
-// 获取产线平衡分析数据设备list（new）
-export function getNewCTDet(data) {
-  return request({
-		url: '/analysis/production-analysis/getNewCTDet',
-    method: 'post',
-    data:data
-	});
-}

src/api/core/base/factory.js

@@ -58,12 +58,3 @@ export function exportFactoryExcel(query) {
     responseType: 'blob'
   })
 }
-// 获取产线设备状态
-export function getLineEqStatus(data) {
-  return request({
-    url: '/base/production-line/getLineEqStatus',
-    method: 'post',
-    data: data
-  })
-}
-

src/api/core/base/lineBindProcess.js

@@ -1,28 +0,0 @@
-import request from '@/utils/request'
-
-
-// 切换工艺
-export function switchLineBindProcess(data) {
-  return request({
-    url: '/base/line-bind-process/switch',
-    method: 'put',
-    data: data
-  })
-}
-// 获得产线工艺目前生产工艺
-export function getLineBindProcessPage(query) {
-  return request({
-    url: '/base/line-bind-process/nowList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得产线工艺log分页
-export function getLineBindProcessLogPage(query) {
-  return request({
-    url: '/base/line-bind-process/logPage',
-    method: 'get',
-    params: query
-  })
-}

src/api/core/base/lineBindProduct.js

@@ -16,14 +16,6 @@ export function switchLineBindProduct(data) {
     data: data
   })
 }
-// 切换产线是否可以自动
-export function switchAutoProduct(data) {
-  return request({
-    url: '/base/line-bind-product/switchAuto',
-    method: 'put',
-    data: data
-  })
-}
 // 更新产线目前生产产品表 主要为更新
 export function updateLineBindProduct(data) {
   return request({

src/api/core/monitoring/auto.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2025-01-07 09:57:36
- * @LastEditors: zwq
+ * @LastEditTime: 2023-09-13 16:11:41
+ * @LastEditors: DY
  * @Description: 
  */
 import request from '@/utils/request'
@@ -17,79 +17,9 @@ export function getPdlAutoReport(data) {
 }
 
 // 获得所有工厂产线列表
-export function getPdList(id) {
+export function getPdList() {
   return request({
-    url: '/base/production-line/listAll' + (id ? '?id=' + id : ''),
+    url: '/base/production-line/listAll',
     method: 'get'
   })
 }
-// 获得产线自动报表
-export function getLineAuto(data) {
-  return request({
-    url: '/monitoring/production-monitor/getPdlAutoReportNew',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得产品自动报表
-export function getProductAuto(data) {
-  return request({
-    url: '/monitoring/production-monitor/getProcessAutoReportNew',
-    method: 'post',
-    data: data
-  })
-}
-
-export function getPdlAutoReportNewSearchNow(data) {
-	return request({
-		url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
-		method: 'post',
-		data: data,
-		timeout: 60000,
-	});
-}
-
-
-// 班组自动报表分页
-export function getTeamReportPage(data) {
-  return request({
-    url: '/monitoring/team-auto-report/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 班组自动报表分页详细
-export function getTeamReportPageDet(id) {
-  return request({
-    url: '/monitoring/team-auto-report/pageDet?id=' + id,
-    method: 'get',
-  })
-}
-
-// 获取产品当班数据
-export function getProcessAutoReportGroup(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportGroup',
-		method: 'post',
-		data: data,
-	});
-}
-
-// 获取产品当天数据
-export function getProcessAutoReportDay(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportDay',
-		method: 'post',
-		data: data,
-	});
-}
-// 获取产品历史数据
-export function getProcessAutoReportNew(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportNew',
-		method: 'post',
-		data: data,
-	});
-}

src/api/core/monitoring/data.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2025-03-03 10:43:34
- * @LastEditors: zwq
+ * @LastEditTime: 2023-09-14 10:25:46
+ * @LastEditors: DY
  * @Description: 
  */
 import request from '@/utils/request'
@@ -23,21 +23,3 @@ export function getPdList() {
     method: 'get'
   })
 }
-// 产线统计数据查询-历史
-export function getPdlAutoReportNewSearch(data) {
-  return request({
-    url: '/monitoring/production-monitor/getPdlAutoReportNewSearch',
-    method: 'post',
-    data: data
-  })
-}
-
-// 产线统计数据查询-当前
-export function getPdlAutoReportNewSearchNow(data) {
-  return request({
-    url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
-    method: 'post',
-    data: data,
-    timeout: 60000,
-  })
-}

src/api/core/monitoring/index.js

@@ -14,79 +14,3 @@ export function getSectionDataSearch(data) {
     data: data
   })
 }
-
-// 获取下片日志分页数据
-export function getDownLogPage(data) {
-  return request({
-		url: '/base/down-log/page',
-		method: 'get',
-		params: data,
-	});
-}
-
-// 获取下片日志历史数据
-export function getDownLogHisData(data) {
-  return request({
-		url: '/base/down-log/pagehis',
-		method: 'get',
-		params: data,
-	});
-}
-
-
-
-// 导出下片日志Excel
-export function exportDownLogData(query) {
-	return request({
-		url: '/base/down-log/export-excel',
-		method: 'get',
-		params: query,
-		responseType: 'blob',
-	});
-}
-
-
-// 获得所有工厂产线列表
-export function getPdList() {
-  return request({
-    url: '/base/production-line/listAll',
-    method: 'get'
-  })
-}
-// 获得玻璃型号列表
-export function getThick() {
-	return request({
-		url: '/base/down-log/thick',
-		method: 'get',
-	});
-}
-
-// 获得原片报表
-export function getCostOriginRadioHisData(data) {
-	return request({
-		url: '/monitoring/cost-origin-ratio-his/page',
-		method: 'get',
-		params: data,
-	});
-}
-
-// 修改原片报表
-export function editCostOriginRadioHisData(data) {
-	return request({
-		url: '/monitoring/cost-origin-ratio-his/update',
-		method: 'put',
-		data: data,
-	});
-}
-
-// 导出原片报表
-export function exportCostOriginRadioHisData(data) {
-	return request({
-		url: '/monitoring/cost-origin-ratio-his/export-excel',
-		method: 'get',
-		params: data,
-		responseType: 'blob',
-	});
-}
-
-

src/api/cost/allCost.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-04-18 16:53:17
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-06 14:35:13
+ * @LastEditTime: 2025-02-17 15:47:58
  * @Description:
  */
 
@@ -52,3 +52,21 @@ export function exportRawCostStatisticsHisExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 获得成本首页 -获取首页数据
+export function getData(query) {
+  return request({
+    url: '/monitoring/cost-homepage/getData',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得成本首页 -详细首页数据
+export function getDetailData(query) {
+  return request({
+    url: '/monitoring/cost-homepage/getDetailData',
+    method: 'get',
+    params: query
+  })
+}

src/api/cost/costOriginRatioHis.js

@@ -15,7 +15,7 @@ export function updatecostOriginRatioHis(data) {
     data: data
   })
 }
-// 获得原片良品率
+// 获得原片产线良品率
 export function getcostOriginRatioHisPage(query) {
   return request({
     url: '/monitoring/cost-origin-ratio-his/page',
@@ -24,6 +24,15 @@ export function getcostOriginRatioHisPage(query) {
   })
 }
 
+// 获得原片工段良品率
+export function getcostOriginWSRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/page-ws',
+    method: 'get',
+    params: query
+  })
+}
+
 // 导出原片良品率 Excel
 export function exportcostOriginRatioHisExcel(query) {
   return request({
@@ -34,3 +43,14 @@ export function exportcostOriginRatioHisExcel(query) {
   })
 }
 
+
+// 导出原片良品率 工段Excel
+export function exportcostOriginWSRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/export-excel-ws',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/environmental/environmentalLog.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 获得环保数据历史分页
+export function getCostEnviHisPage(query) {
+  return request({
+    url: '/monitoring/cost-envi-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得余热发电page
+export function yurepage(query) {
+  return request({
+    url: '/base/energy-quantity-day/yurepage',
+    method: 'get',
+    params: query
+  })
+}

src/api/group/Schedule.js

@@ -1,143 +0,0 @@
-import request from '@/utils/request'
-
-// 删除排班计划配置基础信息
-export function deleteGroupPlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-
-// 获得排班计划配置基础信息分页
-export function getGroupPlanPage(query) {
-  return request({
-    url: '/base/group-scheduling-plan/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取code
-export function getCode() {
-  return request({
-    url: '/base/group-scheduling-plan/getCode',
-    method: 'get'
-  })
-}
-
-// 获得产线工段树形结构
-export function getGroupPlanTree() {
-  return request({
-    url: '/base/factory/getTreeSimple',
-    method: 'get'
-  })
-}
-
-// 基础信息下一步至班组班次
-export function createStepOne(data) {
-  return request({
-    url: '/base/group-scheduling-plan/createStepOne',
-    method: 'post',
-    data:data
-  })
-}
-// 班组班次上一步至基础信息
-export function returnStepOne(id) {
-  return request({
-    url: '/base/group-scheduling-plan/returnStepOne?id='+id,
-    method: 'delete',
-  })
-}
-
-// 获取部门下可用班组
-export function listByDeptId(id) {
-  return request({
-    url: '/base/group-team/listByDeptId?id='+id,
-    method: 'get'
-  })
-}
-// 作废计划
-export function disablePlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/disablePlan?id='+id,
-    method: 'delete',
-  })
-}
-// 同步节假日
-export function updateScheduleLater(data) {
-  return request({
-    url: '/base/group-holiday/updateScheduleLater',
-    method: 'post',
-    data:data
-  })
-}
-// 复制计划
-export function copyPlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/copyPlan?id='+id,
-    method: 'get'
-  })
-}
-
-// 列表草稿编辑
-export function draftEditing(id) {
-  return request({
-    url: '/base/group-scheduling-plan/draftEditing?id='+id,
-    method: 'get'
-  })
-}
-// 排班计划-详情
-export function getPlan(id) {
-  return request({
-    url: '/base/group-scheduling-plan/get?id='+id,
-    method: 'get'
-  })
-}
-// 弹窗-取消
-export function cancelStepThree(id) {
-  return request({
-    url: '/base/group-scheduling-plan/cancelStepThree?id='+id,
-    method: 'delete',
-  })
-}
-// 第三步确认并执行 检查计划时间是否冲突，如果有，返回冲突的计划列表
-export function checkPlan(data) {
-  return request({
-    url: '/base/group-scheduling-plan/checkPlan',
-    method: 'post',
-    data:data
-  })
-}
-// 第三步确认并执行 执行
-export function createStepFour(id) {
-  return request({
-    url: '/base/group-scheduling-plan/createStepFour',
-    method: 'post',
-    data:id
-  })
-}
-// 班组班次下一步至获取预览
-export function createStepTwo(data) {
-  return request({
-    url: '/base/group-scheduling-plan/createStepTwo',
-    method: 'post',
-    data:data
-  })
-}
-// 获取预览上一步至班组班次
-export function returnStepTwo(id) {
-  return request({
-    url: '/base/group-scheduling-plan/returnStepTwo?id='+id,
-    method: 'delete',
-  })
-}
-
-// 第三步获取预览
-export function getPerView(data) {
-  return request({
-    url: '/base/group-scheduling-plan/getPerView',
-    method: 'post',
-    data:data
-  })
-}

src/api/group/calendar.js

@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 获取部门及下级部门排班list
-export function getDeptSchedulingList(data) {
-  return request({
-    url: '/base/group-team-scheduling/getDeptSchedulingList',
-    method: 'post',
-    data: data
-  })
-}
-// 某个班组的排班list
-export function getClassSchedulingList(data) {
-  return request({
-    url: '/base/group-team-scheduling/getClassSchedulingList',
-    method: 'post',
-    data: data
-  })
-}

src/api/group/groupSetting.js

@@ -1,47 +0,0 @@
-import request from '@/utils/request'
-
-// 创建班组基础信息
-export function createGroup(data) {
-  return request({
-    url: '/base/group-team/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新班组基础信息
-export function updateGroup(data) {
-  return request({
-    url: '/base/group-team/update',
-    method: 'put',
-    data: data
-  })
-}
-
-
-// 获得班组基础信息
-export function getGroup(id) {
-  return request({
-    url: '/base/group-team/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得班组基础信息分页
-export function getGroupPage(query) {
-  return request({
-    url: '/base/group-team/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取班组code
-export function getCode() {
-  return request({
-    url: '/base/group-team/getCode',
-    method: 'get'
-  })
-}
-
-

src/api/group/holidaySetting.js

@@ -1,92 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2025-10-18 21:24:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-22 14:34:29
- * @Description:
- */
-import request from '@/utils/request'
-
-// 获得节假日基础信息分页
-export function deptHolidayPage(query) {
-  return request({
-    url: '/base/group-holiday/page',
-    method: 'get',
-    params: query
-  })
-}
-// 获得部门节假日信息
-export function deptHolidayList(data) {
-  return request({
-    url: '/base/group-holiday/deptHolidayList',
-    method: 'post',
-    data: data
-  })
-}
-
-
-// 创建节假日基础信息
-export function createHoliday(data) {
-  return request({
-    url: '/base/group-holiday/create',
-    method: 'post',
-    data: data
-  })
-}
-// 节假日操作后直接更新排班日历
-export function updateSchedule(data) {
-  return request({
-    url: '/base/group-holiday/updateSchedule',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新节假日基础信息
-export function updateHoliday(data) {
-  return request({
-    url: '/base/group-holiday/update',
-    method: 'put',
-    data: data
-  })
-}
-// 删除节假日基础信息前校验是否影响排班
-export function checkDeleteHoliday(id) {
-  return request({
-    url: '/base/group-holiday/checkDelete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 删除
-export function deleteHoliday(id) {
-  return request({
-    url: '/base/group-holiday/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得节假日基础信息
-export function getHoliday(id) {
-  return request({
-    url: '/base/group-holiday/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得节假日变动日志分页
-export function deptHolidayLogList(query) {
-  return request({
-    url: '/base/group-holiday-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得用户本人及以下的部门扁平化结构
-export function getEnableData() {
-  return request({
-    url: '/base/group-team-scheduling/getEnableData',
-    method: 'get',
-  })
-}

src/assets/font/font.css

@@ -0,0 +1,4 @@
+@font-face {
+  font-family: '站酷庆科黄油体';
+  src: url('./站酷庆科黄油体.ttf') format('truetype');;
+}

src/assets/icons/svg/cost.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
+    <defs>
+        <linearGradient x1="91.384997%" y1="100%" x2="25.4330364%" y2="7.84095011e-14%" id="linearGradient-1">
+            <stop stop-color="#4BFFC8" offset="0%"></stop>
+            <stop stop-color="#45F2EC" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="91.384997%" y1="100%" x2="25.4330364%" y2="7.84095011e-14%" id="linearGradient-2">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="成本看板" transform="translate(-64.000000, -290.000000)" fill-rule="nonzero">
+            <g id="成本" transform="translate(64.000000, 290.000000)">
+                <rect id="矩形" fill="#FFFFFF" opacity="0" x="0" y="0" width="32" height="32"></rect>
+                <path d="M24.8336138,7.21888656 C25.307557,7.21888656 25.7025096,7.62700427 25.6893445,8.08778234 L25.6893445,25.768495 C25.6893445,26.5452352 25.2417316,26.6505559 24.859944,26.6505559 L7.17923134,26.6505559 C6.6921231,26.6505559 6.31033556,26.2556033 6.31033556,25.7816601 L6.31033556,8.10094743 C6.31033556,7.61383919 6.70528819,7.23205165 7.17923134,7.23205165 L10.3915127,7.23205165 L10.3915127,9.00933847 C10.3915127,9.41745619 10.733805,9.75974847 11.1419227,9.75974847 L20.8709225,9.75974847 C21.2790402,9.75974847 21.6213325,9.43062128 21.6213325,9.00933847 L21.6213325,7.21888656 Z M21.3580307,13.7224398 C21.0289035,13.3933127 20.5154651,13.3933127 20.1863379,13.7224398 L14.5385153,19.3702624 L11.7738469,16.6319242 C11.4447197,16.302797 10.9312813,16.302797 10.6021541,16.6319242 C10.2730269,16.9610514 10.2730269,17.4744898 10.6021541,17.803617 L13.9460864,21.1475493 C14.2752136,21.4766764 14.788652,21.4766764 15.1177792,21.1475493 L21.3711958,14.9072977 C21.5423419,14.7361516 21.6213325,14.5386753 21.6213325,14.3148688 C21.6213325,14.0910623 21.5291768,13.893586 21.3580307,13.7224398 Z M19.896706,5.34944412 C20.1863379,5.34944412 20.4364746,5.59958078 20.4364746,5.88921271 L20.4364746,8.10094743 C20.4364746,8.39057936 20.1863379,8.64071602 19.896706,8.64071602 L12.1161392,8.64071602 L12.1161392,8.6670462 C11.8265073,8.6670462 11.5763706,8.41690953 11.5763706,8.1272776 L11.5763706,5.88921271 C11.5763706,5.59958078 11.8265073,5.34944412 12.1161392,5.34944412 L19.896706,5.34944412 Z" id="形状结合" fill="url(#linearGradient-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/costchart.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="成本看板" transform="translate(-64.000000, -633.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="近期成本" transform="translate(64.000000, 633.000000)">
+                <rect id="矩形" opacity="0" x="0" y="0" width="32" height="32"></rect>
+                <path d="M26,23 L18.2,27.8 C17.6,28.2 17,27.8 17,27 L17,15.8 C17,15.6 17.2,15.2 17.4,15 L25.2,10.2 C25.8,9.8 26.4,10.2 26.4,11 L26.4,22.4 C26.4,22.6 26.2,23 26,23 Z M6,23 L13.8,27.8 C14.4,28.2 15,27.8 15,27 L15,15.8 C15,15.6 14.8,15.2 14.6,15 L6.8,10.2 C6.4,10 5.6,10.4 5.6,11 L5.6,22.4 C5.6,22.6 5.8,23 6,23 Z M15.8,4 L6.8,7.4 C6.4,7.6 6.4,8.2 6.8,8.4 L15.8,14 C16,14 16.2,14 16.2,14 L25.4,8.4 C25.8,8.2 25.8,7.6 25.4,7.4 L16.2,4 C16,4 16,4 15.8,4 Z" id="形状"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/energy.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24.3417579px" height="24.000009px" viewBox="0 0 24.3417579 24.000009" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>统计</title>
+    <defs>
+        <linearGradient x1="99.4683184%" y1="100%" x2="20.6346149%" y2="7.84095011e-14%" id="linearGradient-1">
+            <stop stop-color="#4BFFC8" offset="0%"></stop>
+            <stop stop-color="#45F2EC" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="99.4683184%" y1="100%" x2="20.6346149%" y2="7.84095011e-14%" id="linearGradient-2">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="成本看板" transform="translate(-1327.000000, -636.000000)" fill-rule="nonzero">
+            <g id="统计" transform="translate(1327.000000, 636.000000)">
+                <rect id="矩形" fill="#FFFFFF" opacity="0" x="0" y="1.29865498e-07" width="23.9999981" height="23.9999981"></rect>
+                <path d="M21.0417425,10.2952681 L19.5753585,10.2952681 L19.5753585,5.90037875 C19.5730113,5.34644149 19.1232931,4.89862885 18.5693508,4.89863383 L13.1812421,4.89863383 L13.1812421,3.15517144 C13.1837389,2.30739523 12.8439612,1.49449588 12.2388994,0.900668572 C11.6338375,0.306841265 10.8147135,-0.0176430365 9.96713292,0.000740689882 C8.21105284,0.081169063 6.8366707,1.54239403 6.8638551,3.30010475 L6.8638551,4.89863383 L1.47574634,4.89863383 C0.921804107,4.89862885 0.472085895,5.34644149 0.46970252,5.90037875 L0.46970252,9.28073494 C0.467465023,9.54901885 0.572450222,9.80709649 0.76136025,9.99760745 C0.950270278,10.1881184 1.2074528,10.2952777 1.47574634,10.2952681 L2.03842858,10.2952681 C3.79455985,10.2680012 5.25513623,11.6398863 5.33779264,13.3942831 C5.35388802,14.2418862 5.02721285,15.0601101 4.4317847,15.6635629 C3.83635654,16.2670156 3.02257894,16.6046145 2.1748364,16.5998668 L1.47574634,16.5998668 C0.92014366,16.5998668 0.46970252,17.0502718 0.46970252,17.6058745 L0.46970252,22.9939832 C0.46970252,23.5495859 0.92014366,24 1.47574634,24 L5.85784745,24 C6.1250049,24.0011302 6.38154936,23.8955063 6.57045992,23.7065957 C6.75937048,23.5176851 6.86499438,23.2611407 6.8638551,22.9939832 L6.8638551,22.4952422 C6.8366707,20.7375314 8.21105284,19.2763065 9.96713292,19.1958781 C10.8147135,19.1774944 11.6338375,19.5019787 12.2388994,20.095806 C12.8439612,20.6896333 13.1837389,21.5025326 13.1812421,22.3503088 L13.1812421,22.9939832 C13.1801084,23.2604003 13.2851484,23.5162945 13.473135,23.7050811 C13.6611216,23.8938677 13.9165675,24 14.182987,24 L18.5693508,24 C19.1249535,24 19.5753585,23.5495859 19.5753585,22.9939832 L19.5753585,16.5998668 L21.1824131,16.5998668 C22.0301722,16.6034883 22.8435102,16.2647998 23.4381378,15.6605426 C24.0327653,15.0562855 24.3583453,14.237612 24.3411066,13.3900204 C24.2562262,11.637307 22.7962968,10.2679159 21.0417425,10.2952681 Z" id="路径" fill="url(#linearGradient-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/fullScreenView.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 54</title>
+    <g id="驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="运营总览_生产线监控驾驶舱" transform="translate(-1866.000000, -36.000000)">
+            <g id="编组-54" transform="translate(1866.000000, 36.000000)">
+                <rect id="矩形" stroke="#69b4ff" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="32" height="32"></rect>
+                <path d="M18.4001211,1 L18.574731,1.00571398 C18.8641421,1.02474925 19.1451559,1.09128771 19.4122178,1.20447947 C19.7221027,1.33395436 19.9991094,1.52058631 20.2392616,1.76073844 C20.4776764,1.99915325 20.6652172,2.27804627 20.7953442,2.58736464 C20.9313506,2.90825642 21,3.24882158 21,3.59987893 L21,3.59987893 L21,18.4001211 L20.994286,18.574731 C20.9752507,18.8641421 20.9087123,19.1451559 20.7955205,19.4122178 C20.6660456,19.7221027 20.4794137,19.9991094 20.2392616,20.2392616 C20.0008468,20.4776764 19.7219537,20.6652172 19.4126354,20.7953442 C19.0917436,20.9313506 18.7511784,21 18.4001211,21 L18.4001211,21 L3.59987893,21 L3.42526905,20.994286 C3.13585794,20.9752507 2.85484405,20.9087123 2.58778224,20.7955205 C2.2778973,20.6660456 2.00089057,20.4794137 1.76073844,20.2392616 C1.52232363,20.0008468 1.33478285,19.7219537 1.20465581,19.4126354 C1.06864936,19.0917436 1,18.7511784 1,18.4001211 L1,18.4001211 L1,3.59987893 L1.00571398,3.42526905 C1.02474925,3.13585794 1.09128771,2.85484405 1.20447947,2.58778224 C1.33395436,2.2778973 1.52058631,2.00089057 1.76073844,1.76073844 C1.99915325,1.52232363 2.27804627,1.33478285 2.58736464,1.20465581 C2.90825642,1.06864936 3.24882158,1 3.59987893,1 L3.59987893,1 L18.4001211,1 Z M18.4001211,2.29539952 L3.59987893,2.29539952 L3.49797651,2.2993263 C2.82542992,2.35136056 2.29539952,2.9140495 2.29539952,3.59987893 L2.29539952,3.59987893 L2.29539952,18.4001211 L2.2993263,18.5020235 C2.35136056,19.1745701 2.9140495,19.7046005 3.59987893,19.7046005 L3.59987893,19.7046005 L18.4001211,19.7046005 L18.5020235,19.7006737 C19.1745701,19.6486394 19.7046005,19.0859505 19.7046005,18.4001211 L19.7046005,18.4001211 L19.7046005,3.59987893 L19.7006737,3.49797651 C19.6486394,2.82542992 19.0859505,2.29539952 18.4001211,2.29539952 L18.4001211,2.29539952 Z M4.56580299,11.8731508 L4.63987359,11.8789244 C4.95620444,11.9219442 5.20096852,12.1943435 5.20096852,12.5208838 L5.20096852,12.5208838 L5.20096852,15.8606113 L8.39814764,12.6634321 L8.45892035,12.6098356 C8.71226443,12.4133149 9.08161636,12.4311804 9.3138681,12.6634321 C9.56547415,12.9150382 9.56547415,13.3275466 9.3138681,13.5791526 L9.3138681,13.5791526 L6.09149511,16.7990315 L9.4155569,16.7990315 L9.49368756,16.8035151 C9.82695229,16.8420028 10.0864105,17.123441 10.081435,17.4601165 C10.0742517,17.8119637 9.78624591,18.094431 9.43371671,18.094431 L9.43371671,18.094431 L4.5691586,18.094431 L4.49163938,18.0899766 C4.16113157,18.051728 3.90556901,17.7718105 3.90556901,17.4308414 L3.90556901,17.4308414 L3.90556901,12.5367736 L3.91007171,12.4587841 C3.94871707,12.1260764 4.23118526,11.8665247 4.56580299,11.8731508 L4.56580299,11.8731508 Z M17.4353814,3.90556901 L17.512257,3.91000958 C17.8400885,3.94813523 18.094431,4.22707005 18.094431,4.56461864 L18.094431,4.56461864 L18.094431,9.46095642 L18.0899283,9.53894589 C18.0512829,9.87165361 17.7688147,10.1312053 17.434197,10.1245792 C17.0828999,10.1173731 16.7990315,9.82850504 16.7990315,9.47684625 L16.7990315,9.47684625 L16.7990315,6.13938874 L13.6018524,9.33656786 L13.5410796,9.39016441 C13.2877356,9.58668512 12.9183836,9.5688196 12.6861319,9.33656786 C12.4345258,9.08496181 12.4345258,8.67245345 12.6861319,8.4208474 L12.6861319,8.4208474 L15.9060108,5.20096852 L12.5821731,5.20096852 L12.5040246,5.19648608 C12.170734,5.1580095 11.9119308,4.876675 11.9185506,4.54071802 C11.9257483,4.18803625 12.2137541,3.90556901 12.5662833,3.90556901 L12.5662833,3.90556901 L17.4353814,3.90556901 Z" id="形状结合" fill="#69b4ff" fill-rule="nonzero" opacity="0.79078311"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/fullscreen.svg

@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>全屏</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="首页" transform="translate(-1865.000000, -106.000000)" fill="#0B58FF">
-            <g id="全屏" transform="translate(1865.000000, 106.000000)">
-                <g>
-                    <rect id="矩形" stroke="#0B58FF" opacity="0" x="0.5" y="0.5" width="31" height="31"></rect>
-                    <path d="M27.3264942,0.842105263 L27.583814,0.850525866 C28.0103146,0.878577843 28.4244403,0.976634518 28.8180051,1.14344343 C29.2746777,1.33424853 29.6828981,1.60928508 30.0368065,1.96319349 C30.3881547,2.31454163 30.6645305,2.72554187 30.8562967,3.18137947 C31.0567273,3.65427262 31.1578947,4.15615812 31.1578947,4.6735058 L31.1578947,26.4843889 L31.1494741,26.7417088 C31.1214222,27.1682093 31.0233655,27.5823351 30.8565566,27.9758999 C30.6657515,28.4325724 30.3907149,28.8407928 30.0368065,29.1947013 C29.6854584,29.5460494 29.2744581,29.8224253 28.8186205,30.0141914 C28.3457274,30.214622 27.8438419,30.3157895 27.3264942,30.3157895 L5.51561106,30.3157895 L5.25829123,30.3073689 C4.83179065,30.2793169 4.41766492,30.1812602 4.02410014,30.0144513 C3.5674276,29.8236462 3.15920715,29.5486097 2.80529875,29.1947013 C2.45395061,28.8433531 2.17757472,28.4323529 1.98580856,27.9765153 C1.785378,27.5036221 1.68421053,27.0017366 1.68421053,26.4843889 L1.68421053,4.6735058 L1.69263113,4.41618596 C1.72068311,3.98968539 1.81873978,3.57555966 1.98554869,3.18199488 C2.17635379,2.72532234 2.45139035,2.31710189 2.80529875,1.96319349 C3.15664689,1.61184534 3.56764713,1.33546946 4.02348473,1.1437033 C4.49637788,0.943272735 4.99826338,0.842105263 5.51561106,0.842105263 L27.3264942,0.842105263 Z M27.3264942,2.75111508 L5.51561106,2.75111508 L5.36543907,2.75690192 C4.37431777,2.83358398 3.59322034,3.6628098 3.59322034,4.6735058 L3.59322034,26.4843889 L3.59900719,26.6345609 C3.67568924,27.6256822 4.50491506,28.4067797 5.51561106,28.4067797 L27.3264942,28.4067797 L27.4766662,28.4009928 C28.4677875,28.3243108 29.2488849,27.4950849 29.2488849,26.4843889 L29.2488849,4.6735058 L29.2430981,4.52333381 C29.166416,3.53221251 28.3371902,2.75111508 27.3264942,2.75111508 Z M6.93907808,16.8656959 L7.04823476,16.8742044 C7.51440654,16.9376019 7.87511151,17.3390325 7.87511151,17.8202498 L7.87511151,22.7419534 L12.5867439,18.0303211 L12.6763037,17.9513367 C13.0496528,17.6617272 13.593961,17.6880553 13.9362267,18.0303211 C14.3070145,18.4011089 14.3070145,19.009016 13.9362267,19.3798038 L9.18746648,24.1248885 L14.0860839,24.1248885 L14.2012238,24.1314959 C14.6923507,24.1882147 15.0747102,24.6029657 15.0673779,25.0991191 C15.056792,25.6176308 14.6323624,26.0338983 14.1128457,26.0338983 L6.94402319,26.0338983 L6.82978436,26.0273339 C6.34272021,25.9709676 5.96610169,25.5584576 5.96610169,25.0559768 L5.96610169,17.8436664 L5.97273726,17.7287345 C6.02968832,17.2384284 6.44595722,16.8559311 6.93907808,16.8656959 Z M25.9047725,5.12399643 L26.0180629,5.13054044 C26.501183,5.1867256 26.8760036,5.59778744 26.8760036,6.09522748 L26.8760036,13.3108831 L26.869368,13.425815 C26.8124169,13.9161211 26.396148,14.2986184 25.9030272,14.2888536 C25.3853261,14.278234 24.9669938,13.8525337 24.9669938,13.3342997 L24.9669938,8.4159413 L20.2553614,13.1275737 L20.1658016,13.2065581 C19.7924524,13.4961675 19.2481443,13.4698394 18.9058786,13.1275737 C18.5350907,12.7567858 18.5350907,12.1488788 18.9058786,11.7780909 L23.6509632,7.03300624 L18.7526762,7.03300624 L18.6375099,7.02640054 C18.1463449,6.96969821 17.7649507,6.5551 17.7747062,6.0600055 C17.7853132,5.54026395 18.2097429,5.12399643 18.7292596,5.12399643 L25.9047725,5.12399643 Z" id="形状结合" fill-rule="nonzero" opacity="0.79078311"></path>
-                </g>
-                <g>
-                    <rect id="矩形" stroke="#0B58FF" opacity="0" x="0.5" y="0.5" width="31" height="31"></rect>
-                    <path d="M27.3264942,0.842105263 L27.583814,0.850525866 C28.0103146,0.878577843 28.4244403,0.976634518 28.8180051,1.14344343 C29.2746777,1.33424853 29.6828981,1.60928508 30.0368065,1.96319349 C30.3881547,2.31454163 30.6645305,2.72554187 30.8562967,3.18137947 C31.0567273,3.65427262 31.1578947,4.15615812 31.1578947,4.6735058 L31.1578947,26.4843889 L31.1494741,26.7417088 C31.1214222,27.1682093 31.0233655,27.5823351 30.8565566,27.9758999 C30.6657515,28.4325724 30.3907149,28.8407928 30.0368065,29.1947013 C29.6854584,29.5460494 29.2744581,29.8224253 28.8186205,30.0141914 C28.3457274,30.214622 27.8438419,30.3157895 27.3264942,30.3157895 L5.51561106,30.3157895 L5.25829123,30.3073689 C4.83179065,30.2793169 4.41766492,30.1812602 4.02410014,30.0144513 C3.5674276,29.8236462 3.15920715,29.5486097 2.80529875,29.1947013 C2.45395061,28.8433531 2.17757472,28.4323529 1.98580856,27.9765153 C1.785378,27.5036221 1.68421053,27.0017366 1.68421053,26.4843889 L1.68421053,4.6735058 L1.69263113,4.41618596 C1.72068311,3.98968539 1.81873978,3.57555966 1.98554869,3.18199488 C2.17635379,2.72532234 2.45139035,2.31710189 2.80529875,1.96319349 C3.15664689,1.61184534 3.56764713,1.33546946 4.02348473,1.1437033 C4.49637788,0.943272735 4.99826338,0.842105263 5.51561106,0.842105263 L27.3264942,0.842105263 Z M27.3264942,2.75111508 L5.51561106,2.75111508 L5.36543907,2.75690192 C4.37431777,2.83358398 3.59322034,3.6628098 3.59322034,4.6735058 L3.59322034,26.4843889 L3.59900719,26.6345609 C3.67568924,27.6256822 4.50491506,28.4067797 5.51561106,28.4067797 L27.3264942,28.4067797 L27.4766662,28.4009928 C28.4677875,28.3243108 29.2488849,27.4950849 29.2488849,26.4843889 L29.2488849,4.6735058 L29.2430981,4.52333381 C29.166416,3.53221251 28.3371902,2.75111508 27.3264942,2.75111508 Z M6.93907808,16.8656959 L7.04823476,16.8742044 C7.51440654,16.9376019 7.87511151,17.3390325 7.87511151,17.8202498 L7.87511151,22.7419534 L12.5867439,18.0303211 L12.6763037,17.9513367 C13.0496528,17.6617272 13.593961,17.6880553 13.9362267,18.0303211 C14.3070145,18.4011089 14.3070145,19.009016 13.9362267,19.3798038 L9.18746648,24.1248885 L14.0860839,24.1248885 L14.2012238,24.1314959 C14.6923507,24.1882147 15.0747102,24.6029657 15.0673779,25.0991191 C15.056792,25.6176308 14.6323624,26.0338983 14.1128457,26.0338983 L6.94402319,26.0338983 L6.82978436,26.0273339 C6.34272021,25.9709676 5.96610169,25.5584576 5.96610169,25.0559768 L5.96610169,17.8436664 L5.97273726,17.7287345 C6.02968832,17.2384284 6.44595722,16.8559311 6.93907808,16.8656959 Z M25.9047725,5.12399643 L26.0180629,5.13054044 C26.501183,5.1867256 26.8760036,5.59778744 26.8760036,6.09522748 L26.8760036,13.3108831 L26.869368,13.425815 C26.8124169,13.9161211 26.396148,14.2986184 25.9030272,14.2888536 C25.3853261,14.278234 24.9669938,13.8525337 24.9669938,13.3342997 L24.9669938,8.4159413 L20.2553614,13.1275737 L20.1658016,13.2065581 C19.7924524,13.4961675 19.2481443,13.4698394 18.9058786,13.1275737 C18.5350907,12.7567858 18.5350907,12.1488788 18.9058786,11.7780909 L23.6509632,7.03300624 L18.7526762,7.03300624 L18.6375099,7.02640054 C18.1463449,6.96969821 17.7649507,6.5551 17.7747062,6.0600055 C17.7853132,5.54026395 18.2097429,5.12399643 18.7292596,5.12399643 L25.9047725,5.12399643 Z" id="形状结合" fill-rule="nonzero" opacity="0.79078311"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>

src/assets/icons/svg/line.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>产量</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="深加工看板" transform="translate(-68.000000, -297.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="产量" transform="translate(68.000000, 297.000000)">
+                <rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                <path d="M22.2162957,1 L1.78372985,1 C1.35093374,1 1,1.33440606 1,1.75168741 L1,7 L23,7 L23,1.75168741 C23,1.33486987 22.6491174,1 22.2162957,1 Z M4.00067655,5 C3.44751496,5 3,4.5525025 3,3.99928444 C3,3.44752352 3.44751496,3 4.00067655,3 C4.55245902,3 5,3.44752352 5,3.99928444 C5,4.5525025 4.55245902,5 4.00067655,5 L4.00067655,5 Z M1,22.2486389 C1,22.6651285 1.35099088,23 1.78385746,23 L22.2161681,23 C22.6499302,23 23,22.6651041 23,22.2486389 L23,17 L1,17 L1,22.2486389 Z M4.00067655,19 C4.55245902,19 5,19.4475091 5,19.9997788 C5,20.5524648 4.55245902,21 4.00067655,21 C3.44751496,21 3,20.5524648 3,19.9997788 C3,19.4475091 3.44751496,19 4.00067655,19 Z M1,15 L23,15 L23,9 L1,9 L1,15 Z M4.00067655,11 C4.55245902,11 5,11.4479977 5,12.0002082 C5,12.552939 4.55245902,13 4.00067655,13 C3.44751496,13 3,12.552939 3,12.0002082 C3,11.4479977 3.44751496,11 4.00067655,11 L4.00067655,11 Z" id="形状"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/refresh.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>更新</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="首页" transform="translate(-474.000000, -116.000000)" fill="#0B58FF" fill-rule="nonzero">
-            <g id="更新" transform="translate(474.000000, 116.000000)">
-                <rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M14.9793977,2.67910156 L13.9879914,3.45429687 C12.6362336,1.72636719 10.5338899,0.6171875 8.17314768,0.6171875 C4.09678049,0.6171875 0.797366431,3.91308594 0.792086694,7.99121094 C0.786819556,12.0728516 4.09326487,15.3828125 8.17314768,15.3828125 C11.3600617,15.3828125 14.0758821,13.3613281 15.1094758,10.5294922 C15.135843,10.4556641 15.0971711,10.3730469 15.023343,10.3484375 L14.0266633,10.0056641 C13.954593,9.98105469 13.8754914,10.0179688 13.8491242,10.0900391 C13.8174836,10.1779297 13.7823274,10.2658203 13.7454133,10.3519531 C13.4413117,11.0726562 13.0053742,11.7195312 12.4499055,12.275 C11.8944367,12.8304687 11.2475617,13.2664062 10.5286164,13.5722656 C9.78506174,13.8869141 8.99228831,14.046875 8.17666331,14.046875 C7.35928049,14.046875 6.56826487,13.8869141 5.82471018,13.5722656 C5.10576487,13.2681641 4.45888987,12.8322266 3.90342112,12.275 C3.34795237,11.7195312 2.91201487,11.0726562 2.60791331,10.3519531 C2.29326487,9.60664063 2.13330393,8.815625 2.13330393,7.99824219 C2.13330393,7.18085937 2.29326487,6.38984375 2.60791331,5.64453125 C2.91201487,4.92382812 3.34795237,4.27695312 3.90342112,3.72148438 C4.45888987,3.16601563 5.10576487,2.73007813 5.82471018,2.42421875 C6.56826487,2.10957031 7.36103831,1.94960938 8.17666331,1.94960938 C8.99404612,1.94960938 9.78506174,2.10957031 10.5286164,2.42421875 C11.2475617,2.72832031 11.8944367,3.16425781 12.4499055,3.72148438 C12.6239289,3.89550781 12.7874055,4.08007812 12.9385774,4.2734375 L11.8803742,5.09960938 C11.7872102,5.17167969 11.8188508,5.31933594 11.9331086,5.34746094 L15.0198274,6.10332031 C15.107718,6.12441406 15.1938508,6.05761719 15.1938508,5.96796875 L15.2079133,2.78808594 C15.2061555,2.67207031 15.0708039,2.60703125 14.9793977,2.67910156 L14.9793977,2.67910156 Z" id="路径" stroke="#0B58FF" stroke-width="0.5"></path>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/icons/svg/unFullScreenView.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 54备份</title>
+    <g id="驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-54备份">
+            <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="21" height="21"></rect>
+            <path d="M18.4001211,1 L18.574731,1.00571398 C18.8641421,1.02474925 19.1451559,1.09128771 19.4122178,1.20447947 C19.7221027,1.33395436 19.9991094,1.52058631 20.2392616,1.76073844 C20.4776764,1.99915325 20.6652172,2.27804627 20.7953442,2.58736464 C20.9313506,2.90825642 21,3.24882158 21,3.59987893 L21,3.59987893 L21,18.4001211 L20.994286,18.574731 C20.9752507,18.8641421 20.9087123,19.1451559 20.7955205,19.4122178 C20.6660456,19.7221027 20.4794137,19.9991094 20.2392616,20.2392616 C20.0008468,20.4776764 19.7219537,20.6652172 19.4126354,20.7953442 C19.0917436,20.9313506 18.7511784,21 18.4001211,21 L18.4001211,21 L3.59987893,21 L3.42526905,20.994286 C3.13585794,20.9752507 2.85484405,20.9087123 2.58778224,20.7955205 C2.2778973,20.6660456 2.00089057,20.4794137 1.76073844,20.2392616 C1.52232363,20.0008468 1.33478285,19.7219537 1.20465581,19.4126354 C1.06864936,19.0917436 1,18.7511784 1,18.4001211 L1,18.4001211 L1,3.59987893 L1.00571398,3.42526905 C1.02474925,3.13585794 1.09128771,2.85484405 1.20447947,2.58778224 C1.33395436,2.2778973 1.52058631,2.00089057 1.76073844,1.76073844 C1.99915325,1.52232363 2.27804627,1.33478285 2.58736464,1.20465581 C2.90825642,1.06864936 3.24882158,1 3.59987893,1 L3.59987893,1 L18.4001211,1 Z M18.4001211,2.29539952 L3.59987893,2.29539952 L3.49797651,2.2993263 C2.82542992,2.35136056 2.29539952,2.9140495 2.29539952,3.59987893 L2.29539952,3.59987893 L2.29539952,18.4001211 L2.2993263,18.5020235 C2.35136056,19.1745701 2.9140495,19.7046005 3.59987893,19.7046005 L3.59987893,19.7046005 L18.4001211,19.7046005 L18.5020235,19.7006737 C19.1745701,19.6486394 19.7046005,19.0859505 19.7046005,18.4001211 L19.7046005,18.4001211 L19.7046005,3.59987893 L19.7006737,3.49797651 C19.6486394,2.82542992 19.0859505,2.29539952 18.4001211,2.29539952 L18.4001211,2.29539952 Z M9.43538136,11.905569 L9.512257,11.9100096 C9.84008849,11.9481352 10.094431,12.2270701 10.094431,12.5646186 L10.094431,12.5646186 L10.094431,17.4609564 L10.0899283,17.5389459 C10.0512829,17.8716536 9.76881474,18.1312053 9.43419701,18.1245792 C9.08289988,18.1173731 8.79903148,17.828505 8.79903148,17.4768462 L8.79903148,17.4768462 L8.79903148,14.1393887 L5.60185236,17.3365679 L5.54107965,17.3901644 C5.28773557,17.5866851 4.91838364,17.5688196 4.6861319,17.3365679 C4.43452585,17.0849618 4.43452585,16.6724534 4.6861319,16.4208474 L4.6861319,16.4208474 L7.90601077,13.2009685 L4.58217312,13.2009685 L4.50402457,13.1964861 C4.17073404,13.1580095 3.9119308,12.876675 3.91855064,12.540718 C3.92574827,12.1880363 4.21375409,11.905569 4.56628329,11.905569 L4.56628329,11.905569 L9.43538136,11.905569 Z M12.565803,3.8731508 L12.6398736,3.87892442 C12.9562044,3.92194416 13.2009685,4.19434347 13.2009685,4.52088378 L13.2009685,4.52088378 L13.2009685,7.86061126 L16.3981476,4.66343214 L16.4589204,4.60983559 C16.7122644,4.41331488 17.0816164,4.4311804 17.3138681,4.66343214 C17.5654742,4.91503819 17.5654742,5.32754655 17.3138681,5.5791526 L17.3138681,5.5791526 L14.0914951,8.79903148 L17.4155569,8.79903148 L17.4936876,8.80351509 C17.8269523,8.84200281 18.0864105,9.12344101 18.081435,9.46011654 C18.0742517,9.81196375 17.7862459,10.094431 17.4337167,10.094431 L17.4337167,10.094431 L12.5691586,10.094431 L12.4916394,10.0899766 C12.1611316,10.051728 11.905569,9.77181051 11.905569,9.4308414 L11.905569,9.4308414 L11.905569,4.53677361 L11.9100717,4.45878413 C11.9487171,4.12607641 12.2311853,3.86652471 12.565803,3.8731508 L12.565803,3.8731508 Z" id="形状结合" fill="#69b4ff" fill-rule="nonzero" opacity="0.79078311"></path>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/unFullscreen.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>推出全屏</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="首页" transform="translate(-1815.000000, -103.000000)" fill="#0B58FF">
-            <g id="推出全屏" transform="translate(1815.000000, 103.000000)">
-                <g id="全屏">
-                    <rect id="矩形" stroke="#0B58FF" opacity="0" x="0.5" y="0.5" width="31" height="31"></rect>
-                    <path d="M26.7638125,1.45454545 L27.0177905,1.4628567 C27.4387521,1.49054436 27.8474996,1.58732758 28.2359531,1.75197014 C28.6866948,1.94029725 29.0896137,2.2117619 29.4389259,2.56107409 C29.7857111,2.90785927 30.0584977,3.31352185 30.2477734,3.76343947 C30.4456009,4.23019115 30.5454545,4.72555866 30.5454545,5.23618754 L30.5454545,26.7638125 L30.5371433,27.0177905 C30.5094556,27.4387521 30.4126724,27.8474996 30.2480299,28.2359531 C30.0597028,28.6866948 29.7882381,29.0896137 29.4389259,29.4389259 C29.0921407,29.7857111 28.6864782,30.0584977 28.2365605,30.2477734 C27.7698088,30.4456009 27.2744413,30.5454545 26.7638125,30.5454545 L5.23618754,30.5454545 L4.98220952,30.5371433 C4.56124792,30.5094556 4.15250044,30.4126724 3.7640469,30.2480299 C3.31330516,30.0597028 2.91038628,29.7882381 2.56107409,29.4389259 C2.21428891,29.0921407 1.94150232,28.6864782 1.75222663,28.2365605 C1.55439906,27.7698088 1.45454545,27.2744413 1.45454545,26.7638125 L1.45454545,5.23618754 L1.4628567,4.98220952 C1.49054436,4.56124792 1.58732758,4.15250044 1.75197014,3.7640469 C1.94029725,3.31330516 2.2117619,2.91038628 2.56107409,2.56107409 C2.90785927,2.21428891 3.31352185,1.94150232 3.76343947,1.75222663 C4.23019115,1.55439906 4.72555866,1.45454545 5.23618754,1.45454545 L26.7638125,1.45454545 Z M26.7638125,3.33876293 L5.23618754,3.33876293 L5.08796584,3.34447462 C4.10971624,3.42016081 3.33876293,4.23861746 3.33876293,5.23618754 L3.33876293,26.7638125 L3.34447462,26.9120342 C3.42016081,27.8902838 4.23861746,28.6612371 5.23618754,28.6612371 L26.7638125,28.6612371 L26.9120342,28.6555254 C27.8902838,28.5798392 28.6612371,27.7613825 28.6612371,26.7638125 L28.6612371,5.23618754 L28.6555254,5.08796584 C28.5798392,4.10971624 27.7613825,3.33876293 26.7638125,3.33876293 Z M13.6987866,17.269857 L13.8115418,17.2763362 C14.2922804,17.3319705 14.6640078,17.7391232 14.6640078,18.2350783 L14.6640078,25.3537223 L14.6574584,25.4671616 C14.6012469,25.9511001 14.1903841,26.3286298 13.7036674,26.3189919 L13.5959284,26.3105939 C13.1358108,26.2480197 12.7797903,25.8518025 12.7797903,25.3768348 L12.7797903,20.5190494 L8.12934794,25.1694917 L8.04095127,25.2474504 C7.67245079,25.5332987 7.13521162,25.5073124 6.79739091,25.1694917 C6.43141847,24.8035193 6.43141847,24.2035071 6.79739091,23.8375347 L11.4844789,19.1540745 L6.64947993,19.1540745 L6.53583534,19.1475529 C6.05108664,19.0915708 5.67369292,18.6822061 5.68093001,18.1924962 C5.69137836,17.6807185 6.11029591,17.269857 6.62306566,17.269857 L13.6987866,17.269857 Z M18.2962333,5.68100813 C18.807211,5.69148979 19.2201105,6.11166149 19.2201105,6.62316519 L19.2201105,11.4776488 L23.8705528,6.82720649 L23.9589495,6.74924786 C24.32745,6.46339956 24.8646892,6.48938577 25.2025099,6.82720649 C25.5684823,7.19317893 25.5684823,7.79319108 25.2025099,8.15916352 L20.5190497,12.8426237 L25.3537226,12.8426237 L25.4673933,12.8491436 C25.9521795,12.9051095 26.3286206,13.3143234 26.3189917,13.8029881 C26.3085224,14.3159797 25.8896049,14.7268412 25.3768351,14.7268412 L18.2945107,14.7268412 L18.1826915,14.7203822 C17.7058457,14.6649267 17.335893,14.2592033 17.335893,13.7682235 L17.335893,6.64627767 L17.3424424,6.53283844 C17.3986538,6.04889994 17.8095166,5.67137018 18.2962333,5.68100813 Z" id="形状结合" fill-rule="nonzero" opacity="0.79078311"></path>
-                </g>
-                <g id="全屏">
-                    <rect id="矩形" stroke="#0B58FF" opacity="0" x="0.5" y="0.5" width="31" height="31"></rect>
-                    <path d="M26.7638125,1.45454545 L27.0177905,1.4628567 C27.4387521,1.49054436 27.8474996,1.58732758 28.2359531,1.75197014 C28.6866948,1.94029725 29.0896137,2.2117619 29.4389259,2.56107409 C29.7857111,2.90785927 30.0584977,3.31352185 30.2477734,3.76343947 C30.4456009,4.23019115 30.5454545,4.72555866 30.5454545,5.23618754 L30.5454545,26.7638125 L30.5371433,27.0177905 C30.5094556,27.4387521 30.4126724,27.8474996 30.2480299,28.2359531 C30.0597028,28.6866948 29.7882381,29.0896137 29.4389259,29.4389259 C29.0921407,29.7857111 28.6864782,30.0584977 28.2365605,30.2477734 C27.7698088,30.4456009 27.2744413,30.5454545 26.7638125,30.5454545 L5.23618754,30.5454545 L4.98220952,30.5371433 C4.56124792,30.5094556 4.15250044,30.4126724 3.7640469,30.2480299 C3.31330516,30.0597028 2.91038628,29.7882381 2.56107409,29.4389259 C2.21428891,29.0921407 1.94150232,28.6864782 1.75222663,28.2365605 C1.55439906,27.7698088 1.45454545,27.2744413 1.45454545,26.7638125 L1.45454545,5.23618754 L1.4628567,4.98220952 C1.49054436,4.56124792 1.58732758,4.15250044 1.75197014,3.7640469 C1.94029725,3.31330516 2.2117619,2.91038628 2.56107409,2.56107409 C2.90785927,2.21428891 3.31352185,1.94150232 3.76343947,1.75222663 C4.23019115,1.55439906 4.72555866,1.45454545 5.23618754,1.45454545 L26.7638125,1.45454545 Z M26.7638125,3.33876293 L5.23618754,3.33876293 L5.08796584,3.34447462 C4.10971624,3.42016081 3.33876293,4.23861746 3.33876293,5.23618754 L3.33876293,26.7638125 L3.34447462,26.9120342 C3.42016081,27.8902838 4.23861746,28.6612371 5.23618754,28.6612371 L26.7638125,28.6612371 L26.9120342,28.6555254 C27.8902838,28.5798392 28.6612371,27.7613825 28.6612371,26.7638125 L28.6612371,5.23618754 L28.6555254,5.08796584 C28.5798392,4.10971624 27.7613825,3.33876293 26.7638125,3.33876293 Z M13.6987866,17.269857 L13.8115418,17.2763362 C14.2922804,17.3319705 14.6640078,17.7391232 14.6640078,18.2350783 L14.6640078,25.3537223 L14.6574584,25.4671616 C14.6012469,25.9511001 14.1903841,26.3286298 13.7036674,26.3189919 L13.5959284,26.3105939 C13.1358108,26.2480197 12.7797903,25.8518025 12.7797903,25.3768348 L12.7797903,20.5190494 L8.12934794,25.1694917 L8.04095127,25.2474504 C7.67245079,25.5332987 7.13521162,25.5073124 6.79739091,25.1694917 C6.43141847,24.8035193 6.43141847,24.2035071 6.79739091,23.8375347 L11.4844789,19.1540745 L6.64947993,19.1540745 L6.53583534,19.1475529 C6.05108664,19.0915708 5.67369292,18.6822061 5.68093001,18.1924962 C5.69137836,17.6807185 6.11029591,17.269857 6.62306566,17.269857 L13.6987866,17.269857 Z M18.2962333,5.68100813 C18.807211,5.69148979 19.2201105,6.11166149 19.2201105,6.62316519 L19.2201105,11.4776488 L23.8705528,6.82720649 L23.9589495,6.74924786 C24.32745,6.46339956 24.8646892,6.48938577 25.2025099,6.82720649 C25.5684823,7.19317893 25.5684823,7.79319108 25.2025099,8.15916352 L20.5190497,12.8426237 L25.3537226,12.8426237 L25.4673933,12.8491436 C25.9521795,12.9051095 26.3286206,13.3143234 26.3189917,13.8029881 C26.3085224,14.3159797 25.8896049,14.7268412 25.3768351,14.7268412 L18.2945107,14.7268412 L18.1826915,14.7203822 C17.7058457,14.6649267 17.335893,14.2592033 17.335893,13.7682235 L17.335893,6.64627767 L17.3424424,6.53283844 C17.3986538,6.04889994 17.8095166,5.67137018 18.2962333,5.68100813 Z" id="形状结合" fill-rule="nonzero" opacity="0.79078311"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/icons/svg/yanqi.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="23.9254658px" viewBox="0 0 24 23.9254658" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>烟气</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="成本看板" transform="translate(-1319.000000, -293.962733)" fill-rule="nonzero">
+            <g id="烟气" transform="translate(1319.000000, 293.962733)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="23.9254658"></rect>
+                <path d="M10.6744092,10.2458592 C10.6744092,10.2458592 3.76099563,15.5072464 6.34479666,19.9378882 C5.78613697,19.5917443 3.83082809,18.2071687 3.2721684,17.4456522 C1.73585426,15.5072464 1.80568673,14.1918996 2.36434642,12.8765528 C3.6213307,9.89971532 7.39228357,6.9921066 8.50960292,5.1229296 C10.3950794,2.07686335 8.85876522,-7.08336081e-14 8.85876522,-7.08336081e-14 C8.85876522,-7.08336081e-14 12.769383,1.73071946 12.9788804,4.98447204 C13.2582102,8.16899586 10.6744092,10.2458592 10.6744092,10.2458592 Z" id="路径" fill="#FFFFFF"></path>
+                <path d="M9.55552302,-6.3573715e-14 L9.48496561,-6.3573715e-14 L9.41440819,-6.3573715e-14 L9.34385077,-6.3573715e-14 L9.27329335,-6.3573715e-14 C9.27329335,-6.3573715e-14 9.20273594,-6.3573715e-14 9.20273596,0.0693204763 L9.13217854,0.0693204763 L9.06162113,0.138640927 L8.99106371,0.207961403 L8.99106371,0.485243308 C8.99106371,0.485243308 8.99106371,0.554563785 9.06162113,0.554563785 L9.06162113,0.623884235 C10.1199823,2.35689604 9.69663786,4.36718972 7.79158769,6.65476534 C7.43880063,7.07068817 6.94489873,7.55593148 6.38043941,8.17981571 C4.96929114,9.35826373 3.6992577,10.6753527 2.99368358,11.7844803 C2.0764372,13.1015692 1.79420756,14.6266197 2.14699459,16.0130291 C2.57033907,17.8153614 4.05204476,19.4790527 6.52155425,20.8654621 C6.59211167,20.9347826 6.66266909,20.9347826 6.73322648,20.9347826 C6.80378389,20.9347826 6.87434131,20.9347826 6.94489873,20.8654621 C7.01545615,20.7961417 7.08601356,20.7961417 7.08601354,20.7268212 L7.08601354,20.6575007 L7.08601354,20.5881803 L7.08601354,20.5188598 L7.08601354,20.4495393 C7.08601354,20.3802188 7.08601354,20.3802188 7.01545615,20.3802188 L7.01545615,20.3108984 C5.60430787,18.3006047 7.01545615,16.0130291 7.9327025,14.9039015 L8.00325992,14.8345811 C8.92050629,13.656133 9.83775267,12.7549669 10.6138842,11.9231212 C11.1783435,11.3685574 11.6722454,10.8833141 12.0955899,10.3287504 C13.647853,8.45709759 14.2123123,6.72408579 13.9300827,5.06039446 C13.5772956,3.18874173 12.0955899,1.4557299 9.55552302,-6.3573715e-14 Z M9.48470738,9.26748999 C8.64336853,10.0744997 6.3074421,10.0757542 5.3258801,11.2862689 C3.92364867,12.9675392 5.42114982,16.3973307 5.7015961,17.9440994 C4.29936467,16.9353372 3.38791424,15.8593242 3.10746797,14.6488095 C2.82702169,13.5727965 3.10746797,12.3622819 3.8085837,11.2862689 L3.87869525,11.219018 C4.5096994,10.2102558 5.84181925,8.93249038 6.89349283,7.9237282 C7.52449698,7.31847086 8.01527795,6.84771519 8.3658358,6.44421029 C10.3289598,4.22493344 10.6094061,2.34191068 10.3289598,0.99689441 C11.5208565,1.87115499 12.6426417,3.01441881 12.9230879,4.49393671 C13.2035342,5.77170217 12.7127532,7.18396925 11.5208565,8.66348714 L9.48470738,9.26748999 Z M21.9281191,9.58246693 C21.6004931,7.86679721 20.3555139,6.28838107 18.1931817,4.98447205 L18.1276565,4.98447205 L18.0621313,4.98447205 L17.9966061,4.98447205 L17.9310808,4.98447205 C17.8655556,4.98447205 17.8655556,4.98447205 17.8655556,5.05309884 L17.8000304,5.05309884 L17.7345052,5.12172564 L17.66898,5.19035243 L17.66898,5.46485958 C17.66898,5.46485958 17.66898,5.53348637 17.7345052,5.53348637 L17.7345052,5.60211316 C18.6518582,7.11190253 18.2587069,8.89619902 16.6861017,10.9550027 C16.4240008,11.2981367 15.9653243,11.7785242 15.5066478,12.3275385 C14.5237695,13.3569403 13.4098408,14.5922225 12.8201138,15.6216244 C12.0993364,16.7882798 11.8372356,18.1608156 12.0993364,19.4647245 C12.4924877,21.1117675 13.7374669,22.5529301 15.8342739,23.856839 C15.8997991,23.9254658 15.9653243,23.9254658 16.0308495,23.9254658 C16.0963747,23.9254658 16.1619,23.9254658 16.2274252,23.856839 C16.2929504,23.7882123 16.3584756,23.7882123 16.3584756,23.7195855 L16.3584756,23.6509587 L16.3584756,23.5823319 L16.3584756,23.5137051 L16.3584756,23.4450783 C16.3584756,23.4450783 16.3584756,23.3764515 16.2929504,23.3764515 L16.2929504,23.3078247 C15.1790217,21.5235282 16.2929504,19.5333513 17.079253,18.5039495 L17.1447782,18.4353227 C17.9310808,17.3372941 18.6518582,16.5137726 19.3726356,15.8275047 C19.8313122,15.3471172 20.2899887,14.8667297 20.6176148,14.454969 C21.7315435,12.6020456 22.19022,11.0922563 21.9281191,9.58246693 L21.9281191,9.58246693 Z M20.5837087,13.7271478 C20.225071,14.1241412 19.7947058,14.5211345 19.2926131,14.9842934 C18.5036102,15.7121146 17.6428797,16.5061012 16.7104218,17.6309157 C15.4193261,19.086558 14.9172334,20.6083659 15.2041435,21.931677 C13.9130479,21.0715248 13.2958761,20.3327069 13.0806935,19.3402236 C12.8655109,18.3477402 13.0806935,17.3552568 13.7262413,16.3627735 L13.7979689,16.2966079 C14.3717892,15.4364556 15.4193261,13.99181 16.4235116,13.0654922 C16.9973319,12.5361677 17.4994247,12.0730088 17.7863348,11.742181 C19.5077957,9.75721431 19.8664333,8.16924091 19.6512507,6.97826087 C20.7271638,7.77224757 21.7313493,8.76473095 21.9465319,9.95571099 C22.1617145,11.2128566 21.7313493,12.4700022 20.5837087,13.7271478 Z" id="形状" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/ButtonNav/index.vue

@@ -81,7 +81,7 @@ export default {
     border: none;
     background: #fff;
     border-radius: 8px;
-    padding: 16px;
+    padding: 15px;
     color: #888;
     letter-spacing: 2px;
     flex: 1;

src/components/DialogForm/index.vue

@@ -92,13 +92,13 @@
 								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
 							</div>
 						</el-upload>
+
 						<uploadedFile
 							class="file"
 							v-for="file in form[col.prop] || []"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="handleDeleteFile(file)"
-							@Preview="handlePreview(file)" />
+							@delete="handleDeleteFile(file)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -138,9 +138,6 @@ const uploadedFile = {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
-		handlePreview() {
-			this.$emit('Preview', this.file);
-		},
 	},
 	mounted() {},
 	render: function (h) {
@@ -159,7 +156,7 @@ const uploadedFile = {
 					cursor: 'pointer',
 					display: 'inline-block',
 				}}>
-				<el-button onClick={this.handlePreview}>{this.file.fileName}</el-button>
+				{this.file.fileName}
 				<el-button
 					type="text"
 					icon="el-icon-close"
@@ -259,20 +256,6 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-		async handlePreview(file) {
-			const data = await this.$axios({
-				url: file.fileUrl,
-				method: 'get',
-				responseType: 'blob',
-			});
-			const link = document.createElement('a');
-			link.href = window.URL.createObjectURL(new Blob([data]));
-			link.download = file.fileName;
-			document.body.appendChild(link);
-			link.click();
-			document.body.removeChild(link);
-			window.URL.revokeObjectURL(link.href);
-		},
 		// getCode
 		async getCode(url) {
 			const response = await this.$axios(url);
@@ -372,9 +355,7 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload(file) {
-      console.log(file)
-    },
+		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
 			this.form.files.push({

src/layout/components/Sidebar/Logo.vue

@@ -67,7 +67,7 @@ export default {
 	},
 	data() {
 		return {
-			title: '中建材智能化院',
+			title: '中建材自贡新能源',
 			logo: logoImg,
 		};
 	},

src/main.js

@@ -4,12 +4,12 @@ import Element from 'element-ui';
 import './assets/styles/element-variables.scss';
 import '@/assets/styles/index.scss'; // global css
 import '@/assets/styles/ruoyi.scss'; // ruoyi css
+import '@/assets/font/font.css'
 import App from './App';
 import store from './store';
 import router from './router';
 import directive from './directive'; // directive
 import plugins from './plugins'; // plugins
-import dataV from '@jiaminghi/data-view'
 
 import './assets/icons'; // icon
 import './permission'; // permission control
@@ -35,7 +35,6 @@ import {
 	getDictDatas,
 	getDictDatas2,
 } from '@/utils/dict';
-
 import './theme/index.css'; // 自定义主题包 - code-brick-zj
 
 // 全局方法挂载
@@ -78,7 +77,6 @@ Vue.use(directive);
 Vue.use(plugins);
 Vue.use(VueMeta);
 // Vue.use(hljs.vuePlugin);
-Vue.use(dataV);
 
 // bpmnProcessDesigner 需要引入
 import MyPD from '@/components/bpmnProcessDesigner/package/index.js';

src/mixins/basic-page.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-02 09:33:29
+ * @LastEditTime: 2025-02-21 13:18:46
  * @Description:
  */
 export default {
@@ -16,7 +16,7 @@ export default {
       },
       tableData: [], //table数据
       listQuery: { //分页
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },

src/mixins/tableHeightMixin.js

@@ -1,20 +0,0 @@
-export default {
-	data() {
-		return {
-			tableH: this.tableHeight(260),
-		};
-	},
-	created() {
-		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
-		window.addEventListener('resize', this._setTableHeight);
-	},
-	destroyed() {
-		window.removeEventListener('resize', this._setTableHeight);
-	},
-	methods: {
-		_setTableHeight() {
-			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
-			// this.tableH = this.tableHeight(260);
-		},
-	},
-};

src/router/index.js

@@ -69,6 +69,26 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/print/design'], resolve),
     hidden: true
   },
+  {
+    path: '/allDashboard-model',
+    component: (resolve) => require(['@/views/dashboard/allDashboard/index-model'], resolve),
+    hidden: true
+  },
+  {
+    path: '/rawDashboard-model',
+    component: (resolve) => require(['@/views/dashboard/rawDashboard/index-model'], resolve),
+    hidden: true
+  },
+  {
+    path: '/deepDashboard-model',
+    component: (resolve) => require(['@/views/dashboard/deepDashboard/index-model'], resolve),
+    hidden: true
+  },
+  {
+    path: '/coldDashboard-model',
+    component: (resolve) => require(['@/views/dashboard/coldDashboard/index-model'], resolve),
+    hidden: true
+  },
   {
     path: "",
     component: Layout,
@@ -76,9 +96,15 @@ export const constantRoutes = [
     children: [
       {
         path: "index",
-        component: (resolve) => require(["@/views/home/index"], resolve),
+        component: (resolve) => require(["@/views/cost/index"], resolve),
         name: "首页",
         meta: { title: "首页", icon: "dashboard", affix: true },
+      },
+      {
+        path: "indexDetail",
+        component: (resolve) => require(["@/views/cost/indexDetail"], resolve),
+        name: "首页详细",
+        meta: { title: "首页详细", icon: "dashboard"},
         hidden: true
       },
     ],

src/utils/dict.js

@@ -86,7 +86,6 @@ export const DICT_TYPE = {
   // ============== PRODUCT - 产品模块 =============
   UNIT_DICT: 'unit_dict',
   PRODUCT_TYPE: 'product_type',
-  PROCESS_TYPE: 'process_type',
 
   // ============== ENERGY - 能源模块 =============
   ENERGY_UNIT: 'energy_unit',

src/views/Environmental/Envi-yure-log.vue

@@ -0,0 +1,121 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-11-13 14:01:16
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-21 14:32:08
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="app-container">
+			<!-- 搜索工作栏 -->
+			<search-bar
+				:formConfigs="formConfig"
+				ref="searchBarForm"
+				@headBtnClick="buttonClick" />
+			<!-- 列表 -->
+			<base-table
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:table-props="tableProps"
+				:table-data="tableData"
+				:max-height="tableH" />
+			<pagination
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:total="listQuery.total"
+				@pagination="getDataList" />
+		</div>
+	</div>
+</template>
+
+<script>
+import basicPage from '@/mixins/basic-page';
+import { yurepage } from '@/api/environmental/environmentalLog';
+import { parseTime } from '@/filter/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'recordTime',
+		label: '记录时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+	{
+		prop: 'usingQuantity',
+		label: '发电量',
+    filter: (val) => (val != null ? Number(val).toFixed(3) : '-'),
+	},
+];
+export default {
+	name: '',
+	mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: yurepage,
+			},
+			formConfig: [
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					width: 350,
+					param: 'searchTime',
+					clearable: false,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			listQuery: {
+				statisticType: 1,
+			},
+			tableProps,
+			tableData: [],
+		};
+	},
+	components: {},
+	created() {
+		const end = new Date();
+		const start = new Date();
+		this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+		this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+		this.$nextTick(() => {
+			this.$refs.searchBarForm.formInline.searchTime = [
+				this.listQuery.startTime,
+				this.listQuery.endTime,
+			];
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.statisticType = 1;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style lang="scss"></style>

src/views/Environmental/Environmental-log.vue

@@ -0,0 +1,131 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-11-13 14:01:16
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-21 14:31:00
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="app-container">
+			<!-- 搜索工作栏 -->
+			<search-bar
+				:formConfigs="formConfig"
+				ref="searchBarForm"
+				@headBtnClick="buttonClick" />
+			<!-- 列表 -->
+			<base-table
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:table-props="tableProps"
+				:table-data="tableData"
+				:max-height="tableH" />
+			<pagination
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:total="listQuery.total"
+				@pagination="getDataList" />
+		</div>
+	</div>
+</template>
+
+<script>
+import basicPage from '@/mixins/basic-page';
+import { getCostEnviHisPage } from '@/api/environmental/environmentalLog';
+import { parseTime } from '@/filter/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'recTime',
+		label: '记录时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+	{
+		prop: 'envi1',
+		label: '二氧化硫mg/Nm3',
+		filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'envi2',
+		label: '氮氧化物mg/Nm3',
+		filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'envi3',
+		label: '粉尘mg/Nm3',
+		filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+];
+export default {
+	name: '',
+	mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostEnviHisPage,
+			},
+			formConfig: [
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					width: 350,
+					param: 'searchTime',
+					clearable: false,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			listQuery: {
+				statisticType: 1,
+			},
+			tableProps,
+			tableData: [],
+		};
+	},
+	components: {},
+	created() {
+		const end = new Date();
+		const start = new Date();
+		this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+		this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+		this.$nextTick(() => {
+			this.$refs.searchBarForm.formInline.searchTime = [
+				this.listQuery.startTime,
+				this.listQuery.endTime,
+			];
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.statisticType = 1;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style lang="scss"></style>

src/views/base/equipmentBindSection/dialogForm.vue

@@ -71,14 +71,14 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="工段设备排序" prop="sort">
+				<el-form-item label="工段排序" prop="sort">
 					<el-input-number
 						v-model="dataForm.sort"
 						filterable
 						min="0"
 						max="100"
 						@change="$emit('update', dataForm)"
-						placeholder="请输入工段设备排序" />
+						placeholder="请输入工段排序" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -112,7 +112,6 @@
 								{ label: '无类型', value: 0 },
 								{ label: '进口统计', value: 1 },
 								{ label: '出口统计', value: 2 },
-                { label: '进出口计数', value: 3 },
 							]"
 							:key="opt.value"
 							:label="opt.label"

src/views/base/equipmentBindSection/index.vue

@@ -4,8 +4,7 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
+			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
 		<base-table
@@ -53,8 +52,6 @@ import {
 	getEquipmentBindSectionPage,
 	exportEquipmentBindSectionExcel,
 } from '@/api/base/equipmentBindSection';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogForm from './dialogForm.vue';
@@ -64,7 +61,7 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['factoryId','productionLineId','workshopSectionId', 'equipmentName'],
+			searchBarKeys: ['workshopSectionId', 'equipmentName'],
 			tableBtn: [
 				this.$auth.hasPermi('base:equipment-bind-section:update')
 					? {
@@ -87,9 +84,8 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'factoryName', label: '工厂' },
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'productionLine', label: '产线名称' },
+				{ prop: 'workshopSection', label: '工段名称' },
 				{ prop: 'equipment', label: '设备名称' },
 				{ prop: 'sort', label: '工段中排序' },
 				{
@@ -102,7 +98,7 @@ export default {
 					prop: 'sectionDataType',
 					label: '工段数据类型',
 					filter: (val) =>
-						val != null ? ['无类型', '进口计数', '出口计数', '进出口计数'][val] : '-',
+						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
 				},
 				// {
 				// 	action: 'show-alert',
@@ -133,20 +129,6 @@ export default {
 				// },
 			],
 			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					multiple: true,
-				},
 				{
 					type: 'select',
 					label: '工段',
@@ -227,8 +209,8 @@ export default {
 						label: '产线数据类型',
 						options: [
 							{ label: '无类型', value: 0 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
 						],
 						prop: 'lineDataType',
 					},
@@ -237,9 +219,8 @@ export default {
 						label: '工段数据类型',
 						options: [
 							{ label: '无类型', value: 0 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '进出口计数', value: 3 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
 						],
 						prop: 'sectionDataType',
 					},
@@ -253,9 +234,6 @@ export default {
 				pageSize: 10,
 				workshopSectionId: null,
 				equipmentId: null,
-        equipmentName: null,
-        factoryId: null,
-				productionLineId: [],
 			},
 			// 表单参数
 			form: {},
@@ -264,7 +242,6 @@ export default {
 	created() {
 		this.getList();
 		this.initWorksection();
-		this.getPdLineList();
 	},
 	methods: {
 		/** 准备工段数据 */
@@ -274,7 +251,7 @@ export default {
 				method: 'get',
 			});
 			if (code == 0) {
-				this.searchBarFormConfig[2].selectOptions = data.map((item) => {
+				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
@@ -282,51 +259,6 @@ export default {
 				});
 			}
 		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.searchBarFormConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.searchBarFormConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.queryParams.productionLineId = [];
-			this.$refs['search-bar'].formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.searchBarFormConfig[1].selectOptions = res.data || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.pageSize = 10;
-					this.queryParams.name = val.name;
-					this.queryParams.workshopSectionId = val.workshopSectionId || undefined;
-					this.queryParams.equipmentName = val.equipmentName || undefined;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.queryParams.productionLineId = val.productionLineId || [];
-					this.handleQuery();
-					break;
-				case 'add':
-					this.handleAdd();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				case 'reset':
-					this.$refs['search-bar'].resetForm();
-					this.resetQuery();
-					break;
-				default:
-					console.log(val);
-			}
-		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;

src/views/base/equipmentPlc/add-or-updata.vue

@@ -1,109 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-26 16:37:29
- * @Description:
--->
-<template>
-	<el-row :gutter="20">
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			@keyup.enter.native="dataFormSubmit()"
-			label-width="80px">
-			<el-col :span="12">
-				<el-form-item label="关联表名" prop="plcTableName">
-					<el-input
-						v-model="dataForm.plcTableName"
-						clearable
-						placeholder="请输入关联表名" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="标识" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入标识" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="英文名" prop="enName">
-					<el-input
-						v-model="dataForm.enName"
-						clearable
-						placeholder="请输入英文名" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否采集" prop="collection">
-					<el-switch
-						v-model="dataForm.collection"
-						:active-value="1"
-						:inactive-value="0"></el-switch>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="描述" prop="description">
-					<el-input
-						v-model="dataForm.description"
-						clearable
-						placeholder="请输入描述" />
-				</el-form-item>
-			</el-col>
-		</el-form>
-	</el-row>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-
-import {
-	createEquipmentPlc,
-	updateEquipmentPlc,
-	getEquipmentPlc,
-	getCode,
-} from '@/api/base/equipmentPlc';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createEquipmentPlc,
-				updateURL: updateEquipmentPlc,
-				infoURL: getEquipmentPlc,
-			},
-			dataForm: {
-				id: undefined,
-				plcTableName: undefined,
-				code: undefined,
-				name: undefined,
-				enName: undefined,
-				collection: 1,
-				description: undefined,
-			},
-			dataRule: {
-				plcTableName: [
-					{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-				],
-				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-				name: [{ required: true, message: '标识不能为空', trigger: 'blur' }],
-			},
-		};
-	},
-	methods: {},
-};
-</script>

src/views/base/equipmentPlc/index.vue

@@ -1,53 +1,59 @@
 <template>
 	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
 		<base-table
-			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			ref="pageTable"
 			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
 				label="操作"
 				:method-list="tableBtn"
-				@clickBtn="handleClick" />
+				@clickBtn="handleTableBtnClick" />
 		</base-table>
+
+		<!-- 分页组件 -->
 		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
 		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="700px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
 import {
+	createEquipmentPlc,
+	updateEquipmentPlc,
 	deleteEquipmentPlc,
+	getEquipmentPlc,
 	getEquipmentPlcPage,
 	exportEquipmentPlcExcel,
-	updateEquipmentPlc,
 } from '@/api/base/equipmentPlc';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 const switchBtn = {
 	name: 'SwitchBtn',
@@ -84,8 +90,38 @@ const switchBtn = {
 		);
 	},
 };
-const tableProps = [
-	{ prop: 'code', label: '编码', width: 220 },
+
+export default {
+	name: 'EquipmentPlc',
+	mixins: [basicPageMixin],
+	components: {},
+	data() {
+		return {
+			tableKey: Math.random(),
+			searchBarKeys: ['name', 'plcTableName'],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-plc:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-plc:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 180,
+				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				// },
+				{ prop: 'code', label: '编码' },
 				{ prop: 'plcTableName', label: '关联表名' },
 				{ prop: 'name', label: '标识名称' },
 				{ prop: 'enName', label: '英文名称' },
@@ -95,34 +131,8 @@ const tableProps = [
 					subcomponent: switchBtn,
 				},
 				{ prop: 'description', label: '描述' },
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getEquipmentPlcPage,
-				deleteURL: deleteEquipmentPlc,
-				exportURL: exportEquipmentPlcExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:equipment-plc:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:equipment-plc:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
+			],
+			searchBarFormConfig: [
 				{
 					type: 'input',
 					label: '表名',
@@ -137,86 +147,231 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '搜索',
+					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
 				{
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					// type: this.$auth.hasPermi('base:equipment-plc:create')
+					// 	? 'button'
+					// 	: '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
-					color: 'success',
 					plain: true,
+					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
 				// 	btnName: '导出',
 				// 	name: 'export',
 				// 	color: 'warning',
 				// },
 			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '关联表名',
+						prop: 'plcTableName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '编码',
+						prop: 'code',
+						url: '/base/equipment-group/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '标识',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '英文名',
+						prop: 'enName',
+					},
+				],
+				[
+					{
+						switch: true,
+						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
+						prop: 'collection',
+						value: 1,
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					},
+				],
+				[
+					{
+						textarea: true,
+						label: '描述',
+						prop: 'description',
+						bind: {
+							placeholder: '请输入备注',
+						},
+					},
+				],
+			],
+			// 是否显示弹出
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				plcTableName: null,
+				name: null,
+			},
+			// 表单参数
+			form: {},
 		};
 	},
-	components: {
-		AddOrUpdate,
+	created() {
+		this.getList();
 	},
-	created() {},
 	methods: {
 		/** 覆盖 handleEmitFun 的默认实现 */
 		handleEmitFun({ action, payload }) {
-      console.log(payload)
 			switch (action) {
 				case 'update-collect':
-					updateEquipmentPlc(payload).then((response) => {
+					this.reset();
+					const tempForm = {};
+					Object.keys(this.form).forEach((key) => {
+						tempForm[key] = payload[key];
+					});
+					updateEquipmentPlc(tempForm).then((response) => {
 						this.$modal.msgSuccess('修改成功');
-						this.getDataList();
+						this.open = false;
+						this.getList();
 					});
 					break;
 			}
 		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.plcTableName = val.plcTableName;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getEquipmentPlcPage(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+				// this.tableKey = Math.random(); // method 1
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: undefined,
+				plcTableName: undefined,
+				code: undefined,
+				name: undefined,
+				enName: undefined,
+				description: undefined,
+				collection: undefined,
 			};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加实时数据采集配置';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			getEquipmentPlc(id).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改实时数据采集配置';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
 				}
+				// 修改的提交
+				if (this.form.id != null) {
+					updateEquipmentPlc(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentPlc(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?')
+				.then(function () {
+					return deleteEquipmentPlc(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有实时数据采集配置数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentPlcExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '实时数据采集配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
 		},
 	},
 };

src/views/base/equipmentPlcConnect/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 16:11:14
+ * @LastEditTime: 2024-04-30 10:01:41
  * @Description:
 -->
 <template>

src/views/base/material/index.vue

@@ -57,7 +57,6 @@ const tableProps = [
     prop: 'createTime',
     label: '添加时间',
     filter: parseTime,
-    minWidth: 150
   },
 	{
 		prop: 'name',
@@ -68,6 +67,10 @@ const tableProps = [
 		label: '原料编码',
 		width: 180,
 	},
+	{
+		prop: 'level',
+		label: '原料等级',
+	},
 	{
 		prop: 'unit',
 		label: '单位',
@@ -149,7 +152,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.code = val.code;
 					this.getDataList();

src/views/base/materialPricing/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-11 09:05:16
+ * @LastEditTime: 2025-03-05 15:23:30
  * @Description:
 -->
 <template>
@@ -63,7 +63,7 @@
 						style="width: 75%"
 						v-model="dataForm.price"
 						clearable
-						placeholder="请输入允许留存时间" />
+						placeholder="请输入单价" />
 					{{ unit }}
 				</el-form-item>
 			</el-col>

src/views/base/materialPricing/index.vue

@@ -63,11 +63,11 @@ const tableProps = [
 		label: '原料编码',
 		width: 180,
 	},
-	{
-		prop: 'price',
-		label: '单价(元/吨)',
-		align: 'right',
-	},
+	// {
+	// 	prop: 'price',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'createTime',
 		label: '生效时间',
@@ -152,7 +152,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.materialId = val.name;
 					this.getDataList();
 					break;

src/views/core/analysis/balanceAnalysis/BarChart.vue

@@ -1,211 +0,0 @@
-<template>
-	<div
-		ref="lineChart"
-		:id="id"
-		:class="className"
-		:style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-import { parseTime } from '../../mixins/code-filter';
-
-const animationDuration = 1000;
-export default {
-	name: 'lineChart',
-	mixins: [resize],
-	props: {
-		id: {
-			type: String,
-			default: 'chart',
-		},
-		className: {
-			type: String,
-			default: 'chart',
-		},
-		title: {
-			type: String,
-			default: '',
-		},
-		width: {
-			type: String,
-			default: '100%',
-		},
-		height: {
-			type: String,
-			default: '300px',
-		},
-		barData: {
-			type: Object,
-			default: () => {},
-		},
-	},
-	data() {
-		return {
-			chart: null,
-		};
-	},
-	mounted() {
-		if (!this.chart) {
-			this.chart = echarts.init(this.$refs.lineChart);
-			this.$nextTick(() => {
-				this.initChart();
-			});
-		}
-	},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	watch: {
-		barData: {
-			handler() {
-				if (this.chart) {
-					this.$nextTick(() => {
-						this.initChart();
-					});
-				} else {
-					this.$nextTick(() => {
-						this.chart = echarts.init(this.$refs.lineChart);
-						this.initChart();
-					});
-				}
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-  methods: {
-    getUniqueTimes() {
-      const { edgeCt, temperCt, downCt } = this.barData;
-      // 合并所有包含时间的数组
-      const allTimeEntries = [...(edgeCt || []), ...(temperCt || []), ...(downCt || [])];
-      // 提取时间戳并去重（使用 Set）
-      const uniqueTimes = [...new Set(allTimeEntries.map(item => item.recordTime))];
-      // 按时间戳排序（确保时间顺序正确）
-      return uniqueTimes.sort((a, b) => a - b);
-    },
-    initChart() {
-      const uniqueTimes = this.getUniqueTimes();
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.title
-						? '{space|}{tip|}{space|}{value|' + this.title + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['磨边节拍', '钢化节拍', '下片节拍'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-          data: uniqueTimes.map(time => parseTime(time, '{m}-{d} {h}:{i}')),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '节拍 pcs/min',
-						min: 0,
-						axisLabel: {
-							formatter: '{value}',
-						},
-					},
-				],
-				dataZoom: [
-					{
-						type: 'inside',
-						start: 0,
-						end: 100,
-					},
-					{
-						start: 0,
-						end: 100,
-					},
-				],
-        series: [
-          {
-            name: '磨边节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              // 查找当前时间对应的 ct 值，没有则补 null（图表中会显示为断点）
-              const match = this.barData.edgeCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          },
-          // 钢化节拍
-          {
-            name: '钢化节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              const match = this.barData.temperCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          },
-          // 下片节拍
-          {
-            name: '下片节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              const match = this.barData.downCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          }
-        ]
-			});
-		},
-	},
-};
-</script>

src/views/core/analysis/balanceAnalysis/eq-detail.vue

@@ -1,273 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-24 14:47:58
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-09 10:04:17
- * @Description:
--->
-<template>
-	<div>
-		<base-table
-			:page="1"
-			:limit="999"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			max-height="400"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableData.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-if="eqChartData.length > 0" style="margin-top: 10px">
-			<search-bar
-				:formConfigs="formConfig"
-				ref="searchBarForm1"
-				@headBtnClick="buttonClick" />
-			<div
-				ref="lineChart"
-				id="chart"
-				:style="{ height: '400px', width: '100%', marginLeft: '10px' }" />
-		</div>
-	</div>
-</template>
-
-<script>
-import { getNewCTDet, getNewCTCharts } from '@/api/core/analysis/index';
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-import { parseTime } from '../../mixins/code-filter';
-
-const tableProps = [
-	{
-		prop: 'equipmentName',
-		label: '设备',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'standardCt',
-		label: '标准节拍pcs/min',
-	},
-	{
-		prop: 'ct',
-		label: '当前节拍pcs/min',
-	},
-];
-export default {
-	mixins: [resize],
-	data() {
-		return {
-			tableProps,
-			tableData: [],
-			tableBtn: [
-				{
-					type: 'eqChart',
-					btnName: '趋势图',
-				},
-			].filter((v) => v),
-			dataListLoading: false,
-			time: {},
-			eqChartData: [],
-			eqName: null,
-			equipmentId: null,
-			chart: null,
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {},
-	mounted() {},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	methods: {
-		// 获取数据列表
-		init(lId, startTime, endTime) {
-			this.eqChartData = [];
-			this.time.startTime = startTime;
-			this.time.endTime = endTime;
-			this.dataListLoading = true;
-      getNewCTDet({ lineId: [lId], startTime, endTime }).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-			});
-		},
-		handleClick(val) {
-			const data = {
-				...this.time,
-				equipmentId: val.data.equipmentId,
-			};
-			this.eqName = val.data.equipmentName;
-			this.equipmentId = val.data.equipmentId;
-			getNewCTCharts(data).then((response) => {
-				this.eqChartData = response.data;
-				this.$nextTick(() => {
-					this.$refs.searchBarForm1.formInline.timeVal = [
-						this.time.startTime,
-						this.time.endTime,
-					];
-					this.initChart();
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.time.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.time.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					const data = {
-						...this.time,
-						equipmentId: this.equipmentId,
-					};
-					getNewCTCharts(data).then((response) => {
-						this.eqChartData = response.data;
-						this.$nextTick(() => {
-							this.initChart();
-						});
-					});
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		initChart() {
-			this.chart = echarts.init(this.$refs.lineChart);
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.eqName
-						? '{space|}{tip|}{space|}{value|' + this.eqName + ' 节拍趋势图' + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['当前节拍', '标准节拍'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-					data: this.eqChartData[0].ct.map((item) => {
-						return parseTime(item.recordTime, '{m}-{d} {h}:{i}');
-					}),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '节拍',
-						min: 0,
-						interval: 20,
-						axisLabel: {
-							formatter: '{value} pcs/min',
-						},
-					},
-				],
-				dataZoom: [
-					{
-						type: 'inside',
-						start: 0,
-						end: 100,
-					},
-					{
-						start: 0,
-						end: 100,
-					},
-				],
-				series: [
-					{
-						name: '标准节拍',
-						type: 'line',
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + 'pcs/min';
-							},
-						},
-						data: this.eqChartData[0].ct.map((item) => {
-							return item.standardCt;
-						}),
-					},
-					{
-						name: '当前节拍',
-						type: 'line',
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + 'pcs/min';
-							},
-						},
-						data: this.eqChartData[0].ct.map((item) => {
-							return item.ct;
-						}),
-					},
-				],
-			});
-		},
-	},
-};
-</script>

src/views/core/analysis/balanceAnalysis/index-old.vue

@@ -1,296 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<div v-if="tableData.length">
-			<base-table
-				v-loading="dataListLoading"
-				:span-method="mergeColumnHandler"
-				:max-height="tableH"
-				:table-props="tableProps"
-				:table-data="tableData" />
-			<SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
-			<balance-chart ref="lineChart" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<!-- <pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" /> -->
-	</div>
-</template>
-
-<script>
-// import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getCT } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import BalanceChart from '../balanceChart';
-import { time } from 'echarts';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-
-// const tableProps = [
-// 	// {
-//   //   prop: 'lineName',
-// 	// 	label: '产线',
-// 	// 	align: 'center',
-// 	// },
-//   // {
-//   //   prop: 'sum',
-//   //   label: '合计',
-//   //   align: 'center',
-//   // },
-//   // {
-//   //   prop: 'dynamicValue',
-//   //   label: 'dynamicName',
-//   //   align: 'center',
-//   //   children:[
-
-//   //   ]
-//   // }
-// ];
-
-export default {
-	components: {
-		BalanceChart,
-	},
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCT,
-			},
-			tableProps: [],
-			dataListLoading: false,
-			tableData: [],
-			listQuery: {
-				// time: ''
-				endTime: undefined,
-				lineId: undefined,
-				startTime: undefined,
-			},
-			timeList: [],
-			spanArr: [],
-			xData: [],
-			yData: [],
-			optionArrUrl: [getProductionLinePage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineIds',
-					defaultSelect: '',
-					multiple: false,
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					width: 350,
-					param: 'time',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		setRowSpan(arr) {
-			let count = 0;
-			arr.forEach((item, index) => {
-				if (index === 0) {
-					this.spanArr.push(1);
-				} else {
-					if (item === arr[index - 1]) {
-						this.spanArr[count] += 1;
-						this.spanArr.push(0);
-					} else {
-						count = index;
-						this.spanArr.push(1);
-					}
-				}
-			});
-		},
-		/** 合并table列的规则 */
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0) {
-				if (this.spanArr[rowIndex]) {
-					return [
-						this.spanArr[rowIndex], // row span
-						1, // col span
-					];
-				} else {
-					return [0, 0];
-				}
-			}
-		},
-		getData() {
-			// this.listQuery.lineId = '1672847052717821953'
-			// this.listQuery.startTime = '1693497600000';
-			// this.listQuery.endTime = '1693843200000';
-			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
-				console.log(res);
-				let arr = [
-					{
-						prop: 'sectionName',
-						label: '工段',
-						align: 'center',
-					},
-					{
-						prop: 'equName',
-						label: '设备',
-						align: 'center',
-            width: 150
-					},
-				];
-				let sectionArr = [];
-				res.data.data.forEach((ele, index) => {
-					let tempData = [];
-					let ggData = [];
-					let sbluData = [];
-					let sbsjData = [];
-					let cxluData = [];
-					let cxsjData = [];
-					ele.data.forEach((item, index) => {
-						item.children.forEach((params) => {
-							if (params.dynamicName === '生产规格') {
-								tempData[item.dynamicName + '_gg'] = params.dynamicValue;
-								ggData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '设备理论速度') {
-								tempData[item.dynamicName + '_sblu'] = params.dynamicValue;
-								sbluData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '设备实际速度') {
-								tempData[item.dynamicName + '_sbsj'] = params.dynamicValue;
-								sbsjData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '产线理论速度') {
-								tempData[item.dynamicName + '_cxlu'] = params.dynamicValue;
-								cxluData[index] = params.dynamicValue;
-							} else if(params.dynamicName === '产线实际速度') {
-								tempData[item.dynamicName + '_cxsj'] = params.dynamicValue;
-								cxsjData[index] = params.dynamicValue;
-							}
-						});
-					});
-					const equipment = {
-						name: ele.equName,
-						ggData: ggData,
-						sbluData: sbluData,
-						sbsjData: sbsjData,
-						cxluData: cxluData,
-						cxsjData: cxsjData,
-					};
-					tempData['equName'] = ele.equName;
-					tempData['sectionName'] = ele.sectionName;
-					this.tableData.push(tempData);
-					const { sectionName } = tempData;
-					sectionArr.push(sectionName);
-					this.yData.push(equipment);
-				});
-				this.setRowSpan(sectionArr);
-				res.data.nameData.forEach((item) => {
-					this.timeList.push(item.name);
-				});
-				const timeArray = Array.from(new Set(this.timeList));
-        console.log(timeArray)
-				for (const times of timeArray) {
-					if (times !== '生产规格' && times !== '设备理论速度' && times !== '设备实际速度'
-             && times !== '产线理论速度' && times !== '产线实际速度'
-          ) {
-						const subprop = {
-							label: times,
-							align: 'center',
-							children: [
-								{ prop: times + '_gg', label: '生产规格', align: 'center' },
-								{ prop: times + '_sblu', label: '设备理论速度[片/min]', align: 'center' },
-								{ prop: times + '_sbsj', label: '设备实际速度[片/min]', align: 'center' },
-								{ prop: times + '_cxlu', label: '产线理论速度[片/min]', align: 'center' },
-								{ prop: times + '_cxsj', label: '产线实际速度[片/min]', align: 'center' },
-							],
-						};
-						arr.push(subprop);
-						this.xData.push(times);
-					}
-				}
-				this.tableProps = arr;
-
-        console.log(this.$refs)
-        this.$nextTick(()=>{
-          this.$refs.lineChart.initChart(this.xData, this.yData);
-        })
-				// this.total = response.data.total;
-				// this.dataListLoading = false;
-			});
-		},
-		buttonClick(val) {
-			// console.log(val)
-			switch (val.btnName) {
-				case 'search':
-					// this.listQuery.pageNo = 1;
-					// this.listQuery.pageSize = 10;
-					this.listQuery.lineId = val.lineIds;
-					this.listQuery.startTime = val.time
-						? String(new Date(val.time[0]).getTime())
-						: undefined;
-					this.listQuery.endTime = val.time
-						? String(new Date(val.time[1]).getTime())
-						: undefined;
-					if (val.time && val.lineIds) {
-						this.tableData = [];
-						this.xData = [];
-						this.yData = [];
-						this.tableProps = [];
-						this.spanArr = [];
-						this.timeList = [];
-						this.getData();
-					} else {
-						this.$message({
-							message: '请选择产线和时间',
-							type: 'warning',
-						});
-					}
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/core/analysis/balanceAnalysis/index.vue

@@ -1,302 +1,260 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2025-01-09 10:27:53
- * @LastEditors: zwq
- * @Description:
--->
 <template>
   <div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<div v-if="showData.length">
-			<base-table
-				class="right-aside"
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="showData">
-				<method-btn
-					v-if="showData.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn"
-					@clickBtn="handleClick" />
-			</base-table>
-			<barChart
-				v-for="item in chartData"
-				:key="item.name + 'echart'"
-				style="margin-top: 50px"
-				height="600px"
-				:id="item.name + 'echart'"
-				:title="item.name + ' 节拍趋势图'"
-				:bar-data="item" />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <div v-if="tableData.length">
+      <base-table v-loading="dataListLoading" :span-method="mergeColumnHandler" :table-props="tableProps" :table-data="tableData" />
+      <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
+      <balance-chart ref="lineChart" />
     </div>
     <div v-else class="no-data-bg"></div>
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-      top="0"
-			width="50%">
-			<eq-detail ref="eqDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
+    <!-- <pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" /> -->
   </div>
 </template>
 
 <script>
-import eqDetail from './eq-detail';
+// import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
-import { getFactoryPage } from '@/api/core/base/factory';
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import barChart from './BarChart.vue';
+import { getCT } from '@/api/core/analysis/index';
+import { getProductionLinePage } from '@/api/core/base/productionLine';
+import BalanceChart from '../balanceChart'
+import { time } from 'echarts';
+// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'edgeCt',
-		label: '磨边当前节拍pcs/min',
-	},
-	{
-		prop: 'temperCt',
-		label: '钢化当前节拍pcs/min',
-	},
-	{
-		prop: 'downCt',
-		label: '下片当前节拍pcs/min',
-	},
-];
+// const tableProps = [
+// 	// {
+//   //   prop: 'lineName',
+// 	// 	label: '产线',
+// 	// 	align: 'center',
+// 	// },
+//   // {
+//   //   prop: 'sum',
+//   //   label: '合计',
+//   //   align: 'center',
+//   // },
+//   // {
+//   //   prop: 'dynamicValue',
+//   //   label: 'dynamicName',
+//   //   align: 'center',
+//   //   children:[
+
+//   //   ]
+//   // }
+// ];
 
 export default {
   components: {
-		barChart,
-		eqDetail,
+    BalanceChart
   },
+  // mixins: [basicPage],
   data() {
     return {
       urlOptions: {
-				getDataListURL: getNewCTNow,
+        getDataListURL: getCT,
       },
-			listQuery: {
-				lineId: [],
-			},
-			fileName: '',
+      tableProps: [],
       dataListLoading: false,
-			tableProps,
-			tableBtn: [
-				{
-					type: 'eq',
-					btnName: '详情',
-				},
-			].filter((v) => v),
-			showData: [],
       tableData: [],
-			chartData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
+      listQuery: {
+        // time: ''
+        endTime: undefined,
+        lineId:undefined,
+        startTime:undefined
       },
+      timeList: [],
+      spanArr: [], 
+      xData: [],
+      yData: [],
+      optionArrUrl: [getProductionLinePage],
+      formConfig: [
         {
           type: 'select',
           label: '产线',
           selectOptions: [],
-					param: 'lineId',
-					multiple: true,
+          param: 'lineIds',
+          defaultSelect: '',
+          multiple: false,
+          filterable: true,
         },
         {
           type: 'datePicker',
-					label: '时间范围',
+          label: '时间',
           dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
           width: 350,
-					clearable: false,
+          param: 'time',
         },
         {
           type: 'button',
           btnName: '查询',
           name: 'search',
           color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	type: 'button',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
+        }
       ],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
     };
   },
   created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime());
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-		this.listQuery.startTime = yesterday.getTime();
-		this.listQuery.endTime = end.getTime();
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [
-				yesterday.getTime(),
-				end.getTime(),
-			];
-		});
-		this.getDataList();
-		this.getPdLineList();
+    this.getArr();
   },
   methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '产线自动报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
+    getArr() {
       const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
+        page: 1,
+        limit: 500
+      }
+      this.optionArrUrl.forEach((item, index) => {
+        item(params).then((response) => {
+          this.formConfig[index].selectOptions = response.data.list
+        });
+      });
+    },
+    setRowSpan(arr) {
+      let count = 0
+      arr.forEach((item, index) => {
+        if(index === 0) {
+          this.spanArr.push(1)
+        } else {
+          if (item === arr[index - 1]) {
+            this.spanArr[count] += 1
+            this.spanArr.push(0)
+          } else {
+            count = index
+            this.spanArr.push(1)
+          }
+        }
+      })
+    },
+    /** 合并table列的规则 */
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+			if (columnIndex == 0) {
+				if (this.spanArr[rowIndex]) {
+					return [
+						this.spanArr[rowIndex], // row span
+						1, // col span
+					];
+				} else {
+					return [0, 0];
+				}
+			}
+		},
+    getData() {
+      // this.listQuery.lineId = '1672847052717821953'
+      // this.listQuery.startTime = '1693497600000';
+      // this.listQuery.endTime = '1693843200000';
+      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+        console.log(res)
+        let arr = [
+          {
+            prop: 'sectionName',
+            label: '工段',
+            align: 'center',
+          },
+          {
+            prop: 'equName',
+            label: '设备',
+            align: 'center',
+          }
+        ]
+        let sectionArr= []
+        res.data.data.forEach((ele, index) => {
+          let tempData = []
+          let eqData = []
+            let plData = []
+          ele.data.forEach((item, index) => {
+            item.children.forEach(params => {
+              if (params.dynamicName === '设备CT') {
+                tempData[item.dynamicName + '_eq'] = params.dynamicValue
+                eqData[index] = params.dynamicValue
+              } else {
+                tempData[item.dynamicName + '_pl'] = params.dynamicValue
+                plData[index] = params.dynamicValue
+              }
+            })
+          })
+          const equipment = {
+            name: ele.equName,
+            eqData: eqData,
+            plData: plData
+          }
+          tempData['equName'] = ele.equName
+          tempData['sectionName'] = ele.sectionName
+          this.tableData.push(tempData)
+          const { sectionName } = tempData
+          sectionArr.push(sectionName)
+          this.yData.push(equipment)
+          console.log('看看equ', this.yData)
+        })
+        this.setRowSpan(sectionArr)
+        res.data.nameData.forEach(item => {
+          this.timeList.push(item.name)
+        })
+        const timeArray = Array.from(new Set(this.timeList))
+        for (const times of timeArray) {
+          if (times !== '设备CT' && times !== '产线CT') {
+            const subprop = {
+              label: times,
+              align: 'center',
+              children: [
+                { prop: times + '_eq', label: '设备CT', align: 'center' },
+                { prop: times + '_pl', label: '产线CT', align: 'center' }
+              ]
+            }
+            arr.push(subprop)
+            this.xData.push(times)
+          }
+        }
+        this.tableProps = arr
+
+        console.log('表格横坐标', this.xData)
+        this.$refs.lineChart.initChart(this.xData, this.yData)
+        // this.total = response.data.total;
+        // this.dataListLoading = false;
       });
     },
     buttonClick(val) {
+      // console.log(val)
       switch (val.btnName) {
         case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId ? val.lineId : [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					this.getDataList();
+          // this.listQuery.pageNo = 1;
+          // this.listQuery.pageSize = 10;
+          this.listQuery.lineId = val.lineIds
+          this.listQuery.startTime = val.time ? String(new Date(val.time[0]).getTime()) : undefined;
+          this.listQuery.endTime = val.time ? String(new Date(val.time[1]).getTime()) : undefined;
+          if (val.time && val.lineIds) {
+            this.tableData = []
+            this.xData = []
+            this.yData = []
+            this.tableProps = []
+            this.spanArr = []
+            this.timeList = []
+            this.getData()
+          } else {
+            this.$message({
+              message: '请选择产线和时间',
+              type: 'warning'
+            });
+          }
           break;
-				case 'export':
-					this.handleExport();
+        case 'reset':
+          this.$refs.searchBarForm.resetForm();
+          this.listQuery = {
+            pageSize: 10,
+            pageNo: 1,
+            total: 1,
+          };
+          this.getDataList();
           break;
         default:
           console.log(val);
       }
     },
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-			getNewCTCharts(this.listQuery).then((response) => {
-				this.chartData = response.data;
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
   },
 };
 </script>

src/views/core/analysis/balanceChart.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2024-11-26 15:52:29
- * @LastEditors: zwq
+ * @LastEditTime: 2023-10-08 16:36:37
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
@@ -108,28 +108,13 @@ export default {
         },
         series: [
           {
-            name: '生产规格',
-            data: dataList.ggData,
+            name: '设备CT',
+            data: dataList.eqData,
             type: 'line',
           },
           {
-            name: '设备理论速度',
-            data: dataList.sbluData,
-            type: 'line',
-          },
-          {
-            name: '设备实际速度',
-            data: dataList.sbsjData,
-            type: 'line',
-          },
-          {
-            name: '产线理论速度',
-            data: dataList.cxluData,
-            type: 'line',
-          },
-          {
-            name: '产线实际速度',
-            data: dataList.cxsjData,
+            name: '产线CT',
+            data: dataList.plData,
             type: 'line',
           }
         ]

src/views/core/analysis/yieldAnalysis/index.vue

@@ -1,15 +1,8 @@
 <template>
   <div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <div v-if="tableData.length">
-			<base-table
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:max-height="tableH"
-				:table-data="tableData" />
+      <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
       <SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
       <line-chart ref="lineChart" />
     </div>
@@ -27,8 +20,7 @@
 import { parseTime } from '../../mixins/code-filter';
 import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
-import lineChart from '../LineChart';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import lineChart from '../LineChart'
 // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
 // const tableProps = [
@@ -56,7 +48,7 @@ export default {
   components: {
     lineChart,
   },
-	mixins: [tableHeightMixin],
+	// mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -67,7 +59,7 @@ export default {
       tableData: [],
       listQuery: {
         lineIds: [],
-				time: '',
+        time: ''
       },
       dateLabelList: [],
       optionArrUrl: [getProductionLinePage ],
@@ -77,16 +69,15 @@ export default {
 					label: '产线',
 					selectOptions: [],
           param: 'lineIds',
-					defaultSelect: [],
+          defaultSelect: '',
           multiple:true,
 					filterable: true,
-					width: 200,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
@@ -98,7 +89,7 @@ export default {
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-				},
+				}
 			],
 		};
 	},
@@ -113,9 +104,9 @@ export default {
 			};
 			this.optionArrUrl.forEach((item, index) => {
 				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
+					this.formConfig[index].selectOptions = response.data.list
           // this.formConfig[0].defaultSelect = response.data.list[0].id
-					// this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
+          this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
 				});
 			});
     },
@@ -123,49 +114,51 @@ export default {
       // this.listQuery.lineIds = ['1672847052717821953']
       // this.listQuery.productId = val.productId;
       // this.listQuery.time = '1694486098000';
-			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+      this.urlOptions.getDataListURL(this.listQuery).then(res => {
         let arr = [
           	{
               prop: 'lineName',
           		label: '产线',
-						fixed: 'left',
+              fixed: 'left'
           	},
             {
               prop: 'sum',
-						label: '合计[片]',
-						fixed: 'left',
+              label: '合计',
+              fixed: 'left'
             },
             {
               prop: res.data ? res.data.nameData[0].name : undefined,
               label: res.data ? res.data.nameData[0].name : undefined,
               align: 'center',
-						children: [],
-					},
-				];
-				// console.log(res.data.nameData.slice(1))
-				let xData = [];
-				let yAllData = [];
-				let lineName = [];
-				if (res.data) {
-					let tempDateList = [];
-					res.data.nameData.forEach((date) => {
-						tempDateList.push(date.name);
-					});
-					this.dateLabelList = Array.from(new Set(tempDateList));
+              children:[
 
-					this.dateLabelList.forEach((item) => {
+              ]
+            }
+        ]
+        // console.log(res.data.nameData.slice(1))
+        let xData = []
+        let yAllData = []
+        let lineName = []
+        if (res.data) {
+          let tempDateList = []
+          res.data.nameData.forEach(date => {
+            tempDateList.push(date.name)
+          })
+          this.dateLabelList = Array.from(new Set(tempDateList))
+
+          this.dateLabelList.forEach(item => {
             if (item.indexOf('年') === -1) {
               // 构造表头
               const props = {
-								prop: item,
-								label: item,
-							};
-							arr[2].children.push(props);
+                'prop': item,
+                'label': item
+              }
+              arr[2].children.push(props)
 
               // 构造echarts横坐标
-							xData.push(item);
+              xData.push(item)
             }
-					});
+          })
           // res.data.nameData.slice(1).forEach(item => {
           //   const props = {
           //     'prop': item.name,
@@ -174,23 +167,23 @@ export default {
           //   }
           //   arr[2].children.push(props)
           // })
-					let tableDataArr = [];
-					res.data.data.forEach((item) => {
-						let obj = {};
-						(obj.lineName = item.lineName),
-							(obj.sum = item.sum),
+          let tableDataArr =[]
+          res.data.data.forEach(item => {
+            let obj = {}
+            obj.lineName= item.lineName,
+            obj.sum= item.sum,
             item.data.forEach((ele, index) => {
               // console.log(ele)
               ele.children.forEach((e) => {
-									console.log(e.dynamicName);
-									obj['' + e.dynamicName + ''] = e.dynamicValue;
+                console.log(e.dynamicName)
+                obj['' + e.dynamicName + ''] = e.dynamicValue
                 console.log(obj['' + e.dynamicName + '']);
+              })
+            })
+            tableDataArr.push(obj)
           });
-							});
-						tableDataArr.push(obj);
-					});
-					this.tableData = tableDataArr;
-					this.tableProps = arr;
+          this.tableData = tableDataArr
+          this.tableProps = arr
           
           // let tempList = []
           // res.data.nameData.slice(1).forEach(item => {
@@ -199,9 +192,9 @@ export default {
           // })
           // xData = Array.from(new Set(tempList))
           
-					res.data.data.forEach((item) => {
-						let yData = [];
-						lineName.push(item.lineName);
+          res.data.data.forEach(item => {
+            let yData = []
+            lineName.push(item.lineName)
             // let obj = {}
             // obj.lineName = item.lineName,
             //   obj.sum = item.sum,
@@ -209,18 +202,18 @@ export default {
                 // console.log(ele)
               ele.children.forEach((e) => {
                 // let yData = []
-								yData.push(e.dynamicValue);
+                yData.push(e.dynamicValue)
+                })
+              })
+            yAllData.push(yData)
           });
-						});
-						yAllData.push(yData);
-					});
-					console.log(lineName);
+          console.log(lineName)
         } else {
-					this.tableProps = arr;
-					this.tableData = [];
-					xData = [];
-					yAllData = [];
-					lineName = [];
+          this.tableProps = arr
+          this.tableData = []
+          xData = []
+          yAllData = []
+          lineName = []
         }
         // res.data.data[0].data[0].children.forEach((item, index) => {
         //   // console.log(item)
@@ -229,9 +222,7 @@ export default {
         //   // obj['' + item.dynamicName + ''] = item.dynamicValue
         // })
         // console.log(this.yData)
-				this.$nextTick(() => {
-					this.$refs.lineChart.initChart(xData, yAllData, lineName);
-				});
+        this.$refs.lineChart.initChart(xData, yAllData, lineName)
         // this.total = response.data.total;
         // this.dataListLoading = false;
       });
@@ -239,19 +230,17 @@ export default {
     buttonClick(val) {
 			switch (val.btnName) {
         case 'search':
-					this.listQuery.lineIds = val.lineIds ? val.lineIds : undefined;
+          this.listQuery.lineIds = val.lineIds ? val.lineIds :undefined
           // this.listQuery.productId = val.productId;
-					this.listQuery.time = val.time
-						? new Date(val.time).getTime()
-						: undefined;
+          this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
 					// this.listQuery.pageNo = 1;
           // this.listQuery.pageSize = 10;
           if (val.time) {
-						this.getData();
+            this.getData()
           } else {
             this.$message({
               message: '请选择时间',
-							type: 'warning',
+              type: 'warning'
             });
           }
 					break;

src/views/core/base/equipment/components/AssetsUpload.vue

@@ -59,12 +59,9 @@
 				<i class="el-icon-delete"></i>
 			</div> -->
 			<div
+				class="file-list__item"
 				v-for="(file, index) in files"
 				:key="file.fileName"
-				style="width: 100%">
-				<div
-					class="file-list__item"
-					v-if="!isPicMode"
 				:style="{
 					background: isPicMode
 						? `url(${file.fileUrl}) no-repeat`
@@ -72,7 +69,6 @@
 					backgroundSize: isPicMode ? '100% 100%' : '64px',
 					backgroundPosition: isPicMode ? '0% 0%' : 'center',
 				}"
-					@click="handleDownload(file)"
 				:data-name="file.fileName">
 				<el-button
 					v-if="!disabled"
@@ -81,14 +77,6 @@
 					style="padding: 0"
 					@click="(e) => handleDelete(file)" />
 			</div>
-
-				<el-image
-					v-else
-					class="file-list__item"
-					style="width: 100%"
-					:src="file.fileUrl"
-					:preview-src-list="files.map((item) => item.fileUrl)"></el-image>
-        </div>
 		</section>
 	</div>
 </template>
@@ -289,32 +277,6 @@ export default {
 			// Array
 			this.$emit('update-filelist', this.appendFilelist);
 		},
-
-		async handleDownload(file) {
-			if (this.isPicMode) {
-				// this.$emit('preview', file);
-				const link = document.createElement('a');
-				link.href = file.fileUrl;
-				link.target = '_blank';
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-			} else {
-				// this.$emit('download', file);
-				const data = await this.$axios({
-					url: file.fileUrl,
-					method: 'get',
-					responseType: 'blob',
-				});
-				const link = document.createElement('a');
-				link.href = window.URL.createObjectURL(new Blob([data]));
-				link.download = file.fileName;
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-				window.URL.revokeObjectURL(link.href);
-			}
-		},
 	},
 };
 </script>

src/views/core/base/equipment/components/DialogForm.vue

@@ -44,7 +44,7 @@
 					<el-date-picker
 						v-if="col.datetime"
 						v-model="form[col.prop]"
-						type="date"
+						type="datetime"
 						:placeholder="`请选择${col.label}`"
 						value-format="timestamp"
 						v-bind="col.bind"></el-date-picker>

src/views/core/base/equipment/components/EquipmentDrawer.vue

@@ -308,7 +308,6 @@ export default {
 				});
 				if (code == 0) {
 					this.$modal.msgSuccess('更新成功');
-          this.$emit('refreshDataList');
 				}
 
 				this.btnLoading = false;

src/views/core/base/equipment/components/EquipmentInfoForm.vue

@@ -57,7 +57,6 @@
 						v-model="form.equipmentTypeId"
 						:disabled="disabled"
 						filterable
-            clearable
 						placeholder="请选择设备类型">
 						<el-option
 							v-for="eqType in eqTypeList"
@@ -80,9 +79,9 @@
 			<el-col :span="8">
 				<el-form-item label="生产日期" prop="productionTime" :rules="[]">
 					<el-date-picker
-						v-model="form.productionTime"
+						v-model="form.enterTime"
 						:disabled="disabled"
-						type="date"
+						type="datetime"
 						placeholder="请选择生产日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
@@ -92,14 +91,14 @@
 					<el-date-picker
 						v-model="form.enterTime"
 						:disabled="disabled"
-						type="date"
+						type="datetime"
 						placeholder="请选择进场日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item
-					label="设备理论生产能效(片/min)"
+					label="设备TT值"
 					prop="tvalue"
 					:rules="[
 						{ required: true, message: '不能为空', trigger: 'blur' },
@@ -113,7 +112,7 @@
 					<el-input
 						v-model="form.tvalue"
 						:disabled="disabled"
-						placeholder="请输入"></el-input>
+						placeholder="请输入设备TT值"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -317,7 +316,7 @@ export default {
 				this.form
 			);
 			// 保存原始文件名
-			if ('fileNames' in this.form) this.form.fileNames.push(file.name+Date.now());
+			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
 			// 保存完整地址
 			if ('fileUrls' in this.form) this.form.fileUrls.push(response.data);
 			this.$modal.msgSuccess('上传成功');

src/views/core/base/equipment/index.vue

@@ -38,7 +38,7 @@
 			@cancel="cancel"
 			width="60%"
 			@confirm="submitForm">
-			<DialogForm1
+			<DialogForm
 				v-if="open"
 				key="index-dialog-form"
 				ref="form"
@@ -78,7 +78,7 @@
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:equipment-attr:update')
@@ -107,7 +107,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from './components/EquipmentDrawer';
-import DialogForm1 from './components/DialogForm';
 
 import {
 	createEquipment,
@@ -125,7 +124,6 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
-		DialogForm1,
 	},
 	mixins: [basicPageMixin],
 	data() {
@@ -159,12 +157,7 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{
-					width: 200,
-					showOverflowtooltip: true,
-					prop: 'name',
-					label: '设备名称',
-				},
+				{ prop: 'name', label: '设备名称' },
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentType', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
@@ -277,7 +270,6 @@ export default {
 						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
 						bind: {
 							filterable: true,
-							clearable: true,
 						},
 					},
 					// {
@@ -302,7 +294,7 @@ export default {
 					{
 						input: true,
 						prop: 'tvalue',
-						label: '设备理论生产能效(片/min)',
+						label: '设备TT值',
 						rules: [
 							{ required: true, message: '不能为空', trigger: 'blur' },
 							{
@@ -443,7 +435,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				code: '',
 				name: '',
 			},
@@ -569,7 +561,6 @@ export default {
 					return;
 				}
 				// 添加的提交
-				this.form.files = [];
 				createEquipment(this.form).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;

src/views/core/base/equipmentType/index.vue

@@ -153,9 +153,6 @@ export default {
 						label: '父类',
 						prop: 'parentId',
 						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
-						bind: {
-							clearable: true, // some condition, like detail mode...
-						}
 					},
 					{},
 				],
@@ -240,6 +237,25 @@ export default {
 			const id = row.id;
 			getEquipmentType(id).then((response) => {
 				this.form = response.data;
+				// this.form = {
+				// 	code: 'SBLX20230925184444000041',
+				// 	name: '测试131',
+				// 	remark: '测试可删除',
+				// 	id: '1706258479729336322',
+				// 	files: [
+				// 		{ fileName: '1.png', fileUrl: '', fileType: 2 },
+				// 		{ fileName: '1.asdfaslkjfkasdf.png', fileUrl: '', fileType: 2 },
+				// 		{ fileName: '2.txt', fileUrl: '', fileType: 2 },
+				// 		{ fileName: '1.rar', fileUrl: '', fileType: 2 },
+				// 		{ fileName: '1.kkk', fileUrl: '', fileType: 2 },
+				// 		{ fileName: 'test.file', fileUrl: '', fileType: 2 },
+				// 		{ fileName: '222', fileUrl: '', fileType: 2 },
+				// 		{ fileName: 'g', fileUrl: '', fileType: 2 },
+				// 	],
+				// 	createTime: 1695638697000,
+				// 	parentId: '1701869972319584257',
+				// };
+				// debugger;
 				this.open = true;
 				this.title = '修改设备类型';
 			});

src/views/core/base/factory/index.vue

@@ -154,7 +154,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.code = val.code;
 					this.getDataList();

src/views/core/base/lineBindProcess/index.vue

@@ -1,99 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-02 15:12:42
- * @LastEditors: zwq
- * @LastEditTime: 2024-11-29 13:25:51
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="[{ label: '产线在制工艺', type: 'title' }]"
-			ref="searchBarForm" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="inputChange" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProcessPage } from '@/api/core/base/lineBindProcess';
-import selectProduct from './selectProduct';
-
-const tableProps = [
-	{
-		prop: 'lineName',
-		label: '产线'
-	},
-	{
-		prop: 'processDictName',
-		label: '在制工艺',
-		list: [],
-		subcomponent: selectProduct,
-	},
-	{
-		prop: 'recordTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage, selectProduct],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProcessPage,
-			},
-			tableProps,
-			tableData: [],
-			// formConfig: [
-			// 	{
-			// 		type: 'button',
-			// 		btnName: '同步',
-			// 		name: 'search',
-			// 		color: 'primary',
-			// 	},
-			// ],
-		};
-	},
-	components: {},
-	created() {
-	},
-	methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data;
-        this.dataListLoading = false;
-      });
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		inputChange() {
-			this.getDataList();
-		},
-	},
-};
-</script>

src/views/core/base/lineBindProcess/selectProduct.vue

@@ -1,83 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-03 14:09:18
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 15:21:07
- * @Description:
--->
-<template>
-	<div class="tableInner">
-		<el-popover
-			placement="top"
-			title="切换在制工艺"
-			width="160"
-			v-model="visible">
-			<el-select v-model="list.processDict" style="margin: 5px" filterable>
-				<el-option
-					v-for="opt in getDictDatas(DICT_TYPE.PROCESS_TYPE)"
-					:key="opt.value"
-					:label="opt.label"
-					:value="opt.value"></el-option>
-			</el-select>
-			<div style="text-align: right; margin: 0">
-				<el-button size="mini" type="text" @click="visible = false">
-					取消
-				</el-button>
-				<el-button type="primary" size="mini" @click="changeInput">
-					确定
-				</el-button>
-			</div>
-			<el-button type="text" slot="reference">
-				<svg-icon icon-class="changelogo" />
-			</el-button>
-		</el-popover>
-		<el-input
-			readonly
-			v-model="list.processDictName"
-			style="width: 50%; margin-left: 5px"></el-input>
-	</div>
-</template>
-<script>
-import { switchLineBindProcess } from '@/api/core/base/lineBindProcess';
-
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-			visible: false,
-		};
-	},
-	mounted() {
-  },
-	methods: {
-		changeInput() {
-      const processDictName = this.getDictDatas(this.DICT_TYPE.PROCESS_TYPE).find(item=>
-        item.value == this.list.processDict
-    )
-			const data = {
-				id: this.list.id,
-				processDict: this.list.processDict,
-				processDictName: processDictName.label,
-			};
-			switchLineBindProcess(data).then((response) => {
-				this.$modal.msgSuccess('修改成功');
-				this.visible = false;
-				this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
-<style scoped>
-.tableInner .el-input__inner {
-	border: none;
-	padding: 0;
-	height: 33px;
-}
-</style>

src/views/core/base/lineBindProcessLog/index.vue

@@ -1,164 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProcessLogPage } from '@/api/core/base/lineBindProcess';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'processDictName',
-		label: '在制工艺',
-	},
-	{
-		prop: 'recordTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProcessLogPage,
-			},
-			tableProps,
-			tableData: [],
-			optionArrUrl: [getFactoryPage,getProductionLinePage],
-			listQuery: {
-				productionLineId: [],
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					multiple: true,
-				},
-				{
-					type: 'select',
-					label: '在制工艺',
-					selectOptions: this.getDictDatas(this.DICT_TYPE.PROCESS_TYPE),
-					labelField: 'label',
-					valueField: 'value',
-					param: 'processDict',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'startTime',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'button',
-					btnName: '重置',
-					name: 'reset',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.productionLineId = [];
-			this.$refs.searchBarForm.formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.productionLineId = val.productionLineId || [];
-					this.listQuery.processDict = val.processDict;
-					this.listQuery.recordTime = val.startTime
-						? [val.startTime[0], val.startTime[1].substr(0, 10) + ' 23:59:59']
-						: null;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/core/base/lineBindProduct/changeStatus.vue

@@ -1,53 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-01-31 14:12:10
- * @LastEditTime: 2024-11-29 10:49:37
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<span>
-		<el-switch
-			@change="changeStatus"
-			v-model="injectData.allowAuto"
-			:active-value="true"
-			:inactive-value="false"></el-switch>
-	</span>
-</template>
-
-<script>
-import { switchAutoProduct } from '@/api/core/base/lineBindProduct';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				submitURL: switchAutoProduct,
-			},
-		};
-	},
-	methods: {
-		// 子级
-		changeStatus() {
-			// 路由参数
-			let obj = {
-				allowAuto: this.injectData.allowAuto,
-				id: this.injectData.id,
-			};
-			this.urlOptions.submitURL(obj).then((res) => {
-        console.log(res)
-				if (res.code !== 0) {
-					return this.$message.error(res.msg);
-				}
-				this.$modal.msgSuccess('切换状态成功');
-				this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>

src/views/core/base/lineBindProduct/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2023-08-02 15:12:42
- * @LastEditors: zwq
- * @LastEditTime: 2024-11-29 10:47:46
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-13 16:35:03
  * @Description:
 -->
 <template>
@@ -30,7 +30,6 @@ import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
 import { getLineBindProductPage } from '@/api/core/base/lineBindProduct';
 import selectProduct from './selectProduct';
-import changeStatus from './changeStatus';
 import { getProductPage } from '@/api/core/base/product';
 
 const tableProps = [
@@ -44,11 +43,6 @@ const tableProps = [
 		list: [],
 		subcomponent: selectProduct,
 	},
-	{
-		prop: 'allowAuto',
-		label: '允许自动',
-		subcomponent: changeStatus,
-	},
 	{
 		prop: 'recordTime',
 		label: '开始时间',
@@ -91,7 +85,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.getDataList();
 					break;
 				default:

src/views/core/base/lineBindProductLog/index.vue

@@ -3,7 +3,6 @@
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
 			@headBtnClick="buttonClick" />
 		<base-table
 			v-loading="dataListLoading"
@@ -25,21 +24,15 @@ import { parseTime } from '../../mixins/code-filter';
 import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
 import { getProductPage } from '@/api/core/base/product';
-import { getFactoryPage } from '@/api/core/base/factory';
-import { getPdList } from '@/api/core/monitoring/auto';
 
 const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
 	{
 		prop: 'productionLineName',
-		label: '产线',
+		label: '产线'
 	},
 	{
 		prop: 'productName',
-		label: '在制产品',
+		label: '在制产品'
 	},
 	{
 		prop: 'startTime',
@@ -62,24 +55,15 @@ export default {
 			},
 			tableProps,
 			tableData: [],
-			listQuery: {
-				productionLineId: [],
-			},
-			optionArrUrl: [getFactoryPage,getProductionLinePage, getProductPage],
+			optionArrUrl: [getProductionLinePage, getProductPage],
 			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
 					param: 'productionLineId',
-					multiple: true,
+					defaultSelect: '',
+					filterable: true,
 				},
 				{
 					type: 'select',
@@ -99,7 +83,7 @@ export default {
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'startTime',
-					valueFormat: 'timestamp',
+					valueFormat: 'timestamp'
 				},
 				{
 					type: 'button',
@@ -115,18 +99,12 @@ export default {
 			],
 		};
 	},
-	components: {},
+	components: {
+	},
 	created() {
 		this.getArr();
 	},
 	methods: {
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.productionLineId = [];
-			this.$refs.searchBarForm.formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
 		getArr() {
 			const params = {
 				page: 1,
@@ -142,11 +120,10 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.productionLineId = val.productionLineId || [];
+					this.listQuery.pageSize = 20;
+					this.listQuery.productionLineId = val.productionLineId;
 					this.listQuery.productId = val.productId;
-					this.listQuery.startTime = val.startTime ? val.startTime : null;
+					this.listQuery.startTime = val.startTime;
 					this.getDataList();
 					break;
 				case 'reset':

src/views/core/base/product/add-or-updata.vue

@@ -1,40 +1,70 @@
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="60%">
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title>
 
 		<div class="content">
 			<div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" label-position="top"
+				<el-form
+					ref="dataForm"
+					:model="dataForm"
+					:rules="dataRule"
+					label-width="100px"
+					label-position="top"
 					@keyup.enter.native="dataFormSubmit">
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="产品编码" prop="code">
-                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入产品编码" />
+								<el-input
+									v-model="dataForm.code"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入产品编码" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="产品名称" prop="name">
-                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入产品名称" />
+								<el-input
+									v-model="dataForm.name"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入产品名称" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="产品类型" prop="typeDictValue">
-                <el-select v-model="dataForm.typeDictValue" style="width: 100%" :disabled="isdetail"
+								<el-select
+									v-model="dataForm.typeDictValue"
+									style="width: 100%"
+									:disabled="isdetail"
 									placeholder="请选择产品类型">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)" :key="dict.value" :label="dict.label"
+									<el-option
+										v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)"
+										:key="dict.value"
+										:label="dict.label"
 										:value="dict.value" />
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="单位" prop="unitDictValue">
-                <el-select v-model="dataForm.unitDictValue" style="width: 100%" :disabled="isdetail"
+								<el-select
+									v-model="dataForm.unitDictValue"
+									style="width: 100%"
+									:disabled="isdetail"
 									placeholder="请选择单位">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)" :key="dict.value" :label="dict.label"
+									<el-option
+										v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+										:key="dict.value"
+										:label="dict.label"
 										:value="dict.value" />
 								</el-select>
 							</el-form-item>
@@ -42,58 +72,63 @@
 					</el-row>
 					<el-row :gutter="20">
 						<el-col :span="12">
-              <el-form-item label="原片规格" prop="originalSpecifications">
-                <el-input :disabled="isdetail" v-model="dataForm.originalSpecifications" placeholder="请输入原片规格" />
+							<el-form-item label="规格" prop="specifications">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.specifications"
+									placeholder="请输入规格" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
-              <el-form-item label="原片单位平方数" prop="originalArea">
-                <el-input :disabled="isdetail" v-model="dataForm.originalArea" placeholder="请输入原片单位平方数" />
+							<el-form-item label="单位平方数" prop="area">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.area"
+									placeholder="请输入单位平方数" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="深加工规格" prop="specifications">
-                <el-input :disabled="isdetail" v-model="dataForm.specifications" placeholder="请输入深加工规格" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="深加工单位平方数" prop="area">
-                <el-input :disabled="isdetail" v-model="dataForm.area" placeholder="请输入深加工单位平方数" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="完成单位产品用时" prop="processTime">
-                <el-input :disabled="isdetail" v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="	加工属性" prop="processType">
-                <el-select v-model="dataForm.processType" clearable style="width: 100%" :disabled="isdetail"
-                  placeholder="请选择加工属性">
-                  <el-option v-for="dict in processTypeList" :key="dict.id" :label="dict.label"
-                    :value="dict.id" />
-                </el-select>
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.processTime"
+									placeholder="请输入完成单位产品用时" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 				</el-form>
 
-        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
 					产品属性列表
 				</small-title>
 
 				<div class="attr-list">
-          <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-            :add-button-show="isdetail ? null : '添加属性'" @emitButtonClick="addNew()" :table-data="productAttributeList">
-            <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+					<base-table
+						:table-props="tableProps"
+						:page="listQuery.pageNo"
+						:limit="listQuery.pageSize"
+						:add-button-show="isdetail ? null : '添加属性'"
+						@emitButtonClick="addNew()"
+						:table-data="productAttributeList">
+						<method-btn
+							v-if="!isdetail"
+							slot="handleBtn"
+							:width="120"
+							label="操作"
+							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-          <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
-            :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
+					<pagination
+						v-show="listQuery.total > 0"
+						:total="listQuery.total"
+						:page.sync="listQuery.pageNo"
+						:limit.sync="listQuery.pageSize"
+						:page-sizes="[5, 10, 15]"
+						@pagination="getList" />
 				</div>
 			</div>
 		</div>
@@ -119,12 +154,13 @@
 			<el-button v-if="isdetail" type="primary" @click="goEdit()">
 				编辑
 			</el-button>
-      <el-button v-else type="primary" @click="dataFormSubmit()">
-        确定
-      </el-button>
+			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 
-    <product-attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id"
+		<product-attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:product-id="dataForm.id"
 			@refreshDataList="getList" />
 	</el-drawer>
 </template>
@@ -184,37 +220,17 @@ export default {
 				id: null,
 				name: '', // 产品名称
 				code: '', // 产品编码
-				area: 0, // 深加工单位平方数(float only)
+				area: 0, // 单位平方数(float only)
 				typeDictValue: null, // 产品类型id
 				processTime: null, // 单位产品用时 (s)
-				specifications: '', // 深加工规格
+				specifications: '', // 规格
 				unitDictValue: '', // 单位id
-				originalSpecifications: '', // 原片规格
-        originalArea: 0, // 原片单位平方数
-        processType:undefined,
 			},
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
 				total: 0,
 			},
-      processTypeList: [
-        {
-          id: '0',
-          label:'压花丝印'
-        },
-        {
-          id: '1',
-          label: '无印打孔'
-        },
-        {
-          id: '2',
-          label: '单层镀膜'
-        }, {
-          id: '3',
-          label: '双层镀膜'
-        }
-      ],
 			dataRule: {
 				code: [
 					{
@@ -355,20 +371,9 @@ export default {
 					// 添加的提交
 					createProduct(this.dataForm).then((response) => {
 						this.$modal.msgSuccess('新增成功');
-						this.$confirm(`是否新增产品属性?`, '系统提示', {
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning',
-						})
-							.then(() => {
-                this.dataForm.id = response.data
-								this.addNew();
-							})
-							.catch(() => {
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});
-					});
 				}
 			});
 		},
@@ -377,14 +382,10 @@ export default {
 		},
 		// 新增 / 修改
 		addNew(id) {
-			if (this.dataForm.id) {
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id);
 			});
-			} else {
-				this.$message('请先创建产品!');
-			}
 		},
 		goback() {
 			this.$emit('refreshDataList');

src/views/core/base/product/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 16:06:59
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-13 10:27:00
  * @Description:
 -->
 <template>
@@ -49,31 +49,27 @@ import {
 
 const tableProps = [
 	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
+		prop: 'code',
+		label: '产品编码'
 	},
 	{
 		prop: 'name',
 		label: '产品名称'
 	},
-	{
-		prop: 'code',
-		label: '产品编码'
-	},
-	{
-		prop: 'originalSpecifications',
-		label: '原片规格'
-	},
 	{
 		prop: 'specifications',
-		label: '深加工规格'
+		label: '规格'
 	},
 	{
 		prop: 'unitDictValue',
 		label: '单位',
 		subcomponent: unitDict,
 	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
 ];
 
 export default {
@@ -166,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.code = val.code;
 					this.getDataList();

src/views/core/base/productionLine/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 15:32:45
+ * @LastEditTime: 2024-04-10 16:31:51
  * @Description:
 -->
 <template>
@@ -12,7 +12,6 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-    label-position="top"
 		label-width="90px">
 		<el-row :gutter="20">
 			<el-col :span="12">
@@ -49,11 +48,11 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="产线理论生产能效(片/min)" prop="tvalue">
+				<el-form-item label="产线TT值(h)" prop="tvalue">
 					<el-input
 						v-model="dataForm.tvalue"
 						clearable
-						placeholder="请输入数量" />
+						placeholder="请输入每小时下片数量" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -81,17 +80,6 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-
-		<el-row>
-			<el-col :span="24">
-				<el-form-item label="描述" prop="description">
-					<el-input
-						v-model="dataForm.description"
-						type="textarea"
-						placeholder="请输入内容" />
-				</el-form-item>
-			</el-col>
 			<el-col :span="12">
 				<el-form-item label="备注" prop="remark">
 					<el-input
@@ -101,6 +89,17 @@
 				</el-form-item>
 			</el-col>
 		</el-row>
+
+		<el-row>
+			<el-col>
+				<el-form-item label="描述" prop="description">
+					<el-input
+						v-model="dataForm.description"
+						type="textarea"
+						placeholder="请输入内容" />
+				</el-form-item>
+			</el-col>
+		</el-row>
 	</el-form>
 </template>
 
@@ -140,11 +139,11 @@ export default {
 			},
       pdTypeArr: [
         {
-          id: '0',
+          id: 0,
           name: '深加工'
         },
         {
-          id: '1',
+          id: 1,
           name: '原片'
         }
       ],
@@ -160,7 +159,6 @@ export default {
 				],
 				tvalue: [
 					{
-            required: true,
 						type: 'number',
 						message: '请输入正确的数字',
 						trigger: 'change',

src/views/core/base/productionLine/index.vue

@@ -48,7 +48,6 @@ import {
 	exportProductionLineExcel,
 	getStatus,
 } from '@/api/core/base/productionLine';
-import { getFactoryPage } from '@/api/core/base/factory';
 
 const tableProps = [
 	{
@@ -122,13 +121,6 @@ export default {
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
 				{
 					type: 'input',
 					label: '产线名称',
@@ -176,15 +168,7 @@ export default {
 	components: {
 		AddOrUpdate,
 	},
-	created() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-    },
+	created() {},
 	methods: {
 		// 获取数据列表
 		getDataList() {
@@ -212,8 +196,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.getDataList();
 					break;

src/views/core/base/workshopSection/index.vue

@@ -3,7 +3,6 @@
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
 			@headBtnClick="buttonClick" />
 		<base-table
       v-loading="dataListLoading"
@@ -47,8 +46,6 @@ import {
   getWorkshopSectionPage,
   exportWorkshopSectionExcel
 } from "@/api/core/base/workshopSection";
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
 
 const tableProps = [
 	{
@@ -59,10 +56,6 @@ const tableProps = [
 		prop: 'name',
 		label: '工段名称'
 	},
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
 	{
 		prop: 'productionLineName',
 		label: '产线'
@@ -106,25 +99,8 @@ export default {
 					  }
 					: undefined,
 			].filter((v)=>v),
-			listQuery: {
-				lineId: [],
-			},
 			tableData: [],
 			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-				},
 				{
 					type: 'input',
 					label: '工段名称',
@@ -170,37 +146,14 @@ export default {
 	components: {
 		AddOrUpdate,
 	},
-	created() {
-		this.getPdLineList();
-	},
+	created() {},
 	methods: {
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId || [];
 					this.getDataList();
 					break;
 				case 'reset':

src/views/core/monitoring/auto/index.vue

@@ -1,21 +1,35 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:59:32
- * @LastEditors: zwq
+ * @LastEditTime: 2023-10-16 15:10:42
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
 	<div class="app-container">
-
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table v-if="showData.length" class="right-aside" v-loading="dataListLoading" :table-props="tableProps"
-      :page="listQuery.pageNo" :limit="listQuery.pageSize" :selectWidth="55" :table-data="showData"
-      @selection-change="selectChange">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-if="showData.length"
+			class="right-aside"
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:selectWidth="55"
+			:table-data="showData"
+			@selection-change="selectChange"
+			>
 		</base-table>
 		<div v-else class="no-data-bg"></div>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList"
+		/>
 		<!-- <div v-show="false" ref="pdf">
 			<base-table
 				v-loading="dataListLoading"
@@ -25,7 +39,11 @@
 				:table-data="selectedList"
 			/>
 		</div> -->
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+		<el-dialog
+			title="提示"
+			:visible.sync="dialogVisible"
+			width="30%"
+			:before-close="handleClose">
 			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
   		<el-button type="success" @click="exportPdf">pdf</el-button>
 			<span slot="footer" class="dialog-footer">
@@ -74,8 +92,7 @@ const tableProps = [
 	},
 	{
 		prop: 'outputArea',
-		label: '产出面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
+		label: '产出面积/㎡'
 	},
 	{
 		prop: 'lossNum',
@@ -83,13 +100,11 @@ const tableProps = [
 	},
 	{
 		prop: 'lossArea',
-		label: '损耗面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
+		label: '损耗面积/㎡'
 	},
 	{
 		prop: 'lossRatio',
-		label: '损耗比例%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
+		label: '损耗比例%'
 	}
 ];
 
@@ -165,6 +180,7 @@ export default {
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
+          defaultSelect: [],
           width: 350
         },
 				{
@@ -186,7 +202,6 @@ export default {
 			],
 		};
 	},
-
 	created() {
 		this.getDataList()
 		this.getPdLineList()
@@ -294,11 +309,11 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.lineId = val.line ? val.line : undefined;
 					this.listQuery.reportType = val.reportType ? val.reportType : undefined;
-					this.listQuery.reportStartTime = val.timeVal ? [new Date(val.timeVal[0]).getTime(),new Date(val.timeVal[1]).getTime()] : undefined;
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
+					this.listQuery.reportStartTime = val.timeVal ? [new Date(val.timeVal[0]).getTime()] : undefined;
+					this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
 					if (val.timeVal && val.timeVal.length > 0) {
 						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
           }

src/views/core/monitoring/components/buttonNav.vue

@@ -1,132 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2024-10-21 08:43:35
- * @LastEditTime: 2024-10-21 09:10:09
- * @LastEditors: zhp
- * @Description: Vue2版本的标签切换组件
--->
-
-<template>
-  <!-- 按钮切换 -->
-  <div v-if="buttonMode" class="button-nav">
-    <button v-for="m in menus" :key="m" :class="{ active: m === currentMenu }" :data-text="m"
-      @click="handleMenuChange(m)"></button>
-  </div>
-  <!-- 标签切换 -->
-  <div v-else class="custom-tabs" style="height: 100%; width: 100%">
-    <el-tabs v-model="currentMenu" class="tag-nav" style="height: 100%">
-      <el-tab-pane v-for="(m, idx) in menus" :key="m" :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
-        :name="m">
-        <slot :name="`tab${idx + 1}`"></slot>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    menus: {
-      type: Array,
-      required: true,
-      default: () => [],
-      validator(val) {
-        return val.length > 0;
-      }
-    },
-    buttonMode: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      currentMenu: this.menus[0] || ''
-    };
-  },
-  methods: {
-    handleMenuChange(menu) {
-      this.currentMenu = menu;
-      this.$emit('change', menu);
-    }
-  },
-  watch: {
-    currentMenu(val) {
-      this.$emit('change', val);
-    }
-  },
-  mounted() {
-    if (this.menus.length > 0) {
-      this.currentMenu = this.menus[0];
-    }
-  }
-};
-</script>
-
-<style scoped>
-.button-nav {
-  width: 100%;
-  padding: 12px 0;
-  display: flex;
-  gap: 12px;
-}
-
-.button-nav * {
-  user-select: none;
-}
-
-.button-nav button {
-  cursor: pointer;
-  appearance: none;
-  outline: none;
-  border: none;
-  background: #fff;
-  border-radius: 8px;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  padding: 20px;
-  color: #888;
-  letter-spacing: 2px;
-  flex: 1;
-  box-sizing: padding-box;
-  position: relative;
-}
-
-.button-nav button::after {
-  content: attr(data-text);
-  position: absolute;
-  top: 10px;
-  left: 50%;
-  font-size: 18px;
-  font-weight: 500;
-  transform: translate(-50%);
-}
-
-.button-nav button.active {
-  color: #111;
-  border-bottom: 4px solid #0b58ff;
-}
-
-.custom-tabs /deep/ .el-tabs__header {
-  margin-bottom: 8px;
-  display: inline-block;
-}
-
-.custom-tabs /deep/ .el-tabs__item {
-  padding-left: 0px !important;
-  padding-right: 0px !important;
-  line-height: 36px !important;
-  height: 36px;
-}
-
-.custom-tabs /deep/ .el-tabs__content {
-  height: calc(100% - 42px);
-}
-
-.custom-tabs /deep/ .el-tab-pane {
-  box-sizing: border-box;
-  height: 100%;
-  padding: 20px;
-  border: 10px solid #f002;
-}
-</style>

src/views/core/monitoring/data/BarChart.vue

@@ -1,169 +0,0 @@
-<template>
-	<div
-		:class="className"
-		:style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-export default {
-	mixins: [resize],
-	props: {
-		className: {
-			type: String,
-			default: 'chart',
-		},
-		title: {
-			type: String,
-			default: '',
-		},
-		width: {
-			type: String,
-			default: '100%',
-		},
-		height: {
-			type: String,
-			default: '300px',
-		},
-		barData: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			chart: null,
-			targetId: '',
-		};
-	},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	methods: {
-		initChart() {
-			this.chart = echarts.init(this.$el, 'macarons');
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.title
-						? '{space|}{tip|}{space|}{value|' + this.title + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['投入', '产出', '加工成品率'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-					data: this.barData.map((item) => {
-						return item.lineName;
-					}),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '投入/产出 片',
-						min: 0,
-						axisLabel: {
-							formatter: '{value}',
-						},
-					},
-					{
-						type: 'value',
-						name: '加工成品率',
-						min: 0,
-						max: 100,
-						interval: 10,
-						axisLabel: {
-							formatter: '{value} %',
-						},
-					},
-				],
-				series: [
-					{
-						name: '投入',
-						type: 'bar',
-						barWidth: '20',
-						data: this.barData.map((item) => {
-							return item.inputNum;
-						}),
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' 片';
-							},
-						},
-						animationDuration,
-					},
-					{
-						name: '产出',
-						type: 'bar',
-						barWidth: '20',
-						data: this.barData.map((item) => {
-							return item.outputNum;
-						}),
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' 片';
-							},
-						},
-						animationDuration,
-					},
-					{
-						name: '加工成品率',
-						type: 'line',
-						yAxisIndex: 1,
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' %';
-							},
-						},
-						data: this.barData.map((item) => {
-							return item.processingRatio;
-						}),
-					},
-				],
-			});
-		},
-	},
-};
-</script>

src/views/core/monitoring/data/baseTable.vue

@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>

src/views/core/monitoring/data/index-old.vue

@@ -1,314 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:43:57
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:selectWidth="55"
-			:table-data="showData"
-			@selection-change="selectChange"
-			>
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import { getPdlDataSearch, getPdList } from '@/api/core/monitoring/data'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-		prop: 'proLineName',
-		label: '产线名称'
-	},
-	{
-		prop: 'inputNum',
-		label: '投入数量/片'
-	},
-	{
-		prop: 'outputNum',
-		label: '产出数量/片'
-	},
-	{
-		prop: 'outputArea',
-		label: '产出面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossNum',
-		label: '损耗数量/片'
-	},
-	{
-		prop: 'lossArea',
-		label: '损耗面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossRate',
-		label: '损耗比例%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	}
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getPdlDataSearch
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-				proLineId: undefined
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-			tableBtn: [],
-			showData: [],
-			tableData: [],
-			selectedList: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'line'
-				},
-				{
-          type: 'datePicker',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-ddTHH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 350
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-	created() {
-		if (this.$route.params.startTime) {
-			this.formConfig[1].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
-		}
-		// const time = new Date()
-		// this.formConfig[1].defaultSelect = [time, time]
-		this.getDataList()
-		this.getPdLineList()
-	},
-	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '产线产量.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '产线产量.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.proLineId = val.line ? val.line : undefined;
-					this.listQuery.startTime = val.timeVal ? new Date(val.timeVal[0]).getTime() : undefined;
-					this.listQuery.endTime = val.timeVal ? new Date(val.timeVal[1]).getTime() : undefined;
-					if (val.timeVal && val.timeVal.length > 0) {
-						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
-          }
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data;
-        this.listQuery.total = response.data.length;
-        this.dataListLoading = false;
-				this.showData = this.tableData
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>

src/views/core/monitoring/data/index.vue

@@ -1,312 +1,137 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2023-10-16 15:18:23
+ * @LastEditors: DY
+ * @Description:
+-->
 <template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['当前', '历史']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>当前</div>
-				</template>
-				<template v-slot:tab2>
-					<div>历史</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
+	<div class="app-container">
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-					@select-changed="handleSearchBarChanged"
 			@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'"></div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table-s
-					:page="1"
-					:limit="100"
+		<base-table
+			v-if="showData.length"
+			class="right-aside"
+			v-loading="dataListLoading"
 			:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH / 2"></base-table-s>
-				<div v-if="listQuery.lineId.length !== 1 && tableData.length > 0">
-					<barChart
-						style="margin-top: 50px"
-						ref="barChart"
-						height="600px"
-						:bar-data="tableData" />
-				</div>
-			</div>
-			<div v-if="activeName === 'now'">
-				<span class="blue-block"></span>
-				<span class="tip">当班数据</span>
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData2"
-					:max-height="tableH / 2" />
-				<span class="blue-block"></span>
-				<span class="tip">当天数据</span>
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData3"
-					:max-height="tableH / 2" />
-			</div>
-		</div>
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:selectWidth="55"
+			:table-data="showData"
+			@selection-change="selectChange"
+			>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<div v-else class="no-data-bg"></div>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<el-dialog
+			title="提示"
+			:visible.sync="dialogVisible"
+			width="30%"
+			:before-close="handleClose">
+			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
+  		<el-button type="success" @click="exportPdf">pdf</el-button>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-import {
-	getPdlAutoReportNewSearch,
-	getPdlAutoReportNewSearchNow,
-} from '@/api/core/monitoring/data';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-import baseTableS from './baseTable.vue';
-import barChart from './BarChart.vue';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
+import { getPdlDataSearch, getPdList } from '@/api/core/monitoring/data'
+import * as XLSX from 'xlsx'
+import FileSaver from 'file-saver'
+import jsPDF from 'jspdf'
+import html2canvas from 'html2canvas'
 
 const tableProps = [
 	{
-		prop: 'factoryName',
-		label: '工厂',
-    fixed: true
+		prop: 'proLineName',
+		label: '产线名称'
 	},
-	{
-		prop: 'lineName',
-		label: '产线',
-    fixed: true
-	},
-	{
-		prop: 'sizes',
-		label: '规格',
-		width: 105,
-		showOverflowtooltip: true,
-    fixed: true
-	},
-
-	{
-		prop: 'inputN',
-		label: '投入',
-    align: 'center',
-		children: [ 
 	{
 		prop: 'inputNum',
-				label: '投入数量/片',
+		label: '投入数量/片'
 	},
-			{
-				prop: 'inputArea',
-				label: '投入面积/m²',
-			},
-		],
-	},
-	{
-		prop: 'outputN',
-		label: '产出',
-    align: 'center',
-		children: [
 	{
 		prop: 'outputNum',
-				label: '产出数量/片',
+		label: '产出数量/片'
 	},
 	{
 		prop: 'outputArea',
-				label: '产出面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
+		label: '产出面积/㎡'
 	},
-		],
-	},
-	{
-		prop: 'lossN',
-		label: '不良',
-    align: 'center',
-		children: [
 	{
 		prop: 'lossNum',
-				label: '不良数量/片',
+		label: '损耗数量/片'
 	},
 	{
 		prop: 'lossArea',
-				label: '不良面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
-			},
-		],
+		label: '损耗面积/㎡'
 	},
 	{
-		prop: 'lossRatio',
-		label: '不良率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'outputRatio',
-		label: '投入产出率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'processingRatio',
-		label: '加工成品率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossD',
-		label: '不良详情',
-    align: 'center',
-		children: [
-			{
-				prop: 'original',
-				label: '原片',
-        align: 'center',
-				children: [
-					{
-						prop: 'originalLossNum',
-						label: '原片不良/片',
-					},
-					{
-						prop: 'originalLossArea',
-						label: '原片不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'edge',
-				label: '磨边',
-        align: 'center',
-				children: [
-					{
-						prop: 'edgeLossNum',
-						label: '磨边不良/片',
-					},
-					{
-						prop: 'edgeLossArea',
-						label: '磨边不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'drill',
-				label: '打孔',
-        align: 'center',
-				children: [
-					{
-						prop: 'drillLossNum',
-						label: '打孔不良/片',
-					},
-					{
-						prop: 'drillLossArea',
-						label: '打孔不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'coating',
-				label: '镀膜',
-        align: 'center',
-				children: [
-					{
-						prop: 'coatingLossNum',
-						label: '镀膜不良/片',
-					},
-					{
-						prop: 'coatingLossArea',
-						label: '镀膜不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'silk',
-				label: '丝印',
-        align: 'center',
-				children: [
-					{
-						prop: 'silkLossNum',
-						label: '丝印不良/片',
-					},
-					{
-						prop: 'silkLossArea',
-						label: '丝印不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'tempering',
-				label: '钢化',
-        align: 'center',
-				children: [
-					{
-						prop: 'temperingLossNum',
-						label: '钢化不良/片',
-					},
-					{
-						prop: 'temperingLossArea',
-						label: '钢化不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'packing',
-				label: '包装',
-        align: 'center',
-				children: [
-					{
-						prop: 'packingLossNum',
-						label: '包装不良/片',
-					},
-					{
-						prop: 'packingLossArea',
-						label: '包装不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-		],
-	},
+		prop: 'lossRate',
+		label: '损耗比例%'
+	}
 ];
+
 export default {
-	name: '',
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getPdlAutoReportNewSearch,
+				getDataListURL: getPdlDataSearch
 			},
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+				proLineId: undefined
+      },
+      exportLoading: false,
+      dataListLoading: false,
+			dialogVisible: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+			tableProps,
+			tableBtn: [],
+			showData: [],
+			tableData: [],
+			selectedList: [],
+			fileName: '',
 			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
+          param: 'line'
 				},
 				{
           type: 'datePicker',
           label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-ddTHH:mm:ss",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
-					width: 350,
+          defaultSelect: [],
+          width: 350
         },
 				{
 					type: 'button',
@@ -323,51 +148,129 @@ export default {
 					btnName: '导出',
 					name: 'export',
 					color: 'warning',
-				},
+				}
 			],
-			listQuery: {
-				lineId: [],
-			},
-			activeName: 'now',
-			tableProps,
-			tableData: [],
-			tableData2: [],
-			tableData3: [],
 		};
 	},
-	components: {
-		ButtonNav,
-		baseTableS,
-		barChart,
-	},
 	created() {
-		this.getPdLineList();
+		if (this.$route.params.startTime) {
+			this.formConfig[1].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
+		}
+		// const time = new Date()
+		// this.formConfig[1].defaultSelect = [time, time]
+		this.getDataList()
+		this.getPdLineList()
 	},
 	methods: {
+		test() {
+			var target = document.getElementsByClassName("right-aside")[0]
+			target.style.background = '#FFFFFF'
+			var that = this
+			setTimeout(() => {
+				html2canvas(target).then(function(canvas) {
+						var contentWidth = canvas.width
+						var contentHeight = canvas.height
+
+						// 一页pdf显示html页面生成的canvas高度
+						var pageHeight = contentHeight / 592.28 * 841.89
+						// 未生成pdf的html页面高度
+						var leftHeight = contentHeight
+						// 页面偏移
+						var position = 0
+						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
+						var imgWidth = 595.28
+						var imgHeight = 592.28 / contentWidth * contentHeight
+
+						var pageData = canvas.toDataURL('image/jpeg', 1.0)
+
+						console.log('nihc URL', leftHeight, pageHeight)
+
+						var pdf = new jsPDF('', 'pt', 'a4')
+
+						if (leftHeight < pageHeight) {
+							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
+						} else {
+							while(leftHeight > 0) {
+								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+								leftHeight -= pageHeight
+								position -= 841.89
+								// 避免空白页
+								if (leftHeight > 0) {
+									pdf.addPage()
+								}
+							}
+						}
+
+						pdf.save(that.fileName + '产线产量.pdf')
+				})
+			}, 300)
+		},
+		exportECL() {
+			let tables = document.querySelector('.el-table').cloneNode(true)
+			const fix = tables.querySelector('.el-table__fixed')
+			const fixRight = tables.querySelector('.el-table__fixed-right')
+			if (fix) {
+				tables.removeChild(tables.querySelector('.el-table__fixed'))
+			}
+			if (fixRight) {
+				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
+			}
+			let exportTable = XLSX.utils.table_to_book(tables)
+
+      var exportTableOut = XLSX.write(exportTable, {
+        bookType: 'xlsx', bookSST: true, type: 'array'
+      })
+      // sheetjs.xlsx为导出表格的标题名称
+      try {
+        FileSaver.saveAs(new Blob([exportTableOut], {
+          type: 'application/octet-stream'
+        }), this.fileName + '产线产量.xlsx')
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, exportTableOut)
+      }
+      return exportTableOut
+    },
+		exportPdf() {
+			this.test()
+			setTimeout(() =>{
+				this.dialogVisible = false
+				this.showData = this.tableData
+			}, 600)
+
+		},
+		exportXlsx() {
+			this.exportECL()
+			this.dialogVisible = false
+			this.showData = this.tableData
+		},
+		handleClose(done) {
+			this.$confirm('确认关闭？')
+				.then(_ => {
+					done();
+				})
+				.catch(_ => {});
+		},
 		getPdLineList() {
 			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
+				this.formConfig[0].selectOptions = res.data || []
+			})
+		},
+		selectChange(val) {
+      console.log(val)
+      this.selectedList = val
     },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId || [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					if (this.activeName === 'his') {
-						this.getDataList();
-					} else {
-						this.getDataList2();
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.proLineId = val.line ? val.line : undefined;
+					this.listQuery.startTime = val.timeVal ? new Date(val.timeVal[0]).getTime() : undefined;
+					this.listQuery.endTime = val.timeVal ? new Date(val.timeVal[1]).getTime() : undefined;
+					if (val.timeVal && val.timeVal.length > 0) {
+						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
           }
+					this.getDataList();
 					break;
 				case 'export':
 					this.handleExport();
@@ -376,199 +279,33 @@ export default {
 					console.log(val);
 			}
 		},
-		currentMenu(val) {
-			this.activeName = val === '历史' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.factoryId = undefined;
-				this.listQuery.lineId = [];
-				// 获取当前时间
-				const now = new Date();
-				// 获取前一天的同一时间
-				const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-				// 设置为00:00:00
-				yesterday.setHours(0, 0, 0, 0);
-				// 设置为23:59:59
-				const end = new Date(yesterday.getTime());
-				end.setHours(23, 59, 59, 59);
-				this.listQuery.startTime = yesterday.getTime();
-				this.listQuery.endTime = end.getTime();
-				this.$nextTick(() => {
-					this.$refs.searchBarForm.formInline.timeVal = [
-						yesterday.getTime(),
-						end.getTime(),
-					];
-				});
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
 		// 获取数据列表
     getDataList() {
-			if (this.listQuery.startTime) {
       this.dataListLoading = true;
-				this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-					this.tableData = response.data.map((item, index) => {
-						item.originalLossNum = item.original?.lossNum;
-						item.originalLossArea = item.original?.lossArea;
-						item.edgeLossNum = item.edge?.lossNum;
-						item.edgeLossArea = item.edge?.lossArea;
-						item.drillLossNum = item.drill?.lossNum;
-						item.drillLossArea = item.drill?.lossArea;
-						item.coatingLossNum = item.coating?.lossNum;
-						item.coatingLossArea = item.coating?.lossArea;
-						item.silkLossNum = item.silk?.lossNum;
-						item.silkLossArea = item.silk?.lossArea;
-						item.temperingLossNum = item.tempering?.lossNum;
-						item.temperingLossArea = item.tempering?.lossArea;
-						item.packingLossNum = item.packing?.lossNum;
-						item.packingLossArea = item.packing?.lossArea;
-						return item;
-					});
-					this.$nextTick(() => {
-            if(this.tableData.length>0){
-              this.$refs.barChart.initChart();
-            }
-					});
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data;
+        this.listQuery.total = response.data.length;
         this.dataListLoading = false;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			getPdlAutoReportNewSearchNow().then((response) => {
-				this.tableData2 = response.data.classData.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
-				this.tableData3 = response.data.todayData.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
+				this.showData = this.tableData
       });
     },
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
     },
-		/** 导出按钮操作 */
-
 		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
+			if (this.selectedList.length > 0) {
+				this.showData = this.selectedList
 			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
+			this.dialogVisible = true
     }
-			let exportTable = XLSX.utils.table_to_book(tables);
-      exportTable.Sheets.Sheet1.A1.v = '序号' //导出表格第一列表头为序号
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					'产线统计数据.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
 	},
 };
 </script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-	.blue-block {
-		float: left;
-		display: inline-block;
-		width: 4px;
-		height: 16px;
-		background-color: #0b58ff;
-		border-radius: 1px;
-		margin-right: 8px;
-		margin-top: 12px;
-	}
-	.tip {
-		display: inline-block;
-		font-size: 16px;
-		margin-right: 8px;
-		margin-top: 10px;
-	}
-}
-</style>

src/views/core/monitoring/data24/index.vue

@@ -16,7 +16,6 @@
 		v-if="tableData && tableData.length > 0"
 			:table-props="tableProps"
 			:table-data="tableData"
-							:max-height="tableH"
 			@emitFun="handleEmitFun"
 		/>
 		</div>
@@ -25,13 +24,11 @@
 
 <script>
 import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'productionLineData24',
 	components: {},
 	props: {},
-	mixins: [tableHeightMixin],
 	data() {
 		return {
       urlOptions: {
@@ -69,14 +66,10 @@ export default {
 						label: times.slice(0, 10) + ' ' + times.slice(11),
 						align: 'center',
 						children: [
-							{ prop: times + '_in', label: '投入数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_out', label: '产出数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_junk', label: '报废数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_area', label: '产出面积',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), }
+							{ prop: times + '_in', label: '投入数量' },
+							{ prop: times + '_out', label: '产出数量' },
+							{ prop: times + '_junk', label: '报废数量' },
+							{ prop: times + '_area', label: '产出面积' }
 						]
 					}
 					this.arr.push(subprop)

src/views/core/monitoring/lineAuto/BarChart.vue

@@ -1,272 +0,0 @@
-<template>
-  <div :class="className" :style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // 引入主题
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-
-export default {
-  mixins: [resize], // 混入 resize 逻辑（自适应窗口）
-  props: {
-    className: {
-      type: String,
-      default: 'chart',
-    },
-    title: {
-      type: String,
-      default: '',
-    },
-    width: {
-      type: String,
-      default: '100%',
-    },
-    height: {
-      type: String,
-      default: '300px',
-    },
-    barData: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      chart: null, // 图表实例
-    };
-  },
-  watch: {
-    // 监听 barData 变化（深度监听数组内部元素）
-    barData: {
-      deep: true,
-      handler: 'handleBarDataChange', // 调用处理方法
-    },
-  },
-  mounted() {
-    // 组件挂载后初始化图表（确保 DOM 已就绪）
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    // 组件销毁前清理图表实例
-    if (this.chart) {
-      this.chart.dispose();
-      this.chart = null;
-    }
-  },
-  methods: {
-    // barData 变化时的处理方法
-    handleBarDataChange() {
-      // 确保 DOM 存在再更新图表
-      this.$nextTick(() => {
-        // 如果图表未初始化，先初始化；否则直接更新数据
-        if (!this.chart) {
-          this.initChart();
-        } else {
-          this.updateChart();
-        }
-      });
-    },
-
-    // 初始化图表
-    initChart() {
-      // 避免重复初始化（先销毁旧实例）
-      if (this.chart) {
-        this.chart.dispose();
-      }
-
-      // 确保 DOM 元素存在
-      if (!this.$el) {
-        console.error('图表容器 DOM 元素不存在');
-        return;
-      }
-
-      // 初始化图表实例
-      this.chart = echarts.init(this.$el, 'macarons');
-      // 设置图表配置
-      this.setChartOption();
-    },
-
-    // 更新图表数据（复用配置逻辑）
-    updateChart() {
-      if (!this.chart) return;
-      this.setChartOption();
-    },
-
-    // 图表配置项（抽离为单独方法，方便初始化和更新复用）
-    setChartOption() {
-      const dataValues = this.barData.flatMap(item => [item.inputNum || 0, item.outputNum || 0]);
-      const maxData = Math.max(...dataValues, 0); // 加 0 确保无数据时 maxData 为 0
-
-      // 2. 计算 Y 轴最大值（留 10% 余量，避免数据顶到顶部）
-      let yMax = 0;
-      if (maxData > 0) {
-        yMax = Math.ceil(maxData * 1.1); // 向上取整，确保刻度为整数
-      } else {
-        yMax = 100; // 无数据时默认最大值为 100，避免 Y 轴消失
-      }
-
-      // 3. 计算 interval（5 个刻度对应 4 个间隔，向上取整确保间隔为整数）
-      const yInterval = Math.ceil((yMax - 0) / 4); // min 固定为 0，直接减 0
-
-      this.chart.setOption({
-        title: {
-          text: this.title
-            ? '{space|}{tip|}{space|}{value|' + this.title + '}'
-            : '',
-          textStyle: {
-            rich: {
-              tip: {
-                width: 6,
-                height: 6,
-                borderRadius: 50,
-                backgroundColor: '#288AFF',
-              },
-              space: {
-                width: 8,
-              },
-              value: {
-                fontSize: 14,
-                color: 'black',
-              },
-            },
-          },
-        },
-        color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999',
-            },
-          },
-        },
-        legend: {
-          data: ['投入', '产出', '加工成品率'],
-        },
-        grid: {
-          left: 20,
-          right: 30,
-          top:40,
-          bottom: 10,
-
-          containLabel: true,
-          splitArea: {
-            show: false // 关键：关闭网格背景分区（去掉间隔色块）
-          }
-        },
-        xAxis: {
-          type: 'category',
-          data: this.barData.map((item) => item.lineName),
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)',
-              width: 1 // 轴线宽度（可选，默认 1，可按需调整）
-            }
-          },
-          // 2. 控制 X 轴刻度线颜色（与轴线颜色保持一致，视觉统一）
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)', // 刻度线颜色，需与轴线颜色匹配
-              width: 1 // 刻度线宽度（可选）
-            },
-            alignWithLabel: true // 可选：让刻度线与文字对齐（避免文字偏移时刻度线错位）
-          },
-          // 3. 控制 X 轴文字颜色（如：深灰色 rgba(0, 0, 0, 0.45)）
-          axisLabel: {
-            color: 'rgba(0, 0, 0, 0.45)6', // 文字颜色，可自定义
-            fontSize: 12, // 可选：调整文字大小（默认 12，按需修改）
-            // 可选：文字过长时换行/省略（避免文字重叠，按需开启）
-            formatter: (value) => {
-              // 示例：文字超过 6 个字符时换行（可根据需求调整字符数）
-              if (value.length > 6) {
-                return value.slice(0, 6) + '\n' + value.slice(6);
-              }
-              return value;
-            }
-          },
-          // 原有配置（若需保留可解开注释）
-          // axisPointer: {
-          //   type: 'shadow',
-          // }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '投入/产出 片',
-            min: 0, // 最小值固定为 0
-            max: yMax,
-            interval: yInterval,
-            splitArea: {
-              show: false
-            },
-            axisLabel: {
-              formatter: '{value}',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-
-            // 可选：修改 Y 轴名称颜色（与文字颜色保持一致）
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-          {
-            type: 'value',
-            name: '加工成品率',
-            min: 0,
-            max: 100, // 成品率固定 0-100%
-            interval: 25, // 100 / 4 = 25，刚好 5 个刻度（0、25、50、75、100）
-            axisLabel: {
-              formatter: '{value} %',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-            splitArea: {
-              show: false
-            },
-            // 可选：修改 Y 轴名称颜色
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-        ],
-        series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.inputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '产出',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.outputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '加工成品率',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: (value) => `${value} %`,
-            },
-            data: this.barData.map((item) => item.processingRatio),
-          },
-        ],
-      });
-    },
-  },
-};
-</script>

src/views/core/monitoring/lineAuto/baseTable.vue

@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>

src/views/core/monitoring/nextClip/hisData.vue

@@ -1,361 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- :isFold="true" 控制展开 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData"
-			>
-			<!-- <method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" /> -->
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getDownLogHisData, getPdList, getThick  } from '@/api/core/monitoring/index'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-    prop: 'productionLineName',
-		label: '产线'
-  },
-  {
-    prop: 'eqName',
-    label: '下片机械手编号'
-  },
-	{
-    prop: 'pos',
-		label: '工位编号'
-	},
-	{
-    prop: 'pallet',
-    label: '托数/托'
-  },
-  {
-    prop: 'palletNum',
-    label: '下片托数'
-  },
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    filter: parseTime,
-    width: 160
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    filter: parseTime,
-    width: 160
-  },
-	{
-		prop: 'outputNum',
-    label: '玻璃长度/mm'
-	},
-	{
-		prop: 'width',
-    label: '玻璃宽度/mm',
-	},
-	{
-    prop: 'thick',
-    label: '玻璃长度/mm'
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-        getDataListURL: getDownLogHisData
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        eqName: undefined,
-        productionLineId: undefined,
-        thick:undefined
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'his',
-          btnName: '历史',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			showData: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'productionLineId'
-        },
-        {
-          type: 'select',
-          label: '玻璃型号',
-          selectOptions: [],
-          param: 'thick'
-        },
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-  },
-  mounted() {
-    this.$refs.searchBarForm.formInline.productionLineId = this.$route.query.productionLineId
-    this.$refs.searchBarForm.formInline.thick = this.$route.query.thick
-    this.listQuery.productionLineId = this.$route.query.productionLineId
-    this.listQuery.thick = this.$route.query.thick
-    this.getDataList()
-    this.getPdLineList()
-    console.log('this.$route.query', this.$route.query);
-
-  },
-  methods: {
-    		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '工段统计.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '工段统计.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-      getThick().then((res) => {
-        this.formConfig[1].selectOptions = res.data.map((item) => {
-          return {
-            id: item.thick + 'mm',
-            name: item.thick + 'mm'
-          }
-        })
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-          this.listQuery.productId = val.productId ? val.productId : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
-
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.listQuery.eqName = this.$route.query.eqName
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list
-				this.showData = this.tableData
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>

src/views/core/monitoring/nextClip/index.vue

@@ -1,373 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- :isFold="true" 控制展开 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData"
-			>
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getDownLogPage, getPdList, getThick, exportDownLogData  } from '@/api/core/monitoring/index'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-    prop: 'productionLineName',
-		label: '产线'
-  },
-  {
-    prop: 'eqName',
-    label: '下片机械手编号'
-  },
-	{
-    prop: 'pos',
-		label: '工位编号'
-	},
-	{
-    prop: 'pallet',
-    label: '托数/托'
-  },
-  {
-    prop: 'palletNum',
-    label: '下片托数'
-  },
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    filter: parseTime,
-    width: 160
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    filter: parseTime,
-    width: 160
-  },
-	{
-		prop: 'outputNum',
-    label: '玻璃长度/mm'
-	},
-	{
-		prop: 'width',
-    label: '玻璃宽度/mm',
-	},
-	{
-    prop: 'thick',
-    label: '玻璃厚度/mm'
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getDownLogPage
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        productionLineId: undefined,
-        thick: undefined,
-
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'his',
-          btnName: '历史',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			showData: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'productionLineId'
-        },
-        {
-          type: 'select',
-          label: '玻璃型号',
-          selectOptions: [],
-          param: 'thick'
-        },
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-	created() {
-		this.getDataList()
-		this.getPdLineList()
-	},
-  methods: {
-    handleClick(val) {
-      console.log(val);
-      if (val.type === 'his') {
-        this.$router.push({
-          path: 'nextClipHis',
-          query: {
-            eqName: val.data.eqName,
-            productionLineId: this.listQuery.productionLineId,
-            thick: this.listQuery.thick,
-          },
-        });
-      }
-			// this.addOrUpdateVisible = true;
-			// this.addOrEditTitle =
-			// 	val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			// this.$nextTick(() => {
-			// 	this.$refs.eqDetail.init(
-			// 		val.data.lineId,
-			// 		this.listQuery.startTime,
-			// 		this.listQuery.endTime
-			// 	);
-			// });
-		},
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '工段统计.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '工段统计.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-      getThick().then((res) => {
-        this.formConfig[1].selectOptions = res.data.map((item) => {
-          return {
-            id: item.thick + 'mm',
-            name: item.thick + 'mm'
-          }
-        })
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-          this.listQuery.productionLineId = val.productionLineId ? val.productionLineId : undefined;
-          this.listQuery.thick = val.thick ? val.thick : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
-
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list
-				this.showData = this.tableData
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.listQuery };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出下片日志?').then(() => {
-        this.exportLoading = true;
-        return exportDownLogData(params);
-      }).then(response => {
-        this.$download.excel(response, '下片日志.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    }
-	},
-};
-</script>

src/views/core/monitoring/productAuto/BarChart.vue

@@ -1,272 +0,0 @@
-<template>
-  <div :class="className" :style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // 引入主题
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-
-export default {
-  mixins: [resize], // 混入 resize 逻辑（自适应窗口）
-  props: {
-    className: {
-      type: String,
-      default: 'chart',
-    },
-    title: {
-      type: String,
-      default: '',
-    },
-    width: {
-      type: String,
-      default: '100%',
-    },
-    height: {
-      type: String,
-      default: '300px',
-    },
-    barData: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      chart: null, // 图表实例
-    };
-  },
-  watch: {
-    // 监听 barData 变化（深度监听数组内部元素）
-    barData: {
-      deep: true,
-      handler: 'handleBarDataChange', // 调用处理方法
-    },
-  },
-  mounted() {
-    // 组件挂载后初始化图表（确保 DOM 已就绪）
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    // 组件销毁前清理图表实例
-    if (this.chart) {
-      this.chart.dispose();
-      this.chart = null;
-    }
-  },
-  methods: {
-    // barData 变化时的处理方法
-    handleBarDataChange() {
-      // 确保 DOM 存在再更新图表
-      this.$nextTick(() => {
-        // 如果图表未初始化，先初始化；否则直接更新数据
-        if (!this.chart) {
-          this.initChart();
-        } else {
-          this.updateChart();
-        }
-      });
-    },
-
-    // 初始化图表
-    initChart() {
-      // 避免重复初始化（先销毁旧实例）
-      if (this.chart) {
-        this.chart.dispose();
-      }
-
-      // 确保 DOM 元素存在
-      if (!this.$el) {
-        console.error('图表容器 DOM 元素不存在');
-        return;
-      }
-
-      // 初始化图表实例
-      this.chart = echarts.init(this.$el, 'macarons');
-      // 设置图表配置
-      this.setChartOption();
-    },
-
-    // 更新图表数据（复用配置逻辑）
-    updateChart() {
-      if (!this.chart) return;
-      this.setChartOption();
-    },
-
-    // 图表配置项（抽离为单独方法，方便初始化和更新复用）
-    setChartOption() {
-      const dataValues = this.barData.flatMap(item => [item.inputNum || 0, item.outputNum || 0]);
-      const maxData = Math.max(...dataValues, 0); // 加 0 确保无数据时 maxData 为 0
-
-      // 2. 计算 Y 轴最大值（留 10% 余量，避免数据顶到顶部）
-      let yMax = 0;
-      if (maxData > 0) {
-        yMax = Math.ceil(maxData * 1.1); // 向上取整，确保刻度为整数
-      } else {
-        yMax = 100; // 无数据时默认最大值为 100，避免 Y 轴消失
-      }
-
-      // 3. 计算 interval（5 个刻度对应 4 个间隔，向上取整确保间隔为整数）
-      const yInterval = Math.ceil((yMax - 0) / 4); // min 固定为 0，直接减 0
-
-      this.chart.setOption({
-        title: {
-          text: this.title
-            ? '{space|}{tip|}{space|}{value|' + this.title + '}'
-            : '',
-          textStyle: {
-            rich: {
-              tip: {
-                width: 6,
-                height: 6,
-                borderRadius: 50,
-                backgroundColor: '#288AFF',
-              },
-              space: {
-                width: 8,
-              },
-              value: {
-                fontSize: 14,
-                color: 'black',
-              },
-            },
-          },
-        },
-        color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999',
-            },
-          },
-        },
-        legend: {
-          data: ['投入', '产出', '加工成品率'],
-        },
-        grid: {
-          left: 20,
-          right: 30,
-          top:40,
-          bottom: 10,
-
-          containLabel: true,
-          splitArea: {
-            show: false // 关键：关闭网格背景分区（去掉间隔色块）
-          }
-        },
-        xAxis: {
-          type: 'category',
-          data: this.barData.map((item) => item.lineName),
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)',
-              width: 1 // 轴线宽度（可选，默认 1，可按需调整）
-            }
-          },
-          // 2. 控制 X 轴刻度线颜色（与轴线颜色保持一致，视觉统一）
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)', // 刻度线颜色，需与轴线颜色匹配
-              width: 1 // 刻度线宽度（可选）
-            },
-            alignWithLabel: true // 可选：让刻度线与文字对齐（避免文字偏移时刻度线错位）
-          },
-          // 3. 控制 X 轴文字颜色（如：深灰色 rgba(0, 0, 0, 0.45)）
-          axisLabel: {
-            color: 'rgba(0, 0, 0, 0.45)6', // 文字颜色，可自定义
-            fontSize: 12, // 可选：调整文字大小（默认 12，按需修改）
-            // 可选：文字过长时换行/省略（避免文字重叠，按需开启）
-            formatter: (value) => {
-              // 示例：文字超过 6 个字符时换行（可根据需求调整字符数）
-              if (value.length > 6) {
-                return value.slice(0, 6) + '\n' + value.slice(6);
-              }
-              return value;
-            }
-          },
-          // 原有配置（若需保留可解开注释）
-          // axisPointer: {
-          //   type: 'shadow',
-          // }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '投入/产出 片',
-            min: 0, // 最小值固定为 0
-            max: yMax,
-            interval: yInterval,
-            splitArea: {
-              show: false
-            },
-            axisLabel: {
-              formatter: '{value}',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-
-            // 可选：修改 Y 轴名称颜色（与文字颜色保持一致）
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-          {
-            type: 'value',
-            name: '加工成品率',
-            min: 0,
-            max: 100, // 成品率固定 0-100%
-            interval: 25, // 100 / 4 = 25，刚好 5 个刻度（0、25、50、75、100）
-            axisLabel: {
-              formatter: '{value} %',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-            splitArea: {
-              show: false
-            },
-            // 可选：修改 Y 轴名称颜色
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-        ],
-        series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.inputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '产出',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.outputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '加工成品率',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: (value) => `${value} %`,
-            },
-            data: this.barData.map((item) => item.processingRatio),
-          },
-        ],
-      });
-    },
-  },
-};
-</script>

src/views/core/monitoring/productAuto/baseTable.vue

@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>

src/views/core/monitoring/rawFilmReport/SmallTitle.vue

@@ -1,65 +0,0 @@
-<!--
- * @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>