Merge pull request 'xiugai' (#442) from projects/ry-line-zhp into projects/ry-line-test

Reviewed-on: #442

.env.dev

@@ -1,21 +1,19 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-10-16 09:22:52
+ # @LastEditTime: 2024-11-25 14:31:39
- # @LastEditors: DY
+ # @LastEditors: zwq
- # @Description: 
+ # @Description:
-### 
+###
 # 开发环境配置
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
+VUE_APP_BASE_API = 'http://172.16.32.79:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -1,15 +1,24 @@
+###
+ # @Author: zwq
+ # @Date: 2024-03-27 15:49:55
+ # @LastEditors: zwq
+ # @LastEditTime: 2024-10-30 11:08:47
+ # @Description:
+###
 # 生产环境配置
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''
 
 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-PUBLIC_PATH = 'http://192.168.0.33:8888/'
+# PUBLIC_PATH = 'http://192.168.0.33:8888/'
+PUBLIC_PATH = ''
 
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'

package.json

@@ -6,9 +6,9 @@
   "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": "vue-cli-service build --mode prod",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
     "build:dev": "vue-cli-service build --mode dev",
     "build:static": "vue-cli-service build --mode static",

src/api/base/energyQuantityManual.js

@@ -0,0 +1,86 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-11 15:00:03
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-12 10:25:30
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得分页数据
+export function energyQuantityManualPage(query) {
+  return request({
+    url: '/base/energy-quantity-manual/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建
+export function energyQuantityManualCreate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function energyQuantityManualUpdate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/update',
+    method: 'put',
+    data: data
+  })
+}
+
+//获得能源抄表（手动）
+export function energyQuantityManualGet(query) {
+  return request({
+    url: '/base/energy-quantity-manual/get',
+    method: 'get',
+    params: query
+  })
+}
+
+//删除
+export function energyQuantityManualDelete(query) {
+  return request({
+    url: '/base/energy-quantity-manual/delete',
+    method: 'delete',
+    params: query
+  })
+}
+
+//导出
+export function energyQuantityManualExport(query) {
+  return request({
+    url: '/base/energy-quantity-manual/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得能源表名配置分页
+export function energyTablePage() {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+  })
+}
+// 获得能源表名配置
+export function energyTableGet(query) {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+    params: query
+  })
+}
+// 更新能源表名配置
+export function energyTableUpdate(data) {
+  return request({
+    url: '/base/energy-type-meter-bind/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/base/equipmentConfig.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2024-02-21 13:43:02
+ * @LastEditTime: 2024-04-30 10:07:59
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得关联表名
+export function getplcAllList(query) {
+  return request({
+    url: '/base/equipment-plc/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备
+export function getEquipmentList(query) {
+  return request({
+    url: '/base/core-equipment/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据产线获得工段
+export function listByParentId(query) {
+  return request({
+    url: '/base/core-workshop-section/listByParentId',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得产线工段设备树形结构
+export function getTree(query) {
+  return request({
+    url: '/base/factory/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备分组列表
+export function getgroupAllList(query) {
+  return request({
+    url: '/base/equipment-group/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/equipmentPlc.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-10-29 09:47:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-26 16:27:48
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建实时数据采集配置
@@ -52,3 +59,11 @@ 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,3 +1,10 @@
+/*
+ * @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,6 +51,13 @@ 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

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,60 @@
+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,3 +58,49 @@ 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,7 +8,14 @@ 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({
@@ -25,4 +32,23 @@ export function autoSet(query) {
     method: 'get',
     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/material.js

@@ -0,0 +1,75 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:33:52
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料
+export function createMaterial(data) {
+  return request({
+    url: '/base/material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料
+export function updateMaterial(data) {
+  return request({
+    url: '/base/material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
+export function deleteMaterial(id) {
+  return request({
+    url: '/base/material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料
+export function getMaterial(id) {
+  return request({
+    url: '/base/material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料分页
+export function getMaterialPage(query) {
+  return request({
+    url: '/base/material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得原料列表
+export function getMaterialList() {
+  return request({
+    url: '/base/material/list',
+    method: 'get',
+  })
+}
+
+// 导出原料 Excel
+export function exportMaterialExcel(query) {
+  return request({
+    url: '/base/material/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/materialPricing.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:31:46
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料
+export function createMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料
+export function updateMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material-pricing/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
+export function deleteMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料
+export function getMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料分页
+export function getMaterialPricingPage(query) {
+  return request({
+    url: '/base/material-pricing/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料 Excel
+export function exportMaterialPricingExcel(query) {
+  return request({
+    url: '/base/material-pricing/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/productionLine.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-03-27 15:49:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-10 14:36:19
+ * @Description:
+ */
 import request from '@/utils/request'
 // 获得所有工厂产线列表
 export function getLineAll() {
@@ -5,4 +12,12 @@ export function getLineAll() {
     url: '/base/production-line/listAll',
     method: 'get'
   })
-}
+}
+// 获得产线分页
+export function getLinePage(query) {
+  return request({
+    url: '/base/production-line/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/worker.js

@@ -0,0 +1,26 @@
+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: 2023-09-13 09:53:45
+ * @LastEditTime: 2025-01-08 15:47:17
- * @LastEditors: zhp
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -22,3 +22,26 @@ 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(id) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTDet?lineId='+id,
+    method: 'get',
+  })
+}

src/api/core/base/factory.js

@@ -58,3 +58,12 @@ 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

@@ -0,0 +1,28 @@
+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,6 +16,14 @@ 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,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2023-09-13 16:11:41
+ * @LastEditTime: 2025-01-07 09:57:36
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -17,9 +17,52 @@ export function getPdlAutoReport(data) {
 }
 
 // 获得所有工厂产线列表
-export function getPdList() {
+export function getPdList(id) {
   return request({
-    url: '/base/production-line/listAll',
+    url: '/base/production-line/listAll' + (id ? '?id=' + id : ''),
     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 getTeamReportPage(data) {
+  return request({
+		url: '/monitoring/group-off-record/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+// 班组自动报表分页详细
+export function getTeamReportPageDet(id) {
+  return request({
+    url: '/monitoring/group-off-record/get?id=' + id,
+    method: 'get',
+  })
+}
+
+export function exportGroupProductReportExcel(data) {
+  return request({
+		url: '/monitoring/group-off-record/export-det-excel',
+		method: 'get',
+		params: data,
+		responseType: 'blob',
+	});
+}

src/api/core/monitoring/data.js

@@ -1,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2023-09-14 10:25:46
+ * @LastEditTime: 2025-03-03 10:43:34
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -22,4 +22,22 @@ export function getPdList() {
     url: '/base/production-line/listAll',
     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/cost/allCost.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得总成本统计-按日期分页
+export function getCostSumPage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新总成本统计-按日期
+export function updateCostSum(data) {
+  return request({
+    url: '/monitoring/cost-sum/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出总成本统计-按日期 Excel
+export function exportCostSumExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costDeepRatioHis.js

@@ -0,0 +1,55 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:00:09
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工良品率
+export function updateDeepRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工产线良品率
+export function getDeepPDRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-pd',
+    method: 'get',
+    params: query
+  })
+}
+// 获得深加工工段良品率
+export function getDeepWSRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-ws',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工工段良品率 Excel
+export function exportDeepWSRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-ws',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+
+// 导出深加工产线良品率 Excel
+export function exportDeepPDRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-pd',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/cost/costEnergy.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 16:11:19
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costEnergyDeep.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:19:24
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costMaterial.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-05 13:55:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原料成本-历史
+export function updateMaterialHis(data) {
+  return request({
+    url: '/monitoring/cost-material-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原料成本-历史分页
+export function getMaterialHisPage(query) {
+  return request({
+    url: '/monitoring/cost-material-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原料成本-成本查询分页
+export function getMaterialRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料成本成本查询 Excel
+export function exportMaterialRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原料成本历史 Excel
+export function exportMaterialHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOriginRatioHis.js

@@ -0,0 +1,36 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 10:53:55
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片良品率
+export function updatecostOriginRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片良品率
+export function getcostOriginRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片良品率 Excel
+export function exportcostOriginRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/cost/costOthercostHis.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 14:24:17
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出原片其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOthercostHisDeep.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:13:20
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出深加工其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOthercostLog.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:12:09
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-othercost-log/listAll',
+    method: 'get'
+  })
+}

src/api/cost/costOthercostLogDeep.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:59:35
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/listAll',
+    method: 'get'
+  })
+}

src/api/cost/deepCostStatistics.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-02 14:43:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得深加工成本分页
+export function getDeepCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新深加工成本-历史
+export function updateDeepCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工成本统计成本查询分页
+export function getDeepCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工成本统计成本查询 Excel
+export function exportDeepStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 导出深加工成本统计-历史成本 Excel
+export function exportDeepCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/deepOthercostRule.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:55:00
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/listAll',
+    method: 'get'
+  })
+}

src/api/cost/rawCostStatistics.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得原片成本分页
+export function getRawCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新原片成本-历史
+export function updateRawCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-origincost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片成本统计成本查询 Excel
+export function exportRawStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/rawOthercostRule.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-18 15:39:12
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-othercost-rule/listAll',
+    method: 'get'
+  })
+}

src/api/material/issue.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+// 获得工厂分页
+export function getMaterialReceiptIssuePageData(data) {
+	return request({
+		url: '/base/material-warehouse-his/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+
+export function createMaterialIssue(data) {
+	return request({
+		url: '/base/material-warehouse-his/create',
+		method: 'post',
+		data: data,
+	});
+}

src/api/monitoring/energyOverlimitLog.js

@@ -43,6 +43,14 @@ export function getEnergyOverlimitLogPage(data) {
   })
 }
 
+// 获得手动抄表记录分页
+export function getEnergyManualLogPage(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/pageManual',
+    method: 'post',
+    data: data
+  })
+}
 // 导出能源超限记录 Excel
 export function exportEnergyOverlimitLogExcel(query) {
   return request({

src/api/order/index.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function getOrderPage(data) {
+	return request({
+		url: '/base/core-work-order/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+export function updateOrderData(data) {
+	return request({
+		url: '/base/core-work-order/updatee',
+		method: 'put',
+		data: data,
+	});
+}
+
+export function createOrderData(data) {
+	return request({
+		url: '/base/core-work-order/create',
+		method: 'post',
+		data: data,
+	});
+}
+export function getOrderData(id) {
+  return request({
+		url: '/base/core-work-order/get?id=' + id,
+		method: 'get',
+	});
+}
+export function getOrderCode(data) {
+	return request({
+		url: '/base/core-work-order/getCode',
+		method: 'get',
+		data: data,
+	});
+}
+
+export function deleteOrder(id) {
+  return request({
+    url: '/base/core-work-order/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/assets/icons/svg/icon-upload.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>上传</title>
+    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.65">
+        <g id="上传_Resources/Button" transform="translate(-12.000000, -9.000000)">
+            <g id="上传" transform="translate(12.000000, 9.000000)">
+                <g id="upload" transform="translate(0.875000, 0.875000)" fill="currentColor" fill-rule="nonzero">
+                    <path d="M5.80371094,0.138085937 C5.8953125,0.046484375 6.01699219,0 6.13867188,0 C6.26035156,0 6.38066406,0.046484375 6.47363281,0.138085937 L8.60371094,2.26953125 C8.78828125,2.45410156 8.78828125,2.75351562 8.60371094,2.93808594 C8.51484375,3.02695312 8.39589844,3.07617188 8.27011719,3.07617188 C8.14433594,3.07617188 8.02539062,3.02695312 7.93652344,2.93808594 L6.61171875,1.61328125 L6.61171875,9.51289062 C6.61171875,9.77402344 6.39980469,9.9859375 6.13867188,9.9859375 C5.87753906,9.9859375 5.665625,9.77402344 5.665625,9.51289062 L5.665625,1.61328125 L4.34082031,2.93808594 C4.15625,3.12265625 3.85683594,3.12265625 3.67363281,2.93808594 C3.4890625,2.75351562 3.4890625,2.45410156 3.67226563,2.26953125 L5.80371094,0.138085937 Z M11.7769531,7.88046875 C11.5158203,7.88046875 11.3039063,8.09238281 11.3039063,8.35351563 L11.3039063,11.025 C11.3039063,11.1794922 11.178125,11.3066406 11.0222656,11.3066406 L1.22636719,11.3066406 C1.071875,11.3066406 0.944726562,11.1808594 0.944726562,11.025 L0.944726562,8.35214844 C0.944726562,8.09101563 0.7328125,7.87910156 0.471679688,7.87910156 C0.210546875,7.87910156 0,8.09238281 0,8.35214844 L0,11.3996094 C0,11.8685547 0.381445313,12.2486328 0.849023437,12.2486328 L11.4009766,12.2486328 C11.8699219,12.2486328 12.25,11.8671875 12.25,11.3996094 L12.25,8.35214844 C12.25,8.09238281 12.0380859,7.88046875 11.7769531,7.88046875 Z" id="Shape"></path>
+                </g>
+                <rect id="Rectangle-49" x="0" y="0" width="14" height="14"></rect>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/styles/login.scss

@@ -1,10 +1,13 @@
 /* ===== PC DESIGN ===== */
-$W: 1000;
+$W: 1080;
 $H: 1920;
-$picW: 438;
+// $picW: 438;
-$picH: 560;
+// $picH: 560;
-$formW: 320;
+$picW: 1080;
+$picH: 1118;
+$formW: 420;
 $tabW: $formW / 2;
+// $rowH: 56;
 $rowH: 56;
 $buttonH: 50;
 
@@ -15,6 +18,7 @@ $containerBgImage: '../assets/images/bg.png';
 $logoWidth: 417px;
 $logoHeight: 64px;
 $logoImage: '../assets/logo/login-logo.png';
+$cnbmLogo: '../assets/logo/cnbm.png';
 // container-content
 $contentWidth: round($W / $H * 100) * 1vw;
 $contentHeight: round($picH / $W * 100) / 100 * $contentWidth;
@@ -22,7 +26,8 @@ $contentBgColor: #ffffff;
 // container-content-pic
 $picWidth: round($picW / $H * 100) * 1vw;
 $picHeight: inherit;
-$picImage: '../assets/images/pic.png';
+// $picImage: '../assets/images/pic.png';
+$picImage: '../assets/images/login-bg.png';
 // container-content-field
 $fieldWidth: $contentWidth - $picWidth;
 $fieldHeight: inherit;
@@ -34,231 +39,310 @@ $buttonHeight: $buttonH * 1px;
 
 // - - - - - 页面基础设置
 .container {
-  .login-code {
+	.login-code {
-    width: 33%;
+		width: 33%;
-    height: 38px;
+		height: 38px;
-    float: right;
+		float: right;
-    img {
+		img {
-      cursor: pointer;
+			cursor: pointer;
-      width:100%;max-width:100px; height:auto;
+			width: 100%;
-      vertical-align: middle;
+			max-width: 100px;
-    }
+			height: auto;
-  }
+			vertical-align: middle;
-  // 元素
+		}
-  width: inherit;
+	}
-  height: inherit;
+	// 元素
-  min-width: 1080px;
+	width: inherit;
-  min-height: 620px;
+	height: inherit;
-  background-color: $containerBgColor;
+	min-width: 1080px;
-  background-image: url($containerBgImage);
+	min-height: 620px;
-  background-size: cover;
+	background-color: $containerBgColor;
-  // 定位
+	// background-image: url($containerBgImage);
-  position: relative;
+	background-size: cover;
-  display: flex;
+	// 定位
-  justify-content: center;
+	position: relative;
-  align-items: center;
+	display: flex;
-  // 文字
+	justify-content: center;
-  font-size: 14px;
+	align-items: center;
-  font-family: Microsoft YaHei;
+	// 文字
-  font-weight: 400;
+	font-size: 14px;
-  .logo {
+	font-family: Microsoft YaHei;
-    // 元素
+	font-weight: 400;
-    width: $logoWidth;
+	.logo {
-    height: $logoHeight;
+		// 元素
-    // background-image: url($logoImage);
+		width: $logoWidth;
-    // background-size: contain;
+		height: $logoHeight;
-    // 定位
+		// background-image: url($logoImage);
-    position: absolute;
+		// background-size: contain;
-    top: 50px;
+		// 定位
-    left: 50%;
+		position: absolute;
-    margin-left: -$logoWidth/2;
+		top: 50px;
-  }
+		left: 50%;
-  .content {
+		margin-left: -$logoWidth/2;
-    // 元素
+	}
-    width: $contentWidth;
+	.content {
-    height: $contentHeight;
+		// 元素
-    background-color: #ffffff;
+		// width: $contentWidth;
-    box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
+		// height: $contentHeight;
-    border-radius: 20px;
+		width: 100%;
-    // 定位
+		height: 100%;
-    position: relative;
+		background-color: #ffffff;
-    .pic {
+		// box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
-      // 元素
+		// border-radius: 20px;
-      width: $picWidth;
+		// 定位
-      height: $picHeight;
+		position: relative;
-      background-image: url($picImage);
+		display: flex;
-      background-repeat: no-repeat;
+
-      background-size: cover;
+		.pic {
-      border-radius: 20px 0 0 20px;
+			// 元素
-      // 定位
+			width: $picWidth;
-      position: absolute;
+			height: $picHeight;
-      top: 0;
+			background-image: url($picImage);
-      left: 0;
+			background-repeat: no-repeat;
-    }
+			background-size: 100% 100%;
-    .field {
+			background-position: 0 0;
-      width: $fieldWidth;
+			position: relative;
-      height: $fieldHeight;
+
-      // 定位
+			&::after {
-      position: absolute;
+        content: '';
-      top: 0;
+				position: absolute;
-      left: $picWidth;
+				top: 0;
-      display:flex;
+				left: 0;
-      justify-content: center;
+				width: 100%;
-      align-items: center;
+				height: 100%;
-      .pc-title{ width: 100%; clear: both;}
+        // background: #f003;
-      .mobile-title,
+        display: inline-block;
-      .mobile-switch {
+			}
-        display: none;
+		}
-      }
+		.field {
-      .form {
+			// background: #ccc3;
-        box-sizing: border-box;
+			position: relative;
-        width: $formWidth;
+			padding-top: 196px;
-        // - - - tab
+			flex: 1;
-        :deep(.el-tabs__content) {
+			display: flex;
-          padding: 20px 0 0;
+			flex-direction: column;
-        }
+			// justify-content: center;
-        :deep(.el-tabs__item) {
+			align-items: center;
-          // 元素
+			.pc-title {
-          width: $tabWidth;
+				width: 100%;
-          height: $rowHeight;
+				text-align: center;
-          padding: 0;
+				clear: both;
-          // 文字
+				position: relative;
-          line-height: $rowHeight;
+				top: -36px;
-          color: #666666;
+
-        }
+				// h3.title {
-        :deep(.el-tabs__item.is-active) {
+				// 	position: relative;
-          font-weight: bold;
+
-          color: #2F53EB;
+				// 	&::before {
-        }
+				// 		content: '';
-        :deep(.el-tabs__active-bar) {
+				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
-          height: 3px;
+				// 		height: 48px;
-          border-radius: 2px;
+				// 		width: 48px;
-        }
+				// 		position: absolute;
-        // - - - input
+				// 		left: 0px;
-        :deep(.el-input__inner) {
+				// 		top: 4px;
-          // 元素
+				// 		display: inline-block;
-          width: 100%;
+				// 	}
-          height: $rowHeight;
+				// }
-          background: #f5f5f5;
+			}
-          border: 0;
+			.mobile-title,
-          border-radius: 28px;
+			.mobile-switch {
-          // 文字
+				display: none;
-          text-align: center;
+			}
-          line-height: 19px;
+			.form {
-          color: #262626;
+				margin-top: 32px;
-        }
+				box-sizing: border-box;
-        .code:deep(.el-input__inner) {
+				// width: $formWidth;
-          padding: 0 24px;
+				width: 100%;
-          // 文字
+				// - - - tab
-          text-align: left;
+				:deep(.el-tabs__nav) {
-        }
+					// background: #f0f3;
-        :deep(.el-input__inner::-webkit-input-placeholder) { /* WebKit browsers */
+				}
-          font-weight: 400;
+				:deep(.el-tabs__content) {
-          color: #8C8C8C;
+					padding: 20px 0 0;
-        }
+				}
-        :deep(.el-input__inner:-moz-placeholder) { /* Mozilla Firefox 4 to 18 */
+				:deep(.el-tabs__item) {
-          font-weight: 400;
+					user-select: none;
-          color: #8C8C8C;
+					// 元素
-        }
+					width: $tabWidth;
-        :deep(.el-input__inner::-moz-placeholder) { /* Mozilla Firefox 19+ */
+					height: $rowHeight;
-          font-weight: 400;
+					padding: 0;
-          color: #8C8C8C;
+					// 文字
-          opacity:1;
+					line-height: $rowHeight;
-        }
+					color: #666666;
-        :deep(.el-input__inner:-ms-input-placeholder) { /* Internet Explorer 10+ */
+					font-size: 18px;
-          font-weight: 400;
+					font-weight: 400;
-          color: #8C8C8C !important;
+					text-align: center;
-        }
+				}
-        :deep(.el-form-item) {
+				:deep(.el-tabs__item.is-active) {
-          position: relative;
+					font-weight: 500;
-          .button-code {
+					color: #2f53eb;
-            // 元素
+				}
-            height: $rowHeight;
+				:deep(.el-tabs__active-bar) {
-            box-sizing: border-box;
+					height: 3px;
-            // 定位
+					border-radius: 2px;
-            position: absolute;
+				}
-            top: 0;
+				// - - - input
-            right: 20px;
+				:deep(.el-input__inner) {
-            z-index: 1;
+					// 元素
-            // 文字
+					width: 100%;
-            line-height: 20px;
+					height: $rowHeight;
-            font-size: 14px;
+					background: #f5f5f5;
-            font-family: PingFang SC;
+					border: 0;
-            font-weight: 400;
+					border-radius: 28px;
-            color: #2F53EB;
+					// 文字
-            span {
+					text-align: center;
-              padding-left: 15px;
+					line-height: 19px;
-              border-left: 2px solid #D9D9D9;
+					color: #262626;
-            }
+				}
-          }
+				.code:deep(.el-input__inner) {
-        }
+					padding: 0 24px;
-        :deep(.el-form-item__error) {
+					// 文字
-          padding-left: 24px;
+					text-align: left;
-        }
+				}
-        .button {
+				:deep(.el-input__inner::-webkit-input-placeholder) {
-          width: 100%;
+					/* WebKit browsers */
-          height: $buttonHeight;
+					font-weight: 400;
-          background: rgba(24, 144, 255, 0.2);
+					color: #8c8c8c;
-          border: 0;
+				}
-          border-radius: 24px;
+				:deep(.el-input__inner:-moz-placeholder) {
-          margin-bottom: 20px;
+					/* Mozilla Firefox 4 to 18 */
-          // 文字
+					font-weight: 400;
-          line-height: 26px;
+					color: #8c8c8c;
-          font-size: 20px;
+				}
-          color: #FFFFFF;
+				:deep(.el-input__inner::-moz-placeholder) {
-        }
+					/* Mozilla Firefox 19+ */
-        .button-active {
+					font-weight: 400;
-          background: #2F53EB;
+					color: #8c8c8c;
-          box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
+					opacity: 1;
-        }
+				}
-      }
+				:deep(.el-input__inner:-ms-input-placeholder) {
-    }
+					/* Internet Explorer 10+ */
-  }
+					font-weight: 400;
-  .footer {
+					color: #8c8c8c !important;
-    // 元素
+				}
-    height: 16px;
+				:deep(.el-form-item) {
-    line-height: 16px;
+					position: relative;
-    font-size: 12px;
+					.button-code {
-    color: #8c8c8c;
+						// 元素
-    // 定位
+						height: $rowHeight;
-    position: absolute;
+						box-sizing: border-box;
-    bottom: 30px;
+						// 定位
-    a,
+						position: absolute;
-    a:hover,
+						top: 0;
-    a:active {
+						right: 20px;
-      color: inherit;
+						z-index: 1;
-      text-decoration: none;
+						// 文字
-    }
+						line-height: 20px;
-  }
+						font-size: 14px;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #2f53eb;
+						span {
+							padding-left: 15px;
+							border-left: 2px solid #d9d9d9;
+						}
+					}
+				}
+				:deep(.el-form-item__error) {
+					padding-left: 24px;
+				}
+				.button {
+					width: 100%;
+					height: $buttonHeight;
+					background: rgba(24, 144, 255, 0.2);
+					border: 0;
+					border-radius: 24px;
+					margin-bottom: 20px;
+					// 文字
+					line-height: 26px;
+					font-size: 20px;
+					color: #ffffff;
+				}
+				.button-active {
+					background: #2f53eb;
+					box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
+				}
+			}
+		}
+	}
+
+	.login-form {
+		* {
+			user-select: none;
+		}
+		// - - - input
+		:deep(.el-input__inner) {
+			// 元素
+			width: 420px;
+			height: 66px;
+			color: #262626;
+			font-size: 18px;
+		}
+		:deep(.el-checkbox__label) {
+			font-size: 18px;
+			line-height: 14px;
+		}
+	}
+
+	.footer {
+		user-select: none;
+		// 元素
+		height: 16px;
+		line-height: 16px;
+		font-size: 12px;
+		color: #8c8c8c;
+		// 定位
+		position: absolute;
+		bottom: 30px;
+		a,
+		a:hover,
+		a:active {
+			color: inherit;
+			text-decoration: none;
+		}
+	}
 }
 
 // - - - - - PC 最小尺寸设置
 @media screen and (min-width: 599px) and (max-width: 1366px) {
-  .container {
+	.container {
-    .content {
+		min-width: 599px;
-      width: 710px;
+		.content {
-      height: 397px;
+			// width: 710px;
-      .pic {
+			// height: 397px;
-        width: 314px;
+			width: 100%;
-      }
+			height: 100%;
-      .field {
+			.pic {
-        width: calc(710px - 314px);
+				// width: 314px;
-        left: 314px;
+				display: none;
-        .form {
+			}
-          width: 320px;
+			.field {
-          :deep(.el-input__inner) {
+				// width: calc(710px - 314px);
-            width: 320px;
+				// left: 314px;
-            height: 56px;
+				// justify-content: center;
-          }
+				width: 100%;
-          .button {
-            height: 50px;
-          }
-        }
-      }
-    }
-  }
-}
 
+				.pc-title {
+					h3 {
+						font-size: 2.4rem !important;
+					}
+				}
+
+				.form {
+					// width: 320px;
+					:deep(.el-input__inner) {
+						width: 320px;
+						height: 56px;
+					}
+					.button {
+						height: 50px;
+					}
+				}
+			}
+		}
+	}
+}
 
 /* ===== MOBILE DESIGN ===== */
 $mobileW: 375;
@@ -273,115 +357,142 @@ $mobileButtonH: 48;
 $mobileContainerBgImage: '../assets/images/bg-mobile.png';
 // container-content
 $mobileContentWidth: round($mobileContentW / $mobileW * 100) * 1vw;
-$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 * $mobileContentWidth;
+$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 *
+	$mobileContentWidth;
 // container-content-field-form
-$mobileFormWidth: round($mobileFormW / $mobileW *100) * 1vw;
+$mobileFormWidth: round($mobileFormW / $mobileW * 100) * 1vw;
 $mobileRowHeight: $mobileRowH * 1px;
 $mobileButtonHeight: $mobileButtonH * 1px;
 $iconBgImage: '../assets/images/icon.png';
 
 // - - - - - 移动端设置
 @media screen and (max-width: 599px) {
-  .container {
+	.container {
-    // 元素
+		// 元素
-    background-image: url($mobileContainerBgImage);
+		background-image: url($mobileContainerBgImage);
-    min-width: 280px;
+		min-width: 280px;
-    min-height: 568px;
+		min-height: 568px;
-    // 文字
+		// 文字
-    font-size: 17px;
+		font-size: 14px;
-    font-family: PingFang SC;
+		font-family: PingFang SC;
-    font-weight: bold;
+		font-weight: bold;
-    .logo {
+		.logo {
-      display: none;
+			display: none;
-    }
+		}
 
-    .content {
+		.pc-title {
-      // 元素
+			display: none;
-      width: $mobileContentWidth;
+		}
-      height: $mobileContentHeight;
+
-      min-width: 250px;
+		.content {
-      min-height: 340px;
+			// 元素
-      // 定位
+			width: $mobileContentWidth;
-      display: flex;
+			height: $mobileContentHeight;
-      justify-content: center;
+			min-width: 250px;
-      align-items: center;
+			min-height: 340px;
-      .pic {
+			// 定位
-        display: none;
+			display: flex;
-      }
+			justify-content: center;
-      .field {
+			align-items: center;
-        // 元素
+			.pic {
-        width: inherit;
+				display: none;
-        min-height: inherit;
+			}
-        // 定位
+			.field {
-        left: 0;
+        padding: 0;
-        display: flex;
+				// 元素
-        flex-direction: column;
+				width: inherit;
-        .mobile-title {
+				min-height: inherit;
-          // 元素
+				// 定位
-          margin: 0 0 20px;
+				left: 0;
-          display: block;
+				display: flex;
-        }
+				flex-direction: column;
-        .form {
+
-          width: $mobileFormWidth;
+				.mobile-title {
-          // - - - tab
+					// 元素
-          :deep(.el-tabs__header) {
+					margin: 0;
-            display: none;
+					display: block;
-          }
+				}
-          :deep(.el-tabs__content) {
+
-            padding: 0;
+				.form {
-          }
-          // - - - input
-          :deep(.el-input__inner) {
-            height: $mobileRowHeight;
-            line-height: 24px;
-            // 文字
-            text-align: center;
-            color: #262626;
-          }
-          :deep(.el-form-item) {
-            .button-code {
-              // 元素
-              height: $mobileRowHeight;
-            }
-          }
-          .button {
-            height: $mobileButtonHeight;
-            line-height: 24px;
-            color: #FFFFFF;
-          }
-        }
-        .mobile-switch {
-          display: block;
-          line-height: 20px;
-          font-size: 14px;
-          font-weight: 400;
-          color: #595959;
           margin: 0;
-          .icon {
+					width: $mobileFormWidth;
-            width: 14px;
+					// - - - tab
-            height: 14px;
+					:deep(.el-tabs__header) {
-            display: inline-block;
+						display: none;
-            background-image: url($iconBgImage);
+					}
-            background-size: cover;
+					:deep(.el-tabs__content) {
-          }
+						padding: 0;
-        }
+					}
-        .mobile-switch:hover {
+					// - - - input
-          cursor: pointer;
+					:deep(.el-input__inner) {
-        }
+						height: $mobileRowHeight;
-      }
+						line-height: 24px;
-    }
+						// 文字
-    .footer {
+						text-align: center;
-      // 元素
+						color: #262626;
-      font-size: 12px;
+					}
-      font-family: PingFang SC;
+					:deep(.el-form-item) {
-      font-weight: 400;
+						.button-code {
-      line-height: 17px;
+							// 元素
-      color: #333333;
+							height: $mobileRowHeight;
-      opacity: 0.6;
+						}
-      // 定位
+					}
-      position: absolute;
+					.button {
-      bottom: 20px;
+						height: $mobileButtonHeight;
-    }
+						line-height: 24px;
-  }
+						color: #ffffff;
+					}
+				}
 
+				.login-form {
+					:deep(.el-input__inner) {
+						height: $mobileRowHeight;
+						line-height: 24px;
+						// 文字
+						text-align: center;
+						color: #262626;
+					}
+
+          :deep(#button-form-item) {
+            margin: 0 !important;
+						button {
+							// 元素
+							height: $mobileRowHeight;
+						}
+					}
+				}
+				.mobile-switch {
+					display: block;
+					line-height: 20px;
+					font-size: 14px;
+					font-weight: 400;
+					color: #595959;
+					margin: 0;
+					.icon {
+						width: 14px;
+						height: 14px;
+						display: inline-block;
+						background-image: url($iconBgImage);
+						background-size: cover;
+					}
+				}
+				.mobile-switch:hover {
+					cursor: pointer;
+				}
+			}
+		}
+
+		.footer {
+			// 元素
+			font-size: 12px;
+			font-family: PingFang SC;
+			font-weight: 400;
+			line-height: 17px;
+			color: #333333;
+			opacity: 0.6;
+			// 定位
+			// position: absolute;
+			bottom: -32px;
+		}
+	}
 }

src/components/ButtonNav/index.vue

@@ -0,0 +1,141 @@
+<template>
+  <!-- 按钮切换 -->
+  <div v-if="buttonMode" class="button-nav">
+    <button v-for="m in menus" :key="m" @click="handleClick(m)"
+      :data-text="m"
+      :class="[m === currentMenu ? 'active' : '']"
+      ></button>
+  </div>
+  <!-- 标签切换 -->
+  <div v-else class="custom-tabs" style="height: 100%; width: 100%">
+    <el-tabs class="tag-nav" v-model="currentMenu" style="height: 100%" @tab-click="handleTabClick">
+      <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 {
+  name: "ButtonNav",
+  props: {
+    menus: {
+      type: Array,
+      required: true,
+      default: () => [],
+      validator: (val) => val.length > 0,
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true,
+    },
+    // 新增：支持外部传入选中值（v-model 绑定）
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      currentMenu: "",
+    };
+  },
+  created() {
+    // 优先使用外部传入的 value，否则默认第一个
+    this.currentMenu = this.value || this.menus[0];
+  },
+  watch: {
+    // 监听外部 value 变化，同步到内部 currentMenu
+    value(newVal) {
+      this.currentMenu = newVal;
+    },
+    // 监听内部 currentMenu 变化，通知外部
+    currentMenu(val) {
+      this.$emit("input", val); // 触发 v-model 同步
+      this.$emit("change", val); // 保留原 change 事件
+    },
+  },
+  methods: {
+    // 按钮点击事件
+    handleClick(m) {
+      this.currentMenu = m;
+    },
+    // 标签点击事件（el-tabs 自带）
+    handleTabClick(tab) {
+      this.currentMenu = tab.name;
+    },
+  },
+};
+</script>
+
+<!-- 样式不变 -->
+<style scoped lang="scss">
+.button-nav {
+  width: 100%;
+  display: flex;
+  gap: 12px;
+
+  * {
+    user-select: none;
+  }
+
+  button {
+    cursor: pointer;
+    appearance: none;
+    outline: none;
+    border: none;
+    background: #fff;
+    border-radius: 8px;
+    padding: 15px;
+    color: #888;
+    letter-spacing: 2px;
+    flex: 1;
+    box-sizing: padding-box;
+    position: relative;
+
+    &::after {
+      content: attr(data-text);
+      position: absolute;
+      top: 5px;
+      left: 50%;
+      font-size: 16px;
+      font-weight: 500;
+      transform: translate(-50%);
+    }
+
+    &.active {
+      color: #111;
+      //border-bottom: 2px solid #0b58ff;
+      box-shadow: 0px 2px 1px 1px #0b58ff;
+    }
+  }
+}
+</style>
+
+<style scoped>
+.custom-tabs>>>.el-tabs__header {
+  margin-bottom: 8px;
+  display: inline-block;
+  /* transform: translateY(-12px); */
+}
+
+.custom-tabs>>>.el-tabs__item {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  line-height: 36px !important;
+  height: 36px;
+}
+
+.custom-tabs>>>.el-tabs__content {
+  height: calc(100% - 42px);
+}
+
+.custom-tabs>>>.el-tab-pane {
+  box-sizing: border-box;
+  height: 100%;
+  padding: 20px;
+  border: 10px solid #f002;
+}
+</style>

src/components/DialogForm/index.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: dialogForm.vue
     author: liubin
     date: 2023-08-15 10:32:36
@@ -83,18 +83,22 @@
 							:on-success="handleUploadSuccess"
 							v-bind="col.bind">
 							<el-button size="mini" :disabled="col.bind?.disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
 								上传文件
 							</el-button>
 							<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
 								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
 							</div>
 						</el-upload>
-
 						<uploadedFile
 							class="file"
 							v-for="file in form[col.prop] || []"
 							:file="file"
-							@delete="handleDeleteFile(file)" />
+							:key="file.fileUrl"
+							@delete="handleDeleteFile(file)"
+							@Preview="handlePreview(file)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -132,9 +136,11 @@ const uploadedFile = {
 	},
 	methods: {
 		handleDelete() {
-			console.log('emit delete event')
 			this.$emit('delete', this.file);
 		},
+		handlePreview() {
+			this.$emit('Preview', this.file);
+		},
 	},
 	mounted() {},
 	render: function (h) {
@@ -153,7 +159,7 @@ const uploadedFile = {
 					cursor: 'pointer',
 					display: 'inline-block',
 				}}>
-				{this.file.fileName}
+				<el-button onClick={this.handlePreview}>{this.file.fileName}</el-button>
 				<el-button
 					type="text"
 					icon="el-icon-close"
@@ -187,6 +193,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		hasFile: {
+			type: Boolean,
+			default: false,
+		},
 		labelPosition: {
 			type: String,
 			default: 'right',
@@ -219,7 +229,6 @@ export default {
 	watch: {
 		rows: {
 			handler() {
-				console.log('watch triggered!');
 				this.$nextTick(() => {
 					this.handleOptions('watch');
 				});
@@ -230,6 +239,9 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
+				if (this.hasFile) {
+					this.form.files = this.form.files ?? [];
+				}
 			},
 			deep: true,
 			immediate: true,
@@ -247,6 +259,20 @@ 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);
@@ -346,7 +372,9 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload(file) {
+      console.log(file)
+    },
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
 			this.form.files.push({
@@ -367,7 +395,9 @@ export default {
 		},
 
 		handleDeleteFile(file) {
-			this.form.files = this.form.files.filter(item => item.fileUrl != file.fileUrl);
+			this.form.files = this.form.files.filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
 			this.$emit('update', this.form);
 		},
 	},

src/filter/code-filter.js

@@ -0,0 +1,94 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-11 13:40:48
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  deactivate: {
+    1: '启用',
+    0: '停用',
+  },
+  wareType: {
+    1: '缓存',
+    2: '活动',
+    3: '其它',
+  },
+  reportType: {
+    2: '日',
+    3: '周',
+    4: '月',
+    5: '年',
+  },
+  manual: {
+    1: '手动',
+    0: '自动',
+  },
+}
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay(),
+    w: '',
+  }
+  const time_str = format.replace(/{([ymdhisaw])+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (key === 'w') {
+      const current = new Date(time);
+      current.setHours(0, 0, 0);
+      current.setDate(current.getDate() + 4 - (current.getDay() || 7));
+      const firstThursday = new Date(current.getFullYear(), 0, 4);
+      firstThursday.setDate(firstThursday.getDate() + 4 - (firstThursday.getDay() || 7));
+      const time1 = current.getTime() - firstThursday.getTime();
+      const weeks = Math.ceil(time1 / (7 * 24 * 3600 * 1000));
+      return (weeks + 1)
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+export default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/mixins/basic-add.js

@@ -0,0 +1,122 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 15:46:19
+ * @Description:
+ */
+import { listData } from "@/api/system/dict/data"; //数据字典接口
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '', //新增接口
+        updateURL: '', //编辑提交接口
+        infoURL: '', //编辑时获取单条数据接口
+        codeURL: '', //获取code接口（返回结果为dataForm.code字段）
+        optionArrUrl: [], //需要获取下拉框的方法数组
+        optionArr: {}, //需要获取下拉框的方法数组的返回结果
+        dictNameList: [], //数据字典name数组
+        dictArr: {}, //需要获取数据字典的方法数组的返回结果
+      },
+      visible: false,
+      setData: false, // 是否需要【编辑时获取单条数据接口】返回的数据操作
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || null;
+      this.visible = true;
+      if (this.urlOptions.optionArrUrl.length > 0) {
+        this.getArr()
+      }
+      if (this.urlOptions.dictNameList.length > 0) {
+        this.getDict()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+            if (this.setData) {
+              this.setDataForm()
+            }
+          });
+        } else {
+          if (this.urlOptions.codeURL) {
+            this.getCode()
+          }
+				}
+      });
+    },
+    /** 获取code */
+		getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    /** 获取下拉框数组 */
+    getArr() {
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      this.urlOptions.optionArrUrl.forEach((item, index) => {
+        item(params).then(({ data: res }) => {
+          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
+        })
+          .catch(() => {
+          });
+      });
+    },
+    /** 查询字典数据列表 */
+    getDict() {
+      this.urlOptions.dictNameList.forEach((item,index)=>{
+        const queryParams = {
+          pageNo: 1,
+          pageSize: 99,
+          dictType: item,
+        }
+        listData(queryParams).then(response => {
+          this.$set(this.urlOptions.dictArr, `dict${index}`, response.data.list)
+        });
+      })
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+    /** 清空form */
+    formClear() {
+      if (this.$refs.dataForm!==undefined) {
+          this.$refs.dataForm.resetFields();
+      }
+    }
+  }
+}

src/mixins/basic-page.js

@@ -0,0 +1,128 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-02 09:33:29
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '', //获取table接口
+        deleteURL: '', //删除接口
+        exportURL: '' //导出接口
+      },
+      tableData: [], //table数据
+      listQuery: { //分页
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false, //导出完成的加载状态是否开启
+      dataListLoading: false, //获取table的加载状态是否开启
+      addOrEditTitle: '', //dialog的title
+      addOrUpdateVisible: false, //dialog状态
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        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();
+    },
+    // 新增
+    addOrUpdateHandle(id) {
+      this.addOrEditTitle = "新增";
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除${name ? '名称为"' + name + '"' : '序号为"' + index + '"'}的数据项?`, "系统提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+    // dialog取消
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    // dialog确定
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    // dialog的父组件方法this.$emit("refreshDataList");
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '报表.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/mixins/lb/tableHeightMixin.js

@@ -0,0 +1,20 @@
+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/mixins/tableHeightMixin.js

@@ -0,0 +1,20 @@
+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

@@ -70,17 +70,18 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/',
+    path: "",
     component: Layout,
-    redirect: 'core/base/factory',
+    redirect: "index",
-    // children: [{
+    children: [
-    //   path: 'index',
+      {
-    //   redirect: 'core/base/factory',
+        path: "index",
-    //   component: (resolve) => require(['@/views/index'], resolve),
+        component: (resolve) => require(["@/views/core/base/factory/index"], resolve),
-    //   name: '首页',
+        name: "首页",
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: "首页", icon: "dashboard", affix: true },
-    // }
+        hidden: true
-    // ]
+      },
+    ],
   },
   {
     path: '/user',

src/utils/dict.js

@@ -86,10 +86,11 @@ export const DICT_TYPE = {
   // ============== PRODUCT - 产品模块 =============
   UNIT_DICT: 'unit_dict',
   PRODUCT_TYPE: 'product_type',
+  PROCESS_TYPE: 'process_type',
 
   // ============== ENERGY - 能源模块 =============
   ENERGY_UNIT: 'energy_unit',
-  
+
   // ============== ENERGY - 能源模块 =============
   EQU_ALARM_LEVEL: 'equ_alarm_level',
   MONITOR_INDEX_TYPE: 'monitor_index_type',

src/utils/ruoyi.js

@@ -48,6 +48,50 @@ export function parseTime(time, pattern) {
   return time_str
 }
 
+// 日期格式化(仅适用表格)
+export function parseTimeTable(pattern) {
+  return function(time){
+    if (arguments.length === 0 || !time) {
+      return null
+    }
+    const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+    let date
+    if (typeof time === 'object') {
+      date = time
+    } else {
+      if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+        time = parseInt(time)
+      } else if (typeof time === 'string') {
+        time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
+      }
+      if ((typeof time === 'number') && (time.toString().length === 10)) {
+        time = time * 1000
+      }
+      date = new Date(time)
+    }
+    const formatObj = {
+      y: date.getFullYear(),
+      m: date.getMonth() + 1,
+      d: date.getDate(),
+      h: date.getHours(),
+      i: date.getMinutes(),
+      s: date.getSeconds(),
+      a: date.getDay()
+    }
+    const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+      let value = formatObj[key]
+      // Note: getDay() returns 0 on Sunday
+      if (key === 'a') {
+        return ['日', '一', '二', '三', '四', '五', '六'][value]
+      }
+      if (result.length > 0 && value < 10) {
+        value = '0' + value
+      }
+      return value || 0
+    })
+    return time_str
+  }
+}
 // 表单重置
 export function resetForm(refName) {
   if (this.$refs[refName]) {

src/views/base/dataBoard/index.vue

@@ -6,7 +6,9 @@
 -->
 
 <template>
-	<div ref="dataBoard" class=""></div>
+	<div ref="dataBoard" class="data-board">
+		<el-button type="text" @click="goback" class="go-back--btn">返回</el-button>
+	</div>
 </template>
 
 <script>
@@ -24,39 +26,42 @@ export default {
 			mainFooter: null, // dom
 		};
 	},
-	mounted() {
+	// mounted() {
-		this.$nextTick(() => {
+	// 	this.$nextTick(() => {
-			this.modify();
+	// 		this.modify();
-		});
+	// 	});
-	},
+	// },
-	activated() {
+	// activated() {
-		this.modify();
+	// 	this.modify();
-	},
+	// },
-	deactivated() {
+	// deactivated() {
-		this.recover();
+	// 	this.recover();
-	},
+	// },
-	beforeDestroy() {
+	// beforeDestroy() {
-		this.recover();
+	// 	this.recover();
-	},
+	// },
 	methods: {
-		modify() {
+		// modify() {
-			// 在这个页面临时修改下父类的margin，结束时需还原
+		// 	// 在这个页面临时修改下父类的margin，结束时需还原
-			this.appMain = document.querySelector('.app-main');
+		// 	this.appMain = document.querySelector('.app-main');
-			// this.appMain.style.minHeight = 'calc(100vh - 90px)';
+		// 	// this.appMain.style.minHeight = 'calc(100vh - 90px)';
-			this.appMain.style.margin = 0;
+		// 	this.appMain.style.margin = 0;
-			// 在这个页面临时删除 main-footer 元素，结束时需还原
+		// 	// 在这个页面临时删除 main-footer 元素，结束时需还原
-			// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
+		// 	// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
-			// document.querySelector('.main-footer').remove();
+		// 	// document.querySelector('.main-footer').remove();
-            this.$refs.dataBoard.classList.add('data-board');
+        //     this.$refs.dataBoard.classList.add('data-board');
-		},
+		// },
-		recover() {
+		// recover() {
-            this.$refs.dataBoard.classList.remove('data-board');
+        //     this.$refs.dataBoard.classList.remove('data-board');
-			this.$nextTick(() => {
+		// 	this.$nextTick(() => {
-				this.appMain.style.margin = this.parentStyle.margin;
+		// 		this.appMain.style.margin = this.parentStyle.margin;
-				// this.appMain.style.minHeight = this.parentStyle.minHeight;
+		// 		// this.appMain.style.minHeight = this.parentStyle.minHeight;
-				// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
+		// 		// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
-			});
+		// 	});
-		},
+		// },
+		goback() {
+			this.$router.go(-1);
+		}
 	},
 };
 </script>
@@ -71,4 +76,25 @@ export default {
 	background: url('../../../assets/images/DataBoard.png') 100% 100% / contain
 		no-repeat;
 }
+
+.go-back--btn {
+	position: fixed;
+	top: 28px;
+	left: 24px;
+	color: #fff;
+	font-size: 18px;
+	letter-spacing: 6px;
+
+	&:hover {
+		text-decoration: underline;
+	}
+
+	&::after {
+		content: "\2BAA";
+		position: absolute;
+		top: 6px;
+		right: -26px;
+		font-size: 24px;
+	}
+}
 </style>

src/views/base/equipmentBindGroup/components/BasicDrawer.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description: 
+    description:
 -->
 
 <template>
@@ -320,7 +320,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

src/views/base/equipmentBindGroup/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

src/views/base/equipmentBindSection/dialogForm.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: dialogForm.vue
     author: liubin
     date: 2023-09-11 15:55:13
@@ -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,6 +112,7 @@
 								{ 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,7 +4,8 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+			@select-changed="handleSearchBarChanged"
+			@headBtnClick="buttonClick" />
 
 		<!-- 列表 -->
 		<base-table
@@ -52,6 +53,8 @@ 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';
@@ -61,7 +64,7 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['workshopSectionId', 'equipmentName'],
+			searchBarKeys: ['factoryId','productionLineId','workshopSectionId', 'equipmentName'],
 			tableBtn: [
 				this.$auth.hasPermi('base:equipment-bind-section:update')
 					? {
@@ -84,8 +87,9 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'productionLine', label: '产线名称' },
+				{ prop: 'factoryName', label: '工厂' },
-				{ prop: 'workshopSection', label: '工段名称' },
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
 				{ prop: 'sort', label: '工段中排序' },
 				{
@@ -98,7 +102,7 @@ export default {
 					prop: 'sectionDataType',
 					label: '工段数据类型',
 					filter: (val) =>
-						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
+						val != null ? ['无类型', '进口计数', '出口计数', '进出口计数'][val] : '-',
 				},
 				// {
 				// 	action: 'show-alert',
@@ -129,6 +133,20 @@ export default {
 				// },
 			],
 			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '工厂',
+					selectOptions: [],
+					param: 'factoryId',
+					onchange: true,
+				},
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'productionLineId',
+					multiple: true,
+				},
 				{
 					type: 'select',
 					label: '工段',
@@ -209,8 +227,8 @@ export default {
 						label: '产线数据类型',
 						options: [
 							{ label: '无类型', value: 0 },
-							{ label: '进口统计', value: 1 },
+							{ label: '进口计数', value: 1 },
-							{ label: '出口统计', value: 2 },
+							{ label: '出口计数', value: 2 },
 						],
 						prop: 'lineDataType',
 					},
@@ -219,8 +237,9 @@ export default {
 						label: '工段数据类型',
 						options: [
 							{ label: '无类型', value: 0 },
-							{ label: '进口统计', value: 1 },
+							{ label: '进口计数', value: 1 },
-							{ label: '出口统计', value: 2 },
+							{ label: '出口计数', value: 2 },
+							{ label: '进出口计数', value: 3 },
 						],
 						prop: 'sectionDataType',
 					},
@@ -234,6 +253,9 @@ export default {
 				pageSize: 10,
 				workshopSectionId: null,
 				equipmentId: null,
+        equipmentName: null,
+        factoryId: null,
+				productionLineId: [],
 			},
 			// 表单参数
 			form: {},
@@ -242,6 +264,7 @@ export default {
 	created() {
 		this.getList();
 		this.initWorksection();
+		this.getPdLineList();
 	},
 	methods: {
 		/** 准备工段数据 */
@@ -251,7 +274,7 @@ export default {
 				method: 'get',
 			});
 			if (code == 0) {
-				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+				this.searchBarFormConfig[2].selectOptions = data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
@@ -259,6 +282,51 @@ 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/equipmentGroup/components/BasicDrawer.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description: 
+    description:
 -->
 
 <template>
@@ -36,7 +36,7 @@
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
-							:dataForm="form"
+							v-model="form"
 							:rows="formRows" />
 					</div>
 
@@ -320,7 +320,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

src/views/base/equipmentGroup/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows"/>
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

src/views/base/equipmentGroupAlarm/index.vue

@@ -280,7 +280,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			if (this.queryParams.equipmentGroupId == null)
-				return this.$message.error('没有检测到设备分组信息');
+				return this.$message.warning('没有检测到设备分组信息');
 			this.reset();
 			this.open = true;
 			this.title = '添加设备分组报警明细';

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

@@ -0,0 +1,109 @@
+<!--
+ * @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,59 +1,53 @@
 <template>
 	<div class="app-container">
-		<!-- 搜索工作栏 -->
+		<search-bar
-		<SearchBar
+			:formConfigs="formConfig"
-			:formConfigs="searchBarFormConfig"
+			ref="searchBarForm"
-			ref="search-bar"
+			@headBtnClick="buttonClick" />
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
 		<base-table
+			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:page="queryParams.pageNo"
+			:page="listQuery.pageNo"
-			:limit="queryParams.pageSize"
+			:limit="listQuery.pageSize"
-			:table-data="list"
+			:table-data="tableData"
-			ref="pageTable"
 			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
+				@clickBtn="handleClick" />
 		</base-table>
-
-		<!-- 分页组件 -->
 		<pagination
-			v-show="total > 0"
+			:limit.sync="listQuery.pageSize"
-			:total="total"
+			:page.sync="listQuery.pageNo"
-			:page.sync="queryParams.pageNo"
+			:total="listQuery.total"
-			:limit.sync="queryParams.pageSize"
+			@pagination="getDataList" />
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
 		<base-dialog
-			:dialogTitle="title"
+			:dialogTitle="addOrEditTitle"
-			:dialogVisible="open"
+			:dialogVisible="addOrUpdateVisible"
-			width="700px"
+			@cancel="handleCancel"
-			@close="cancel"
+			@confirm="handleConfirm"
-			@cancel="cancel"
+			:before-close="handleCancel"
-			@confirm="submitForm">
+			width="50%">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
 		</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',
@@ -90,49 +84,45 @@ const switchBtn = {
 		);
 	},
 };
+const tableProps = [
+	{ prop: 'code', label: '编码', width: 220 },
+	{ prop: 'plcTableName', label: '关联表名' },
+	{ prop: 'name', label: '标识名称' },
+	{ prop: 'enName', label: '英文名称' },
+	{
+		prop: 'collection',
+		label: '是否采集',
+		subcomponent: switchBtn,
+	},
+	{ prop: 'description', label: '描述' },
+];
 
 export default {
-	name: 'EquipmentPlc',
+	mixins: [basicPage],
-	mixins: [basicPageMixin],
-	components: {},
 	data() {
 		return {
-			tableKey: Math.random(),
+			urlOptions: {
-			searchBarKeys: ['name', 'plcTableName'],
+				getDataListURL: getEquipmentPlcPage,
+				deleteURL: deleteEquipmentPlc,
+				exportURL: exportEquipmentPlcExcel,
+			},
+			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:equipment-plc:update')
+				this.$auth.hasPermi(`base:equipment-plc:update`)
 					? {
 							type: 'edit',
-							btnName: '修改',
+							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-plc:delete')
+				this.$auth.hasPermi(`base:equipment-plc:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
 			].filter((v) => v),
-			tableProps: [
+			tableData: [],
-				// {
+			formConfig: [
-				// 	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: '英文名称' },
-				{
-					prop: 'collection',
-					label: '是否采集',
-					subcomponent: switchBtn,
-				},
-				{ prop: 'description', label: '描述' },
-			],
-			searchBarFormConfig: [
 				{
 					type: 'input',
 					label: '表名',
@@ -147,231 +137,86 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
 				{
 					type: 'separate',
 				},
 				{
-					// type: this.$auth.hasPermi('base:equipment-plc:create')
+					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
-					// 	? 'button'
-					// 	: '',
-					type: 'button',
 					btnName: '新增',
 					name: 'add',
-					plain: true,
 					color: 'success',
+					plain: true,
 				},
 				// {
-				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:factory: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: {},
 		};
 	},
-	created() {
+	components: {
-		this.getList();
+		AddOrUpdate,
 	},
+	created() {},
 	methods: {
 		/** 覆盖 handleEmitFun 的默认实现 */
 		handleEmitFun({ action, payload }) {
+      console.log(payload)
 			switch (action) {
 				case 'update-collect':
-					this.reset();
+					updateEquipmentPlc(payload).then((response) => {
-					const tempForm = {};
-					Object.keys(this.form).forEach((key) => {
-						tempForm[key] = payload[key];
-					});
-					updateEquipmentPlc(tempForm).then((response) => {
 						this.$modal.msgSuccess('修改成功');
-						this.open = false;
+						this.getDataList();
-						this.getList();
 					});
 					break;
 			}
 		},
-		/** 查询列表 */
+		buttonClick(val) {
-		getList() {
+			switch (val.btnName) {
-			this.loading = true;
+				case 'search':
-			// 执行查询
+					this.listQuery.pageNo = 1;
-			getEquipmentPlcPage(this.queryParams).then((response) => {
+					this.listQuery.pageSize = 10;
-				this.list = response.data.list;
+					this.listQuery.name = val.name;
-				this.total = response.data.total;
+					this.listQuery.plcTableName = val.plcTableName;
-				this.loading = false;
+					this.getDataList();
-				// this.tableKey = Math.random(); // method 1
+					break;
-			});
+				case 'reset':
-		},
+					this.$refs.searchBarForm.resetForm();
-		/** 取消按钮 */
+					this.listQuery = {
-		cancel() {
+						pageSize: 10,
-			this.open = false;
+						pageNo: 1,
-			this.reset();
+						total: 1,
-		},
+					};
-		/** 表单重置 */
+					this.getDataList();
-		reset() {
+					break;
-			this.form = {
+				case 'add':
-				id: undefined,
+					this.addOrEditTitle = '新增';
-				plcTableName: undefined,
+					this.addOrUpdateVisible = true;
-				code: undefined,
+					this.addOrUpdateHandle();
-				name: undefined,
+					break;
-				enName: undefined,
+				case 'export':
-				description: undefined,
+					this.handleExport();
-				collection: undefined,
+					break;
-			};
+				default:
-			this.resetForm('form');
+					console.log(val);
-		},
+			}
-		/** 搜索按钮操作 */
-		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/TableConfig.vue

@@ -0,0 +1,388 @@
+<!-- 
+    filename: TableConfig.vue
+    author: liubin
+    date: 2023-10-30 10:09:03
+    description: 
+-->
+
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			ref="pageTable"
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			: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 {
+	createEquipmentPlc,
+	updateEquipmentPlc,
+	deleteEquipmentPlc,
+	getEquipmentPlc,
+	getEquipmentPlcPage,
+	exportEquipmentPlcExcel,
+} from '@/api/base/equipmentPlc';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+const switchBtn = {
+	name: 'SwitchBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	computed: {
+		active() {
+			return +this.injectData[this.injectData.prop] == 1 ? true : false;
+		},
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'el-switch',
+			{
+				props: {
+					value: this.active,
+				},
+				on: {
+					change: (newVal) => {
+						this.$emit('emitData', {
+							action: 'update-collect',
+							payload: {
+								...this.injectData,
+								collection: newVal ? 1 : 0,
+							},
+						});
+					},
+				},
+			},
+			null
+		);
+	},
+};
+
+export default {
+	name: 'EquipmentPlc',
+	mixins: [basicPageMixin, tableHeightMixin],
+	components: {},
+	data() {
+		return {
+			tableKey: Math.random(),
+			searchBarKeys: ['name', 'plcTableName'],
+			tableBtn: [
+				this.$auth.hasPermiAnd([
+					'base:equipment-plc:update',
+					'base:equipment-plc:query'
+					])
+					? {
+							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: '编码', width: 180, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
+				{
+					prop: 'collection',
+					label: '是否采集',
+					subcomponent: switchBtn,
+				},
+				{ prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '表名',
+					placeholder: '请输入表名',
+					param: 'plcTableName',
+				},
+				{
+					type: 'input',
+					label: '标识',
+					placeholder: '请输入标识',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-plc:create')
+						?  'separate' : '',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-plc:create')
+						? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:realtime-table-config: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/energy-plc/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',
+						bind: {
+              'active-value': 1,
+							'inactive-value': 0,
+              value: 1,
+						},
+					},
+				],
+				[
+					{
+						textarea: true,
+						label: '描述',
+						prop: 'description',
+						bind: {
+							placeholder: '请输入备注',
+						},
+					},
+				],
+			],
+			// 是否显示弹出
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 20,
+				plcTableName: null,
+				name: null,
+			},
+			// 表单参数
+			form: {},
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, payload }) {
+			switch (action) {
+				case 'update-collect':
+					this.reset();
+					const tempForm = {};
+					Object.keys(this.form).forEach((key) => {
+						tempForm[key] = payload[key];
+					});
+					updateEquipmentPlc(tempForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					break;
+			}
+		},
+		/** 查询列表 */
+		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: 1,
+			};
+			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('是否确认删除该配置?')
+				.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(() => {});
+		},
+	},
+};
+</script>

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

@@ -0,0 +1,151 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-25 16:11:14
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px">
+		<el-form-item label="设备" prop="equipmentId">
+			<el-cascader
+				placeholder="请选择设备"
+				v-model="dataForm.equipmentId"
+				:options="plLineList"
+				:props="{value: 'id', label: 'name', children: 'children'}"
+				style="width: 100%"
+				filterable />
+		</el-form-item>
+		<el-form-item label="关联表名" prop="plcId">
+			<el-select
+				v-model="dataForm.plcId"
+				filterable
+				placeholder="请选择关联表"
+				style="width: 100%">
+				<el-option
+					v-for="dict in plcList"
+					:key="dict.id"
+					:label="dict.plcTableName"
+					:value="dict.id" />
+			</el-select>
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from './components/basic-add';
+import { createEquipmentPlcConnect, updateEquipmentPlcConnect } from '@/api/base/equipmentPlcConnect';
+import { getplcAllList, getTree } from "@/api/base/equipmentConfig";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createEquipmentPlcConnect,
+				updateURL: updateEquipmentPlcConnect,
+			},
+			dataForm: {
+        id: undefined,
+        equipmentId: undefined,
+        plcId: undefined
+			},
+			plcList: [],
+			plLineList: [],
+			dataRule: {
+        equipmentId: [{ required: true, message: "设备不能为空", trigger: "blur" }],
+				plcId: [{ required: true, message: "关联表名不能为空", trigger: "blur" }]
+      },
+			options: [{
+          value: 'zhinan',
+          label: '指南',
+          children: [{
+            value: 'shejiyuanze',
+            label: '设计原则',
+            children: [{
+              value: 'yizhi',
+              label: '一致'
+            }, {
+              value: 'fankui',
+              label: '反馈'
+            }, {
+              value: 'xiaolv',
+              label: '效率'
+            }, {
+              value: 'kekong',
+              label: '可控'
+            }]
+          }, {
+            value: 'daohang',
+            label: '导航'
+          }]
+        }]
+		};
+	},
+	created() {
+		this.getDict()
+	},
+	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+			})
+		},
+		async getDict() {
+			// 关联表名列表
+			const res = await getplcAllList();
+			this.plcList = res.data;
+			// 树形结构
+			const res1 = await getTree();
+			this.plLineList = res1.data;
+			// const res1 = await getCorePLList();
+			// this.plLineList = res1.data;
+			// this.plLineList.forEach(item => {
+			// 	listByParentId({ id: item.id }).then(resp => {
+			// 		if (resp.data.length > 0) {
+			// 			// item.children = resp.data
+			// 			this.$set(item, 'children', resp.data)
+			// 			// this.$forceUpdate()
+			// 		}
+			// 	})
+			// })
+		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          updateEquipmentPlcConnect({
+						id: this.dataForm.id,
+						equipmentId: this.dataForm.equipmentId[this.dataForm.equipmentId.length],
+						plcId: this.dataForm.plcId
+					}).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        createEquipmentPlcConnect({
+						id: this.dataForm.id,
+						equipmentId: this.dataForm.equipmentId[this.dataForm.equipmentId.length - 1],
+						plcId: this.dataForm.plcId
+					}).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    }
+	}
+};
+</script>

src/views/base/equipmentPlcConnect/components-old/BasicDrawer.vue

@@ -0,0 +1,574 @@
+<!--
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description:
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div class="form-part" v-if="section.key == 'base'">
+						<el-skeleton v-if="!showForm" animated />
+						<BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="mode.includes('detail')"
+							v-model="form"
+							:rows="formRows" />
+					</div>
+
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							:add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr"
+							@emitFun="handleEmitFun">
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="45%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:disabled="mode.includes('detail')"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'infoData'],
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: 1,
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+				equipmentParamType: '',
+				productionParamType: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '参数列名',
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '参数名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '单位',
+						prop: 'unit',
+						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						switch: true,
+						label: '是否采集',
+						prop: 'collection',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备参数类型',
+						prop: 'equipmentParamType',
+						options: [
+							{ label: '一般参数', value: 1 },
+							{ label: '工艺参数', value: 2 },
+							{ label: '报警参数', value: 3 },
+						],
+						rules: [
+							{
+								required: true,
+								message: '设备参数类型不能为空',
+								trigger: 'blur',
+							},
+						],
+					},
+					{
+						select: true,
+						label: '生产参数类型',
+						prop: 'productionParamType',
+						options: [
+							// { label: '进片数量', value: 1 },
+							// { label: '出片数量', value: 2 },
+							// { label: '破损数量', value: 3 },
+							// { label: '无类型', value: 4 },
+							{ label: '进口计数', value: 1 },
+							{ label: '出口计数', value: 2 },
+							{ label: '损耗计数', value: 3 },
+							{ label: '无类型', value: 4 },
+						],
+						rules: [
+							{
+								required: true,
+								message: '生产参数类型不能为空',
+								trigger: 'blur',
+							},
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '最小值',
+						prop: 'minValue',
+						rules: [
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+					{
+						input: true,
+						label: '最大值',
+						prop: 'maxValue',
+						rules: [
+							{
+								required: false,
+							},
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '标准值',
+						prop: 'defaultValue',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '描述',
+						prop: 'description',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					return {
+						...col,
+						bind: {
+							// 详情 模式下，禁用各种输入
+							// disabled: this.mode == 'detail',
+							disabled: true,
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				// debugger;
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			} else if (section.key == 'base') {
+				this.form = this.infoData;
+				this.showForm = true;
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.mode = 'edit';
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			this.attrForm = {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: 1,
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+			};
+			this.attrTitle = '添加设备绑定信息';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备绑定信息';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该分组报警?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		async submitAttrForm() {
+			this.$refs['attrForm'].validate((valid) => {
+				if (!valid) {
+          return false;
+				}
+			});
+			const isEdit = this.attrForm.id != null;
+			this.attrFormSubmitting = true;
+			const res = await this.$axios({
+				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+				method: isEdit ? 'put' : 'post',
+				data: {
+					...this.attrForm,
+					connectId: this.infoData.id
+				},
+			});
+
+			if (res.code == 0) {
+				this.closeAttrForm();
+				this.$message({
+					message: `${isEdit ? '更新' : '创建'}成功`,
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.getAttrList();
+					},
+				});
+			}
+			this.attrFormSubmitting = false;
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(`确定删除该报警?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+				})
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/base/equipmentPlcConnect/components/BasicDrawer.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description: 
+    description:
 -->
 
 <template>
@@ -12,7 +12,7 @@
 		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -29,29 +29,107 @@
 				<section v-for="(section, index) in sections" :key="section.key">
 					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
 
-					<div class="form-part" v-if="section.key == 'base'">
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
 						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
+						<!-- <BaseInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
-							:dataForm="form"
+							v-model="form"
-							:rows="formRows" />
+							:rows="formRows" /> -->
+
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.equipmentName }}
+								</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									关联表名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.plcName }}
+								</div>
+							</el-col>
+						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.equipmentId"
+											filterable
+											clearable
+											placeholder="请选择设备">
+											<el-option
+												v-for="eq in eqList"
+												:key="eq.id"
+												:label="eq.name"
+												:value="eq.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备关联表名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.plcId"
+											filterable
+											clearable
+											placeholder="请选择关联表">
+											<el-option
+												v-for="plc in plcList"
+												:key="plc.id"
+												:label="plc.plcTableName"
+												:value="plc.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<div
+						v-if="section.key == 'attrs'"
+						style="position: relative; margin-top: 12px">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加参数
+							</el-button>
+						</div>
 						<base-table
 							v-loading="attrListLoading"
 							:table-props="section.props"
 							:page="attrQuery?.params.pageNo || 1"
 							:limit="attrQuery?.params.pageSize || 10"
 							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
 							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -71,17 +149,12 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<el-button
-					编辑
+					type="primary"
+					v-if="!mode.includes('detail')"
+					@click="handleSave">
+					保存
 				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
 			</div>
 		</div>
 
@@ -96,10 +169,10 @@
 			@close="closeAttrForm"
 			@cancel="closeAttrForm"
 			@confirm="submitAttrForm">
+			<!-- :disabled="mode.includes('detail')" -->
 			<DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
-				:disabled="mode.includes('detail')"
 				v-model="attrForm"
 				:rows="attrRows" />
 		</base-dialog>
@@ -136,7 +209,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData'],
+	props: ['sections', 'defaultMode', 'infoData', 'size'],
 	data() {
 		return {
 			mode: '',
@@ -145,6 +218,8 @@ export default {
 			total: 0,
 			form: {},
 			list: [],
+			eqList: [],
+			plcList: [],
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -166,13 +241,17 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -181,7 +260,6 @@ export default {
 						label: '单位',
 						prop: 'unit',
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						switch: true,
@@ -193,6 +271,47 @@ export default {
 						},
 					},
 				],
+				[
+					{
+						select: true,
+						label: '设备参数类型',
+						prop: 'equipmentParamType',
+						options: [
+							{ label: '一般参数', value: 1 },
+							{ label: '工艺参数', value: 2 },
+							{ label: '报警参数', value: 3 },
+						],
+						rules: [
+							{
+								required: true,
+								message: '设备参数类型不能为空',
+								trigger: 'blur',
+							},
+						],
+					},
+					{
+						select: true,
+						label: '生产参数类型',
+						prop: 'productionParamType',
+						options: [
+							// { label: '进片数量', value: 1 },
+							// { label: '出片数量', value: 2 },
+							// { label: '破损数量', value: 3 },
+							// { label: '无类型', value: 4 },
+							{ label: '进口计数', value: 1 },
+							{ label: '出口计数', value: 2 },
+							{ label: '损耗计数', value: 3 },
+							{ label: '无类型', value: 4 },
+						],
+						rules: [
+							{
+								required: true,
+								message: '生产参数类型不能为空',
+								trigger: 'blur',
+							},
+						],
+					},
+				],
 				[
 					{
 						input: true,
@@ -222,7 +341,6 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -230,13 +348,11 @@ export default {
 						input: true,
 						label: '标准值',
 						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '描述',
 						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -244,7 +360,6 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 			],
@@ -257,6 +372,7 @@ export default {
 			infoQuery: null, // 基本信息的请求
 			attrFormSubmitting: false,
 			attrListLoading: false,
+			shouldRefreshPageView: false,
 		};
 	},
 	computed: {
@@ -275,11 +391,24 @@ export default {
 			});
 		},
 		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+			return this.sections[1].tableBtn;
+			// return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
 		},
 	},
 	mounted() {
+		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
+
+		if (this.mode != 'detail') {
+			this.$axios('/base/equipment/listAll').then(({ code, data }) => {
+				this.eqList = data;
+			});
+			this.$axios({
+				url: '/base/equipment-plc/listAll',
+			}).then(({ code, data }) => {
+				this.plcList = data;
+			});
+		}
 		for (const section of this.sections) {
 			// 请求具体信息
 			if ('url' in section) {
@@ -341,7 +470,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -355,6 +484,9 @@ export default {
 		},
 
 		handleCancel() {
+			if (this.shouldRefreshPageView) {
+				this.$emit('refreshDataList');
+			}
 			this.visible = false;
 		},
 
@@ -376,9 +508,11 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
+				equipmentParamType: '',
+				productionParamType: '',
 				alarmContent: '',
 			};
-			this.attrTitle = '添加设备绑定信息';
+			this.attrTitle = '添加参数绑定信息';
 			this.attrFormVisible = true;
 		},
 
@@ -391,14 +525,14 @@ export default {
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑设备绑定信息';
+				this.attrTitle = '编辑参数绑定信息';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该分组报警?', '提示', {
+			this.$confirm('确定删除该参数?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -410,6 +544,7 @@ export default {
 						params: { id: attrId },
 					});
 					if (res.code == 0) {
+						this.shouldRefreshPageView = true;
 						this.$message({
 							message: '删除成功',
 							type: 'success',
@@ -424,35 +559,37 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
+		submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
-			const isEdit = this.attrForm.id != null;
-			this.attrFormSubmitting = true;
-			const res = await this.$axios({
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				method: isEdit ? 'put' : 'post',
-				data: {
-					...this.attrForm,
-					connectId: this.infoData.id
-				},
-			});
 
-			if (res.code == 0) {
+				const isEdit = this.attrForm.id != null;
-				this.closeAttrForm();
+				this.attrFormSubmitting = true;
-				this.$message({
+				const res = await this.$axios({
-					message: `${isEdit ? '更新' : '创建'}成功`,
+					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-					type: 'success',
+					method: isEdit ? 'put' : 'post',
-					duration: 1500,
+					data: {
-					onClose: () => {
+						...this.attrForm,
-						this.getAttrList();
+						connectId: this.infoData.id,
 					},
 				});
-			}
+
-			this.attrFormSubmitting = false;
+				if (res.code == 0) {
+					this.closeAttrForm();
+					this.$message({
+						message: `${isEdit ? '更新' : '创建'}成功`,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAttrList();
+							this.shouldRefreshPageView = true;
+						},
+					});
+				}
+				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {
@@ -461,7 +598,7 @@ export default {
 
 		handleClick(raw) {
 			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该报警?`, '提示', {
+				this.$confirm(`确定删除该参数?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning',

src/views/base/equipmentPlcConnect/components/basic-add.js

@@ -0,0 +1,100 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-12-13 15:52:53
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '',
+        updateURL: '',
+        infoURL: '',
+        codeURL: '',
+        getOption: false,
+        isGetCode: false,
+        optionArrUrl: [],
+        optionArr: {}
+      },
+      visible: false,
+      setData: false
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+            if (this.setData) {
+              this.setDataForm()
+            }
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+		getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    getArr() {
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      this.urlOptions.optionArrUrl.forEach((item, index) => {
+        item(params).then(({ data: res }) => {
+          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
+        })
+          .catch(() => {
+          });
+      });
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+    formClear() {
+      this.$refs.dataForm.resetFields()
+    }
+  }
+}

src/views/base/equipmentPlcConnect/index-old.vue

@@ -0,0 +1,535 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			: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>
+
+		<!-- 抽屉 详情 -->
+		<BasicDrawer
+			v-if="editVisible"
+			ref="drawer"
+			:default-mode="editMode"
+			:info-data="alarmForm"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+				},
+				{
+					name: '属性列表',
+					key: 'attrs',
+					props: drawerListProps,
+					url: '/base/equipment-plc-param/page',
+					urlCreate: '/base/equipment-plc-param/create',
+					urlUpdate: '/base/equipment-plc-param/update',
+					urlDelete: '/base/equipment-plc-param/delete',
+					urlDetail: '/base/equipment-plc-param/get',
+					queryParams: {
+						connectId: alarmForm.id,
+						pageNo: 1,
+						pageSize: 10,
+					},
+					tableBtn: [
+						this.$auth.hasPermi('base:equipment-plc-param:update')
+							? {
+									type: 'edit',
+									btnName: '修改',
+							  }
+							: undefined,
+						this.$auth.hasPermi('base:equipment-plc-param:delete')
+							? {
+									type: 'delete',
+									btnName: '删除',
+							  }
+							: undefined,
+					].filter((v) => v),
+					allowAdd: true,
+				},
+			]"
+			@refreshDataList="getList"
+			@cancel="editVisible = false"
+			@destroy="editVisible = false" />
+	</div>
+</template>
+
+<script>
+import {
+	createEquipmentPlcConnect,
+	updateEquipmentPlcConnect,
+	deleteEquipmentPlcConnect,
+	getEquipmentPlcConnect,
+	getEquipmentPlcConnectPage,
+	exportEquipmentPlcConnectExcel,
+} from '@/api/base/equipmentPlcConnect';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+// import './http';
+import BasicDrawer from './components/BasicDrawer.vue';
+import { publicFormatter } from '@/utils/dict';
+
+export default {
+	name: 'EquipmentPlcConnect',
+	mixins: [basicPageMixin],
+	components: { BasicDrawer },
+	data() {
+		return {
+			searchBarKeys: ['equipmentId', 'plcId'],
+			// 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),
+			tableBtn: [
+				{
+					type: 'detail',
+					btnName: '参数绑定',
+				},
+				{
+					type: 'edit',
+					btnName: '修改',
+				},
+				// {
+				// 	type: 'params-bind',
+				// 	btnName: '参数绑定',
+				// },
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			tableProps: [
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 180,
+				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				// },
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名' },
+				{ prop: 'equipmentCode', label: '设备编码' },
+				{ prop: 'plcCode', label: '关联表编码' },
+				{ prop: 'plcTableName', label: '关联表名' },
+				{ prop: 'plcName', label: '标识名称' },
+				{ prop: 'bindingParameters', label: '绑定参数数量' },
+				// {
+				// 	_action: 'params-bind',
+				// 	label: '查看绑定',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								payload: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看绑定'
+				// 			);
+				// 		},
+				// 	},
+				// },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '设备名',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					selectOptions: [],
+				},
+				{
+					type: 'select',
+					label: '编码',
+					placeholder: '请选择编码',
+					param: 'plcId',
+					selectOptions: [],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('base:equipment-plc:create')
+					// 	? 'button'
+					// 	: '',
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '关联表名',
+						prop: 'plcId',
+						labelKey: `plcTableName`,
+						url: '/base/equipment-plc/listAll',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						url: '/base/equipment/page?pageNo=1&pageSize=99',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
+			],
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				plcId: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			// 查看绑定配置
+			editVisible: false,
+			editMode: '',
+			drawerBaseInfoRows: [
+				[
+					{
+						input: true,
+						label: '设备名',
+						prop: 'equipmentName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '关联表名',
+						prop: 'plcTableName',
+						// url: '/base/equipment/getCode',
+					},
+				],
+			],
+			drawerListProps: [
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'name', label: '参数名称' },
+				{
+					prop: 'unit',
+					label: '单位',
+					filter: publicFormatter('unit_dict'),
+				},
+				{
+					prop: 'equipmentParamType',
+					label: '设备参数类型',
+					filter: (val) =>
+						val != null
+							? ['', '一般参数', '工艺参数', '报警参数', ''][val]
+							: '-',
+				},
+				{
+					prop: 'productionParamType',
+					label: '生产参数类型',
+					filter: (val) =>
+						val != null
+							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
+							: '-',
+				},
+				{
+					prop: 'collection',
+					label: '是否采集',
+					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
+				},
+				{ prop: 'minValue', label: '最小值' },
+				{ prop: 'maxValue', label: '最大值' },
+				{ prop: 'defaultValue', label: '标准值' },
+				{ prop: 'description', label: '描述' },
+				{ prop: 'remark', label: '备注' },
+			],
+			alarmForm: {
+				id: undefined,
+				equipmentName: undefined,
+				plcTableName: undefined,
+			},
+		};
+	},
+	created() {
+		this.getList();
+		this.initSearchOptions();
+	},
+	methods: {
+		async getEquipmentOptions() {
+			const res = await this.$axios({
+				url: '/base/equipment/listAll',
+				method: 'get',
+			});
+			return res.data;
+		},
+
+		async getPlcOptions() {
+			const res = await this.$axios({
+				url: '/base/equipment-plc/listAll',
+				method: 'get',
+			});
+			return res.data;
+		},
+
+		/** 初始化查询条件 */
+		async initSearchOptions() {
+			Promise.all([this.getEquipmentOptions(), this.getPlcOptions()]).then(
+				([eqList, plcList]) => {
+					this.searchBarFormConfig[0].selectOptions = eqList.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				}
+			);
+		},
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, payload }) {
+			switch (action) {
+				case 'params-bind':
+					this.reset();
+					const {
+						id,
+						equipmentName,
+						equipmentId,
+						plcId,
+						plcName,
+						plcTableName,
+					} = payload;
+					// console.log('Cha看绑定参数弹窗', id, equipmentName, plcTableName);
+					this.$router.push({
+						name: 'EquipmentPlcParam',
+						params: {
+							id,
+							equipmentName,
+							plcTableName,
+						},
+					});
+					break;
+			}
+		},
+
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getEquipmentPlcConnectPage(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: undefined,
+				plcId: undefined,
+				equipmentId: undefined,
+			};
+			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;
+			getEquipmentPlcConnect(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) {
+					updateEquipmentPlcConnect(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentPlcConnect(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+
+		// 查看报警
+		handleDetail(row) {
+			// debugger;
+			const {
+				id,
+				bindingParameters,
+				equipmentCode,
+				equipmentId,
+				equipmentName,
+				plcCode,
+				plcId,
+				plcName,
+				plcTableName,
+				productionLine,
+				workshopSection,
+			} = row;
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.alarmForm.id = id;
+			this.alarmForm.plcTableName = plcTableName; // 关联表名
+			this.alarmForm.equipmentName = equipmentName;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否删除该配置?')
+				.then(function () {
+					return deleteEquipmentPlcConnect(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 exportEquipmentPlcConnectExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备与实时采集关系表（一对多）.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/base/equipmentPlcConnect/index.vue

@@ -1,3 +1,10 @@
+<!--
+    filename: CollectionConfig.vue
+    author: liubin
+    date: 2023-10-30 10:09:03
+    description:
+-->
+
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
@@ -12,7 +19,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -34,17 +42,21 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="700px"
+			width="30%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<!-- <DialogForm v-if="open" ref="form" v-model="form" :rows="rows" /> -->
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:info-data="alarmForm"
 			:sections="[
@@ -52,9 +64,13 @@
 					name: '基本信息',
 					key: 'base',
 					rows: drawerBaseInfoRows,
+					url: '/base/equipment-plc-connect/get',
+					urlUpdate: '/base/equipment-plc-connect/update',
+					urlCreate: '/base/equipment-plc-connect/create',
+					queryParams: { id: alarmForm.id },
 				},
 				{
-					name: '属性列表',
+					name: '采集参数',
 					key: 'attrs',
 					props: drawerListProps,
 					url: '/base/equipment-plc-param/page',
@@ -68,18 +84,26 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						this.$auth.hasPermi('base:equipment-plc-param:update')
+						{
-							? {
+							type: 'edit',
-									type: 'edit',
+							btnName: '修改',
-									btnName: '修改',
+						},
-							  }
+						{
-							: undefined,
+							type: 'delete',
-						this.$auth.hasPermi('base:equipment-plc-param:delete')
+							btnName: '删除',
-							? {
+						},
-									type: 'delete',
+						// this.$auth.hasPermi('equipment:collection-config-param:update')
-									btnName: '删除',
+						// 	? {
-							  }
+						// 			type: 'edit',
-							: undefined,
+						// 			btnName: '修改',
+						// 	  }
+						// 	: undefined,
+						// this.$auth.hasPermi('equipment:collection-config-param:delete')
+						// 	? {
+						// 			type: 'delete',
+						// 			btnName: '删除',
+						// 	  }
+						// 	: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
@@ -99,67 +123,60 @@ import {
 	getEquipmentPlcConnectPage,
 	exportEquipmentPlcConnectExcel,
 } from '@/api/base/equipmentPlcConnect';
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import './http';
 import BasicDrawer from './components/BasicDrawer.vue';
 import { publicFormatter } from '@/utils/dict';
+import AddOrUpdate from './add-or-updata';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentPlcConnect',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
-	components: { BasicDrawer },
+	components: { BasicDrawer, AddOrUpdate },
 	data() {
 		return {
 			searchBarKeys: ['equipmentId', 'plcId'],
 			// 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),
 			tableBtn: [
-				{
+				this.$auth.hasPermiAnd([
-					type: 'detail',
+					'base:equipment-plc-connect:query',
-					btnName: '参数绑定',
+					'base:equipment-plc-param:query'
-				},
+				])
-				{
+				? {
-					type: 'edit',
+						type: 'detail',
-					btnName: '修改',
+						btnName: '参数绑定',
-				},
+					} : undefined,
-				// {
+				this.$auth.hasPermiAnd([
-				// 	type: 'params-bind',
+						'base:equipment-plc-connect:update',
-				// 	btnName: '参数绑定',
+						'base:equipment-plc-connect:query',
-				// },
+						'base:equipment-plc-param:create',
-				{
+						'base:equipment-plc-param:update',
-					type: 'delete',
+						'base:equipment-plc-param:delete',
-					btnName: '删除',
+						'base:equipment-plc-param:query'
-				},
+					])
-			],
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-plc-connect:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
 			tableProps: [
-				// {
+				{ prop: 'productionLine', label: '产线', minWidth: 120, showOverflowtooltip: true },
-				// 	prop: 'createTime',
+				{ prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
-				// 	label: '添加时间',
+				{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
-				// 	fixed: true,
+				{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
-				// 	width: 180,
+				{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
-				// },
+				{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名' },
-				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'plcCode', label: '关联表编码' },
-				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'plcName', label: '标识名称' },
-				{ prop: 'bindingParameters', label: '绑定参数数量' },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@@ -194,13 +211,15 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
+					filterable: true,
 				},
 				{
 					type: 'select',
-					label: '编码',
+					label: '关联表编码',
-					placeholder: '请选择编码',
+					placeholder: '请选择关联表编码',
 					param: 'plcId',
 					selectOptions: [],
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -209,20 +228,21 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
+						? 'separate' : '',
 				},
 				{
-					// type: this.$auth.hasPermi('base:equipment-plc:create')
+					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
-					// 	? 'button'
+						? 'button'
-					// 	: '',
+						: '',
-					type: 'button',
+					// type: 'button',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+				// 	type: this.$auth.hasPermi('equipment:collection-config:export') ? 'button' : '',
 				// 	btnName: '导出',
 				// 	name: 'export',
 				// 	color: 'warning',
@@ -236,7 +256,9 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '关联表名不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -247,8 +269,10 @@ export default {
 						select: true,
 						label: '设备',
 						prop: 'equipmentId',
-						url: '/base/equipment/page?pageNo=1&pageSize=99',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -259,7 +283,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				plcId: null,
 				equipmentId: null,
 			},
@@ -274,7 +298,9 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名不能为空', trigger: 'blur' },
+						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -283,7 +309,7 @@ export default {
 						input: true,
 						label: '关联表名',
 						prop: 'plcTableName',
-						// url: '/base/equipment/getCode',
+						// url: '/base/core-equipment/getCode',
 					},
 				],
 			],
@@ -295,6 +321,23 @@ export default {
 					label: '单位',
 					filter: publicFormatter('unit_dict'),
 				},
+				{
+					prop: 'equipmentParamType',
+					label: '设备参数类型',
+					filter: (val) =>
+						val != null
+							? ['', '一般参数', '工艺参数', '报警参数', ''][val]
+							: '-',
+				},
+				{
+					prop: 'productionParamType',
+					label: '生产参数类型',
+					filter: (val) =>
+						val != null
+							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
+							: '-',
+				},
 				{
 					prop: 'collection',
 					label: '是否采集',
@@ -318,6 +361,10 @@ export default {
 		this.initSearchOptions();
 	},
 	methods: {
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
 		async getEquipmentOptions() {
 			const res = await this.$axios({
 				url: '/base/equipment/listAll',
@@ -325,7 +372,6 @@ export default {
 			});
 			return res.data;
 		},
-
 		async getPlcOptions() {
 			const res = await this.$axios({
 				url: '/base/equipment-plc/listAll',
@@ -346,7 +392,7 @@ export default {
 					});
 					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
 						return {
-							name: item.name,
+							name: item.code,
 							id: item.id,
 						};
 					});
@@ -403,6 +449,19 @@ export default {
 			};
 			this.resetForm('form');
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -417,7 +476,10 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加设备与实时采集关系表（一对多）';
+			this.title = '添加设备采集配置';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -426,35 +488,16 @@ export default {
 			getEquipmentPlcConnect(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改设备与实时采集关系表（一对多）';
+				this.title = '修改设备采集配置';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs['form'].validate((valid) => {
+			this.$refs.addOrUpdate.dataFormSubmit()
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlcConnect(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlcConnect(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
 		},
 
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			// debugger;
 			const {
 				id,
@@ -470,7 +513,7 @@ export default {
 				workshopSection,
 			} = row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = id;
 			this.alarmForm.plcTableName = plcTableName; // 关联表名
 			this.alarmForm.equipmentName = equipmentName;

src/views/base/equipmentPlcParam/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>

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

@@ -0,0 +1,94 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 09:30:06
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+		label-position="top">
+		<el-row :gutter="20">
+			<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="level">
+					<el-input v-model="dataForm.level" clearable
+						placeholder="请输入原料等级" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="原料编码" prop="code">
+					<el-input v-model="dataForm.code" readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="单位" prop="unit">
+					<el-select
+						v-model="dataForm.unit"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						placeholder="请选择单位">
+						<el-option
+							v-for="item in urlOptions.dictArr.dict0"
+							:key="item.id"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import {
+	createMaterial,
+	updateMaterial,
+	getMaterial,
+  getCode
+} from '@/api/base/material';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createMaterial,
+				updateURL: updateMaterial,
+				infoURL: getMaterial,
+        codeURL: getCode, //获取code接口（返回结果为dataForm.code字段）
+        dictNameList: ['unit_dict'], //数据字典name数组
+			},
+			dataForm: {
+				id: undefined,
+				code: '',
+				name: '',
+				unit: '',
+				level: '',
+			},
+			dataRule: {
+				name: [
+					{ required: true, message: '原料不能为空', trigger: 'blur' },
+				],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	created() {},
+	methods: {
+	},
+};
+</script>

src/views/base/material/index.vue

@@ -0,0 +1,180 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="90"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '@/mixins/basic-page';
+import { parseTime } from '@/filter/code-filter';
+import { publicFormatter } from "@/utils/dict";
+import {
+	deleteMaterial,
+	getMaterialPage,
+} from '@/api/base/material';
+
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+	{
+		prop: 'name',
+		label: '原料名称',
+	},
+	{
+		prop: 'code',
+		label: '原料编码',
+		width: 180,
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMaterialPage,
+				deleteURL: deleteMaterial,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:material:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:material:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+          type: 'input',
+          label: '原料名称',
+          placeholder: '原料名称',
+          param: 'name'
+				},
+				{
+          type: 'input',
+          label: '原料编码',
+          placeholder: '原料编码',
+          param: 'code'
+				},
+				{
+					type: this.$auth.hasPermi('base:material:query')
+						? 'button'
+						: '',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type:
+						this.$auth.hasPermi('base:material:create') &&
+						this.$auth.hasPermi('base:material:query')
+							? 'separate'
+							: '',
+				},
+				{
+					type: this.$auth.hasPermi('base:material:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.code = val.code;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

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

@@ -0,0 +1,156 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-11 09:05:16
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="原料名称" prop="materialId">
+					<el-select
+						v-model="dataForm.materialId"
+						filterable
+						@change="setCode"
+						:style="{ width: '100%' }"
+						placeholder="请选择原料名称">
+						<el-option
+							v-for="item in MaterialList"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="原料编码" prop="code">
+					<el-input v-model="dataForm.code" clearable readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="生效开始时间" prop="startTime">
+					<el-date-picker
+						v-model="dataForm.startTime"
+						type="date"
+						value-format="timestamp"
+						:style="{ width: '100%' }"
+						placeholder="选择开始时间"></el-date-picker>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="生效结束时间" prop="endTime">
+					<el-date-picker
+						v-model="dataForm.endTime"
+						type="date"
+						value-format="timestamp"
+						:style="{ width: '100%' }"
+						placeholder="选择结束时间"></el-date-picker>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="单价" prop="price">
+					<el-input-number
+						:min="0"
+						style="width: 75%"
+						v-model="dataForm.price"
+						clearable
+						placeholder="请输入允许留存时间" />
+					{{ unit }}
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import {
+	createMaterialPricing,
+	updateMaterialPricing,
+	getMaterialPricing,
+} from '@/api/base/materialPricing';
+import { getMaterialPage } from '@/api/base/material';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createMaterialPricing,
+				updateURL: updateMaterialPricing,
+				infoURL: getMaterialPricing,
+				optionArrUrl: [getMaterialPage], //需要获取下拉框的方法数组
+				dictNameList: ['unit_dict'], //数据字典name数组
+			},
+			dataForm: {
+				id: null,
+				code: '',
+				materialId: '',
+				price: '',
+				startTime: new Date().getTime(),
+				endTime: null,
+				remark: '',
+			},
+			setData: true,
+			MaterialList: [],
+			unit: '元/吨',
+			dataRule: {
+				materialId: [
+					{ required: true, message: '原料不能为空', trigger: 'blur' },
+				],
+				price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+				startTime: [
+					{
+						required: true,
+						message: '生效开始时间不能为空',
+						trigger: 'change',
+					},
+				],
+			},
+		};
+	},
+	created() {},
+	methods: {
+		getArr() {
+			getMaterialPage({ pageSize: 100, pageNo: 1 }).then((response) => {
+				this.MaterialList = response.data.list;
+			});
+		},
+		setDataForm() {
+			if (this.MaterialList.length > 0) {
+				this.setCode();
+			} else {
+				setTimeout(this.setCode(), 1000);
+			}
+		},
+		setCode() {
+			this.MaterialList.forEach((item) => {
+				if (item.id === this.dataForm.materialId) {
+					this.dataForm.code = item.code;
+					this.unit =
+						'元/' +
+						this.urlOptions.dictArr.dict0.find((d) => d.value === item.unit)
+							.label;
+				}
+			});
+		},
+	},
+};
+</script>

src/views/base/materialPricing/connectTime.vue

@@ -0,0 +1,23 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-12-05 13:45:59
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 15:20:11
+ * @Description
+-->
+<template>
+	<div>
+		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
+	</div>
+</template>
+<script>
+export default {
+	name: '',
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+};
+</script>

src/views/base/materialPricing/index.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="90"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import connectTime from './connectTime';
+import basicPage from '@/mixins/basic-page';
+import { parseTime } from '@/filter/code-filter';
+import {
+	deleteMaterialPricing,
+	getMaterialPricingPage,
+} from '@/api/base/materialPricing';
+import { getMaterialPage } from '@/api/base/material';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '原料名称',
+	},
+	{
+		prop: 'code',
+		label: '原料编码',
+		width: 180,
+	},
+	{
+		prop: 'price',
+		label: '单价(元/吨)',
+		align: 'right',
+	},
+	{
+		prop: 'createTime',
+		label: '生效时间',
+		width: 235,
+		subcomponent: connectTime,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMaterialPricingPage,
+				deleteURL: deleteMaterialPricing,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:material-pricing:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:material-pricing:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '原料名称',
+					selectOptions: [],
+					param: 'name',
+					filterable: true,
+				},
+				{
+					type: this.$auth.hasPermi('base:material-pricing:query')
+						? 'button'
+						: '',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type:
+						this.$auth.hasPermi('base:material-pricing:create') &&
+						this.$auth.hasPermi('base:material-pricing:query')
+							? 'separate'
+							: '',
+				},
+				{
+					type: this.$auth.hasPermi('base:material-pricing:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		getMaterialPage({ pageSize: 100, pageNo: 1 }).then((response) => {
+			this.formConfig[0].selectOptions = response.data.list;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.materialId = val.name;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/bpm/form/formEditor.vue

@@ -299,7 +299,7 @@ export default {
       }
     })
     clipboard.on('error', e => {
-      this.$message.error('代码复制失败')
+      this.$message.warning('代码复制失败')
     })
   },
   created() {

src/views/bpm/oa/leave/detail.vue

@@ -42,7 +42,7 @@ export default {
   created() {
     this.leaveId = this.id || this.$route.query.id;
     if (!this.leaveId) {
-      this.$message.error('未传递 id 参数，无法查看 OA 请假信息');
+      this.$message.warning('未传递 id 参数，无法查看 OA 请假信息');
       return;
     }
     this.getDetail();

src/views/bpm/processInstance/detail.vue

@@ -167,7 +167,7 @@ export default {
   created() {
     this.id = this.$route.query.id;
     if (!this.id) {
-      this.$message.error('未传递 id 参数，无法查看流程信息');
+      this.$message.warning('未传递 id 参数，无法查看流程信息');
       return;
     }
     this.getDetail();
@@ -185,7 +185,7 @@ export default {
       this.processInstanceLoading = true;
       getProcessInstance(this.id).then(response => {
         if (!response.data) {
-          this.$message.error('查询不到流程信息！');
+          this.$message.warning('查询不到流程信息！');
           return;
         }
         // 设置流程信息

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

@@ -0,0 +1,197 @@
+<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: {
+		initChart() {
+			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.edgeCt.map((item) => {
+						return parseTime(item.recordTime, '{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: this.barData.edgeCt.map((item) => {
+							return item.ct;
+						}),
+					},
+					{
+						name: '钢化节拍',
+						type: 'line',
+						tooltip: {
+							valueFormatter: function (value) {
+								return value + 'pcs/min';
+							},
+						},
+						data: this.barData.temperCt.map((item) => {
+							return item.ct;
+						}),
+					},
+					{
+						name: '下片节拍',
+						type: 'line',
+						tooltip: {
+							valueFormatter: function (value) {
+								return value + 'pcs/min';
+							},
+						},
+						data: this.barData.downCt.map((item) => {
+							return item.ct;
+						}),
+					},
+				],
+			});
+		},
+	},
+};
+</script>

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

@@ -0,0 +1,273 @@
+<!--
+ * @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(lineId, startTime, endTime) {
+			this.eqChartData = [];
+			this.time.startTime = startTime;
+			this.time.endTime = endTime;
+			this.dataListLoading = true;
+			getNewCTDet(lineId).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

@@ -0,0 +1,296 @@
+<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,260 +1,302 @@
+<!--
+ * @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">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <div v-if="tableData.length">
+			:formConfigs="formConfig"
-      <base-table v-loading="dataListLoading" :span-method="mergeColumnHandler" :table-props="tableProps" :table-data="tableData" />
+			ref="searchBarForm"
-      <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
+			@select-changed="handleSearchBarChanged"
-      <balance-chart ref="lineChart" />
+			@headBtnClick="buttonClick" />
-    </div>
+		<div v-if="showData.length">
-    <div v-else class="no-data-bg"></div>
+			<base-table
-    <!-- <pagination
+				class="right-aside"
-			:limit.sync="listQuery.pageSize"
+				v-loading="dataListLoading"
-			:page.sync="listQuery.pageNo"
+				:table-props="tableProps"
-			:total="listQuery.total"
+				:page="1"
-			@pagination="getDataList" /> -->
+				:limit="999"
-  </div>
+				: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" />
+		</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>
+	</div>
 </template>
 
 <script>
-// import basicPage from '../../mixins/basic-page';
+import eqDetail from './eq-detail';
 import { parseTime } from '../../mixins/code-filter';
-import { getCT } from '@/api/core/analysis/index';
+import { getPdList } from '@/api/core/monitoring/auto';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
-import BalanceChart from '../balanceChart'
+import { getFactoryPage } from '@/api/core/base/factory';
-import { time } from 'echarts';
+// import codeFilter from '../../mixins/code-filter'
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+import * as XLSX from 'xlsx';
+import FileSaver from 'file-saver';
+import barChart from './BarChart.vue';
 
-// const tableProps = [
+const tableProps = [
-// 	// {
+	{
-//   //   prop: 'lineName',
+		prop: 'factoryName',
-// 	// 	label: '产线',
+		label: '工厂',
-// 	// 	align: 'center',
+	},
-// 	// },
+	{
-//   // {
+		prop: 'lineName',
-//   //   prop: 'sum',
+		label: '产线',
-//   //   label: '合计',
+	},
-//   //   align: 'center',
+	{
-//   // },
+		prop: 'size',
-//   // {
+		label: '规格',
-//   //   prop: 'dynamicValue',
+		showOverflowtooltip: true,
-//   //   label: 'dynamicName',
+	},
-//   //   align: 'center',
+	{
-//   //   children:[
+		prop: 'process',
-
+		label: '产品工艺',
-//   //   ]
+	},
-//   // }
+	{
-// ];
+		prop: 'edgeCt',
+		label: '磨边当前节拍pcs/min',
+	},
+	{
+		prop: 'temperCt',
+		label: '钢化当前节拍pcs/min',
+	},
+	{
+		prop: 'downCt',
+		label: '下片当前节拍pcs/min',
+	},
+];
 
 export default {
-  components: {
+	components: {
-    BalanceChart
+		barChart,
-  },
+		eqDetail,
-  // mixins: [basicPage],
+	},
-  data() {
+	data() {
-    return {
+		return {
-      urlOptions: {
+			urlOptions: {
-        getDataListURL: getCT,
+				getDataListURL: getNewCTNow,
-      },
+			},
-      tableProps: [],
+			listQuery: {
-      dataListLoading: false,
+				lineId: [],
-      tableData: [],
+			},
-      listQuery: {
+			fileName: '',
-        // time: ''
+			dataListLoading: false,
-        endTime: undefined,
+			tableProps,
-        lineId:undefined,
+			tableBtn: [
-        startTime:undefined
+				{
-      },
+					type: 'eq',
-      timeList: [],
+					btnName: '详情',
-      spanArr: [], 
+				},
-      xData: [],
+			].filter((v) => v),
-      yData: [],
+			showData: [],
-      optionArrUrl: [getProductionLinePage],
+			tableData: [],
-      formConfig: [
+			chartData: [],
-        {
+			formConfig: [
-          type: 'select',
+				{
-          label: '产线',
+					type: 'select',
-          selectOptions: [],
+					label: '工厂',
-          param: 'lineIds',
+					selectOptions: [],
-          defaultSelect: '',
+					param: 'factoryId',
-          multiple: false,
+					onchange: true,
-          filterable: true,
+				},
-        },
+				{
-        {
+					type: 'select',
-          type: 'datePicker',
+					label: '产线',
-          label: '时间',
+					selectOptions: [],
-          dateType: 'datetimerange',
+					param: 'lineId',
-          format: 'yyyy-MM-dd',
+					multiple: true,
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				},
-          rangeSeparator: '-',
+				{
-          startPlaceholder: '开始时间',
+					type: 'datePicker',
-          endPlaceholder: '结束时间',
+					label: '时间范围',
-          width: 350,
+					dateType: 'datetimerange',
-          param: 'time',
+					format: 'yyyy-MM-dd HH:mm:ss',
-        },
+					valueFormat: 'timestamp',
-        {
+					rangeSeparator: '-',
-          type: 'button',
+					startPlaceholder: '开始时间',
-          btnName: '查询',
+					endPlaceholder: '结束时间',
-          name: 'search',
+					defaultTime: ['00:00:00', '23:59:59'],
-          color: 'primary',
+					param: 'timeVal',
-        }
+					width: 350,
-      ],
+					clearable: false,
-    };
+				},
-  },
+				{
-  created() {
+					type: 'button',
-    this.getArr();
+					btnName: '查询',
-  },
+					name: 'search',
-  methods: {
+					color: 'primary',
-    getArr() {
+				},
-      const params = {
+				// {
-        page: 1,
+				// 	type: 'separate',
-        limit: 500
+				// },
-      }
+				// {
-      this.optionArrUrl.forEach((item, index) => {
+				// 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-        item(params).then((response) => {
+				// 	type: 'button',
-          this.formConfig[index].selectOptions = response.data.list
+				// 	btnName: '导出',
-        });
+				// 	name: 'export',
-      });
+				// 	color: 'warning',
-    },
+				// },
-    setRowSpan(arr) {
+			],
-      let count = 0
+			addOrEditTitle: '',
-      arr.forEach((item, index) => {
+			addOrUpdateVisible: false,
-        if(index === 0) {
+		};
-          this.spanArr.push(1)
+	},
-        } else {
+	created() {
-          if (item === arr[index - 1]) {
+		// 获取当前时间
-            this.spanArr[count] += 1
+		const now = new Date();
-            this.spanArr.push(0)
+		// 获取前一天的同一时间
-          } else {
+		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-            count = index
+		// 设置为00:00:00
-            this.spanArr.push(1)
+		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();
-    /** 合并table列的规则 */
+		this.listQuery.endTime = end.getTime();
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+		this.$nextTick(() => {
-			if (columnIndex == 0) {
+			this.$refs.searchBarForm.formInline.timeVal = [
-				if (this.spanArr[rowIndex]) {
+				yesterday.getTime(),
-					return [
+				end.getTime(),
-						this.spanArr[rowIndex], // row span
+			];
-						1, // col span
+		});
-					];
+		this.getDataList();
-				} else {
+		this.getPdLineList();
-					return [0, 0];
+	},
-				}
+	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 || [];
+			});
+			const params = {
+				pageSize: 100,
+				pageNo: 1,
+			};
+			getFactoryPage(params).then((res) => {
+				this.formConfig[0].selectOptions = res.data.list || [];
+			});
+		},
+		buttonClick(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();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
 			}
 		},
-    getData() {
+		// 获取数据列表
-      // this.listQuery.lineId = '1672847052717821953'
+		getDataList() {
-      // this.listQuery.startTime = '1693497600000';
+			this.dataListLoading = true;
-      // this.listQuery.endTime = '1693843200000';
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+				this.tableData = response.data;
-        console.log(res)
+				this.dataListLoading = false;
-        let arr = [
+				this.showData = this.tableData;
-          {
+			});
-            prop: 'sectionName',
+			getNewCTCharts(this.listQuery).then((response) => {
-            label: '工段',
+				this.chartData = response.data;
-            align: 'center',
+			});
-          },
+		},
-          {
+		handleSearchBarChanged({ param, value }) {
-            prop: 'equName',
+			this.listQuery.lineId = [];
-            label: '设备',
+			this.$refs.searchBarForm.formInline.lineId = undefined;
-            align: 'center',
+			getPdList(value).then((res) => {
-          }
+				this.formConfig[1].selectOptions = res.data || [];
-        ]
+			});
-        let sectionArr= []
+		},
-        res.data.data.forEach((ele, index) => {
+		handleClick(val) {
-          let tempData = []
+			this.addOrUpdateVisible = true;
-          let eqData = []
+			this.addOrEditTitle =
-            let plData = []
+				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-          ele.data.forEach((item, index) => {
+			this.$nextTick(() => {
-            item.children.forEach(params => {
+				this.$refs.eqDetail.init(
-              if (params.dynamicName === '设备CT') {
+					val.data.lineId,
-                tempData[item.dynamicName + '_eq'] = params.dynamicValue
+					this.listQuery.startTime,
-                eqData[index] = params.dynamicValue
+					this.listQuery.endTime
-              } else {
+				);
-                tempData[item.dynamicName + '_pl'] = params.dynamicValue
+			});
-                plData[index] = params.dynamicValue
+		},
-              }
+		handleCancel() {
-            })
+			this.addOrUpdateVisible = false;
-          })
+			this.addOrEditTitle = '';
-          const equipment = {
+		},
-            name: ele.equName,
+		handleConfirm() {
-            eqData: eqData,
+			this.handleCancel();
-            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.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/balanceChart.vue

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

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

@@ -1,18 +1,25 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <div v-if="tableData.length">
+			:formConfigs="formConfig"
-      <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
+			ref="searchBarForm"
-      <SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
+			@headBtnClick="buttonClick" />
-      <line-chart ref="lineChart" />
+		<div v-if="tableData.length">
-    </div>
+			<base-table
-    <div v-else class="no-data-bg"></div>
+				v-loading="dataListLoading"
-    <!-- <pagination
+				:table-props="tableProps"
+				:max-height="tableH"
+				:table-data="tableData" />
+			<SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
+			<line-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>
+	</div>
 </template>
 
 <script>
@@ -20,7 +27,8 @@
 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 lineChart from '../LineChart';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
 // const tableProps = [
@@ -45,51 +53,52 @@ import lineChart from '../LineChart'
 // ];
 
 export default {
-  components: {
+	components: {
-    lineChart,
+		lineChart,
-  },
+	},
-	// mixins: [basicPage],
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getYieldAnalysisPageData,
+				getDataListURL: getYieldAnalysisPageData,
 			},
-      tableProps:[],
+			tableProps: [],
-      dataListLoading:false,
+			dataListLoading: false,
-      tableData: [],
+			tableData: [],
-      listQuery: {
+			listQuery: {
-        lineIds: [],
+				lineIds: [],
-        time: ''
+				time: '',
-      },
+			},
-      dateLabelList: [],
+			dateLabelList: [],
-      optionArrUrl: [getProductionLinePage ],
+			optionArrUrl: [getProductionLinePage],
 			formConfig: [
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-          param: 'lineIds',
+					param: 'lineIds',
-          defaultSelect: '',
+					defaultSelect: [],
-          multiple:true,
+					multiple: true,
 					filterable: true,
+					width: 400,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-          param: 'time',
+					param: 'time',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-				}
+				},
 			],
 		};
 	},
@@ -104,145 +113,147 @@ 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.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)
 				});
 			});
-    },
+		},
-    getData() {
+		getData() {
-      // this.listQuery.lineIds = ['1672847052717821953']
+			// this.listQuery.lineIds = ['1672847052717821953']
-      // this.listQuery.productId = val.productId;
+			// this.listQuery.productId = val.productId;
-      // this.listQuery.time = '1694486098000';
+			// this.listQuery.time = '1694486098000';
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
-        let arr = [
+				let arr = [
-          	{
+					{
-              prop: 'lineName',
+						prop: 'lineName',
-          		label: '产线',
+						label: '产线',
-              fixed: 'left'
+						fixed: 'left',
-          	},
+					},
-            {
+					{
-              prop: 'sum',
+						prop: 'sum',
-              label: '合计',
+						label: '合计[片]',
-              fixed: 'left'
+						fixed: 'left',
-            },
+					},
-            {
+					{
-              prop: res.data ? res.data.nameData[0].name : undefined,
+						prop: res.data ? res.data.nameData[0].name : undefined,
-              label: res.data ? res.data.nameData[0].name : undefined,
+						label: res.data ? res.data.nameData[0].name : undefined,
-              align: 'center',
+						align: 'center',
-              children:[
+						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));
 
-              ]
+					this.dateLabelList.forEach((item) => {
-            }
+						if (item.indexOf('年') === -1) {
-        ]
+							// 构造表头
-        // console.log(res.data.nameData.slice(1))
+							const props = {
-        let xData = []
+								prop: item,
-        let yAllData = []
+								label: item,
-        let lineName = []
+							};
-        if (res.data) {
+							arr[2].children.push(props);
-          let tempDateList = []
-          res.data.nameData.forEach(date => {
-            tempDateList.push(date.name)
-          })
-          this.dateLabelList = Array.from(new Set(tempDateList))
 
-          this.dateLabelList.forEach(item => {
+							// 构造echarts横坐标
-            if (item.indexOf('年') === -1) {
+							xData.push(item);
-              // 构造表头
+						}
-              const props = {
+					});
-                'prop': item,
+					// res.data.nameData.slice(1).forEach(item => {
-                'label': item
+					//   const props = {
-              }
+					//     'prop': item.name,
-              arr[2].children.push(props)
+					//     'label': item.name,
+					//     'align': 'center'
+					//   }
+					//   arr[2].children.push(props)
+					// })
+					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(obj['' + e.dynamicName + '']);
+								});
+							});
+						tableDataArr.push(obj);
+					});
+					this.tableData = tableDataArr;
+					this.tableProps = arr;
 
-              // 构造echarts横坐标
+					// let tempList = []
-              xData.push(item)
+					// res.data.nameData.slice(1).forEach(item => {
-            }
+					//   tempList.push(item.name)
-          })
+					//   // arr[2].children.push(props)
-          // res.data.nameData.slice(1).forEach(item => {
+					// })
-          //   const props = {
+					// xData = Array.from(new Set(tempList))
-          //     'prop': item.name,
+
-          //     'label': item.name,
+					res.data.data.forEach((item) => {
-          //     'align': 'center'
+						let yData = [];
-          //   }
+						lineName.push(item.lineName);
-          //   arr[2].children.push(props)
+						// let obj = {}
-          // })
+						// obj.lineName = item.lineName,
-          let tableDataArr =[]
+						//   obj.sum = item.sum,
-          res.data.data.forEach(item => {
+						item.data.forEach((ele, index) => {
-            let obj = {}
+							// console.log(ele)
-            obj.lineName= item.lineName,
+							ele.children.forEach((e) => {
-            obj.sum= item.sum,
+								// let yData = []
-            item.data.forEach((ele, index) => {
+								yData.push(e.dynamicValue);
-              // console.log(ele)
+							});
-              ele.children.forEach((e) => {
+						});
-                console.log(e.dynamicName)
+						yAllData.push(yData);
-                obj['' + e.dynamicName + ''] = e.dynamicValue
+					});
-                console.log(obj['' + e.dynamicName + '']);
+					console.log(lineName);
-              })
+				} else {
-            })
+					this.tableProps = arr;
-            tableDataArr.push(obj)
+					this.tableData = [];
-          });
+					xData = [];
-          this.tableData = tableDataArr
+					yAllData = [];
-          this.tableProps = arr
+					lineName = [];
-          
+				}
-          // let tempList = []
+				// res.data.data[0].data[0].children.forEach((item, index) => {
-          // res.data.nameData.slice(1).forEach(item => {
+				//   // console.log(item)
-          //   tempList.push(item.name)
+				//   yData.push(item.dynamicValue)
-          //   // arr[2].children.push(props)
+				//   // let data = 'data' + Number(index+1)
-          // })
+				//   // obj['' + item.dynamicName + ''] = item.dynamicValue
-          // xData = Array.from(new Set(tempList))
+				// })
-          
+				// console.log(this.yData)
-          res.data.data.forEach(item => {
+				this.$nextTick(() => {
-            let yData = []
+					this.$refs.lineChart.initChart(xData, yAllData, lineName);
-            lineName.push(item.lineName)
+				});
-            // let obj = {}
+				// this.total = response.data.total;
-            // obj.lineName = item.lineName,
+				// this.dataListLoading = false;
-            //   obj.sum = item.sum,
+			});
-            item.data.forEach((ele, index) => {
+		},
-                // console.log(ele)
+		buttonClick(val) {
-              ele.children.forEach((e) => {
-                // let yData = []
-                yData.push(e.dynamicValue)
-                })
-              })
-            yAllData.push(yData)
-          });
-          console.log(lineName)
-        } else {
-          this.tableProps = arr
-          this.tableData = []
-          xData = []
-          yAllData = []
-          lineName = []
-        }
-        // res.data.data[0].data[0].children.forEach((item, index) => {
-        //   // console.log(item)
-        //   yData.push(item.dynamicValue)
-        //   // let data = 'data' + Number(index+1)
-        //   // obj['' + item.dynamicName + ''] = item.dynamicValue
-        // })
-        // console.log(this.yData)
-        this.$refs.lineChart.initChart(xData, yAllData, lineName)
-        // this.total = response.data.total;
-        // this.dataListLoading = false;
-      });
-    },
-    buttonClick(val) {
 			switch (val.btnName) {
-        case 'search':
+				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.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;
+					// this.listQuery.pageSize = 10;
-          if (val.time) {
+					if (val.time) {
-            this.getData()
+						this.getData();
-          } else {
+					} else {
-            this.$message({
+						this.$message({
-              message: '请选择时间',
+							message: '请选择时间',
-              type: 'warning'
+							type: 'warning',
-            });
+						});
-          }
+					}
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();

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

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: AssetsUpload.vue
     author: liubin
     date: 2023-10-12 16:40:14
@@ -18,9 +18,16 @@
 				预览
 			</div> -->
 		</section>
-		<section class="file-area">
+		<section
+			class="file-area"
+			:style="{
+				height: expand ? 'auto' : isPicMode ? '180px' : '152px',
+				gap: isPicMode ? '0 24px' : '24px',
+				gridAutoRows: isPicMode ? '180px' : '152px',
+			}">
 			<el-upload
 				class="equipment-upload"
+				:style="{ marginBottom: isPicMode ? '48px' : '24px' }"
 				:disabled="disabled"
 				drag
 				:action="uploadUrl"
@@ -52,25 +59,36 @@
 				<i class="el-icon-delete"></i>
 			</div> -->
 			<div
-				class="file-list__item"
 				v-for="(file, index) in files"
 				:key="file.fileName"
-				:style="{
+				style="width: 100%">
-					display: index > 3 && !expand ? 'none' : 'block',
+				<div
-					background: isPicMode
+					class="file-list__item"
-						? `url(${file.fileUrl}) no-repeat`
+					v-if="!isPicMode"
-						: `url(${defaultBg}) no-repeat`,
+					:style="{
-					backgroundSize: isPicMode ? '100% 100%' : '64px',
+						background: isPicMode
-					backgroundPosition: isPicMode ? '0% 0%' : 'center',
+							? `url(${file.fileUrl}) no-repeat`
-				}"
+							: `url(${defaultBg}) no-repeat`,
-				:data-name="file.fileName">
+						backgroundSize: isPicMode ? '100% 100%' : '64px',
-				<el-button
+						backgroundPosition: isPicMode ? '0% 0%' : 'center',
-					v-if="!disabled"
+					}"
-					type="text"
+					@click="handleDownload(file)"
-					class="el-icon-delete"
+					:data-name="file.fileName">
-					style="padding: 0"
+					<el-button
-					@click="(e) => handleDelete(file)" />
+						v-if="!disabled"
-			</div>
+						type="text"
+						class="el-icon-delete"
+						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>
@@ -211,7 +229,7 @@ export default {
 				response.data == null ||
 				response.data.trim() == ''
 			) {
-				this.$message.error('上传出错了!');
+				this.$message.warning('上传出错了!');
 				return;
 			}
 			this.files.push({
@@ -226,7 +244,7 @@ export default {
 				clearTimeout(this.updateTimer);
 			}
 			this.updateTimer = setTimeout(() => {
-				console.log('[AssetsUpload] 更新上传列表');
+				// console.log('[AssetsUpload] 更新上传列表');
 				this.emitFilelist();
 				clearTimeout(this.updateTimer);
 				this.updateTimer = null;
@@ -271,6 +289,32 @@ 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>
@@ -314,7 +358,6 @@ export default {
 }
 
 :deep(.equipment-upload) {
-	background: #ccc4;
 	.el-upload-dragger {
 		width: 188px;
 		height: 128px;
@@ -346,6 +389,10 @@ export default {
 	}
 }
 
+.equipment-upload {
+	margin-bottom: 24px;
+}
+
 .file-list {
 	padding: 12px;
 	border: 1px solid #ccc;
@@ -354,13 +401,14 @@ export default {
 // custom
 .file-area {
 	display: grid;
-	grid-template-columns: repeat(5, 188px);
+	grid-template-columns: repeat(auto-fill, 188px);
-	grid-auto-rows: 128px;
+	grid-auto-rows: 152px;
-	gap: 24px 18px;
+	gap: 48px 24px;
-	place-content: center;
+	overflow: hidden;
 }
 
 .file-list__item {
+	height: 128px;
 	background-color: #fff;
 	border: 1px dashed #d9d9d9;
 	border-radius: 6px;

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

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: dialogForm.vue
     author: liubin
     date: 2023-08-15 10:32:36
@@ -44,7 +44,7 @@
 					<el-date-picker
 						v-if="col.datetime"
 						v-model="form[col.prop]"
-						type="datetime"
+						type="date"
 						:placeholder="`请选择${col.label}`"
 						value-format="timestamp"
 						v-bind="col.bind"></el-date-picker>

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

@@ -1,32 +0,0 @@
-<!-- 
-    filename: EquipmentAssets.vue
-    author: liubin
-    date: 2023-08-22 11:11:18
-    description: 设备资产
--->
-
-<template>
-    <div class="equipment-assets"></div>
-</template>
-
-<script>
-export default {
-    name: "EquipmentAssets",
-    components: {},
-    props: {},
-    data() {
-        return {}
-    },
-    computed: {},
-    methods: {},
-}
-</script>
-
-<style scoped lang="scss">
-.equipment-assets {
-    background: #f1f1f1;
-    padding: 12px;
-    min-height: 128px;
-    margin-top: 8px;
-}
-</style>

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

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description: 
+    description:
 -->
 
 <template>
@@ -308,6 +308,7 @@ export default {
 				});
 				if (code == 0) {
 					this.$modal.msgSuccess('更新成功');
+          this.$emit('refreshDataList');
 				}
 
 				this.btnLoading = false;
@@ -361,7 +362,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			if (!this.dataId) return this.$message.warning('请先创建设备信息');
 			this.attrForm = {
 				id: null,
 				equipmentId: this.dataId,

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

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

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

@@ -1,111 +0,0 @@
-<!-- 
-    filename: EquipmentPics.vue
-    author: liubin
-    date: 2023-08-18 16:29:39
-    description: 
--->
-
-<template>
-	<div class="equipment-pics">
-		<div v-for="(url, idx) in images" :key="url">
-			<img :src="url" :alt="url" />
-			<figure class="big-img" :style="inlineStyle">
-				<img :src="url" :alt="url" />
-				<figcaption>{{ desc[idx] }}</figcaption>
-			</figure>
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'EquipmentPics',
-	components: {},
-	props: {
-		inlineStyle: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			desc: [
-				'车间设备 - 1',
-				'车间设备 - 2',
-				'车间设备 - 3',
-				'车间设备 - 4',
-				'车间设备 - 5',
-				'车间设备 - 6',
-				'车间设备 - 7',
-				'车间设备 - 8',
-				'车间设备 - 9',
-				'车间设备 - 10',
-				'车间设备 - 11',
-				'车间设备 - 12',
-			],
-			images: Array(10)
-				.fill(1)
-				.map((_, index) => require(`../assets/eq${index + 1}.jpg`)),
-		};
-	},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.equipment-pics {
-	// background: #cfcfcf;
-	padding: 12px;
-	// margin: 8px;
-	display: flex;
-	overflow-x: auto;
-}
-
-.equipment-pics > div {
-	height: 100px;
-	position: relative;
-	cursor: pointer;
-}
-
-.equipment-pics > div:not(:last-child) {
-	margin-right: 12px;
-}
-
-.equipment-pics > div > img {
-	height: 95%;
-}
-
-.equipment-pics > div > figure {
-	display: none;
-	position: fixed;
-	// inset: 0;
-	// margin: auto;
-	top: 0;
-	right: 0;
-	// width: 640px;
-	// height: 480px;
-	background: #000;
-	overflow: hidden;
-	padding: 8px 8px 0;
-}
-
-.equipment-pics > div:hover > figure {
-	margin: 0;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-
-.equipment-pics > div > figure > img {
-	flex: 1;
-}
-
-.equipment-pics > div > figure > figcaption {
-	height: 24px;
-	margin-top: 8px;
-	font-size: 18px;
-	line-height: 1;
-	color: #fff;
-}
-</style>

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

@@ -38,14 +38,15 @@
 			@cancel="cancel"
 			width="60%"
 			@confirm="submitForm">
-			<DialogForm
+			<DialogForm1
 				v-if="open"
 				key="index-dialog-form"
 				ref="form"
 				label-position="top"
 				size="small"
-				:dataForm="form"
+				v-model="form"
-				:rows="computedRows" />
+				:rows="computedRows"
+				:has-file="true" />
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
@@ -77,7 +78,7 @@
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:equipment-attr:update')
@@ -105,10 +106,8 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { getAccessToken } from '@/utils/auth';
-import EquipmentPics from './components/EquipmentPics';
-import EquipmentAssets from './components/EquipmentAssets';
 import EquipmentDrawer from './components/EquipmentDrawer';
+import DialogForm1 from './components/DialogForm';
 
 import {
 	createEquipment,
@@ -126,12 +125,19 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
+		DialogForm1,
 	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
+				this.$auth.hasPermi(`base:equipment:update`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi('base:equipment:update')
 					? {
 							type: 'edit',
@@ -144,12 +150,6 @@ export default {
 							btnName: '删除',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`base:equipment:update`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			tableProps: [
 				{
@@ -159,7 +159,12 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备名称' },
+				{
+					width: 200,
+					showOverflowtooltip: true,
+					prop: 'name',
+					label: '设备名称',
+				},
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentType', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
@@ -213,6 +218,12 @@ export default {
 				{
 					type: 'separate',
 				},
+				{
+					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
 				{
 					type: this.$auth.hasPermi('base:equipment:create') ? 'button' : '',
 					btnName: '新增',
@@ -220,12 +231,6 @@ export default {
 					plain: true,
 					color: 'success',
 				},
-				{
-					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
 			],
 			rows: [
 				[
@@ -272,6 +277,7 @@ export default {
 						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
 						bind: {
 							filterable: true,
+							clearable: true,
 						},
 					},
 					// {
@@ -296,7 +302,7 @@ export default {
 					{
 						input: true,
 						prop: 'tvalue',
-						label: '设备TT值',
+						label: '设备理论生产能效(片/min)',
 						rules: [
 							{ required: true, message: '不能为空', trigger: 'blur' },
 							{
@@ -437,7 +443,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				code: '',
 				name: '',
 			},
@@ -563,6 +569,7 @@ export default {
 					return;
 				}
 				// 添加的提交
+				this.form.files = [];
 				createEquipment(this.form).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;

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

@@ -37,7 +37,12 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:rows="rows"
+				:has-file="true" />
 		</base-dialog>
 	</div>
 </template>
@@ -148,6 +153,9 @@ export default {
 						label: '父类',
 						prop: 'parentId',
 						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
+						bind: {
+							clearable: true, // some condition, like detail mode...
+						}
 					},
 					{},
 				],
@@ -207,8 +215,6 @@ export default {
 				name: undefined,
 				parentId: undefined,
 				remark: undefined,
-				fileNames: [],
-				fileUrls: [],
 			};
 			this.resetForm('form');
 		},
@@ -234,25 +240,6 @@ 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

@@ -51,7 +51,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '工厂编码'
-	},																																																																						
+	},
 	{
 		prop: 'name',
 		label: '工厂名称'

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

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

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

@@ -0,0 +1,164 @@
+<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

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