merge server

.env.dev

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

.env.prod

@@ -1,24 +1,15 @@
-###
- # @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

@@ -8,7 +8,7 @@
     "local": "vue-cli-service serve --mode local",
     "dev": "vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
-    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
+    "build:prod": "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",
@@ -41,20 +41,18 @@
     "url": "https://github.com/YunaiV/ruoyi-vue-pro"
   },
   "dependencies": {
+    "@antv/x6": "^2.15.3",
     "@babel/parser": "7.18.4",
-    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
-    "chinese-lunar": "^0.1.4",
     "clipboard": "2.0.8",
     "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
-    "el-tree-transfer": "^2.4.7",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",

src/api/base/energyQuantityManual.js

@@ -1,86 +0,0 @@
-/*
- * @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/equipment.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建设备
 export function createEquipment(data) {
   return request({
-    url: '/base/equipment/create',
+    url: '/base/core-equipment/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createEquipment(data) {
 // 更新设备
 export function updateEquipment(data) {
   return request({
-    url: '/base/equipment/update',
+    url: '/base/core-equipment/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateEquipment(data) {
 // 删除设备
 export function deleteEquipment(id) {
   return request({
-    url: '/base/equipment/delete?id=' + id,
+    url: '/base/core-equipment/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteEquipment(id) {
 // 获得设备
 export function getEquipment(id) {
   return request({
-    url: '/base/equipment/get?id=' + id,
+    url: '/base/core-equipment/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getEquipment(id) {
 // 获得设备分页
 export function getEquipmentPage(query) {
   return request({
-    url: '/base/equipment/page',
+    url: '/base/core-equipment/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getEquipmentPage(query) {
 // 导出设备 Excel
 export function exportEquipmentExcel(query) {
   return request({
-    url: '/base/equipment/export-excel',
+    url: '/base/core-equipment/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
@@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) {
 // 获得所有设备列表
 export function getEquipmentAll() {
   return request({
-    url: '/base/equipment/listAll',
+    url: '/base/core-equipment/listAll',
     method: 'get'
   })
 }

src/api/base/equipmentConfig.js

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

src/api/base/equipmentType.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建设备类型
 export function createEquipmentType(data) {
   return request({
-    url: '/base/equipment-type/create',
+    url: '/base/core-equipment-type/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createEquipmentType(data) {
 // 更新设备类型
 export function updateEquipmentType(data) {
   return request({
-    url: '/base/equipment-type/update',
+    url: '/base/core-equipment-type/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateEquipmentType(data) {
 // 删除设备类型
 export function deleteEquipmentType(id) {
   return request({
-    url: '/base/equipment-type/delete?id=' + id,
+    url: '/base/core-equipment-type/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteEquipmentType(id) {
 // 获得设备类型
 export function getEquipmentType(id) {
   return request({
-    url: '/base/equipment-type/get?id=' + id,
+    url: '/base/core-equipment-type/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getEquipmentType(id) {
 // 获得设备类型分页
 export function getEquipmentTypePage(query) {
   return request({
-    url: '/base/equipment-type/page',
+    url: '/base/core-equipment-type/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) {
 // 导出设备类型 Excel
 export function exportEquipmentTypeExcel(query) {
   return request({
-    url: '/base/equipment-type/export-excel',
+    url: '/base/core-equipment-type/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/base/factory.js

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

src/api/base/groupClasses.js

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

src/api/base/groupSchedulingPlan.js

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

src/api/base/groupSchedulingRule.js

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

src/api/base/groupTeam.js

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

src/api/base/groupTeamScheduling.js

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

src/api/base/material.js

@@ -1,75 +0,0 @@
-/*
- * @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

@@ -1,68 +0,0 @@
-/*
- * @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,10 +1,3 @@
-/*
- * @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() {
@@ -13,11 +6,3 @@ export function getLineAll() {
     method: 'get'
   })
 }
-// 获得产线分页
-export function getLinePage(query) {
-  return request({
-    url: '/base/production-line/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/worker.js

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

src/api/core/analysis/index.js

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

src/api/core/base/factory.js

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

src/api/core/base/lineBindProcess.js

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

src/api/core/base/lineBindProduct.js

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

src/api/core/monitoring/auto.js

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

src/api/core/monitoring/data.js

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

src/api/core/monitoring/index.js

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

src/api/cost/allCost.js

@@ -1,54 +0,0 @@
-/*
- * @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

@@ -1,55 +0,0 @@
-/*
- * @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

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

@@ -1,54 +0,0 @@
-/*
- * @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

@@ -1,54 +0,0 @@
-/*
- * @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

@@ -1,36 +0,0 @@
-/*
- * @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

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

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

@@ -1,68 +0,0 @@
-/*
- * @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

@@ -1,68 +0,0 @@
-/*
- * @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

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

@@ -1,68 +0,0 @@
-/*
- * @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

@@ -1,54 +0,0 @@
-/*
- * @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

@@ -1,68 +0,0 @@
-/*
- * @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/group/Schedule.js

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

src/api/group/calendar.js

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

src/api/group/groupSetting.js

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

src/api/group/holidaySetting.js

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

src/api/monitoring/energyOverlimitLog.js

@@ -43,14 +43,6 @@ 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/assets/icons/svg/fullscreen.svg

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

src/assets/icons/svg/refresh.svg

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

src/assets/icons/svg/unFullscreen.svg

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

src/assets/styles/login.scss

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

@@ -1,132 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2024-04-02 09:49:36
-    description:
--->
-
-<template>
-  <!-- 按钮切换 -->
-  <div v-if="buttonMode" class="button-nav">
-    <button
-      v-for="m in menus"
-      :key="m"
-      @click="currentMenu = 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%">
-      <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) => {
-        return val.length > 0;
-      },
-    },
-    buttonMode: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data() {
-    return {
-      currentMenu: "",
-    };
-  },
-  created() {
-    this.currentMenu = this.menus[0];
-  },
-  watch: {
-    currentMenu(val) {
-      this.$emit("change", val);
-    },
-  },
-};
-</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: 16px;
-    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

@@ -92,13 +92,13 @@
 								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
 							</div>
 						</el-upload>
+
 						<uploadedFile
 							class="file"
 							v-for="file in form[col.prop] || []"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="handleDeleteFile(file)"
+							@delete="handleDeleteFile(file)" />
-							@Preview="handlePreview(file)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -109,6 +109,7 @@
 <script>
 import { getAccessToken } from '@/utils/auth';
 import tupleImg from '@/assets/images/tuple.png';
+import cache from '@/views/extend/processFlow/cache';
 
 /**
  * 找到最长的label
@@ -138,9 +139,6 @@ const uploadedFile = {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
-		handlePreview() {
-			this.$emit('Preview', this.file);
-		},
 	},
 	mounted() {},
 	render: function (h) {
@@ -159,7 +157,7 @@ const uploadedFile = {
 					cursor: 'pointer',
 					display: 'inline-block',
 				}}>
-				<el-button onClick={this.handlePreview}>{this.file.fileName}</el-button>
+				{this.file.fileName}
 				<el-button
 					type="text"
 					icon="el-icon-close"
@@ -193,7 +191,7 @@ export default {
 			type: Boolean,
 			default: false,
 		},
-		hasFile: {
+		hasFiles: {
 			type: Boolean,
 			default: false,
 		},
@@ -239,7 +237,7 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
-				if (this.hasFile) {
+				if (this.hasFiles) {
 					this.form.files = this.form.files ?? [];
 				}
 			},
@@ -259,20 +257,6 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-		async handlePreview(file) {
-			const data = await this.$axios({
-				url: file.fileUrl,
-				method: 'get',
-				responseType: 'blob',
-			});
-			const link = document.createElement('a');
-			link.href = window.URL.createObjectURL(new Blob([data]));
-			link.download = file.fileName;
-			document.body.appendChild(link);
-			link.click();
-			document.body.removeChild(link);
-			window.URL.revokeObjectURL(link.href);
-		},
 		// getCode
 		async getCode(url) {
 			const response = await this.$axios(url);
@@ -334,6 +318,11 @@ export default {
 										'list' in response.data
 											? response.data.list
 											: response.data;
+
+									if (opt.cache) {
+										cache.store(opt.cache, list);
+									}
+
 									this.$set(
 										this.optionListOf,
 										opt.prop,
@@ -372,9 +361,7 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload(file) {
+		beforeUpload() {},
-      console.log(file)
-    },
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
 			this.form.files.push({

src/filter/code-filter.js

@@ -1,94 +0,0 @@
-
-/*
- * @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/main.js

@@ -9,7 +9,6 @@ import store from './store';
 import router from './router';
 import directive from './directive'; // directive
 import plugins from './plugins'; // plugins
-import dataV from '@jiaminghi/data-view'
 
 import './assets/icons'; // icon
 import './permission'; // permission control
@@ -78,7 +77,6 @@ Vue.use(directive);
 Vue.use(plugins);
 Vue.use(VueMeta);
 // Vue.use(hljs.vuePlugin);
-Vue.use(dataV);
 
 // bpmnProcessDesigner 需要引入
 import MyPD from '@/components/bpmnProcessDesigner/package/index.js';

src/mixins/basic-add.js

@@ -1,122 +0,0 @@
-/*
- * @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

@@ -1,128 +0,0 @@
-/*
- * @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/basicPageMixin.js

@@ -28,10 +28,37 @@ export default {
 			// tableBtn: [], // 占位
 			// searchBarFormConfig: [], // 占位
 			// // 弹窗表单配置
-			// dialogFormConfig: [], // 占位
+			// dialogFormConfig: [], // 
+			updateUrl: '',
+			addUrl: '',
+			pageUrl: '',
+			form: {}
 		};
 	},
 	methods: {
+		// utils
+		http(url, method, payload) {
+			return this.$axios({
+				url,
+				method,
+				params: method === 'get' ? payload : null,
+				data: method !== 'get' ? payload : null,
+			})
+		},
+		put(payload) {
+			return this.http(this.updateUrl, 'put', payload);
+		},
+		post(payload) {
+			return this.http(this.addUrl, 'post', payload);
+		},
+		recv(payload) {
+			return this.http(this.pageUrl, 'get', payload);
+		},
+		info(payload) {
+			return this.http(this.infoUrl, 'get', payload);
+		},
+
+
 		// 过滤后端传回的详情数据
 		filterData(data, keys) {
 			const obj = {};

src/mixins/lb/tableHeightMixin.js

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

src/mixins/tableHeightMixin.js

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

src/router/index.js

@@ -70,18 +70,17 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: "",
+    path: '/',
     component: Layout,
-    redirect: "index",
+    // redirect: 'core/base/factory',
-    children: [
+    children: [{
-      {
+      path: 'index',
-        path: "index",
+      // redirect: 'core/base/factory',
-        component: (resolve) => require(["@/views/home/index"], resolve),
+      component: (resolve) => require(['@/views/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,7 +86,6 @@ export const DICT_TYPE = {
   // ============== PRODUCT - 产品模块 =============
   UNIT_DICT: 'unit_dict',
   PRODUCT_TYPE: 'product_type',
-  PROCESS_TYPE: 'process_type',
 
   // ============== ENERGY - 能源模块 =============
   ENERGY_UNIT: 'energy_unit',

src/utils/ruoyi.js

@@ -48,50 +48,6 @@ 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,9 +6,7 @@
 -->
 
 <template>
-	<div ref="dataBoard" class="data-board">
+	<div ref="dataBoard" class=""></div>
-		<el-button type="text" @click="goback" class="go-back--btn">返回</el-button>
-	</div>
 </template>
 
 <script>
@@ -26,42 +24,39 @@ 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>
@@ -76,25 +71,4 @@ 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

@@ -320,7 +320,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			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" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->
@@ -219,7 +219,7 @@ export default {
 					{
 						select: true,
 						label: '设备',
-						url: '/base/equipment/page?pageNo=1&pageSize=100',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100',
 						prop: 'equipmentId',
 						bind: {
 							filterable: true,
@@ -278,7 +278,7 @@ export default {
 						input: true,
 						label: '设备分组编码',
 						prop: 'code',
-						// url: '/base/equipment/getCode',
+						// url: '/base/core-equipment/getCode',
 					},
 				],
 			],

src/views/base/equipmentBindSection/dialogForm.vue

@@ -71,14 +71,14 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="工段设备排序" prop="sort">
+				<el-form-item label="工段排序" prop="sort">
 					<el-input-number
 						v-model="dataForm.sort"
 						filterable
 						min="0"
 						max="100"
 						@change="$emit('update', dataForm)"
-						placeholder="请输入工段设备排序" />
+						placeholder="请输入工段排序" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -112,7 +112,6 @@
 								{ label: '无类型', value: 0 },
 								{ label: '进口统计', value: 1 },
 								{ label: '出口统计', value: 2 },
-                { label: '进出口计数', value: 3 },
 							]"
 							:key="opt.value"
 							:label="opt.label"
@@ -192,7 +191,7 @@ export default {
 		// 获取设备列表
 		async getEquipmentList() {
 			const response = await this.$axios(
-				'/base/equipment/page?pageNo=1&pageSize=100'
+				'/base/core-equipment/page?pageNo=1&pageSize=100'
 			);
 			this.equipmentList = response.data.list.map((item) => ({
 				label: item.name,

src/views/base/equipmentBindSection/index.vue

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

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

@@ -36,7 +36,7 @@
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
-							v-model="form"
+							:dataForm="form"
 							:rows="formRows" />
 					</div>
 
@@ -320,7 +320,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			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" v-model="form" :rows="rows"/>
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->
@@ -192,7 +192,7 @@ export default {
 						input: true,
 						label: '设备分组编码',
 						prop: 'code',
-						// url: '/base/equipment/getCode',
+						// url: '/base/core-equipment/getCode',
 					}
 				]
 			],

src/views/base/equipmentGroupAlarm/index.vue

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

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

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

src/views/base/equipmentPlc/index.vue

@@ -1,53 +1,59 @@
 <template>
 	<div class="app-container">
-		<search-bar
+		<!-- 搜索工作栏 -->
-			:formConfigs="formConfig"
+		<SearchBar
-			ref="searchBarForm"
+			:formConfigs="searchBarFormConfig"
-			@headBtnClick="buttonClick" />
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
 		<base-table
-			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:page="listQuery.pageNo"
+			:page="queryParams.pageNo"
-			:limit="listQuery.pageSize"
+			:limit="queryParams.pageSize"
-			:table-data="tableData"
+			:table-data="list"
+			ref="pageTable"
 			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
 				label="操作"
 				:method-list="tableBtn"
-				@clickBtn="handleClick" />
+				@clickBtn="handleTableBtnClick" />
 		</base-table>
+
+		<!-- 分页组件 -->
 		<pagination
-			:limit.sync="listQuery.pageSize"
+			v-show="total > 0"
-			:page.sync="listQuery.pageNo"
+			:total="total"
-			:total="listQuery.total"
+			:page.sync="queryParams.pageNo"
-			@pagination="getDataList" />
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
 		<base-dialog
-			:dialogTitle="addOrEditTitle"
+			:dialogTitle="title"
-			:dialogVisible="addOrUpdateVisible"
+			:dialogVisible="open"
-			@cancel="handleCancel"
+			width="700px"
-			@confirm="handleConfirm"
+			@close="cancel"
-			:before-close="handleCancel"
+			@cancel="cancel"
-			width="50%">
+			@confirm="submitForm">
-			<add-or-update
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-				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',
@@ -84,45 +90,49 @@ 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 {
-	mixins: [basicPage],
+	name: 'EquipmentPlc',
+	mixins: [basicPageMixin],
+	components: {},
 	data() {
 		return {
-			urlOptions: {
+			tableKey: Math.random(),
-				getDataListURL: getEquipmentPlcPage,
+			searchBarKeys: ['name', 'plcTableName'],
-				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),
-			tableData: [],
+			tableProps: [
-			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: '表名',
@@ -137,86 +147,231 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '搜索',
+					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
 				{
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					// type: this.$auth.hasPermi('base:equipment-plc:create')
+					// 	? 'button'
+					// 	: '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
-					color: 'success',
 					plain: true,
+					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
+				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
-				// },
-				// {
-				// 	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: {},
 		};
 	},
-	components: {
+	created() {
-		AddOrUpdate,
+		this.getList();
 	},
-	created() {},
 	methods: {
 		/** 覆盖 handleEmitFun 的默认实现 */
 		handleEmitFun({ action, payload }) {
-      console.log(payload)
 			switch (action) {
 				case 'update-collect':
-					updateEquipmentPlc(payload).then((response) => {
+					this.reset();
+					const tempForm = {};
+					Object.keys(this.form).forEach((key) => {
+						tempForm[key] = payload[key];
+					});
+					updateEquipmentPlc(tempForm).then((response) => {
 						this.$modal.msgSuccess('修改成功');
-						this.getDataList();
+						this.open = false;
+						this.getList();
 					});
 					break;
 			}
 		},
-		buttonClick(val) {
+		/** 查询列表 */
-			switch (val.btnName) {
+		getList() {
-				case 'search':
+			this.loading = true;
-					this.listQuery.pageNo = 1;
+			// 执行查询
-					this.listQuery.pageSize = 10;
+			getEquipmentPlcPage(this.queryParams).then((response) => {
-					this.listQuery.name = val.name;
+				this.list = response.data.list;
-					this.listQuery.plcTableName = val.plcTableName;
+				this.total = response.data.total;
-					this.getDataList();
+				this.loading = false;
-					break;
+				// this.tableKey = Math.random(); // method 1
-				case 'reset':
+			});
-					this.$refs.searchBarForm.resetForm();
+		},
-					this.listQuery = {
+		/** 取消按钮 */
-						pageSize: 10,
+		cancel() {
-						pageNo: 1,
+			this.open = false;
-						total: 1,
+			this.reset();
-					};
+		},
-					this.getDataList();
+		/** 表单重置 */
-					break;
+		reset() {
-				case 'add':
+			this.form = {
-					this.addOrEditTitle = '新增';
+				id: undefined,
-					this.addOrUpdateVisible = true;
+				plcTableName: undefined,
-					this.addOrUpdateHandle();
+				code: undefined,
-					break;
+				name: undefined,
-				case 'export':
+				enName: undefined,
-					this.handleExport();
+				description: undefined,
-					break;
+				collection: undefined,
-				default:
+			};
-					console.log(val);
+			this.resetForm('form');
-			}
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加实时数据采集配置';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			getEquipmentPlc(id).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改实时数据采集配置';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					updateEquipmentPlc(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentPlc(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?')
+				.then(function () {
+					return deleteEquipmentPlc(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有实时数据采集配置数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentPlcExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '实时数据采集配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
 		},
 	},
 };

src/views/base/equipmentPlcConnect/TableConfig.vue

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

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

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

@@ -12,7 +12,7 @@
 		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
-		:size="size || '50%'"
+		size="60%"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -29,107 +29,29 @@
 				<section v-for="(section, index) in sections" :key="section.key">
 					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
 
-					<div
+					<div class="form-part" v-if="section.key == 'base'">
-						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')"
-							v-model="form"
+							:dataForm="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
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
-						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 && !mode.includes('detail')"
+								v-if="section.tableBtn"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -149,12 +71,17 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					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>
 
@@ -169,10 +96,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>
@@ -209,7 +136,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData', 'size'],
+	props: ['sections', 'defaultMode', 'infoData'],
 	data() {
 		return {
 			mode: '',
@@ -218,8 +145,6 @@ export default {
 			total: 0,
 			form: {},
 			list: [],
-			eqList: [],
-			plcList: [],
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -241,17 +166,13 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
-						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
-						],
 					},
 				],
 				[
@@ -260,6 +181,7 @@ export default {
 						label: '单位',
 						prop: 'unit',
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						switch: true,
@@ -271,47 +193,6 @@ 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,
@@ -341,6 +222,7 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -348,11 +230,13 @@ export default {
 						input: true,
 						label: '标准值',
 						prop: 'defaultValue',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '描述',
 						prop: 'description',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -360,6 +244,7 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 			],
@@ -372,7 +257,6 @@ export default {
 			infoQuery: null, // 基本信息的请求
 			attrFormSubmitting: false,
 			attrListLoading: false,
-			shouldRefreshPageView: false,
 		};
 	},
 	computed: {
@@ -391,24 +275,11 @@ export default {
 			});
 		},
 		tableBtn() {
-			return this.sections[1].tableBtn;
+			return this.mode == 'detail' ? [] : 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) {
@@ -470,7 +341,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = !this.mode.includes('detail');
+					const isEdit = this.mode == 'edit';
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -484,9 +355,6 @@ export default {
 		},
 
 		handleCancel() {
-			if (this.shouldRefreshPageView) {
-				this.$emit('refreshDataList');
-			}
 			this.visible = false;
 		},
 
@@ -508,11 +376,9 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
-				equipmentParamType: '',
-				productionParamType: '',
 				alarmContent: '',
 			};
-			this.attrTitle = '添加参数绑定信息';
+			this.attrTitle = '添加设备绑定信息';
 			this.attrFormVisible = true;
 		},
 
@@ -525,14 +391,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',
@@ -544,7 +410,6 @@ export default {
 						params: { id: attrId },
 					});
 					if (res.code == 0) {
-						this.shouldRefreshPageView = true;
 						this.$message({
 							message: '删除成功',
 							type: 'success',
@@ -559,37 +424,35 @@ export default {
 		},
 
 		// 提交属性表
-		submitAttrForm() {
+		async submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
+			this.$refs['attrForm'].validate((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
+				},
+			});
 
-				const isEdit = this.attrForm.id != null;
+			if (res.code == 0) {
-				this.attrFormSubmitting = true;
+				this.closeAttrForm();
-				const res = await this.$axios({
+				this.$message({
-					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					message: `${isEdit ? '更新' : '创建'}成功`,
-					method: isEdit ? 'put' : 'post',
+					type: 'success',
-					data: {
+					duration: 1500,
-						...this.attrForm,
+					onClose: () => {
-						connectId: this.infoData.id,
+						this.getAttrList();
 					},
 				});
-
+			}
-				if (res.code == 0) {
+			this.attrFormSubmitting = false;
-					this.closeAttrForm();
-					this.$message({
-						message: `${isEdit ? '更新' : '创建'}成功`,
-						type: 'success',
-						duration: 1500,
-						onClose: () => {
-							this.getAttrList();
-							this.shouldRefreshPageView = true;
-						},
-					});
-				}
-				this.attrFormSubmitting = false;
-			});
 		},
 
 		closeAttrForm() {
@@ -598,7 +461,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

@@ -1,100 +0,0 @@
-/*
- * @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

@@ -1,535 +0,0 @@
-<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,10 +1,3 @@
-<!--
-    filename: CollectionConfig.vue
-    author: liubin
-    date: 2023-10-30 10:09:03
-    description:
--->
-
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
@@ -19,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -42,21 +34,17 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="30%"
+			width="700px"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<!-- <DialogForm v-if="open" ref="form" v-model="form" :rows="rows" /> -->
+			<DialogForm v-if="open" ref="form" :dataForm="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="[
@@ -64,13 +52,9 @@
 					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',
@@ -84,26 +68,18 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						{
+						this.$auth.hasPermi('base:equipment-plc-param:update')
-							type: 'edit',
+							? {
-							btnName: '修改',
+									type: 'edit',
-						},
+									btnName: '修改',
-						{
+							  }
-							type: 'delete',
+							: undefined,
-							btnName: '删除',
+						this.$auth.hasPermi('base:equipment-plc-param:delete')
-						},
+							? {
-						// this.$auth.hasPermi('equipment:collection-config-param:update')
+									type: 'delete',
-						// 	? {
+									btnName: '删除',
-						// 			type: 'edit',
+							  }
-						// 			btnName: '修改',
+							: undefined,
-						// 	  }
-						// 	: undefined,
-						// this.$auth.hasPermi('equipment:collection-config-param:delete')
-						// 	? {
-						// 			type: 'delete',
-						// 			btnName: '删除',
-						// 	  }
-						// 	: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
@@ -123,60 +99,67 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
-	components: { BasicDrawer, AddOrUpdate },
+	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: [
-				this.$auth.hasPermiAnd([
+				{
-					'base:equipment-plc-connect:query',
+					type: 'detail',
-					'base:equipment-plc-param:query'
+					btnName: '参数绑定',
-				])
+				},
-				? {
+				{
-						type: 'detail',
+					type: 'edit',
-						btnName: '参数绑定',
+					btnName: '修改',
-					} : undefined,
+				},
-				this.$auth.hasPermiAnd([
+				// {
-						'base:equipment-plc-connect:update',
+				// 	type: 'params-bind',
-						'base:equipment-plc-connect:query',
+				// 	btnName: '参数绑定',
-						'base:equipment-plc-param:create',
+				// },
-						'base:equipment-plc-param:update',
+				{
-						'base:equipment-plc-param:delete',
+					type: 'delete',
-						'base:equipment-plc-param:query'
+					btnName: '删除',
-					])
+				},
-					? {
+			],
-							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: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
+				// 	prop: 'createTime',
-				{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
+				// 	label: '添加时间',
-				{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
+				// 	fixed: true,
-				{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
+				// 	width: 180,
-				{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
+				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
+				// },
-				{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
+				{ 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: '查看绑定',
@@ -211,15 +194,13 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
-					filterable: true,
 				},
 				{
 					type: 'select',
-					label: '关联表编码',
+					label: '编码',
-					placeholder: '请选择关联表编码',
+					placeholder: '请选择编码',
 					param: 'plcId',
 					selectOptions: [],
-					filterable: true,
 				},
 				{
 					type: 'button',
@@ -228,21 +209,20 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
+					type: 'separate',
-						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
+					// type: this.$auth.hasPermi('base:equipment-plc:create')
-						? 'button'
+					// 	? 'button'
-						: '',
+					// 	: '',
-					// type: 'button',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('equipment:collection-config:export') ? 'button' : '',
+				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
 				// 	btnName: '导出',
 				// 	name: 'export',
 				// 	color: 'warning',
@@ -256,9 +236,7 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -270,9 +248,7 @@ export default {
 						label: '设备',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -283,7 +259,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				plcId: null,
 				equipmentId: null,
 			},
@@ -298,9 +274,7 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备名不能为空', trigger: 'blur' },
-						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -321,23 +295,6 @@ 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: '是否采集',
@@ -361,17 +318,14 @@ export default {
 		this.initSearchOptions();
 	},
 	methods: {
-		successSubmit() {
-      this.cancel()
-      this.getList()
-    },
 		async getEquipmentOptions() {
 			const res = await this.$axios({
-				url: '/base/equipment/listAll',
+				url: '/base/core-equipment/listAll',
 				method: 'get',
 			});
 			return res.data;
 		},
+
 		async getPlcOptions() {
 			const res = await this.$axios({
 				url: '/base/equipment-plc/listAll',
@@ -392,7 +346,7 @@ export default {
 					});
 					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
 						return {
-							name: item.code,
+							name: item.name,
 							id: item.id,
 						};
 					});
@@ -449,19 +403,6 @@ 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;
@@ -476,10 +417,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加设备采集配置';
+			this.title = '添加设备与实时采集关系表（一对多）';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init()
-			})
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -488,16 +426,35 @@ export default {
 			getEquipmentPlcConnect(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改设备采集配置';
+				this.title = '修改设备与实时采集关系表（一对多）';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
+			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, mode = 'detail') {
+		handleDetail(row) {
 			// debugger;
 			const {
 				id,
@@ -513,7 +470,7 @@ export default {
 				workshopSection,
 			} = row;
 			// 打开抽屉
-			this.editMode = mode;
+			this.editMode = 'detail';
 			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" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>

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

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

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

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

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

@@ -1,182 +0,0 @@
-<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.warning('代码复制失败')
+      this.$message.error('代码复制失败')
     })
   },
   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.warning('未传递 id 参数，无法查看 OA 请假信息');
+      this.$message.error('未传递 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.warning('未传递 id 参数，无法查看流程信息');
+      this.$message.error('未传递 id 参数，无法查看流程信息');
       return;
     }
     this.getDetail();
@@ -185,7 +185,7 @@ export default {
       this.processInstanceLoading = true;
       getProcessInstance(this.id).then(response => {
         if (!response.data) {
-          this.$message.warning('查询不到流程信息！');
+          this.$message.error('查询不到流程信息！');
           return;
         }
         // 设置流程信息

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

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

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

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

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

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