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

Reviewed-on: #454

.env.dev

@@ -12,10 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://172.16.33.187:48082'
-VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
-# VUE_APP_BASE_API = 'http://172.16.19.12:48082'
-
+VUE_APP_BASE_API = 'http://172.16.32.76:48080'
+# VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
+    "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:stage": "vue-cli-service build --mode stage",
@@ -49,7 +49,7 @@
     "bpmn-js-token-simulation": "0.10.0",
     "chinese-lunar": "^0.1.4",
     "clipboard": "2.0.8",
-    "code-brick-zj": "^1.1.1",
+    "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",

src/api/analysis/exception.js

@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-// 获得设备健康分析周期报表list
-export function getReportPage(query) {
-  return request({
-    url: '/analysis/equipment-health-auto-report/reportList',
-    method: 'get',
-    params: query
-  })
-}// 获得设备健康分析累计
-export function getQueryPage(query) {
-  return request({
-    url: '/analysis/equipment-health-auto-report/queryList',
-    method: 'get',
-    params: query
-  })
-}
-// 导出
-export function exportReportExcel(query) {
-  return request({
-    url: '/analysis/equipment-health-auto-report/export-excel-report',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-export function exportQueryExcel(query) {
-  return request({
-    url: '/analysis/equipment-health-auto-report/export-excel-query',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/base/equipment.js

@@ -59,34 +59,3 @@ export function getEquipmentAll() {
     method: 'get'
   })
 }
-
-export function getTree(query) {
-  return request({
-		url: '/base/factory/getTreeSimple',
-		method: 'get',
-		params: query,
-	});
-}
-
-export function getEquipmentOverall(data) {
-	return request({
-		url: '/monitoring/equipment-overall/get',
-		method: 'post',
-		data: data,
-	});
-}
-
-export function getParamMonitor(data) {
-	return request({
-		url: '/monitoring/equipment-monitor/paramMonitor',
-		method: 'post',
-		data: data,
-	});
-}
-export function getAlarmDet(data) {
-	return request({
-		url: 'monitoring/equipment-overall/alarmDet',
-		method: 'post',
-		data: data,
-	});
-}

src/api/base/equipmentSectionShutdownLog.js

@@ -1,64 +0,0 @@
-import request from '@/utils/request'
-
-// 创建计划停机配置
-export function createPlan(data) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新计划停机配置
-export function updatePlan(data) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得计划停机配置
-export function getPlan(id) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 计划停机配置list
-export function planList(query) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/planList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 停机记录list
-export function errorList(query) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/errorList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出计划停机配置list
-export function exportPlanList(query) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/exportPlanList',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-// 导出停机记录list
-export function exportErrorList(query) {
-  return request({
-    url: '/base/equipment-section-shutdown-log/exportErrorList',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/base/equipmentType.js

@@ -52,5 +52,3 @@ export function exportEquipmentTypeExcel(query) {
     responseType: 'blob'
   })
 }
-
-

src/api/core/analysis/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2026-04-28 11:13:17
+ * @LastEditTime: 2025-01-08 15:47:17
  * @LastEditors: zwq
  * @Description:
  */
@@ -14,13 +14,6 @@ export function getYieldAnalysisPageData(data) {
     data: data
   })
 }
-export function getYieldAnalysisHandlePageData(data) {
-  return request({
-    url: '/analysis/production-analysis/getOutputManual',
-    method: 'post',
-    data: data
-  })
-}
 
 export function getCT(data) {
   return request({
@@ -53,40 +46,3 @@ export function getNewCTDet(data) {
     data:data
 	});
 }
-
-// 获得产线累计oee与teep
-export function listHeader() {
-  return request({
-		url: '/analysis/production-oee-auto-report/listHeader',
-    method: 'get',
-	});
-}
-
-// 获得产线报表oee与teep
-export function listLineReport(query) {
-  return request({
-		url: '/analysis/production-oee-auto-report/listLineReport',
-    method: 'get',
-    params: query,
-	});
-}
-
-// 导出生产分析teepExcel
-export function exportTeepExcel(query) {
-  return request({
-    url: '/analysis/production-oee-auto-report/export-excel-teep',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 导出生产分析oeeExcel
-export function exportOeeExcel(query) {
-  return request({
-    url: '/analysis/production-oee-auto-report/export-excel-oee',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/core/monitoring/auto.js

@@ -50,15 +50,6 @@ export function getPdlAutoReportNewSearchNow(data) {
 	});
 }
 
-export function getPdlAutoReportNewSearchLastGroup(data) {
-	return request({
-		url: '/monitoring/production-monitor/getPdlAutoReportNewSearchLastGroup',
-		method: 'post',
-		data: data,
-		timeout: 60000,
-	});
-}
-
 
 // 班组自动报表分页
 export function getTeamReportPage(data) {
@@ -102,17 +93,3 @@ export function getProcessAutoReportNew(data) {
 		data: data,
 	});
 }
-export function getPLlistByFactory(data) {
-	return request({
-		url: 'base/production-line/listByFactory',
-		method: 'post',
-		data: data,
-	});
-}
-export function getProcessAutoReportLastGroup(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportLastGroup',
-		method: 'post',
-		data: data,
-	});
-}

src/api/core/monitoring/data24.js

@@ -1,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2026-03-30 15:01:38
- * @LastEditors: zwq
- * @Description:
+ * @LastEditTime: 2023-09-15 14:12:26
+ * @LastEditors: DY
+ * @Description: 
  */
 import request from '@/utils/request'
 
@@ -15,12 +15,3 @@ export function getPdlDataOneDay(data) {
     data: data
   })
 }
-
-// 获得近24小时产线生产数据-新版
-export function getSectionDataOneDay(data) {
-  return request({
-    url: '/monitoring/production-monitor/getSectionDataOneDay',
-    method: 'post',
-    data: data
-  })
-}

src/api/group/Schedule.js

@@ -141,13 +141,3 @@ export function getPerView(data) {
     data:data
   })
 }
-
-// 导出 Excel
-export function exportExcel(query) {
-  return request({
-    url: '/base/group-scheduling-plan/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/group/groupSetting.js

@@ -26,13 +26,6 @@ export function getGroup(id) {
     method: 'get'
   })
 }
-// 检查更新-生产班组
-export function updateIsProduction(id) {
-  return request({
-    url: '/base/group-team/updateIsProduction?id=' + id,
-    method: 'get'
-  })
-}
 
 // 获得班组基础信息分页
 export function getGroupPage(query) {

src/api/group/holidaySetting.js

@@ -90,29 +90,3 @@ export function getEnableData() {
     method: 'get',
   })
 }
-
-// 解除继承节假日
-export function disExtends(data) {
-  return request({
-    url: '/base/group-holiday/disExtends',
-    method: 'post',
-    data: data
-  })
-}
-// 恢复继承节假日
-export function reExtends(data) {
-  return request({
-    url: '/base/group-holiday/reExtends',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得部门节假日继承设置信息设置
-export function getSet(query) {
-  return request({
-    url: '/base/group-holiday-dept-set/getSet',
-    method: 'get',
-    params: query
-  })
-}

src/api/monitoring/defectSummary.js

@@ -1,56 +0,0 @@
-import request from '@/utils/request'
-
-// 创建能源监控配置
-export function getDefectSummaryTable(data) {
-	return request({
-		url: '/extend/check-gaozhun-record/defectSummaryTable',
-		method: 'post',
-		data: data,
-	});
-}
-export function getTranslucentPage(data) {
-	return request({
-		url: '/monitoring/translucent/page',
-		method: 'get',
-		params: data,
-	});
-}
-
-export function exportTranslucent(data) {
-	return request({
-		url: '/monitoring/translucent/export-excel',
-		method: 'get',
-		params: data,
-		responseType: 'blob',
-	});
-}
-
-export function getDefectAnalysis(data) {
-	return request({
-		url: '/extend/check-gaozhun-record/defectAnalysis',
-		method: 'post',
-		data: data,
-	});
-}
-
-export function getSectionDefect(data) {
-	return request({
-		url: '/extend/check-gaozhun-record/sectionDefect',
-		method: 'post',
-		data: data,
-	});
-}
-export function getDefectSummaryChart(data) {
-	return request({
-		url: '/extend/check-gaozhun-record/defectSummaryChart',
-		method: 'post',
-		data: data,
-	});
-}
-export function getDefectSummaryDet(data) {
-	return request({
-		url: '/extend/check-gaozhun-record/defectSummaryDet',
-		method: 'post',
-		data: data,
-	});
-}

src/api/monitoring/qualityIsra.js

@@ -1,63 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-12-08 15:26:59
- * @LastEditTime: 2023-12-11 15:21:44
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-export function getQualityIsraPage(query) {
-  return request({
-		url: '/extend/check-isra-statistics/getIsraData',
-		method: 'get',
-		params: query,
-	});
-}
-
-export function getQualityIsraDayMap(query) {
-  return request({
-    url: '/base/quality-isra-statistics/dayMap',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getQualityIsraWeekMap(query) {
-  return request({
-    url: '/base/quality-isra-statistics/weekMap',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getQualityIsraMonthMap(query) {
-  return request({
-    url: '/base/quality-isra-statistics/monthMap',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getQualityIsraDayList(query) {
-  return request({
-    url: '/base/quality-isra-statistics/dayList',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getQualityIsraWeekList(query) {
-  return request({
-    url: '/base/quality-isra-statistics/weekList',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getQualityIsraMonthList(query) {
-  return request({
-    url: '/base/quality-isra-statistics/monthList',
-    method: 'get',
-    params: query
-  })
-}

src/api/ssdl/product&recipe.js

@@ -0,0 +1,154 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 09:29:14
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得原料分页
+export function getProductPage(query) {
+  return request({
+    url: '/wms/material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得原料
+export function getProduct(id) {
+  return request({
+    url: '/wms/material/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除原料
+export function deleteProduct(id) {
+  return request({
+    url: '/wms/material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProduct(data) {
+  return request({
+    url: '/wms/material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProduct(data) {
+  return request({
+    url: '/wms/material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 获得工艺分页
+export function getProcessPage(query) {
+  return request({
+    url: '/wms/process/page/group/by',
+    method: 'get',
+    params: query
+  })
+}
+// 获得工艺点击展开表格
+export function getProcessDetailPage(query) {
+  return request({
+    url: '/wms/process/page/group/by/detail',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺
+export function deleteProcess(id) {
+  return request({
+    url: '/wms/process/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 批量删除工艺
+export function deleteProcessList(ids) {
+  return request({
+    url: '/wms/process/delete-list?ids=' + ids,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProcess(data) {
+  return request({
+    url: '/wms/process/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcess(data) {
+  return request({
+    url: '/wms/process/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcess(id) {
+  return request({
+    url: '/wms/process/get?id=' + id,
+    method: 'get'
+  })
+}
+// 工艺设备原料分页
+export function getProcessMaterialPage(query) {
+  return request({
+    url: '/wms/process-equipment-material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺设备原料
+export function deleteProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 更新
+export function updateProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备分页
+export function getEquipmentPage(query) {
+  return request({
+    url: '/wms/equipment/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/ssdl/taskList.js

@@ -0,0 +1,60 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-18 15:42:19
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得任务分页
+export function getTaskPage(query) {
+  return request({
+    url: '/wms/job-main-task/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得任务
+export function getTask(id) {
+  return request({
+    url: '/wms/job-main-task/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得任务日志分页
+export function getTaskLogPage(query) {
+  return request({
+    url: '/wms/job-main-task-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新
+export function updateTask(data) {
+  return request({
+    url: '/wms/job-main-task/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 根据区域id获取该区域下的库位信息
+export function getRegion(id) {
+  return request({
+    url: '/wms/line-edge-library/get-by-region-id?regionId=' + id,
+    method: 'get'
+  })
+}
+
+// 创建
+export function createPCTask(data) {
+  return request({
+    url: '/wms/job-main-task/pc-create-task',
+    method: 'post',
+    data: data
+  })
+}

src/api/visualization/visualization.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getLineEdgeLibraryList(data) {
+  return request({
+		url: '/wms/line-edge-library/list',
+		method: 'get',
+		params: data,
+	});
+}

src/components/ButtonNav/index.vue

@@ -1,3 +1,10 @@
+<!--
+    filename: index.vue
+    author: liubin
+    date: 2024-04-02 09:49:36
+    description:
+-->
+
 <template>
   <!-- 按钮切换 -->
   <div v-if="buttonMode" class="button-nav">
@@ -47,7 +54,7 @@ export default {
     };
   },
   created() {
-    // this.currentMenu = this.menus[0];
+    this.currentMenu = this.menus[0];
   },
   watch: {
     currentMenu(val) {

src/components/DialogForm/index.vue

@@ -6,48 +6,104 @@
 -->
 
 <template>
-  <el-form ref="form" :model="form" :label-width="`${labelWidth}px`" :size="size" :label-position="labelPosition"
-    v-loading="formLoading">
-    <el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
-      <el-col v-for="col in row" :key="col.label" :span="24 / row.length">
-        <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
-          <el-input v-if="col.input" v-model="form[col.prop]" @change="$emit('update', form)"
-            :placeholder="`请输入${col.label}`" v-bind="col.bind" />
-          <el-input v-if="col.textarea" type="textarea" v-model="form[col.prop]" @change="$emit('update', form)"
-            :placeholder="`请输入${col.label}`" v-bind="col.bind" />
-          <el-select v-if="col.select" v-model="form[col.prop]" :placeholder="`请选择${col.label}`"
-            @change="$emit('update', form)" v-bind="col.bind">
-            <el-option v-for="opt in optionListOf[col.prop]" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-          <el-date-picker v-if="col.datetime" v-model="form[col.prop]" type="datetime" :placeholder="`请选择${col.label}`"
-            value-format="timestamp" v-bind="col.bind"></el-date-picker>
-          <el-switch v-if="col.switch" v-model="form[col.prop]" active-color="#0b58ff" inactive-color="#e1e1e1"
-            v-bind="col.bind" @change="handleSwitchChange(col.prop)"></el-switch>
-          <component v-if="col.subcomponent" :key="col.key" :is="col.subcomponent" :inlineStyle="col.style"></component>
+	<el-form
+		ref="form"
+		:model="form"
+		:label-width="`${labelWidth}px`"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
+			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
+				<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
+					<el-input
+						v-if="col.input"
+						v-model="form[col.prop]"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						v-bind="col.bind" />
+					<el-input
+						v-if="col.textarea"
+						type="textarea"
+						v-model="form[col.prop]"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						v-bind="col.bind" />
+					<el-select
+						v-if="col.select"
+						v-model="form[col.prop]"
+						:placeholder="`请选择${col.label}`"
+						@change="$emit('update', form)"
+						v-bind="col.bind">
+						<el-option
+							v-for="opt in optionListOf[col.prop]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+					<el-date-picker
+						v-if="col.datetime"
+						v-model="form[col.prop]"
+						type="datetime"
+						:placeholder="`请选择${col.label}`"
+						value-format="timestamp"
+						v-bind="col.bind"></el-date-picker>
+					<el-switch
+						v-if="col.switch"
+						v-model="form[col.prop]"
+						active-color="#0b58ff"
+						inactive-color="#e1e1e1"
+						v-bind="col.bind"></el-switch>
+					<component
+						v-if="col.subcomponent"
+						:key="col.key"
+						:is="col.subcomponent"
+						:inlineStyle="col.style"></component>
 
-          <div class="upload-area" :class="uploadOpen ? '' : 'height-48'" ref="uploadArea" v-if="col.upload">
-            <span class="close-icon" :class="uploadOpen ? 'open' : ''">
-              <el-button type="text" icon="el-icon-arrow-right" @click="handleFilesOpen" />
-            </span>
-            <!-- :file-list="uploadedFileList" -->
-            <el-upload class="upload-in-dialog" v-if="col.upload" :action="uploadUrl" :headers="uploadHeaders"
-              :show-file-list="false" icon="el-icon-upload2" :before-upload="beforeUpload"
-              :on-success="handleUploadSuccess" v-bind="col.bind">
-              <el-button size="mini" :disabled="col.bind?.disabled || false">
-                <svg-icon icon-class="icon-upload" style="color: inherit"></svg-icon>
-                上传文件
-              </el-button>
-              <div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
-                {{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
-              </div>
-            </el-upload>
-            <uploadedFile class="file" v-for="file in form[col.prop] || []" :file="file" :key="file.fileUrl"
-              @delete="handleDeleteFile(file)" @Preview="handlePreview(file)" />
-          </div>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea"
+						v-if="col.upload">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="handleFilesOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							class="upload-in-dialog"
+							v-if="col.upload"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:before-upload="beforeUpload"
+							:on-success="handleUploadSuccess"
+							v-bind="col.bind">
+							<el-button size="mini" :disabled="col.bind?.disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
+								上传文件
+							</el-button>
+							<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
+								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+							</div>
+						</el-upload>
+						<uploadedFile
+							class="file"
+							v-for="file in form[col.prop] || []"
+							:file="file"
+							:key="file.fileUrl"
+							@delete="handleDeleteFile(file)"
+							@Preview="handlePreview(file)" />
+					</div>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
 </template>
 
 <script>
@@ -78,8 +134,7 @@ const uploadedFile = {
 	data() {
 		return {};
 	},
-  methods: {
-
+	methods: {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
@@ -196,12 +251,7 @@ export default {
 		// 处理 options
 		this.handleOptions();
 	},
-  methods: {
-    handleSwitchChange(prop) {
-      // 触发 update 事件，将最新的 form 数据传递给父组件
-      this.$emit('update', { ...this.form });
-      console.log(`switch ${prop} 变化：`, this.form[prop]);
-    },
+	methods: {
 		/** 模拟透传 ref  */
 		validate(cb) {
 			return this.$refs.form.validate(cb);

src/mixins/basic-page.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-02 09:33:29
+ * @LastEditTime: 2025-11-28 09:35:03
  * @Description:
  */
 export default {
@@ -69,7 +69,7 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
       } else {
         this.otherMethods(val)
       }

src/permission.js

@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login','screenbg',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -25,9 +25,9 @@ router.beforeEach((to, from, next) => {
         // 获取字典数据 add by 芋艿
         store.dispatch('dict/loadDictDatas')
         // 判断当前用户是否已拉取完 user_info 信息
-        store.dispatch('GetInfo').then(() => {
+        store.dispatch('GetInfo').then(userInfo => {
           isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
+          store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => {
             // 根据 roles 权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

src/router/index.js

@@ -28,223 +28,277 @@ Vue.use(Router)
 
 // 公共路由
 export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: (resolve) => require(['@/views/redirect'], resolve)
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: (resolve) => require(['@/views/login'], resolve),
-    hidden: true
-  },
-  {
-    path: '/sso',
-    component: (resolve) => require(['@/views/sso'], resolve),
-    hidden: true
-  },
-  {
-    path: '/social-login',
-    component: (resolve) => require(['@/views/socialLogin'], resolve),
-    hidden: true
-  },
-  {
-    path: '/404',
-    component: (resolve) => require(['@/views/error/404'], resolve),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: (resolve) => require(['@/views/error/401'], resolve),
-    hidden: true
-  },
-  {
-    path: '/print-design',
-    component: (resolve) => require(['@/views/print/design'], resolve),
-    hidden: true
-  },
-  {
-    path: "",
-    component: Layout,
-    redirect: "index",
-    children: [
-      {
-        path: "index",
-        component: (resolve) => require(["@/views/home/index"], resolve),
-        name: "首页",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-        hidden: true
-      },
-    ],
-  },
-  {
-    path: '/user',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [{
-      path: 'profile',
-      component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
-      name: 'Profile',
-      meta: { title: '个人中心', icon: 'user' }
-    }, {
-      path: 'notify-message',
-      component: (resolve) => require(['@/views/system/notify/my/index'], resolve),
-      name: 'MyNotifyMessage',
-      meta: { title: '我的站内信', icon: 'message' },
-    }]
-  },
-  {
-    path: '/dict',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'type/data/:dictId(\\d+)',
-      component: (resolve) => require(['@/views/system/dict/data'], resolve),
-      name: 'SystemDictData',
-      meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' }
-    }
-    ]
-  },
-  {
-    path: '/job',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'log',
-      component: (resolve) => require(['@/views/infra/job/log'], resolve),
-      name: 'InfraJobLog',
-      meta: { title: '调度日志', activeMenu: '/infra/job' }
-    }
-    ]
-  }, {
-    path: '/codegen',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'edit/:tableId(\\d+)',
-      component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
-      name: 'InfraCodegenEditTable',
-      meta: { title: '修改生成配置', activeMenu: '/infra/codegen' }
-    }
-    ]
-  },
-  {
-    path: '/bpm',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [{
-      path: 'oa/leave/create',
-      component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve),
-      name: 'BpmOALeaveCreate',
-      meta: { title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave' }
-    }, {
-      path: 'oa/leave/detail',
-      component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve),
-      name: 'BpmOALeaveDetail',
-      meta: { title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave' }
-    }
-    ]
-  },
-  {
-    path: '/bpm',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'manager/form/edit',
-      component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve),
-      name: 'BpmFormEditor',
-      meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' }
-    }, {
-      path: 'manager/definition',
-      component: (resolve) => require(['@/views/bpm/definition/index'], resolve),
-      name: 'BpmProcessDefinition',
-      meta: { title: '流程定义', activeMenu: '/bpm/manager/model' }
-    }, {
-      path: 'manager/model/design',
-      component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve),
-      name: 'BpmModelEditor',
-      meta: { title: '设计流程', activeMenu: '/bpm/manager/model' }
-    }, {
-      path: 'process-instance/create',
-      component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve),
-      name: 'BpmProcessInstanceCreate',
-      meta: { title: '发起流程', activeMenu: '/bpm/task/my' }
-    }, {
-      path: 'process-instance/detail',
-      component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
-      name: 'BpmProcessInstanceDetail',
-      meta: { title: '流程详情', activeMenu: '/bpm/task/my' }
-    }
-    ]
-  },
-  {
-    path: '/property',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'value/:propertyId(\\d+)',
-      component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
-      name: 'ProductPropertyValue',
-      meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
-    }
-    ]
-  },
-  {
-    path: '/spu',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'edit/:spuId(\\d+)',
-      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-      name: 'ProductSpuUpdate',
-      meta: { title: '修改商品', activeMenu: '/product/spu' }
-    },
-    {
-      path: 'add',
-      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-      name: 'ProductSpuCreate',
-      meta: { title: '添加商品', activeMenu: '/product/spu' }
-    }
-    ]
-  },
-  {
-    path: '/trade/order',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'detail',
-        name: 'TradeOrderDetail',
-        hidden: true,
-        meta: { title: '订单详情' },
-        component: (resolve) => require(['@/views/mall/trade/order/detail'], resolve)
-      }
-    ]
-  },
-  {
-    path: '/pay',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: 'order/submit',
-      name: 'PayOrderSubmit',
-      hidden: true,
-      meta: {
-        title: '收银台',
-        noCache: true
-      },
-      component: (resolve) => require(['@/views/pay/order/submit'], resolve)
-    }]
-  }
-]
+	{
+		path: '/redirect',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: '/redirect/:path(.*)',
+				component: (resolve) => require(['@/views/redirect'], resolve),
+			},
+		],
+	},
+	{
+		path: '/login',
+		component: (resolve) => require(['@/views/login'], resolve),
+		// hidden: true,
+	},
+
+	{
+		path: '/sso',
+		component: (resolve) => require(['@/views/sso'], resolve),
+		hidden: true,
+	},
+	{
+		path: '/social-login',
+		component: (resolve) => require(['@/views/socialLogin'], resolve),
+		hidden: true,
+	},
+	{
+		path: '/404',
+		component: (resolve) => require(['@/views/error/404'], resolve),
+		hidden: true,
+	},
+	{
+		path: '/401',
+		component: (resolve) => require(['@/views/error/401'], resolve),
+		hidden: true,
+	},
+	{
+		path: '/print-design',
+		component: (resolve) => require(['@/views/print/design'], resolve),
+		hidden: true,
+	},
+	{
+		path: '',
+		component: Layout,
+		redirect: 'index',
+		children: [
+			{
+				path: 'index',
+				component: (resolve) => require(['@/views/home/index'], resolve),
+				name: '首页',
+				meta: { title: '首页', icon: 'dashboard', affix: true },
+				hidden: true,
+			},
+		],
+	},
+	{
+		path: '/screenbg',
+		component: () =>
+			import(
+				/* webpackChunkName: "about" */ '@/views/productionVisualization/equipmentBoard'
+			),
+		name: 'screenbg',
+		meta: { title: '大屏', icon: 'chart' },
+	},
+	{
+		path: '/user',
+		component: Layout,
+		hidden: true,
+		redirect: 'noredirect',
+		children: [
+			{
+				path: 'profile',
+				component: (resolve) =>
+					require(['@/views/system/user/profile/index'], resolve),
+				name: 'Profile',
+				meta: { title: '个人中心', icon: 'user' },
+			},
+			{
+				path: 'notify-message',
+				component: (resolve) =>
+					require(['@/views/system/notify/my/index'], resolve),
+				name: 'MyNotifyMessage',
+				meta: { title: '我的站内信', icon: 'message' },
+			},
+		],
+	},
+	{
+		path: '/dict',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'type/data/:dictId(\\d+)',
+				component: (resolve) => require(['@/views/system/dict/data'], resolve),
+				name: 'SystemDictData',
+				meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' },
+			},
+		],
+	},
+	{
+		path: '/job',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'log',
+				component: (resolve) => require(['@/views/infra/job/log'], resolve),
+				name: 'InfraJobLog',
+				meta: { title: '调度日志', activeMenu: '/infra/job' },
+			},
+		],
+	},
+	{
+		path: '/codegen',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'edit/:tableId(\\d+)',
+				component: (resolve) =>
+					require(['@/views/infra/codegen/editTable'], resolve),
+				name: 'InfraCodegenEditTable',
+				meta: { title: '修改生成配置', activeMenu: '/infra/codegen' },
+			},
+		],
+	},
+	{
+		path: '/bpm',
+		component: Layout,
+		hidden: true,
+		redirect: 'noredirect',
+		children: [
+			{
+				path: 'oa/leave/create',
+				component: (resolve) =>
+					require(['@/views/bpm/oa/leave/create'], resolve),
+				name: 'BpmOALeaveCreate',
+				meta: {
+					title: '发起 OA 请假',
+					icon: 'form',
+					activeMenu: '/bpm/oa/leave',
+				},
+			},
+			{
+				path: 'oa/leave/detail',
+				component: (resolve) =>
+					require(['@/views/bpm/oa/leave/detail'], resolve),
+				name: 'BpmOALeaveDetail',
+				meta: {
+					title: '查看 OA 请假',
+					icon: 'view',
+					activeMenu: '/bpm/oa/leave',
+				},
+			},
+		],
+	},
+	{
+		path: '/bpm',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'manager/form/edit',
+				component: (resolve) =>
+					require(['@/views/bpm/form/formEditor'], resolve),
+				name: 'BpmFormEditor',
+				meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' },
+			},
+			{
+				path: 'manager/definition',
+				component: (resolve) =>
+					require(['@/views/bpm/definition/index'], resolve),
+				name: 'BpmProcessDefinition',
+				meta: { title: '流程定义', activeMenu: '/bpm/manager/model' },
+			},
+			{
+				path: 'manager/model/design',
+				component: (resolve) =>
+					require(['@/views/bpm/model/modelEditor'], resolve),
+				name: 'BpmModelEditor',
+				meta: { title: '设计流程', activeMenu: '/bpm/manager/model' },
+			},
+			{
+				path: 'process-instance/create',
+				component: (resolve) =>
+					require(['@/views/bpm/processInstance/create'], resolve),
+				name: 'BpmProcessInstanceCreate',
+				meta: { title: '发起流程', activeMenu: '/bpm/task/my' },
+			},
+			{
+				path: 'process-instance/detail',
+				component: (resolve) =>
+					require(['@/views/bpm/processInstance/detail'], resolve),
+				name: 'BpmProcessInstanceDetail',
+				meta: { title: '流程详情', activeMenu: '/bpm/task/my' },
+			},
+		],
+	},
+	{
+		path: '/property',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'value/:propertyId(\\d+)',
+				component: (resolve) =>
+					require(['@/views/mall/product/property/value'], resolve),
+				name: 'ProductPropertyValue',
+				meta: {
+					title: '商品属性值',
+					icon: '',
+					activeMenu: '/product/property',
+				},
+			},
+		],
+	},
+	{
+		path: '/spu',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'edit/:spuId(\\d+)',
+				component: (resolve) =>
+					require(['@/views/mall/product/spu/save'], resolve),
+				name: 'ProductSpuUpdate',
+				meta: { title: '修改商品', activeMenu: '/product/spu' },
+			},
+			{
+				path: 'add',
+				component: (resolve) =>
+					require(['@/views/mall/product/spu/save'], resolve),
+				name: 'ProductSpuCreate',
+				meta: { title: '添加商品', activeMenu: '/product/spu' },
+			},
+		],
+	},
+	{
+		path: '/trade/order',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'detail',
+				name: 'TradeOrderDetail',
+				hidden: true,
+				meta: { title: '订单详情' },
+				component: (resolve) =>
+					require(['@/views/mall/trade/order/detail'], resolve),
+			},
+		],
+	},
+	{
+		path: '/pay',
+		component: Layout,
+		hidden: true,
+		children: [
+			{
+				path: 'order/submit',
+				name: 'PayOrderSubmit',
+				hidden: true,
+				meta: {
+					title: '收银台',
+					noCache: true,
+				},
+				component: (resolve) => require(['@/views/pay/order/submit'], resolve),
+			},
+		],
+	},
+];
 
 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;

src/store/modules/permission.js

@@ -1,5 +1,4 @@
 import {constantRoutes} from '@/router'
-import {getRouters} from '@/api/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
 import {toCamelCase} from "@/utils";
@@ -27,22 +26,25 @@ const permission = {
     },
   },
   actions: {
-    // 生成路由
-    GenerateRoutes({commit}) {
+    /**
+     * 生成路由
+     *
+     * @param commit commit 函数
+     * @param menus  路由参数
+     */
+    GenerateRoutes({commit}, menus) {
       return new Promise(resolve => {
-        // 向后端请求路由数据（菜单）
-        getRouters().then(res => {
-          const sdata = JSON.parse(JSON.stringify(res.data)) // 【重要】用于菜单中的数据
-          const rdata = JSON.parse(JSON.stringify(res.data)) // 用于最后添加到 Router 中的数据
-          const sidebarRoutes = filterAsyncRouter(sdata)
-          const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-          rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
-          commit('SET_ROUTES', rewriteRoutes)
-          commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
-          commit('SET_DEFAULT_ROUTES', sidebarRoutes)
-          commit('SET_TOPBAR_ROUTES', sidebarRoutes)
-          resolve(rewriteRoutes)
-        })
+        // 将 menus 菜单，转换为 route 路由数组
+        const sdata = JSON.parse(JSON.stringify(menus)) // 【重要】用于菜单中的数据
+        const rdata = JSON.parse(JSON.stringify(menus)) // 用于最后添加到 Router 中的数据
+        const sidebarRoutes = filterAsyncRouter(sdata)
+        const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+        rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
+        commit('SET_ROUTES', rewriteRoutes)
+        commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
+        commit('SET_DEFAULT_ROUTES', sidebarRoutes)
+        commit('SET_TOPBAR_ROUTES', sidebarRoutes)
+        resolve(rewriteRoutes)
       })
     }
   }

src/utils/request.js

@@ -1,10 +1,10 @@
 import axios from 'axios'
-import { Message, MessageBox, Notification, Loading } from 'element-ui'
+import {Message, MessageBox, Notification, Loading} from 'element-ui'
 import store from '@/store'
-import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
+import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { getPath, getTenantEnable } from "@/utils/ruoyi";
-import { refreshToken } from "@/api/login";
+import {getPath, getTenantEnable} from "@/utils/ruoyi";
+import {refreshToken} from "@/api/login";
 
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@@ -86,7 +86,7 @@ service.interceptors.request.use(config => {
     for (const propName of Object.keys(config.params)) {
       const value = config.params[propName];
       const part = encodeURIComponent(propName) + '='
-      if (value !== null && typeof (value) !== "undefined") {
+      if (value !== null && typeof(value) !== "undefined") {
         if (typeof value === 'object') {
           for (const key of Object.keys(value)) {
             let params = propName + '[' + key + ']';
@@ -104,9 +104,9 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-  tryHideFullScreenLoading()
-  console.log(error)
-  Promise.reject(error)
+    tryHideFullScreenLoading()
+    console.log(error)
+    Promise.reject(error)
 })
 
 // 响应拦截器
@@ -176,38 +176,36 @@ service.interceptors.response.use(async res => {
         + '<div>5 分钟搭建本地环境</div>',
     })
     return Promise.reject(new Error(msg))
-  } else if (code === 400) {
-    //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息
-    return res.data
   } else if (code !== 200) {
     if (msg === '无效的刷新令牌') { // hard coding：忽略这个提示，直接登出
       console.log(msg)
     } else {
-      //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息
-      return res.data
+      Notification.error({
+        title: msg
+      })
     }
     return Promise.reject('error')
   } else {
     return res.data
   }
 }, error => {
-  tryHideFullScreenLoading()
-  console.log('err' + error)
-  let { message } = error;
-  if (message === "Network Error") {
-    message = "后端接口连接异常";
-  } else if (message.includes("timeout")) {
-    message = "系统接口请求超时";
-  } else if (message.includes("Request failed with status code")) {
-    message = "系统接口" + message.substr(message.length - 3) + "异常";
+    tryHideFullScreenLoading()
+    console.log('err' + error)
+    let {message} = error;
+    if (message === "Network Error") {
+      message = "后端接口连接异常";
+    } else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
   }
-  Message({
-    message: message,
-    type: 'error',
-    duration: 5 * 1000
-  })
-  return Promise.reject(error)
-}
 )
 
 export function getBaseHeader() {
@@ -221,10 +219,10 @@ function handleAuthorized() {
   if (!isRelogin.show) {
     isRelogin.show = true;
     MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-      confirmButtonText: '重新登录',
-      cancelButtonText: '取消',
-      type: 'warning'
-    }
+        confirmButtonText: '重新登录',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
     ).then(() => {
       isRelogin.show = false;
       store.dispatch('LogOut').then(() => {

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

@@ -6,27 +6,35 @@
 -->
 
 <template>
-  <el-drawer :visible="visible" :show-close="false" :wrapper-closable="false" class="drawer" custom-class="mes-drawer"
-    :size="size || '50%'" @closed="$emit('destroy')">
-    <SmallTitle slot="title">
-      {{
-      mode.includes('detail')
-      ? '详情'
-      : mode.includes('edit')
-      ? '编辑'
-      : '新增'
-      }}
-    </SmallTitle>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		:size="size || '50%'"
+		@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="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'"
-            style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
-            <el-skeleton v-if="!showForm" animated />
-            <!-- <BaseInfoForm
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
+						<el-skeleton v-if="!showForm" animated />
+						<!-- <BaseInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							ref="form"
@@ -34,87 +42,141 @@
 							v-model="form"
 							: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>
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.equipmentName }}
+								</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									关联表名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.plcName }}
+								</div>
+							</el-col>
+						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.equipmentId"
+											filterable
+											clearable
+											placeholder="请选择设备">
+											<el-option
+												v-for="eq in eqList"
+												:key="eq.id"
+												:label="eq.name"
+												:value="eq.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备关联表名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.plcId"
+											filterable
+											clearable
+											placeholder="请选择关联表">
+											<el-option
+												v-for="plc in plcList"
+												:key="plc.id"
+												:label="plc.plcTableName"
+												:value="plc.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
+					</div>
 
-          <div v-if="section.key == 'attrs'" style="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" @emitFun="handleEmitFun">
-              <!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+					<div
+						v-if="section.key == 'attrs'"
+						style="position: relative; margin-top: 12px">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加参数
+							</el-button>
+						</div>
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
-              <method-btn v-if="section.tableBtn && !mode.includes('detail')" slot="handleBtn" label="操作"
-                :method-list="tableBtn" @clickBtn="handleTableBtnClick" />
-            </base-table>
+							<method-btn
+								v-if="section.tableBtn && !mode.includes('detail')"
+								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>
+						<!-- 分页组件 -->
+						<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 type="primary" v-if="!mode.includes('detail')" @click="handleSave">
-          保存
-        </el-button>
-      </div>
-    </div>
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button
+					type="primary"
+					v-if="!mode.includes('detail')"
+					@click="handleSave">
+					保存
+				</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">
-      <!-- :disabled="mode.includes('detail')" -->
-      <DialogForm v-if="attrFormVisible" ref="attrForm" v-model="attrForm"  :data-form="attrForm"
-        :rows="attrRows"
-        @update="handleAttrFormUpdate"/>
-    </base-dialog>
-  </el-drawer>
+		<!-- 属性对话框 -->
+		<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">
+			<!-- :disabled="mode.includes('detail')" -->
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
 </template>
 
 <script>
@@ -170,9 +232,7 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
-        alarmContent: '',
-        displayTip: false,
-        alarmTip: false,
+				alarmContent: '',
 			},
 			attrFormVisible: false,
 			attrRows: [
@@ -282,27 +342,7 @@ export default {
 							},
 						],
 					},
-        ],
-        [
-          {
-            switch: true,
-            label: '是否展示',
-            prop: 'displayTip',
-            bind: {
-              'active-value': true,
-              'inactive-value': false,
-            },
-          },
-          {
-            switch: true,
-            label: '超出阈值是否报警',
-            prop: 'alarmTip',
-            bind: {
-              'active-value': true,
-              'inactive-value': false,
-            },
-          },
-        ],
+				],
 				[
 					{
 						input: true,
@@ -396,24 +436,7 @@ export default {
 			}
 		}
 	},
-  methods: {
-    handleAttrFormUpdate(updatedForm) {
-      console.log('updatedForm', updatedForm);
-
-      // 只同步需要的字段，避免覆盖其他数据
-      this.attrForm = {
-        ...this.attrForm,
-        ...updatedForm,
-        // 确保开关值是布尔类型（双重保险）
-        displayTip: Boolean(updatedForm.displayTip),
-        alarmTip: Boolean(updatedForm.alarmTip),
-        collection: Number(updatedForm.collection) // 采集开关保持数字类型
-      };
-      console.log('开关值同步：', {
-        displayTip: this.attrForm.displayTip,
-        alarmTip: this.attrForm.alarmTip
-      });
-    },
+	methods: {
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':
@@ -479,8 +502,7 @@ export default {
 				name: '',
 				plcParamName: '',
 				unit: '',
-        collection: 1,
-
+				collection: 1,
 				minValue: '',
 				maxValue: '',
 				defaultValue: '',
@@ -488,9 +510,7 @@ export default {
 				remark: '',
 				equipmentParamType: '',
 				productionParamType: '',
-        alarmContent: '',
-        displayTip: false,
-        alarmTip: false,
+				alarmContent: '',
 			};
 			this.attrTitle = '添加参数绑定信息';
 			this.attrFormVisible = true;
@@ -503,15 +523,8 @@ export default {
 				method: 'get',
 				params: { id: attrId },
 			});
-      if (res.code == 0) {
-        console.log('res.data', res.data);
-
-        this.attrForm = {
-          ...res.data,
-          // // 强制转为数字类型，避免字符串类型导致绑定失败
-          // displayTip: Number(res.data.displayTip) || 0,
-          // alarmTip: Number(res.data.alarmTip) || 0
-        };
+			if (res.code == 0) {
+				this.attrForm = res.data;
 				this.attrTitle = '编辑参数绑定信息';
 				this.attrFormVisible = true;
 			}
@@ -550,8 +563,7 @@ export default {
 			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
-        }
-        console.log('this.attrForm', this.attrForm);
+				}
 
 				const isEdit = this.attrForm.id != null;
 				this.attrFormSubmitting = true;
@@ -571,9 +583,8 @@ export default {
 						type: 'success',
 						duration: 1500,
 						onClose: () => {
-              this.shouldRefreshPageView = true;
-              this.getAttrList();
-
+							this.getAttrList();
+							this.shouldRefreshPageView = true;
 						},
 					});
 				}

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

@@ -1,189 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2026-04-16 15:13:53
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		v-if="visible"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="150px">
-		<el-row :gutter="20">
-			<el-col :span="24">
-				<el-form-item label="产线" prop="lineId">
-					<el-select
-						v-model="dataForm.lineId"
-						filterable
-						clearable
-						:style="{ width: '100%' }"
-						placeholder="请选择产线">
-						<el-option
-							v-for="item in lineOptions"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24">
-				<el-form-item label="计划停机起止时间" prop="timeRange">
-					<el-date-picker
-						v-model="dataForm.timeRange"
-						type="datetimerange"
-						:style="{ width: '100%' }"
-						range-separator="至"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"
-						value-format="timestamp"
-						@change="handleTimeRangeChange"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24">
-				<el-form-item label="停机时长" prop="timeStopVal">
-					<span>{{ timeStopText }}</span>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24">
-				<el-form-item label="原因" prop="reason">
-					<el-input
-						type="textarea"
-						:rows="2"
-						placeholder="请输入原因"
-						v-model="dataForm.reason"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	createPlan,
-	updatePlan,
-	getPlan,
-} from '@/api/base/equipmentSectionShutdownLog';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createPlan,
-				updateURL: updatePlan,
-				infoURL: getPlan,
-				optionArrUrl: [getProductionLinePage],
-			},
-			setData: true,
-			dataForm: {
-				id: undefined,
-				lineId: undefined,
-				timeRange: undefined,
-				reason: '',
-				timeStopVal: undefined, // 存储分钟数或秒数
-			},
-			lineOptions: [],
-			timeStopText: '', // 显示文本：x天x小时x分钟
-			dataRule: {
-				lineId: [
-					{ required: true, message: '产线不能为空', trigger: 'change' },
-				],
-				timeRange: [
-					{
-						required: true,
-						message: '计划停机起止时间不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-		};
-	},
-	created() {},
-	methods: {
-		getArr() {
-			getProductionLinePage({
-				page: 1,
-				limit: 500,
-			}).then((response) => {
-				this.lineOptions = response.data.list;
-			});
-		},
-		setDataForm() {
-			this.dataForm.timeRange =
-				this.dataForm.startTime && this.dataForm.endTime
-					? [this.dataForm.startTime, this.dataForm.endTime]
-					: undefined;
-			this.handleTimeRangeChange(this.dataForm.timeRange);
-		},
-		// 时间范围改变时计算停机时长
-		handleTimeRangeChange(val) {
-			if (!val || val.length < 2) {
-				this.timeStopText = '';
-				this.dataForm.timeStopVal = undefined;
-				return;
-			}
-
-			const start = new Date(val[0]).getTime();
-			const end = new Date(val[1]).getTime();
-
-			if (end <= start) {
-				this.timeStopText = '结束时间必须大于开始时间';
-				this.dataForm.timeStopVal = undefined;
-				return;
-			}
-
-			// 总毫秒数 → 总分钟数
-			const totalMinutes = (end - start) / 1000 / 60;
-
-			// 计算天、小时、剩余分钟
-			const days = Math.floor(totalMinutes / 1440);
-			const hours = Math.floor((totalMinutes % 1440) / 60);
-			const minutes = Math.round(totalMinutes % 60);
-
-			// 拼接显示文本
-			let text = '';
-			if (days > 0) text += `${days}天`;
-			if (hours > 0) text += `${hours}小时`;
-			if (minutes > 0 || text === '') text += `${minutes}分钟`;
-
-			this.timeStopText = text;
-			this.dataForm.timeStopVal = totalMinutes; // 提交时可传总分钟数
-		},
-
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.dataForm.startTime = this.dataForm.timeRange
-					? this.dataForm.timeRange[0]
-					: undefined;
-				this.dataForm.endTime = this.dataForm.timeRange
-					? this.dataForm.timeRange[1]
-					: undefined;
-				// 修改的提交
-				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');
-				});
-			});
-		},
-	},
-};
-</script>

src/views/base/equipmentSectionShutdownLog/index.vue

@@ -1,470 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2026-04-16 14:03:22
- * @LastEditors: zwq
- * @LastEditTime: 2026-04-17 15:50:29
- * @Description:
--->
-<template>
-	<div style="background: #f2f4f9">
-		<div style="background: #f2f4f9; height: 38px; width: 100%">
-			<ButtonNav
-				ref="buttonNav"
-				:menus="['计划停机配置', '停机记录']"
-				@change="currentMenu">
-				<template v-slot:tab1>
-					<div>计划停机配置</div>
-				</template>
-				<template v-slot:tab2>
-					<div>停机记录</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div
-			style="
-				background: #ffffff;
-				width: 100%;
-				margin-bottom: 8px;
-				padding: 10px 10px 0 10px;
-			">
-			<!-- 搜索工作栏 -->
-			<search-bar
-				v-if="activeName === '计划停机配置'"
-				:formConfigs="formConfig"
-				ref="searchBarForm"
-				@headBtnClick="buttonClick" />
-
-			<div v-else class="searchBarBox">
-				<el-form
-					:inline="true"
-					ref="searchBarForm"
-					:model="formInline"
-					class="searchBar">
-					<span class="blue-block"></span>
-					<el-form-item label="产线/工段" prop="lineIds">
-						<el-cascader size="small"
-							v-model="formInline.lineIds"
-							:options="options"
-							:props="{
-								value: 'id',
-								label: 'name',
-								checkStrictly: true,
-								multiple: true,
-								emitPath: false,
-							}"></el-cascader>
-					</el-form-item>
-					<el-form-item label="时间范围" prop="times">
-						<el-date-picker size="small"
-							v-model="formInline.times"
-							type="daterange"
-							format="yyyy-MM-dd"
-							value-format="yyyy-MM-dd HH:mm:ss"
-							range-separator="-"
-							start-placeholder="开始时间"
-							end-placeholder="结束时间"></el-date-picker>
-					</el-form-item>
-					<el-form-item label="停机时长" prop="duration">
-						<el-select size="small"
-							v-model="durationJudge"
-							@change="handleCompareChange"
-							style="width: 100px; margin-right: 8px">
-							<el-option label="大于" value="1"></el-option>
-							<el-option label="大于等于" value="2"></el-option>
-							<el-option label="小于" value="3"></el-option>
-							<el-option label="小于等于" value="4"></el-option>
-							<el-option label="等于" value="5"></el-option>
-							<el-option label="介于" value="6"></el-option>
-						</el-select>
-						<el-input size="small"
-							v-model.number="duration1"
-							type="number"
-							placeholder="输入整数"
-							min="0"
-							style="width: 100px; margin-right: 8px"
-							@keydown="preventNonInteger"></el-input>
-						<span v-if="durationJudge === '6'" style="margin-right: 8px">
-							~
-						</span>
-
-						<el-input size="small"
-							v-if="durationJudge === '6'"
-							v-model.number="duration2"
-							type="number"
-							placeholder="输入整数"
-							min="0"
-							style="width: 100px; margin-right: 8px"
-							@keydown="preventNonInteger"></el-input>
-						<!-- 时间单位下拉 -->
-						<el-select size="small" v-model="timeUnit" style="width: 100px">
-							<el-option label="分钟" value="minute"></el-option>
-							<el-option label="小时" value="hour"></el-option>
-							<el-option label="天" value="day"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button size="small" type="primary" @click="handleRecordSearch">
-							查询
-						</el-button>
-						<el-button size="small" type="warning" @click="handleExport1">
-							导出
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-		</div>
-
-		<div
-			class="app-container"
-			v-if="activeName === '计划停机配置'"
-			style="background: #ffffff">
-			<!-- 表 -->
-			<div>
-				<base-table
-					:page="1"
-					:limit="100"
-					:table-props="tableProps1"
-					:table-data="list"
-					:max-height="500">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="90"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-		</div>
-		<div
-			class="app-container"
-			v-else-if="activeName === '停机记录'"
-			style="background: #ffffff">
-			<!-- 表 -->
-			<div>
-				<base-table
-					:page="1"
-					:limit="100"
-					:table-props="tableProps2"
-					:table-data="list"
-					:max-height="500"></base-table>
-			</div>
-		</div>
-		<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 ButtonNav from '@/components/ButtonNav';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import {
-	planList,
-	errorList,
-	exportPlanList,
-	exportErrorList,
-} from '@/api/base/equipmentSectionShutdownLog';
-import subDiv from './subDiv.vue';
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getGroupPlanTree } from '@/api/group/Schedule';
-
-const tableProps1 = [
-	{
-		prop: 'lineName',
-		label: '产线名称',
-	},
-	{
-		prop: 'timeVal',
-		label: '停机起止时间',
-		subcomponent: subDiv,
-	},
-	{
-		prop: 'durationStr',
-		label: '停机时长',
-	},
-	{
-		prop: 'reason',
-		label: '原因',
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'lineName',
-		label: '产线名称',
-	},
-	{
-		prop: 'sectionName',
-		label: '工段名称',
-	},
-	{
-		prop: 'timeVal',
-		label: '停机起止时间',
-		subcomponent: subDiv,
-	},
-	{
-		prop: 'duration',
-		label: '停机时长',
-	},
-];
-export default {
-	mixins: [basicPage],
-	name: '',
-	data() {
-		return {
-			urlOptions: {
-				exportURL: exportPlanList,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineIds',
-					collapseTags: true,
-					multiple: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-			].filter((v) => v),
-			activeName: '计划停机配置',
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				lineIds: null,
-				times: null,
-			},
-			tableProps1,
-			tableProps2,
-			list: [],
-			lineList: [],
-			formInline: {
-				lineIds: null,
-				times: null,
-				durationJudge: '1',
-				duration: 0,
-			},
-			options: [], // 产线/工段选项
-			// 停机时长筛选相关
-			durationJudge: '1',
-			duration1: 0,
-			duration2: '',
-			timeUnit: 'minute',
-		};
-	},
-	components: { ButtonNav, AddOrUpdate },
-	mounted() {
-		this.$nextTick(() => {
-			getProductionLinePage({
-				page: 1,
-				limit: 500,
-			}).then((response) => {
-				this.formConfig[0].selectOptions = response.data.list;
-			});
-			if (this.$refs.buttonNav) {
-				this.$refs.buttonNav.currentMenu = '计划停机配置';
-			}
-			this.getDataList();
-		});
-	},
-	methods: {
-		currentMenu(val) {
-			this.activeName = val;
-			if (this.activeName == '计划停机配置') {
-				this.urlOptions.exportURL = exportPlanList;
-				this.getDataList();
-			} else {
-				this.urlOptions.exportURL = exportErrorList;
-				getGroupPlanTree().then((res) => {
-					this.options = res.data;
-				});
-				this.getErrorList();
-			}
-		},
-		//计划停机配置list
-		getDataList() {
-			planList(this.queryParams).then((response) => {
-				this.list = response.data;
-			});
-		},
-		//停机记录list
-		getErrorList() {
-			errorList(this.formInline).then((response) => {
-				this.list = response.data;
-			});
-		},
-		// 查询
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.lineIds = val.lineIds;
-					this.queryParams.type = val.type;
-					this.queryParams.times = val.timeVal;
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
-				});
-			}
-		},
-		handleCompareChange() {
-			// 切换为非between时清空第二个输入框
-			if (this.durationJudge !== '6') {
-				this.duration2 = '';
-			}
-		},
-
-		//  * 禁止输入非数字字符
-		preventNonInteger(e) {
-			// 允许数字、退格、删除、方向键
-			const keyCode = e.keyCode;
-			if (
-				!(keyCode >= 48 && keyCode <= 57) && // 0-9
-				!(keyCode >= 96 && keyCode <= 105) && // 小键盘0-9
-				keyCode !== 8 && // Backspace
-				keyCode !== 46 && // Delete
-				!(keyCode >= 37 && keyCode <= 40) // 方向键
-			) {
-				e.preventDefault();
-			}
-		},
-		handleRecordSearch() {
-			this.formInline.durationJudge = this.durationJudge;
-			// 构建停机时长筛选条件
-			if (this.durationJudge === '6') {
-				if (this.duration1 !== '' && this.duration2 !== '') {
-					this.formInline.duration = undefined;
-					// 转分钟
-					let start = Number(this.duration1);
-					let end = Number(this.duration2);
-					if (this.timeUnit === 'hour') {
-						start *= 60;
-						end *= 60;
-					} else if (this.timeUnit === 'day') {
-						start *= 60 * 24;
-						end *= 60 * 24;
-					} //minute 则不处理
-					this.formInline.betweenDurationStart = start;
-					this.formInline.betweenDurationEnd = end;
-				}
-			} else {
-				if (this.duration1 !== '') {
-					let val = Number(this.duration1);
-					if (this.timeUnit === 'hour') {
-						val *= 60;
-					} else if (this.timeUnit === 'day') {
-						val *= 60 * 24;
-					}
-					this.formInline.duration = val;
-				}
-			}
-			// 调用接口查询数据
-
-			this.getErrorList();
-		},
-    handleExport1() {
-      this.handleRecordSearch()
-      // 处理查询参数
-      let params = { ...this.formInline };
-      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(() => { });
-    }
-	},
-};
-</script>
-<style scoped>
-.searchBarBox {
-	width: 100%;
-	position: relative;
-	margin-bottom: 8px;
-}
-.searchBarBox::after {
-	content: '';
-	display: block;
-	clear: both;
-}
-.searchBar .blue-block {
-	display: inline-block;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	margin-top: 12px;
-}
-.searchBar .el-form-item {
-	margin-bottom: 4px;
-}
-</style>

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

@@ -88,32 +88,7 @@ export default {
 		};
 	},
 	created() {},
-  methods: {
-    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 => {
-          if (response.code === 1001033 || response.code === 1001034) {
-            return this.$modal.msgError(response.msg);
-          }
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
+	methods: {
 	},
 };
 </script>

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

@@ -63,7 +63,7 @@
 						style="width: 75%"
 						v-model="dataForm.price"
 						clearable
-						placeholder="请输入单价" />
+						placeholder="请输入允许留存时间" />
 					{{ unit }}
 				</el-form-item>
 			</el-col>
@@ -103,7 +103,7 @@ export default {
 				id: null,
 				code: '',
 				materialId: '',
-        price: undefined,
+				price: '',
 				startTime: new Date().getTime(),
 				endTime: null,
 				remark: '',
@@ -140,42 +140,17 @@ export default {
 				setTimeout(this.setCode(), 1000);
 			}
 		},
-    setCode() {
-      console.log('this.MaterialList', this.urlOptions.dictArr.dict0);
-
+		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)
+						this.urlOptions.dictArr.dict0.find((d) => d.value === item.unit)
 							.label;
 				}
 			});
-    },
-    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 => {
-          // console.log('response',);
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
+		},
 	},
 };
 </script>

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

@@ -47,15 +47,15 @@ const tableProps = [
 		prop: 'equipmentName',
 		label: '设备',
 	},
-	// {
-	// 	prop: 'size',
-	// 	label: '规格',
-	// 	showOverflowtooltip: true,
-	// },
-	// {
-	// 	prop: 'process',
-	// 	label: '产品工艺',
-	// },
+	{
+		prop: 'size',
+		label: '规格',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'process',
+		label: '产品工艺',
+	},
 	{
 		prop: 'standardCt',
 		label: '标准节拍pcs/min',
@@ -128,7 +128,7 @@ export default {
 				this.tableData = response.data;
 				this.dataListLoading = false;
 			});
-		},  
+		},
 		handleClick(val) {
 			const data = {
 				...this.time,

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

@@ -1,295 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2026-04-16 13:14:29
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<div v-if="showData.length">
-			<base-table
-				class="right-aside"
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="showData">
-				<method-btn
-					v-if="showData.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn"
-					@clickBtn="handleClick" />
-			</base-table>
-			<barChart
-				v-for="item in chartData"
-				:key="item.name + 'echart'"
-				style="margin-top: 50px"
-				height="600px"
-				:id="item.name + 'echart'"
-				:title="item.name + ' 节拍趋势图'"
-				:bar-data="item" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-      top="0"
-			width="50%">
-			<eq-detail ref="eqDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import eqDetail from './eq-detail';
-import { parseTime } from '../../mixins/code-filter';
-import { getPLlistByFactory } from '@/api/core/monitoring/auto';
-import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
-import { getFactoryPage } from '@/api/core/base/factory';
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import barChart from './BarChart.vue';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'edgeCt',
-		label: '磨边当前节拍pcs/min',
-	},
-	{
-		prop: 'temperCt',
-		label: '钢化当前节拍pcs/min',
-	},
-	{
-		prop: 'downCt',
-		label: '下片当前节拍pcs/min',
-	},
-];
-
-export default {
-	components: {
-		barChart,
-		eqDetail,
-	},
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getNewCTNow,
-			},
-			listQuery: {
-				lineId: [],
-			},
-			fileName: '',
-			dataListLoading: false,
-			tableProps,
-			tableBtn: [
-				{
-					type: 'eq',
-					btnName: '详情',
-				},
-			].filter((v) => v),
-			showData: [],
-			tableData: [],
-			chartData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-          param: 'factoryId',
-          collapseTags: true,
-          multiple: true,
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'lineId',
-          collapseTags: true,
-					multiple: true,
-				},
-				{
-					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',
-				},
-			],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
-		};
-	},
-	created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime());
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-		this.listQuery.startTime = yesterday.getTime();
-		this.listQuery.endTime = end.getTime();
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [
-				yesterday.getTime(),
-				end.getTime(),
-			];
-		});
-		this.getDataList();
-		this.getPdLineList();
-	},
-	methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '产线自动报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-      // getPLlistByFactory().then((res) => {
-			// 	this.formConfig[1].selectOptions = res.data || [];
-			// });
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId ? val.lineId : [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-			getNewCTCharts(this.listQuery).then((response) => {
-				this.chartData = response.data;
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-      getPLlistByFactory({ factoryIds: this.$refs.searchBarForm.formInline.factoryId }).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
-	},
-};
-</script>

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

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

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

@@ -1,223 +1,162 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2025-01-09 10:27:53
+ * @LastEditors: zwq
+ * @Description:
+-->
 <template>
-	<div style="background: #f2f4f9">
-		<div style="background: #f2f4f9; height: 38px; width: 100%">
-			<ButtonNav
-				ref="buttonNav"
-				:menus="['OEE分析', 'TEEP分析', '节拍分析']"
-				@change="currentMenu">
-				<template v-slot:tab1>
-					<div>OEE分析</div>
-				</template>
-				<template v-slot:tab2>
-					<div>TEEP分析</div>
-				</template>
-				<template v-slot:tab3>
-					<div>节拍分析</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="scroll-container" v-if="activeName !== '节拍分析'">
-			<!-- 外层滚动容器 -->
-			<div class="card-scroll-wrapper">
-				<!-- 卡片列表 -->
-				<div
-					v-for="(item, index) in lineList"
-					:key="index"
-					class="efficiency-card">
-					<div class="card-label">
-						{{ item[activeName === 'OEE分析' ? 'oeename' : 'teepname'] }}
-					</div>
-					<div class="card-value">
-						{{ item[activeName === 'OEE分析' ? 'oeevalue' : 'teepvalue'] }}%
-					</div>
-				</div>
-			</div>
-		</div>
-		<div
-			style="
-				background: #ffffff;
-				width: 100%;
-				margin-bottom: 8px;
-				padding: 10px 10px 0 10px;
-			">
-			<!-- 搜索工作栏 -->
-			<search-bar
-				v-if="activeName !== '节拍分析'"
-				:formConfigs="formConfig"
-				ref="searchBarForm"
-				@headBtnClick="buttonClick" />
-		</div>
-
-		<div
-			class="app-container"
-			v-if="activeName === 'OEE分析'"
-			style="background: #ffffff">
-			<!-- 表 -->
-			<div>
-				<base-table
-					:page="1"
-					:limit="100"
-					:table-props="tableProps1"
-					:table-data="list"
-					:max-height="500"></base-table>
-			</div>
-		</div>
-		<div
-			class="app-container"
-			v-else-if="activeName === 'TEEP分析'"
-			style="background: #ffffff">
-			<!-- 表 -->
-			<div>
-				<base-table
-					:page="1"
-					:limit="100"
-					:table-props="tableProps2"
-					:table-data="list"
-					:max-height="500"></base-table>
-			</div>
-		</div>
-		<div v-else style="background: #ffffff">
-			<indexJiepai />
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@select-changed="handleSearchBarChanged"
+			@headBtnClick="buttonClick" />
+		<div v-if="showData.length">
+			<base-table
+				class="right-aside"
+				v-loading="dataListLoading"
+				:table-props="tableProps"
+				:page="1"
+				:limit="999"
+				:table-data="showData">
+				<method-btn
+					v-if="showData.length"
+					slot="handleBtn"
+					:width="80"
+					label="操作"
+					:method-list="tableBtn"
+					@clickBtn="handleClick" />
+			</base-table>
+			<barChart
+				v-for="item in chartData"
+				:key="item.name + 'echart'"
+				style="margin-top: 50px"
+				height="600px"
+				:id="item.name + 'echart'"
+				:title="item.name + ' 节拍趋势图'"
+				:bar-data="item" />
 		</div>
+		<div v-else class="no-data-bg"></div>
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			close-on-click-modal
+      top="0"
+			width="50%">
+			<eq-detail ref="eqDetail" />
+			<slot name="footer">
+				<el-row slot="footer" type="flex" justify="end">
+					<el-col :span="24">
+						<el-button size="small" class="btnTextStyle" @click="handleCancel">
+							取消
+						</el-button>
+					</el-col>
+				</el-row>
+			</slot>
+		</base-dialog>
 	</div>
 </template>
-<script>
-import ButtonNav from '@/components/ButtonNav';
-import indexJiepai from './index-jiepai.vue';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import {
-	listHeader,
-	listLineReport,
-	exportTeepExcel,
-	exportOeeExcel,
-} from '@/api/core/analysis/index';
-import subDiv from './subDiv.vue';
 
-const tableProps1 = [
+<script>
+import eqDetail from './eq-detail';
+import { parseTime } from '../../mixins/code-filter';
+import { getPdList } from '@/api/core/monitoring/auto';
+import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
+import { getFactoryPage } from '@/api/core/base/factory';
+// import codeFilter from '../../mixins/code-filter'
+import * as XLSX from 'xlsx';
+import FileSaver from 'file-saver';
+import barChart from './BarChart.vue';
+
+const tableProps = [
 	{
-		prop: 'name',
-		label: '名称',
+		prop: 'factoryName',
+		label: '工厂',
 	},
 	{
-		prop: 'timeVal',
-		label: '时间段',
-		subcomponent: subDiv,
+		prop: 'lineName',
+		label: '产线',
 	},
 	{
-		prop: 'plannedProductionHours',
-		label: '计划生产时长',
+		prop: 'size',
+		label: '规格',
+		showOverflowtooltip: true,
 	},
 	{
-		prop: 'actualRunningHours',
-		label: '实际运行时长',
+		prop: 'process',
+		label: '产品工艺',
 	},
 	{
-		prop: 'actualDowntimeHours',
-		label: '实际停机时长',
+		prop: 'edgeCt',
+		label: '磨边当前节拍pcs/min',
 	},
 	{
-		prop: 'inputQuantity',
-		label: '上片数量（片）',
+		prop: 'temperCt',
+		label: '钢化当前节拍pcs/min',
 	},
 	{
-		prop: 'outputQuantity',
-		label: '下片数量',
-	},
-	{
-		prop: 'qualityRate',
-		label: '良品率',
-	},
-	{
-		prop: 'availabilityRate',
-		label: '可用率',
-	},
-	{
-		prop: 'performanceRate',
-		label: '性能',
-	},
-	{
-		prop: 'oee',
-		label: 'OEE',
-		//filter: (val) => (val ? val.join(',') : ''),
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'name',
-		label: '产线名称',
-	},
-	{
-		prop: 'timeVal',
-		label: '时间段',
-		subcomponent: subDiv,
-	},
-	{
-		prop: 'teep',
-		label: 'TEEP',
-	},
-	{
-		prop: 'oee',
-		label: 'OEE',
-	},
-	{
-		prop: 'useRate',
-		label: '设备使用率',
-	},
-	{
-		prop: 'capacityUtilization',
-		label: '产能利用率',
+		prop: 'downCt',
+		label: '下片当前节拍pcs/min',
 	},
 ];
+
 export default {
-	name: '',
+	components: {
+		barChart,
+		eqDetail,
+	},
 	data() {
 		return {
+			urlOptions: {
+				getDataListURL: getNewCTNow,
+			},
+			listQuery: {
+				lineId: [],
+			},
+			fileName: '',
+			dataListLoading: false,
+			tableProps,
+			tableBtn: [
+				{
+					type: 'eq',
+					btnName: '详情',
+				},
+			].filter((v) => v),
+			showData: [],
+			tableData: [],
+			chartData: [],
 			formConfig: [
+				{
+					type: 'select',
+					label: '工厂',
+					selectOptions: [],
+					param: 'factoryId',
+					onchange: true,
+				},
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
 					param: 'lineId',
-					collapseTags: true,
 					multiple: true,
 				},
-				{
-					type: 'select',
-					label: '报表类型',
-					selectOptions: [
-						{
-							id: 0,
-							name: '班',
-						},
-						{
-							id: 1,
-							name: '日',
-						},
-						// {
-						// 	id: 2,
-						// 	name: '周',
-						// },
-						{
-							id: 3,
-							name: '月',
-						},
-						{
-							id: 4,
-							name: '年',
-						},
-					],
-					param: 'type',
-				},
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					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',
@@ -225,163 +164,139 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+				// 	type: 'button',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
 			],
-			activeName: 'OEE分析',
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				lineId: null,
-				type: null,
-				createTime: null,
-			},
-			tableProps1,
-			tableProps2,
-			list: [],
-			lineList: [],
+			addOrEditTitle: '',
+			addOrUpdateVisible: false,
 		};
 	},
-	components: { ButtonNav, indexJiepai },
-	mounted() {
-		listHeader().then((response) => {
-			this.lineList = response.data.map((item) => ({
-				oeename: `${item.name}累计OEE综合效率`,
-				teepname: `${item.name}累计TEEP综合效率`,
-				oeevalue: item.oee.toFixed(2),
-				teepvalue: item.teep.toFixed(2),
-			}));
-		});
+	created() {
+		// 获取当前时间
+		const now = new Date();
+		// 获取前一天的同一时间
+		const yesterday = new Date(now.getTime());
+		// 设置为00:00:00
+		yesterday.setHours(0, 0, 0, 0);
+		// 设置为23:59:59
+		const end = new Date(yesterday.getTime());
+		end.setHours(23, 59, 59, 59);
+		this.listQuery.startTime = yesterday.getTime();
+		this.listQuery.endTime = end.getTime();
 		this.$nextTick(() => {
-			getProductionLinePage({
-				page: 1,
-				limit: 500,
-			}).then((response) => {
-				this.formConfig[0].selectOptions = response.data.list;
-			});
-			if (this.$refs.buttonNav) {
-				this.$refs.buttonNav.currentMenu = 'OEE分析';
-			}
-			this.getPage();
+			this.$refs.searchBarForm.formInline.timeVal = [
+				yesterday.getTime(),
+				end.getTime(),
+			];
 		});
+		this.getDataList();
+		this.getPdLineList();
 	},
 	methods: {
-		currentMenu(val) {
-			this.activeName = val;
-			if (this.activeName !== '节拍分析') {
-				this.getPage();
+		handleExport() {
+			let tables = document.querySelector('.el-table').cloneNode(true);
+			const fix = tables.querySelector('.el-table__fixed');
+			const fixRight = tables.querySelector('.el-table__fixed-right');
+			if (fix) {
+				tables.removeChild(tables.querySelector('.el-table__fixed'));
 			}
+			if (fixRight) {
+				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
+			}
+			let exportTable = XLSX.utils.table_to_book(tables);
+
+			var exportTableOut = XLSX.write(exportTable, {
+				bookType: 'xlsx',
+				bookSST: true,
+				type: 'array',
+			});
+			// sheetjs.xlsx为导出表格的标题名称
+			try {
+				FileSaver.saveAs(
+					new Blob([exportTableOut], {
+						type: 'application/octet-stream',
+					}),
+					this.fileName + '产线自动报表.xlsx'
+				);
+			} catch (e) {
+				if (typeof console !== 'undefined') console.log(e, exportTableOut);
+			}
+			return exportTableOut;
 		},
-		getPage() {
-			listLineReport(this.queryParams).then((response) => {
-				this.list = response.data;
+		getPdLineList() {
+			getPdList().then((res) => {
+				this.formConfig[1].selectOptions = res.data || [];
+			});
+			const params = {
+				pageSize: 100,
+				pageNo: 1,
+			};
+			getFactoryPage(params).then((res) => {
+				this.formConfig[0].selectOptions = res.data.list || [];
 			});
 		},
-		// 查询
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-					this.queryParams.lineId = val.lineId;
-					this.queryParams.type = val.type;
-					this.queryParams.createTime = val.timeVal;
-					this.getPage();
+					this.listQuery.factoryId = val.factoryId || undefined;
+					this.listQuery.lineId = val.lineId ? val.lineId : [];
+					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
+					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
+					this.getDataList();
 					break;
 				case 'export':
-					this.queryParams.lineId = val.lineId;
-					this.queryParams.type = val.type;
-					this.queryParams.createTime = val.timeVal;
 					this.handleExport();
 					break;
 				default:
 					console.log(val);
 			}
 		},
-		handleExport() {
-			// 处理查询参数
-			const params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return this.activeName == 'OEE分析'
-						? exportOeeExcel(params)
-						: exportTeepExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '报表.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.tableData = response.data;
+				this.dataListLoading = false;
+				this.showData = this.tableData;
+			});
+			getNewCTCharts(this.listQuery).then((response) => {
+				this.chartData = response.data;
+			});
+		},
+		handleSearchBarChanged({ param, value }) {
+			this.listQuery.lineId = [];
+			this.$refs.searchBarForm.formInline.lineId = undefined;
+			getPdList(value).then((res) => {
+				this.formConfig[1].selectOptions = res.data || [];
+			});
+		},
+		handleClick(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle =
+				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
+			this.$nextTick(() => {
+				this.$refs.eqDetail.init(
+					val.data.lineId,
+					this.listQuery.startTime,
+					this.listQuery.endTime
+				);
+			});
+		},
+		handleCancel() {
+			this.addOrUpdateVisible = false;
+			this.addOrEditTitle = '';
+		},
+		handleConfirm() {
+			this.handleCancel();
 		},
 	},
 };
 </script>
-<style scoped>
-/* 外层容器：限制高度，提供背景 */
-.scroll-container {
-	width: 100%;
-	padding: 10px 0;
-	background-color: #f5f5f5; /* 背景色，可根据UI调整 */
-}
-
-/* 核心样式：横向滚动 */
-.card-scroll-wrapper {
-	/* 重要：开启Flex，让子元素横向排列 */
-	display: flex;
-	/* 重要：不换行，强制排在一行 */
-	flex-wrap: nowrap;
-	/* 重要：添加横向滚动条 */
-	overflow-x: auto;
-	padding: 10px 15px;
-	/* 对齐方式 */
-	align-items: center;
-}
-
-/* 卡片样式：圆角、白色背景、阴影 */
-.efficiency-card {
-	/* 固定宽度，也可以用 flex: 0 0 200px; 固定宽度 */
-	min-width: 200px;
-	height: 120px;
-	margin: 0 10px; /* 卡片之间的间距 */
-	padding: 20px 16px;
-	background-color: #ffffff;
-	border-radius: 12px; /* 圆角 */
-	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06); /* 轻微阴影 */
-	/* 卡片内部文字布局 */
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	/* 防止文字挤压 */
-	flex-shrink: 0;
-	text-align: center;
-}
-.efficiency-card:hover {
-	transform: scale(1.1);
-}
-
-/* 标签文字 */
-.card-label {
-	font-size: 14px;
-	color: #666666;
-	margin-bottom: 8px;
-	white-space: nowrap; /* 确保文字也不换行 */
-}
-
-/* 数值文字（加粗放大） */
-.card-value {
-	font-size: 24px;
-	font-weight: bold;
-	color: #333333;
-	line-height: 1.2;
-}
-</style>

src/views/core/analysis/yieldAnalysis-handle/LineChart.vue

@@ -1,103 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2026-03-18 14:45:07
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div :class="className" :style="{ height: height, width: width }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-// import resize from './mixins/resize'
-
-export default {
-	// mixins: [resize],
-	props: {
-		className: {
-			type: String,
-			default: 'chart',
-		},
-		width: {
-			type: String,
-			default: '100%',
-		},
-		height: {
-			type: String,
-			default: '350px',
-		},
-		// autoResize: {
-		//   type: Boolean,
-		//   default: true
-		// }
-	},
-	data() {
-		return {
-			chart: null,
-		};
-	},
-	// watch: {
-	//   chartData: {
-	//     deep: true,
-	//     handler(val) {
-	//       this.setOptions(val)
-	//     }
-	//   }
-	// },
-	mounted() {
-		// this.$nextTick(() => {
-		//   this.initChart()
-		// })
-	},
-	// beforeDestroy() {
-	//   if (!this.chart) {
-	//     return
-	//   }
-	//   this.chart.dispose()
-	//   this.chart = null
-	// },
-	methods: {
-		initChart(xData, yData, lineName) {
-			this.chart = echarts.init(this.$el, 'macarons');
-			this.setOptions(xData, yData, lineName);
-		},
-		setOptions(xData, yData, lineName) {
-			let seriesData = [];
-			lineName.forEach((item, index) => {
-				seriesData.push(
-					{
-						name: item + '白班',
-						data: yData[index].map(item => item.day),
-						type: 'line',
-					},
-					{
-						name: item + '夜班',
-						data: yData[index].map(item => item.night),
-						type: 'line',
-					}
-				);
-			});
-			const result = lineName.flatMap((item) => [item + '白班', item + '夜班']);
-			this.chart.setOption(
-				{
-					xAxis: {
-						type: 'category',
-						data: xData,
-					},
-					legend: {
-						data: result,
-					},
-					yAxis: {
-						type: 'value',
-					},
-					series: seriesData,
-				},
-				true
-			);
-		},
-	},
-};
-</script>

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

@@ -1,272 +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"
-				:table-props="tableProps"
-				:max-height="tableH"
-				:table-data="tableData" />
-			<SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
-			<line-chart ref="lineChart" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getYieldAnalysisHandlePageData } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import lineChart from './LineChart';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import subDiv from './subDiv.vue';
-
-export default {
-	components: {
-		lineChart,
-		subDiv,
-	},
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getYieldAnalysisHandlePageData,
-			},
-			tableProps: [],
-			dataListLoading: false,
-			tableData: [],
-			listQuery: {
-				lineIds: [],
-				time: '', // 存储时间选择器的选中值（时间戳/格式化字符串，根据接口要求调整）
-			},
-			dateLabelList: [],
-			optionArrUrl: [getProductionLinePage],
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'month', // 单个月份选择
-					format: 'yyyy-MM', // 显示格式
-					valueFormat: 'yyyy-MM-dd HH:mm:ss', // 绑定值的格式
-					param: 'time',
-					defaultSelect: '', // 新增：默认月份值
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineIds',
-					defaultSelect: [], // 产线默认选择值（多选数组）
-					multiple: true,
-					collapseTags: true,
-					filterable: true,
-					width: 300,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	mounted() {
-		// 1. 初始化默认当月时间
-		this.initDefaultMonth();
-		// 2. 获取产线数据
-		this.getArr();
-	},
-	methods: {
-		/**
-		 * 初始化默认当月时间（单个月份）
-		 */
-		initDefaultMonth() {
-			const now = new Date();
-			const year = now.getFullYear();
-			const month = now.getMonth(); // 月份从0开始，直接使用（取当月1号）
-			// 创建当月1号0点0分0秒的日期对象
-			const firstDayOfMonth = new Date(year, month, 1, 0, 0, 0);
-			// 转换为时间戳（毫秒级）
-			const defaultTimeStamp = firstDayOfMonth.getTime();
-			// 给时间选择器赋值默认值
-			this.formConfig[0].defaultSelect = firstDayOfMonth;
-			// this.listQuery.time = defaultTimeStamp;
-		},
-		/**
-		 * 获取产线数据
-		 */
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			// 原代码forEach遍历冗余，直接调用第一个方法即可
-			this.optionArrUrl[0](params)
-				.then((response) => {
-					const lineList = response.data.list;
-					this.formConfig[1].selectOptions = lineList;
-					// 产线默认选择第一条数据（多选需用数组格式）
-					if (lineList.length > 0) {
-						const firstLineId = lineList[0].id;
-						this.formConfig[1].defaultSelect = [firstLineId];
-						// 给查询参数赋值
-						this.listQuery.lineIds = [firstLineId];
-					}
-				})
-				.catch((err) => {
-					console.error('获取产线数据失败：', err);
-				});
-		},
-		/**
-		 * 获取产量分析数据
-		 */
-		getData() {
-			this.dataListLoading = true; // 开启加载状态
-			this.urlOptions
-				.getDataListURL(this.listQuery)
-				.then((res) => {
-					let arr = [
-						{
-							prop: 'lineName',
-							label: '产线',
-							fixed: 'left',
-						},
-						{
-							prop: 'sum',
-							label: '合计[片]',
-							fixed: 'left',
-						},
-						{
-							prop: res.data ? res.data.nameData[0].name : undefined,
-							label: res.data ? res.data.nameData[0].name : undefined,
-							align: 'center',
-							children: [],
-						},
-					];
-
-					let xData = [];
-					let yAllData = [];
-					let lineName = [];
-					if (res.data) {
-						// 处理日期标签去重
-						let tempDateList = [];
-						res.data.nameData.forEach((date) => {
-							tempDateList.push(date.name);
-						});
-						this.dateLabelList = Array.from(new Set(tempDateList));
-
-						// 构造表头children和echarts横坐标
-						this.dateLabelList.forEach((item) => {
-							if (item.indexOf('年') === -1) {
-								arr[2].children.push({
-									prop: item,
-									label: item,
-									subcomponent: subDiv,
-								});
-								xData.push(item);
-							}
-						});
-
-						// 构造表格数据
-						let tableDataArr = [];
-						res.data.data.forEach((item) => {
-							let obj = {
-								lineName: item.lineName,
-								sum: item.sum,
-							};
-							item.data.forEach((ele) => {
-								ele.children.forEach((e) => {
-									obj[e.dynamicName] = JSON.parse(e.dynamicValue || '{}');
-								});
-							});
-							tableDataArr.push(obj);
-						});
-						this.tableData = tableDataArr;
-						this.tableProps = arr;
-
-						// 构造图表数据
-						res.data.data.forEach((item) => {
-							let yData = [];
-							lineName.push(item.lineName);
-							item.data.forEach((ele) => {
-								ele.children.forEach((e) => {
-									yData.push(JSON.parse(e.dynamicValue || '{}'));
-								});
-							});
-							yAllData.push(yData);
-						});
-					} else {
-						this.tableProps = arr;
-						this.tableData = [];
-						xData = [];
-						yAllData = [];
-						lineName = [];
-					}
-
-					// 初始化图表
-					this.$nextTick(() => {
-						this.$refs.lineChart.initChart(xData, yAllData, lineName);
-					});
-				})
-				.catch((err) => {
-					console.error('获取产量数据失败：', err);
-					this.tableData = [];
-				})
-				.finally(() => {
-					this.dataListLoading = false; // 关闭加载状态
-				});
-		},
-		/**
-		 * 搜索栏按钮点击事件
-		 * @param {Object} val - 按钮/表单传递的参数
-		 */
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					// 处理产线参数（避免undefined，空值设为空数组）
-					this.listQuery.lineIds = val.lineIds || [];
-					// 处理时间参数：如果是时间字符串，可转换为时间戳（根据接口要求调整）
-					if (val.time) {
-						// this.listQuery.time = val.time;
-						// 若接口需要时间戳，取消下面注释：
-						this.listQuery.time = new Date(val.time).getTime();
-					} else {
-						this.$message({
-							message: '请选择时间',
-							type: 'warning',
-						});
-						return;
-					}
-
-					// 验证产线是否选择（可选，根据业务需求调整）
-					if (this.listQuery.lineIds.length === 0) {
-						this.$message({
-							message: '请选择至少一条产线',
-							type: 'warning',
-						});
-						return;
-					}
-
-					this.getData();
-					break;
-				case 'reset':
-					// 重置表单
-					this.$refs.searchBarForm.resetForm();
-					// 恢复默认值
-					this.listQuery = {
-						lineIds: this.formConfig[1].defaultSelect || [],
-						time: this.formConfig[0].defaultValue || '',
-					};
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/core/analysis/yieldAnalysis-handle/subDiv.vue

@@ -1,31 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2026-03-18 14:32:19
- * @Description:
--->
-<template>
-	<div style="text-align:center">
-		<div style="padding:3px 6px;border:1px solid black">{{ injectData[injectData.prop].day || '-' }}</div>
-		<div style="padding:3px 6px;border:1px solid black;background-color: black;color: #fff;">{{ injectData[injectData.prop].night || '-' }}</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	computed: {},
-	created() {
-  },
-	methods: {},
-};
-</script>

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

@@ -1,261 +1,273 @@
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <div v-if="tableData.length">
-      <base-table v-loading="dataListLoading" :table-props="tableProps" :max-height="tableH" :table-data="tableData" />
-      <SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
-      <line-chart ref="lineChart" />
-    </div>
-    <div v-else class="no-data-bg"></div>
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<div v-if="tableData.length">
+			<base-table
+				v-loading="dataListLoading"
+				:table-props="tableProps"
+				:max-height="tableH"
+				:table-data="tableData" />
+			<SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
+			<line-chart ref="lineChart" />
+		</div>
+		<div v-else class="no-data-bg"></div>
+		<!-- <pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" /> -->
+	</div>
 </template>
 
 <script>
+// import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
 import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
 import lineChart from '../LineChart';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+// import { 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: {
-    lineChart,
-  },
-  mixins: [tableHeightMixin],
-  data() {
-    return {
-      urlOptions: {
-        getDataListURL: getYieldAnalysisPageData,
-      },
-      tableProps: [],
-      dataListLoading: false,
-      tableData: [],
-      listQuery: {
-        lineIds: [],
-        time: '', // 存储时间选择器的选中值（时间戳/格式化字符串，根据接口要求调整）
-      },
-      dateLabelList: [],
-      optionArrUrl: [getProductionLinePage],
-      formConfig: [
-        {
-          type: 'datePicker',
-          label: '时间',
-          dateType: 'month', // 单个月份选择
-          format: 'yyyy-MM', // 显示格式
-          valueFormat: 'yyyy-MM-dd HH:mm:ss', // 绑定值的格式
-          param: 'time',
-          defaultSelect: '', // 新增：默认月份值
-        },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineIds',
-          defaultSelect: [], // 产线默认选择值（多选数组）
-          multiple: true,
-          collapseTags: true,
-          filterable: true,
-          width: 300,
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary',
-        },
-      ],
-    };
-  },
-  mounted() {
-    // 1. 初始化默认当月时间
-    this.initDefaultMonth();
-    // 2. 获取产线数据
-    this.getArr();
-  },
-  methods: {
-    /**
-     * 初始化默认当月时间（单个月份）
-     */
-    initDefaultMonth() {
-      const now = new Date();
-      const year = now.getFullYear();
-      const month = now.getMonth(); // 月份从0开始，直接使用（取当月1号）
-      // 创建当月1号0点0分0秒的日期对象
-      const firstDayOfMonth = new Date(year, month, 1, 0, 0, 0);
-      // 转换为时间戳（毫秒级）
-      const defaultTimeStamp = firstDayOfMonth.getTime();
-      // 给时间选择器赋值默认值
-      this.formConfig[0].defaultSelect = firstDayOfMonth;
-      // this.listQuery.time = defaultTimeStamp;
-    },
-    /**
-     * 获取产线数据
-     */
-    getArr() {
-      const params = {
-        page: 1,
-        limit: 500,
-      };
-      // 原代码forEach遍历冗余，直接调用第一个方法即可
-      this.optionArrUrl[0](params)
-        .then((response) => {
-          const lineList = response.data.list;
-          this.formConfig[1].selectOptions = lineList;
-          // 产线默认选择第一条数据（多选需用数组格式）
-          if (lineList.length > 0) {
-            const firstLineId = lineList[0].id;
-            this.formConfig[1].defaultSelect = [firstLineId];
-            // 给查询参数赋值
-            this.listQuery.lineIds = [firstLineId];
-          }
-        })
-        .catch((err) => {
-          console.error('获取产线数据失败：', err);
-        });
-    },
-    /**
-     * 获取产量分析数据
-     */
-    getData() {
-      this.dataListLoading = true; // 开启加载状态
-      this.urlOptions.getDataListURL(this.listQuery)
-        .then((res) => {
-          let arr = [
-            {
-              prop: 'lineName',
-              label: '产线',
-              fixed: 'left',
-            },
-            {
-              prop: 'sum',
-              label: '合计[片]',
-              fixed: 'left',
-            },
-            {
-              prop: res.data ? res.data.nameData[0].name : undefined,
-              label: res.data ? res.data.nameData[0].name : undefined,
-              align: 'center',
-              children: [],
-            },
-          ];
+	components: {
+		lineChart,
+	},
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getYieldAnalysisPageData,
+			},
+			tableProps: [],
+			dataListLoading: false,
+			tableData: [],
+			listQuery: {
+				lineIds: [],
+				time: '',
+			},
+			dateLabelList: [],
+			optionArrUrl: [getProductionLinePage],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'lineIds',
+					defaultSelect: [],
+					multiple: true,
+					filterable: true,
+					width: 200,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'month',
+					format: 'yyyy-MM',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					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;
+					// this.formConfig[0].defaultSelect = response.data.list[0].id
+					// this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
+				});
+			});
+		},
+		getData() {
+			// this.listQuery.lineIds = ['1672847052717821953']
+			// this.listQuery.productId = val.productId;
+			// this.listQuery.time = '1694486098000';
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				let arr = [
+					{
+						prop: 'lineName',
+						label: '产线',
+						fixed: 'left',
+					},
+					{
+						prop: 'sum',
+						label: '合计[片]',
+						fixed: 'left',
+					},
+					{
+						prop: res.data ? res.data.nameData[0].name : undefined,
+						label: res.data ? res.data.nameData[0].name : undefined,
+						align: 'center',
+						children: [],
+					},
+				];
+				// console.log(res.data.nameData.slice(1))
+				let xData = [];
+				let yAllData = [];
+				let lineName = [];
+				if (res.data) {
+					let tempDateList = [];
+					res.data.nameData.forEach((date) => {
+						tempDateList.push(date.name);
+					});
+					this.dateLabelList = Array.from(new Set(tempDateList));
 
-          let xData = [];
-          let yAllData = [];
-          let lineName = [];
-          if (res.data) {
-            // 处理日期标签去重
-            let tempDateList = [];
-            res.data.nameData.forEach((date) => {
-              tempDateList.push(date.name);
-            });
-            this.dateLabelList = Array.from(new Set(tempDateList));
+					this.dateLabelList.forEach((item) => {
+						if (item.indexOf('年') === -1) {
+							// 构造表头
+							const props = {
+								prop: item,
+								label: item,
+							};
+							arr[2].children.push(props);
 
-            // 构造表头children和echarts横坐标
-            this.dateLabelList.forEach((item) => {
-              if (item.indexOf('年') === -1) {
-                arr[2].children.push({
-                  prop: item,
-                  label: item,
-                });
-                xData.push(item);
-              }
-            });
+							// 构造echarts横坐标
+							xData.push(item);
+						}
+					});
+					// res.data.nameData.slice(1).forEach(item => {
+					//   const props = {
+					//     'prop': item.name,
+					//     'label': item.name,
+					//     'align': 'center'
+					//   }
+					//   arr[2].children.push(props)
+					// })
+					let tableDataArr = [];
+					res.data.data.forEach((item) => {
+						let obj = {};
+						(obj.lineName = item.lineName),
+							(obj.sum = item.sum),
+							item.data.forEach((ele, index) => {
+								// console.log(ele)
+								ele.children.forEach((e) => {
+									console.log(e.dynamicName);
+									obj['' + e.dynamicName + ''] = e.dynamicValue;
+									console.log(obj['' + e.dynamicName + '']);
+								});
+							});
+						tableDataArr.push(obj);
+					});
+					this.tableData = tableDataArr;
+					this.tableProps = arr;
 
-            // 构造表格数据
-            let tableDataArr = [];
-            res.data.data.forEach((item) => {
-              let obj = {
-                lineName: item.lineName,
-                sum: item.sum,
-              };
-              item.data.forEach((ele) => {
-                ele.children.forEach((e) => {
-                  obj[e.dynamicName] = e.dynamicValue;
-                });
-              });
-              tableDataArr.push(obj);
-            });
-            this.tableData = tableDataArr;
-            this.tableProps = arr;
+					// let tempList = []
+					// res.data.nameData.slice(1).forEach(item => {
+					//   tempList.push(item.name)
+					//   // arr[2].children.push(props)
+					// })
+					// xData = Array.from(new Set(tempList))
 
-            // 构造图表数据
-            res.data.data.forEach((item) => {
-              let yData = [];
-              lineName.push(item.lineName);
-              item.data.forEach((ele) => {
-                ele.children.forEach((e) => {
-                  yData.push(e.dynamicValue);
-                });
-              });
-              yAllData.push(yData);
-            });
-          } else {
-            this.tableProps = arr;
-            this.tableData = [];
-            xData = [];
-            yAllData = [];
-            lineName = [];
-          }
-
-          // 初始化图表
-          this.$nextTick(() => {
-            this.$refs.lineChart.initChart(xData, yAllData, lineName);
-          });
-        })
-        .catch((err) => {
-          console.error('获取产量数据失败：', err);
-          this.tableData = [];
-        })
-        .finally(() => {
-          this.dataListLoading = false; // 关闭加载状态
-        });
-    },
-    /**
-     * 搜索栏按钮点击事件
-     * @param {Object} val - 按钮/表单传递的参数
-     */
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          // 处理产线参数（避免undefined，空值设为空数组）
-          this.listQuery.lineIds = val.lineIds || [];
-          // 处理时间参数：如果是时间字符串，可转换为时间戳（根据接口要求调整）
-          if (val.time) {
-            // this.listQuery.time = val.time;
-            // 若接口需要时间戳，取消下面注释：
-            this.listQuery.time = new Date(val.time).getTime();
-          } else {
-            this.$message({
-              message: '请选择时间',
-              type: 'warning',
-            });
-            return;
-          }
-
-          // 验证产线是否选择（可选，根据业务需求调整）
-          if (this.listQuery.lineIds.length === 0) {
-            this.$message({
-              message: '请选择至少一条产线',
-              type: 'warning',
-            });
-            return;
-          }
-
-          this.getData();
-          break;
-        case 'reset':
-          // 重置表单
-          this.$refs.searchBarForm.resetForm();
-          // 恢复默认值
-          this.listQuery = {
-            lineIds: this.formConfig[1].defaultSelect || [],
-            time: this.formConfig[0].defaultValue || '',
-          };
-          break;
-        default:
-          console.log(val);
-      }
-    },
-  },
+					res.data.data.forEach((item) => {
+						let yData = [];
+						lineName.push(item.lineName);
+						// let obj = {}
+						// obj.lineName = item.lineName,
+						//   obj.sum = item.sum,
+						item.data.forEach((ele, index) => {
+							// console.log(ele)
+							ele.children.forEach((e) => {
+								// let yData = []
+								yData.push(e.dynamicValue);
+							});
+						});
+						yAllData.push(yData);
+					});
+					console.log(lineName);
+				} else {
+					this.tableProps = arr;
+					this.tableData = [];
+					xData = [];
+					yAllData = [];
+					lineName = [];
+				}
+				// res.data.data[0].data[0].children.forEach((item, index) => {
+				//   // console.log(item)
+				//   yData.push(item.dynamicValue)
+				//   // let data = 'data' + Number(index+1)
+				//   // obj['' + item.dynamicName + ''] = item.dynamicValue
+				// })
+				// console.log(this.yData)
+				this.$nextTick(() => {
+					this.$refs.lineChart.initChart(xData, yAllData, lineName);
+				});
+				// this.total = response.data.total;
+				// this.dataListLoading = false;
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.lineIds = val.lineIds ? val.lineIds : undefined;
+					// this.listQuery.productId = val.productId;
+					this.listQuery.time = val.time
+						? new Date(val.time).getTime()
+						: undefined;
+					// this.listQuery.pageNo = 1;
+					// this.listQuery.pageSize = 10;
+					if (val.time) {
+						this.getData();
+					} else {
+						this.$message({
+							message: '请选择时间',
+							type: 'warning',
+						});
+					}
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
 };
 </script>

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

@@ -279,8 +279,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-          },
-          
+					},
 					// {
 					// 	select: true,
 					// 	label: '设备分组',

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

@@ -92,9 +92,7 @@ export default {
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{ prop: 'name', label: '设备类型名称' },
-				{ prop: 'isCraft', label: '是否为生产设备',
-					filter: (val) => val?'是': '否', },
-        { prop: 'code', label: '设备类型编码' },
+				{ prop: 'code', label: '检测类型编码' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [

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

@@ -22,9 +22,9 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="玻璃类型" prop="typeDictValue">
+              <el-form-item label="产品类型" prop="typeDictValue">
                 <el-select v-model="dataForm.typeDictValue" style="width: 100%" :disabled="isdetail"
-                  placeholder="请选择玻璃类型">
+                  placeholder="请选择产品类型">
                   <el-option v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)" :key="dict.value" :label="dict.label"
                     :value="dict.value" />
                 </el-select>
@@ -66,30 +66,20 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="完成单位产品用时(S)" prop="processTime">
-                <el-input :disabled="isdetail" v-model="dataForm.processTime" placeholder="请输入完成单位产品用时(S)" />
+              <el-form-item label="完成单位产品用时" prop="processTime">
+                <el-input :disabled="isdetail" v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="	产品工艺" prop="processTypes">
-                <el-select :disabled="isdetail" collapse-tags multiple v-model="dataForm.processTypes" clearable
-                  style="width: 100%" placeholder="请选择产品工艺">
-                  <el-option v-for="dict in processTypeList" :key="dict.value" :label="dict.label"
-                    :value="dict.value" />
+              <el-form-item label="	加工属性" prop="processType">
+                <el-select v-model="dataForm.processType" clearable style="width: 100%" :disabled="isdetail"
+                  placeholder="请选择加工属性">
+                  <el-option v-for="dict in processTypeList" :key="dict.id" :label="dict.label"
+                    :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="	基板类型" prop="typeDictValue">
-                <el-select :disabled="isdetail" v-model="dataForm.typeDictValue" clearable
-                  style="width: 100%" placeholder="请选择基板类型">
-                  <el-option v-for="dict in typeList" :key="dict.value" :label="dict.label" :value="dict.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row> -->
         </el-form>
 
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
@@ -141,360 +131,317 @@
 
 <script>
 import {
-  deleteProductAttr,
-  getProductAttrPage,
+	deleteProductAttr,
+	getProductAttrPage,
 } from '@/api/core/base/productAttr';
 
 import {
-  createProduct,
-  updateProduct,
-  getProduct,
-  getCode,
+	createProduct,
+	updateProduct,
+	getProduct,
+	getCode,
 } from '@/api/core/base/product';
 import productAttrAdd from './attr-add';
 import { parseTime } from '../../mixins/code-filter';
 import SmallTitle from './SmallTitle';
-import { listData } from "@/api/system/dict/data"; //数据字典接口
+
 const tableBtn = [
-  {
-    type: 'edit',
-    btnName: '编辑',
-  },
-  {
-    type: 'delete',
-    btnName: '删除',
-  },
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
 ];
 const tableProps = [
-  {
-    prop: 'createTime',
-    label: '添加时间',
-    filter: parseTime,
-  },
-  {
-    prop: 'name',
-    label: '属性名',
-  },
-  {
-    prop: 'value',
-    label: '属性值',
-  },
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'name',
+		label: '属性名',
+	},
+	{
+		prop: 'value',
+		label: '属性值',
+	},
 ];
 
 export default {
-  components: { productAttrAdd, SmallTitle },
-  data() {
-    return {
-      visible: false,
-      addOrUpdateVisible: false,
-      tableBtn,
-      tableProps,
-      productAttributeList: [],
-      dataForm: {
-        id: null,
-        name: '', // 产品名称
-        code: '', // 产品编码
-        area: 0, // 深加工单位平方数(float only)
-        typeDictValue: null, // 玻璃类型id
-        processTime: null, // 单位产品用时 (s)
-        specifications: '', // 深加工规格
-        unitDictValue: '', // 单位id
-        originalSpecifications: '', // 原片规格
+	components: { productAttrAdd, SmallTitle },
+	data() {
+		return {
+			visible: false,
+			addOrUpdateVisible: false,
+			tableBtn,
+			tableProps,
+			productAttributeList: [],
+			dataForm: {
+				id: null,
+				name: '', // 产品名称
+				code: '', // 产品编码
+				area: 0, // 深加工单位平方数(float only)
+				typeDictValue: null, // 产品类型id
+				processTime: null, // 单位产品用时 (s)
+				specifications: '', // 深加工规格
+				unitDictValue: '', // 单位id
+				originalSpecifications: '', // 原片规格
         originalArea: 0, // 原片单位平方数
-        processTypes: [],
-      },
-      typeList:[],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
+        processType:undefined,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
       },
       processTypeList: [
-        // {
-        //   value: '1',
-        //   label: '压花丝印'
-        // },
-        // {
-        //   value: '2',
-        //   label: '无印打孔'
-        // },
-        // {
-        //   value: '3',
-        //   label: '单层镀膜'
-        // }, {
-        //   value: '4',
-        //   label: '双层镀膜'
-        // }
+        {
+          id: '0',
+          label:'压花丝印'
+        },
+        {
+          id: '1',
+          label: '无印打孔'
+        },
+        {
+          id: '2',
+          label: '单层镀膜'
+        }, {
+          id: '3',
+          label: '双层镀膜'
+        }
       ],
-      dataRule: {
-        code: [
-          {
-            required: true,
-            message: '产品编码不能为空',
-            trigger: 'blur',
-          },
-          // {
-          // 	type: 'number',
-          // 	message: '产品编码为数字类型',
-          // 	trigger: 'blur',
-          // 	transfom: 'val => Number(val)',
-          // },
-        ],
-        name: [
-          {
-            required: true,
-            message: '产品名称不能为空',
-            trigger: 'blur',
-          },
-        ],
-        typeDictValue: [
-          {
-            required: true,
-            message: '玻璃类型不能为空',
-            trigger: 'blur',
-          },
-        ],
-        area: [
-          {
-            type: 'number',
-            message: '请输入正确的数值',
-            trigger: 'change',
-            transform: (val) => Number(val),
-          },
-        ],
-        processTime: [
-          {
-            required: true,
-            message: '完成单位产品用时不能为空',
-            trigger: 'blur',
-          },
-          {
-            type: 'number',
-            message: '请输入正确的数值',
-            trigger: 'blur',
-            transform: (val) => Number(val),
-          },
-        ],
-      },
-      isdetail: false,
-    };
-  },
-  methods: {
-    async initData() {
-      this.productAttributeList.splice(0);
-      this.listQuery.total = 0;
-      const typeRes  = await listData({
-        pageNo:
-          1,
-        pageSize
-          : 10,
-        dictType
-          : 'product_type'
-      })
+			dataRule: {
+				code: [
+					{
+						required: true,
+						message: '产品编码不能为空',
+						trigger: 'blur',
+					},
+					// {
+					// 	type: 'number',
+					// 	message: '产品编码为数字类型',
+					// 	trigger: 'blur',
+					// 	transfom: 'val => Number(val)',
+					// },
+				],
+				name: [
+					{
+						required: true,
+						message: '产品名称不能为空',
+						trigger: 'blur',
+					},
+				],
+				typeDictValue: [
+					{
+						required: true,
+						message: '产品类型不能为空',
+						trigger: 'blur',
+					},
+				],
+				area: [
+					{
+						type: 'number',
+						message: '请输入正确的数值',
+						trigger: 'change',
+						transform: (val) => Number(val),
+					},
+				],
+				processTime: [
+					{
+						required: true,
+						message: '完成单位产品用时不能为空',
+						trigger: 'blur',
+					},
+					{
+						type: 'number',
+						message: '请输入正确的数值',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
+				],
+			},
+			isdetail: false,
+		};
+	},
+	methods: {
+		initData() {
+			this.productAttributeList.splice(0);
+			this.listQuery.total = 0;
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || null;
+			this.visible = true;
 
-      this.typeList = typeRes.data.list
-      console.log('typeRes', this.typeList);
-      const processTypeRes = await listData({
-        pageNo:
-          1,
-        pageSize
-          : 10,
-        dictType
-          : 'process_type'
-      })
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
 
-      this.processTypeList = processTypeRes.data.list
-      console.log('typeRes', this.typeList);
-    },
-    init(id, isdetail) {
-      this.initData();
-      this.isdetail = isdetail || false;
-      this.dataForm.id = id || null;
-      // this.dataForm.processTypes = [] // 清空工艺选择
-      this.visible = true;
+				if (this.dataForm.id) {
+					// 获取产品详情
+					getProduct(id).then((response) => {
+						this.dataForm = response.data;
+					});
+					// 获取产品的属性列表
+					this.getList();
+				} else {
+					getCode().then((res) => {
+						this.dataForm.code = res.data;
+					});
+				}
+			});
+		},
 
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields();
-
-        if (this.dataForm.id) {
-          // 获取产品详情
-          getProduct(id).then((res) => {
-            const resData = res.data || {};
-            // 逐个字段赋值（保留响应式）
-            this.dataForm.name = resData.name || '';
-            this.dataForm.code = resData.code || '';
-            this.dataForm.area = resData.area || 0;
-            this.dataForm.typeDictValue = resData.typeDictValue || null;
-            this.dataForm.processTime = resData.processTime || null;
-            this.dataForm.specifications = resData.specifications || '';
-            this.dataForm.unitDictValue = resData.unitDictValue || '';
-            this.dataForm.originalSpecifications = resData.originalSpecifications || '';
-            this.dataForm.originalArea = resData.originalArea || 0;
-
-            // 处理工艺列表：确保是数组，过滤空值
-            this.dataForm.processTypes = resData.processType
-              ? resData.processType.split(',').filter(Boolean)
-              : [];
-
-            console.log('工艺列表（编辑时）：', this.dataForm.processTypes); // 验证是否为 ["1","2"] 格式
-          });
-          // 获取产品的属性列表
-          this.getList();
-        } else {
-          getCode().then((res) => {
-            this.dataForm.code = res.data;
-          });
-        }
-      });
-    },
-
-    getList() {
-      // 获取产品的属性列表
-      getProductAttrPage({
-        ...this.listQuery,
-        productId: this.dataForm.id,
-      }).then((response) => {
-        this.productAttributeList = response.data.list;
-        this.listQuery.total = response.data.total;
-      });
-    },
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        this.$confirm(
-          `确定对${raw.data.name
-            ? '[名称=' + raw.data.name + ']'
-            : '[序号=' + raw.data._pageIndex + ']'
-          }进行删除操作?`,
-          '提示',
-          {
-            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);
-      }
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-
-          // 修改的提交
-          if (this.dataForm.id) {
-            updateProduct(this.dataForm).then((response) => {
-              this.$modal.msgSuccess('修改成功');
-              this.visible = false;
-              this.$emit('refreshDataList');
-            });
-            return;
-          }
-          // 添加的提交
-          createProduct(this.dataForm).then((response) => {
-            this.$modal.msgSuccess('新增成功');
-            this.$confirm(`是否新增产品属性?`, '系统提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-              .then(() => {
+		getList() {
+			// 获取产品的属性列表
+			getProductAttrPage({
+				...this.listQuery,
+				productId: this.dataForm.id,
+			}).then((response) => {
+				this.productAttributeList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						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);
+			}
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProduct(this.dataForm).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProduct(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.$confirm(`是否新增产品属性?`, '系统提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning',
+						})
+							.then(() => {
                 this.dataForm.id = response.data
-                this.addNew();
-              })
-              .catch(() => {
-                this.visible = false;
-                this.$emit('refreshDataList');
-              });
-          });
-        }
-      });
-    },
-    goEdit() {
-      this.isdetail = false;
-    },
-    // 新增 / 修改
-    addNew(id) {
-      if (this.dataForm.id) {
-        this.addOrUpdateVisible = true;
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id);
-        });
-      } else {
-        this.$message('请先创建产品!');
-      }
-    },
-    goback() {
-      this.$emit('refreshDataList');
-      this.visible = false;
-      this.initData();
-    },
-  },
+								this.addNew();
+							})
+							.catch(() => {
+								this.visible = false;
+								this.$emit('refreshDataList');
+							});
+					});
+				}
+			});
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			if (this.dataForm.id) {
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(id);
+				});
+			} else {
+				this.$message('请先创建产品!');
+			}
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			this.initData();
+		},
+	},
 };
 </script>
 
 <style scoped>
-.drawer>>>.el-drawer {
-  border-radius: 8px 0 0 8px;
-  display: flex;
-  flex-direction: column;
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
 }
 
-.drawer>>>.el-form-item__label {
-  padding: 0;
+.drawer >>> .el-form-item__label {
+	padding: 0;
 }
 
-.drawer>>>.el-drawer__header {
-  margin: 0;
-  padding: 32px 32px 24px;
-  border-bottom: 1px solid #dcdfe6;
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
 }
 
-.drawer>>>.el-drawer__body {
-  flex: 1;
-  height: 1px;
-  display: flex;
-  flex-direction: column;
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
 }
 
-.drawer>>>.content {
-  padding: 30px 24px;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  /* height: 100%; */
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
 }
 
-.drawer>>>.visual-part {
-  flex: 1 auto;
-  max-height: 76vh;
-  overflow: hidden;
-  overflow-y: scroll;
-  padding-right: 10px;
-  /* 调整滚动条样式 */
-}
-
-.drawer>>>.el-form,
-.drawer>>>.attr-list {
-  padding: 0 16px;
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
 }
 
 .drawer-body__footer {
-  display: flex;
-  justify-content: flex-end;
-  padding: 18px;
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
 }
 </style>

src/views/core/base/product/attr-add.vue

@@ -1,142 +1,139 @@
 <template>
-  <el-dialog v-loading="isLoading" loading-text="处理中..." loading-spinner="el-icon-loading"
-    loading-background="rgba(255, 255, 255, 0.7)" :visible.sync="visible" :width="'35%'" :append-to-body="true"
-    :close-on-click-modal="false" class="dialog">
-    <template #title>
-      <slot name="title">
-        <div class="titleStyle">
-          {{ !dataForm.id ? '新增' : '编辑' }}
-        </div>
-      </slot>
-    </template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
 
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
-      @keyup.enter.native="dataFormSubmit()">
-      <el-form-item label="属性名" prop="name">
-        <el-input v-model="dataForm.name" placeholder="请输入属性名" clearable />
-      </el-form-item>
-      <el-form-item label="属性值" prop="value">
-        <el-input v-model="dataForm.value" placeholder="请输入属性值" clearable />
-      </el-form-item>
-    </el-form>
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="属性名" prop="name">
+				<el-input
+					v-model="dataForm.name"
+					placeholder="请输入属性名"
+					clearable />
+			</el-form-item>
+			<el-form-item label="属性值" prop="value">
+				<el-input
+					v-model="dataForm.value"
+					placeholder="请输入属性值"
+					clearable />
+			</el-form-item>
+		</el-form>
 
-    <el-row style="text-align: right">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button :loading="isLoading" type="primary" @click="dataFormSubmit()">确定</el-button>
-    </el-row>
-  </el-dialog>
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
 </template>
 
 <script>
 import {
-  createProductAttr,
-  updateProductAttr,
-  getProductAttr,
+	createProductAttr,
+	updateProductAttr,
+	getProductAttr,
 } from '@/api/core/base/productAttr';
 
 export default {
-  props: {
-    productId: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      visible: false,
-      isLoading: false,
-      dataForm: {
-        id: 0,
-        name: '',
-        value: '',
-      },
-      dataRule: {
-        name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      },
-    };
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || '';
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields();
-        if (this.dataForm.id) {
-          getProductAttr(this.dataForm.id).then((res) => {
-            const { name, value } = res.data;
-            this.dataForm.name = name;
-            this.dataForm.value = value;
-          }).catch(err => {
-            console.error('获取属性详情失败：', err);
-            this.$modal.msgError('获取数据失败，请重试');
-          });
-        }
-      });
-    },
-    // 表单提交（优化加载状态和错误处理）
-    async dataFormSubmit() {
-      // 先验证表单
-      const valid = await new Promise((resolve) => {
-        this.$refs['dataForm'].validate((isValid) => resolve(isValid));
-      });
-
-      if (!valid) return;
-
-      this.isLoading = true; // 开始加载
-
-      try {
-        if (this.dataForm.id) {
-          // 编辑操作
-          await updateProductAttr({
-            ...this.dataForm,
-            productId: this.productId,
-          });
-          this.$modal.msgSuccess('修改成功');
-        } else {
-          // 新增操作
-          await createProductAttr({
-            ...this.dataForm,
-            productId: this.productId,
-          });
-          this.$modal.msgSuccess('新增成功');
-        }
-        this.visible = false;
-        this.$emit('refreshDataList');
-      } catch (error) {
-        // 错误处理
-        console.error('提交失败：', error);
-        this.$modal.msgError('操作失败，请重试');
-      } finally {
-        // 无论成功失败，都关闭加载状态
-        this.isLoading = false;
-      }
-    },
-  },
+	props: {
+		productId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				name: '',
+				value: '',
+			},
+			dataRule: {
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getProductAttr(this.dataForm.id).then((res) => {
+						const { name, value } = res.data;
+						this.dataForm.name = name;
+						this.dataForm.value = value;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProductAttr({
+							...this.dataForm,
+							productId: this.productId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProductAttr({
+						...this.dataForm,
+						productId: this.productId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
 };
 </script>
 
 <style scoped>
-.dialog>>>.el-dialog__body {
-  padding: 30px 24px;
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
 }
-
-.dialog>>>.el-dialog__header {
-  font-size: 16px;
-  color: rgba(0, 0, 0, 0.85);
-  font-weight: 500;
-  padding: 13px 24px;
-  border-bottom: 1px solid #e9e9e9;
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
 }
-
-.dialog>>>.el-dialog__header .titleStyle::before {
-  content: '';
-  display: inline-block;
-  width: 4px;
-  height: 16px;
-  background-color: #0b58ff;
-  border-radius: 1px;
-  margin-right: 8px;
-  position: relative;
-  top: 2px;
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
 }
 </style>

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

@@ -104,11 +104,7 @@ export default {
 				getDataListURL: getProductionLinePage,
 				deleteURL: deleteProductionLine,
 				exportURL: exportProductionLineExcel,
-      },
-      listQuery: {
-        pageSize: 20,
-        pageNo:1
-      },
+			},
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi(`base:production-line:update`)
@@ -216,7 +212,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.factoryId = val.factoryId || undefined;
 					this.listQuery.name = val.name;
 					this.getDataList();
@@ -224,7 +220,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-            pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

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

@@ -12,19 +12,19 @@
 		<el-skeleton v-if="initing" :rows="6" animated />
 		<!-- :span-method="mergeColumnHandler" -->
 		<div v-else :class="{ 'no-data-bg': !tableData || tableData.length == 0 }">
-			<base-table
-				v-if="tableData && tableData.length > 0"
-				:table-props="tableProps"
-				:table-data="tableData"
-				:max-height="tableH"
-				:span-method="mergeColumnHandler"
-				@emitFun="handleEmitFun" />
+		<base-table
+		v-if="tableData && tableData.length > 0"
+			:table-props="tableProps"
+			:table-data="tableData"
+							:max-height="tableH"
+			@emitFun="handleEmitFun"
+		/>
 		</div>
 	</div>
 </template>
 
 <script>
-import { getSectionDataOneDay } from '@/api/core/monitoring/data24';
+import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
@@ -34,8 +34,8 @@ export default {
 	mixins: [tableHeightMixin],
 	data() {
 		return {
-			urlOptions: {
-				getDataListURL: getSectionDataOneDay,
+      urlOptions: {
+				getDataListURL: getPdlDataOneDay
 			},
 			initing: false,
 			queryParams: {
@@ -45,7 +45,6 @@ export default {
 			list: [],
 			arr: [],
 			spanArr: [],
-			spanArrProLine: [], // 产线合并行数组
 			timeList: [],
 			tableData: [],
 			tableProps: [],
@@ -59,130 +58,78 @@ export default {
 	methods: {
 		/** 构建tableProps - 依据第一个元素所提供的信息 */
 		buildProps(plData) {
-			this.timeList = []; // 重置避免重复
-			this.arr = [];      // 重置避免重复
-			plData.forEach((item) => {
-				this.timeList.push(item.name);
-			});
-			const timeArray = Array.from(new Set(this.timeList));
+			plData.forEach(item => {
+				this.timeList.push(item.name)
+			})
+			const timeArray = Array.from(new Set(this.timeList))
+			console.log('nihc', timeArray)
 			for (const times of timeArray) {
-				if (!['投入数', '产出数', '报废数量', '报废比例'].includes(times)) {
+				if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') {
 					const subprop = {
-						label: `${times.slice(0, 10)} ${times.slice(11)}`,
+						label: times.slice(0, 10) + ' ' + times.slice(11),
 						align: 'center',
 						children: [
-							{
-								prop: `${times}_in`,
-								label: '投入数',
-								filter: (val) => (val != null ? val : '-'),
-							},
-							{
-								prop: `${times}_out`,
-								label: '产出数',
-								filter: (val) => (val != null ? val : '-'),
-							},
-							{
-								prop: `${times}_junk`,
-								label: '报废数量',
-								filter: (val) => (val != null ? val : '-'),
-							},
-							{
-								prop: `${times}_area`,
-								label: '报废比例',
-								filter: (val) => (val != null ? val.toFixed(2) : '-'),
-							},
-						],
-					};
-					this.arr.push(subprop);
+							{ prop: times + '_in', label: '投入数量',
+							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
+							{ prop: times + '_out', label: '产出数量',
+							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
+							{ prop: times + '_junk', label: '报废数量',
+							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
+							{ prop: times + '_area', label: '产出面积',
+							filter: (val) => (val != null ? val.toFixed(2) : '-'), }
+						]
+					}
+					this.arr.push(subprop)
 				}
 			}
-			this.tableProps = [
-				{
-					prop: 'proLineName',
-					label: '产线',
-					fixed: 'left',
-          width: 120,
-					showOverflowTooltip: true,
-				},
-				{
-					prop: 'spec',
-					label: '产品规格',
-					fixed: 'left',
-          width: 110,
-					showOverflowTooltip: true,
-					filter: (val) => val != null ? val.join(' / ') : '-',
-				},
-				{
-					prop: 'sectionName',
-					label: '工段名称',
-					fixed: 'left',
-          width: 120,
-					showOverflowTooltip: true,
-				},
-				{
-					prop: 'allNum',
-					label: '生产总数',
-					fixed: 'left',
-					showOverflowTooltip: true,
-				},
-				...this.arr
-			];
-		},
-		/** 通用合并行计算方法 */
-		calcRowSpan(arr) {
-			const spanArr = [];
-			let count = 0;
-			arr.forEach((item, index) => {
-				if (index === 0) {
-					spanArr.push(1);
-				} else {
-					if (item === arr[index - 1]) {
-						spanArr[count] += 1;
-						spanArr.push(0);
-					} else {
-						count = index;
-						spanArr.push(1);
-					}
-				}
-			});
-			return spanArr;
+			this.tableProps = this.arr
 		},
+		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)
+          }
+        }
+      })
+      console.log('打印数组长度', this.spanArr)
+    },
 
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
-			this.tableData = []; // 重置避免重复
-			const proLineNames = []; // 存储产线名称用于计算合并
-			const specNames = [];    // 存储规格名称用于计算合并
-
-			list.forEach((ele) => {
-				const tempData = {};
-				// 基础字段赋值
-				tempData.proLineName = ele.proLineName;
-				tempData.spec = ele.spec;
-				tempData.sectionName = ele.sectionName;
-				tempData.allNum = ele.allNum;
-
-				// 动态字段赋值
-				ele.data.forEach((item) => {
-					item.children.forEach((params) => {
-						const keyMap = {
-							'投入数': `${item.dynamicName}_in`,
-							'产出数': `${item.dynamicName}_out`,
-							'报废数量': `${item.dynamicName}_junk`,
-							'报废比例': `${item.dynamicName}_area`,
-						};
-						const key = keyMap[params.dynamicName];
-						if (key) tempData[key] = params.dynamicValue;
-					});
-				});
-
-				this.tableData.push(tempData);
-				proLineNames.push(ele.proLineName);
-				specNames.push(ele.spec);
-			});
-
-			// 计算合并行数组
-			this.spanArrProLine = this.calcRowSpan(proLineNames);
+			let sectionArr= []
+			console.log('打印看下数据list', list)
+			list.forEach((ele, index) => {
+				let tempData = []
+				ele.data.forEach(item => {
+					item.children.forEach(params => {
+						if (params.dynamicName === '投入数量') {
+							tempData[item.dynamicName + '_in'] = params.dynamicValue
+						} else if (params.dynamicName === '产出数量') {
+							tempData[item.dynamicName + '_out'] = params.dynamicValue
+						} else if (params.dynamicName === '报废数量') {
+							tempData[item.dynamicName + '_junk'] = params.dynamicValue
+						} else {
+							tempData[item.dynamicName + '_area'] = params.dynamicValue
+						}
+					})
+				})
+				tempData['proLineName'] = ele.proLineName
+				tempData['spec'] = ele.spec
+				this.tableData.push(tempData)
+				console.log('看看数据', this.tableData, tempData)
+				const { proLineName } = tempData
+				sectionArr.push(proLineName)
+			})
+			this.setRowSpan(sectionArr)
+			console.log('工段名称列表', sectionArr)
 		},
 
 		buildData(data) {
@@ -191,55 +138,38 @@ export default {
 
 		/** 合并table列的规则 */
 		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			// 列索引0: 产线列, 列索引1: 产品规格列
-			if (columnIndex === 0) {
-				return {
-					rowspan: this.spanArrProLine[rowIndex] || 0,
-					colspan: this.spanArrProLine[rowIndex] ? 1 : 0
-				};
+			if (columnIndex == 0) {
+				if (this.spanArr[rowIndex]) {
+					return [
+						this.spanArr[rowIndex], // row span
+						1, // col span
+					];
+				} else {
+					return [0, 0];
+				}
 			}
-			if (columnIndex === 1) {
-				return {
-					rowspan: this.spanArrProLine[rowIndex] || 0,
-					colspan: this.spanArrProLine[rowIndex] ? 1 : 0
-				};
-			}
-			// 其他列不合并
-			return { rowspan: 1, colspan: 1 };
 		},
 
 		async getList() {
-			this.urlOptions.getDataListURL().then((res) => {
-				console.log('看看数据', res);
+      this.urlOptions.getDataListURL().then(res => {
+        console.log('看看数据', res)
 				this.arr = [
-					{
-						prop: 'proLineName',
-						label: '产线',
+          {
+            prop: 'proLineName',
+            label: '生产线',
 						fixed: 'left',
-						showOverflowTooltip: true,
-					},
-					{
-						prop: 'spec',
-						label: '产品规格',
+						showOverflowTooltip: true
+          },
+          {
+            prop: 'spec',
+            label: '产品规格',
 						fixed: 'left',
-						showOverflowTooltip: true,
-					},
-					{
-						prop: 'sectionName',
-						label: '工段名称',
-						fixed: 'left',
-						showOverflowTooltip: true,
-					},
-					{
-						prop: 'allNum',
-						label: '生产总数',
-						fixed: 'left',
-						showOverflowTooltip: true,
-					},
-				];
+						showOverflowTooltip: true
+          }
+				]
 				this.buildProps(res.data.nameData);
 				this.buildData(res.data.data);
-			});
+      })
 
 			// // const data = this.res.data;
 			// // console.log('recent-24', data);

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

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

src/views/core/monitoring/groupReport/gr-detail.vue

@@ -1,331 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-24 14:47:58
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 14:03:40
- * @Description:
--->
-<template>
-  <div>
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table id="detail" :data="tableData" :header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}" border  v-loading="dataListLoading" style="width: 100%" ref="dataList">
-      <el-table-column prop="lineName" label="产线" align="center" />
-      <!-- <el-table-column prop="sizes" width="105" showOverflowtooltip align="center" label="规格" /> -->
-      <!-- <el-table-column prop="process" label="产品工艺" align="center" /> -->
-      <el-table-column prop="inputN" label="磨边" align="center">
-        <el-table-column prop="edgeNum" label="投入数量/片" />
-        <el-table-column prop="edgeTime" label="数据上报时间">
-          <template v-slot="scope">
-            <span>
-              {{
-              scope.row.reportType === 0
-              ? parseTime(scope.row.edgeTime)
-              : '-'
-              }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="outputN" label="打孔/丝印" align="center">
-        <el-table-column prop="drillCoating" label="投入数量">
-          <template v-slot="scope">
-            <span>
-              {{
-              (scope.row.drillNum ?? '-')
-              + '/'
-              + (scope.row.coatingNum ?? '-')
-              }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="coatingTime" label="数据上报时间">
-          <template v-slot="scope">
-            <span>
-              {{
-  scope.row.reportType === 0
-              ? parseTime(scope.row.coatingTime)
-              : '-'
-              }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="lossN" label="镀膜" align="center">
-        <el-table-column prop="silkNum" label="投入数量" />
-        <el-table-column prop="silkTime" label="数据上报时间">
-          <template v-slot="scope">
-            <span>
-              {{
-  scope.row.reportType === 0
-              ? parseTime(scope.row.silkTime)
-              : '-'
-              }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="lossN" label="钢化" align="center">
-        <el-table-column prop="temperingNum" label="投入数量" />
-        <el-table-column prop="temperingTime" label="数据上报时间">
-          <template v-slot="scope">
-            <span>
-              {{
-  scope.row.reportType === 0
-              ? parseTime(scope.row.temperingTime)
-              : '-'
-              }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="lossN" label="包装" align="center">
-        <el-table-column prop="packingNum" label="投入数量" />
-        <el-table-column prop="packingTime" label="数据上报时间">
-          <template v-slot="scope">
-            <span>
-              {{
-  scope.row.reportType === 0
-              ? parseTime(scope.row.packingTime)
-              : '-'
-              }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <!-- <el-table-column prop="lossRatio" label="不良率/%">
-        <template v-slot="scope">
-          <span>
-            {{
-            scope.row.lossRatio != null ? scope.row.lossRatio.toFixed(2) : '-'
-            }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="outputRatio" label="投入产出率/%">
-        <template v-slot="scope">
-          <span>
-            {{
-            scope.row.outputRatio != null
-            ? scope.row.outputRatio.toFixed(2)
-            : '-'
-            }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="processingRatio" label="加工成品率/%">
-        <template v-slot="scope">
-          <span>
-            {{
-            scope.row.processingRatio != null
-            ? scope.row.processingRatio.toFixed(2)
-            : '-'
-            }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="lossD" label="不良详情" align="center">
-        <el-table-column prop="original" label="原片" align="center">
-          <el-table-column prop="originalLossNum" label="原片不良/片" />
-          <el-table-column prop="originalLossArea" label="原片不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.originalLossArea != null
-                ? scope.row.originalLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="edge" label="磨边" align="center">
-          <el-table-column prop="edgeLossNum" label="磨边不良/片" />
-          <el-table-column prop="edgeLossArea" label="磨边不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.edgeLossArea != null
-                ? scope.row.edgeLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="drill" label="打孔" align="center">
-          <el-table-column prop="drillLossNum" label="打孔不良/片" />
-          <el-table-column prop="drillLossArea" label="打孔不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.drillLossArea != null
-                ? scope.row.drillLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="coating" label="镀膜" align="center">
-          <el-table-column prop="coatingLossNum" label="镀膜不良/片" />
-          <el-table-column prop="coatingLossArea" label="镀膜不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.coatingLossArea != null
-                ? scope.row.coatingLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="silk" label="丝印" align="center">
-          <el-table-column prop="silkLossNum" label="丝印不良/片" />
-          <el-table-column prop="silkLossArea" label="丝印不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.silkLossArea != null
-                ? scope.row.silkLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="tempering" label="钢化" align="center">
-          <el-table-column prop="temperingLossNum" label="钢化不良/片" />
-          <el-table-column prop="temperingLossArea" label="钢化不良/m²">
-            <template v-slot="scope">
-              <span>
-                {{
-                scope.row.temperingLossArea != null
-                ? scope.row.temperingLossArea.toFixed(2)
-                : '-'
-                }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table-column> -->
-      <el-table-column prop="down" label="下片" align="center">
-        <el-table-column prop="downNum" label="成品数量" />
-        <el-table-column prop="scrapNum" label="废片数量" />
-        <el-table-column prop="inputOutputRate" label="投入产出率" />
-        <el-table-column prop="yieldRate" label="加工成品率" />
-      </el-table-column>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getTeamReportPageDet, exportGroupProductReportExcel } from '@/api/core/monitoring/auto';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-
-export default {
-	components: {},
-	data() {
-		return {
-      tableData: [],
-      id:null,
-			dataListLoading: false,
-			formConfig: [
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {},
-	mounted() {},
-	methods: {
-		// 获取数据列表
-    init(id) {
-      this.id = id
-			this.dataListLoading = true;
-			getTeamReportPageDet(id).then((response) => {
-				this.tableData = response.data?.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					if (item.isSummaryReport) {
-						item.lineName = '合计';
-					}
-					return item;
-				});
-				this.dataListLoading = false;
-			});
-		},
-		// arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-		// 	if (row.isSummaryReport) {
-		// 		if (columnIndex === 0) {
-		// 			return [1, 3];
-		// 		} else if (columnIndex === 1) {
-		// 			return [0, 0];
-		// 		} else if (columnIndex === 2) {
-		// 			return [0, 0];
-		// 		}
-		// 	}
-		// },
-
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-    handleExport() {
-      this.$modal.confirm('是否确认导出').then(() => {
-          return exportGroupProductReportExcel({id:this.id});
-        }).then(response => {
-          console.log(response)
-          this.$download.excel(response, '班组生产报表-详情.xls');
-        }).catch(() => {})
-			// let tables = document.querySelector('#detail').cloneNode(true);
-			// let exportTable = XLSX.utils.table_to_book(tables);
-
-			// var exportTableOut = XLSX.write(exportTable, {
-			// 	bookType: 'xlsx',
-			// 	bookSST: true,
-			// 	type: 'array',
-			// });
-			// // sheetjs.xlsx为导出表格的标题名称
-			// try {
-			// 	FileSaver.saveAs(
-			// 		new Blob([exportTableOut], {
-			// 			type: 'application/octet-stream',
-			// 		}),
-			// 		'班组生产报表-详情.xlsx'
-			// 	);
-			// } catch (e) {
-			// 	if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			// }
-			// return exportTableOut;
-		},
-	},
-};
-</script>

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

@@ -1,594 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2026-04-13 14:27:08
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table-s
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData">
-			<method-btn
-				v-if="showData.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table-s>
-		<div v-else class="no-data-bg"></div>
-		<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"
-			close-on-click-modal
-			top="0"
-			width="80%">
-			<gr-detail ref="grDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import grDetail from './gr-detail';
-import { getTeamReportPage } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import { getGroupTeamPage } from '@/api/base/groupTeam';
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import baseTableS from './baseTable.vue';
-import { parseTime } from '@/filter/code-filter';
-
-const tableProps = [
-	{
-		prop: 'reportType',
-		label: '报表类型',
-    fixed: true
-	},
-	{
-    prop: 'reportDate',
-		label: '日期',
-		width: 180,
-    fixed: true
-	},
-	{
-		prop: 'factoryName',
-		label: '工厂',
-    fixed: true
-	},
-	{
-		prop: 'teamName',
-		label: '班组',
-    fixed: true
-	},
-  {
-    prop: 'edgeNum',
-    label: '磨边',
-    fixed: true
-  }, {
-    prop: 'drillOrCoating',
-    label: '打孔/丝印',
-    fixed: true
-  }, {
-    prop: 'silkNum',
-    label: '镀膜',
-    fixed: true
-  }, {
-    prop: 'temperingNum',
-    label: '钢化',
-    fixed: true
-  }, {
-    prop: 'packingNum',
-    label: '包装',
-    fixed: true
-  },
-	{
-		prop: 'inputN',
-		label: '下片',
-		align: 'center',
-		children: [
-			{
-        prop: 'downNum',
-				label: '成品数量',
-        width:100
-			},
-			{
-        prop: 'scrapNum',
-				label: '废片数量',
-        width:100
-      },
-      {
-        prop: 'inputOutputRate',
-        label: '投入产出率',
-        width: 100
-      },
-      {
-        prop: 'yieldRate',
-        label: '加工成品率',
-        width: 100
-      },
-		],
-	},
-	// {
-	// 	prop: 'outputN',
-	// 	label: '产出',
-	// 	align: 'center',
-	// 	children: [
-	// 		{
-	// 			prop: 'outputNum',
-	// 			label: '产出数量/片',
-  //       width:100
-	// 		},
-	// 		{
-	// 			prop: 'outputArea',
-	// 			label: '产出面积/㎡',
-	// 			filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //       width:100
-	// 		},
-	// 	],
-	// },
-	// {
-	// 	prop: 'lossN',
-	// 	label: '不良',
-	// 	align: 'center',
-	// 	children: [
-	// 		{
-	// 			prop: 'lossNum',
-	// 			label: '不良数量/片',
-  //       width:100
-	// 		},
-	// 		{
-	// 			prop: 'lossArea',
-	// 			label: '不良面积/㎡',
-	// 			filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //       width:100
-	// 		},
-	// 	],
-	// },
-	// {
-	// 	prop: 'lossRatio',
-	// 	label: '不良率/%',
-	// 	filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //   width:100
-	// },
-	// {
-	// 	prop: 'outputRatio',
-	// 	label: '投入产出率/%',
-	// 	filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //   width:110
-	// },
-	// {
-	// 	prop: 'processingRatio',
-	// 	label: '加工成品率/%',
-	// 	filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //   width:110
-	// },
-	// {
-	// 	prop: 'lossD',
-	// 	label: '不良详情',
-	// 	align: 'center',
-	// 	children: [
-	// 		{
-	// 			prop: 'original',
-	// 			label: '原片',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'originalLossNum',
-	// 					label: '原片不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'originalLossArea',
-	// 					label: '原片不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'edge',
-	// 			label: '磨边',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'edgeLossNum',
-	// 					label: '磨边不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'edgeLossArea',
-	// 					label: '磨边不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'drill',
-	// 			label: '打孔',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'drillLossNum',
-	// 					label: '打孔不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'drillLossArea',
-	// 					label: '打孔不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'coating',
-	// 			label: '镀膜',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'coatingLossNum',
-	// 					label: '镀膜不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'coatingLossArea',
-	// 					label: '镀膜不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'silk',
-	// 			label: '丝印',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'silkLossNum',
-	// 					label: '丝印不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'silkLossArea',
-	// 					label: '丝印不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'tempering',
-	// 			label: '钢化',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'temperingLossNum',
-	// 					label: '钢化不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'temperingLossArea',
-	// 					label: '钢化不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 		{
-	// 			prop: 'packing',
-	// 			label: '包装',
-  //       align: 'center',
-	// 			children: [
-	// 				{
-	// 					prop: 'packingLossNum',
-	// 					label: '包装不良/片',
-  //           width:100
-	// 				},
-	// 				{
-	// 					prop: 'packingLossArea',
-	// 					label: '包装不良/㎡',
-	// 					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-  //           width:100
-	// 				},
-	// 			],
-	// 		},
-	// 	],
-	// },
-];
-
-export default {
-	components: {
-		baseTableS,
-		grDetail,
-	},
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getTeamReportPage,
-			},
-			listQuery: {
-        reportType: 1,
-				pageSize: 10,
-        pageNo: 1,
-        startTime: undefined,
-        endTime: undefined,
-				total: 1,
-			},
-			fileName: '',
-			dataListLoading: false,
-			tableProps,
-      tableBtn: [
-        this.$auth.hasPermi(`monitoring:group-off:detail`)
-          ? {
-            type: 'eq',
-            btnName: '详情',
-          }
-          : undefined,
-
-			].filter((v) => v),
-			showData: [],
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-				},
-				{
-					type: 'select',
-					label: '班组',
-					selectOptions: [],
-					param: 'teamId',
-				},
-				{
-					type: 'select',
-					label: '报表类型',
-          selectOptions: [
-            {
-              id: 0,
-              name: '班',
-            },
-						{
-							id: 1,
-							name: '日',
-						},
-						// {
-						// 	id: 2,
-						// 	name: '周',
-						// },
-						{
-							id: 3,
-							name: '月',
-						},
-						{
-							id: 4,
-							name: '年',
-						},
-					],
-					defaultSelect: 1,
-					param: 'reportType',
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-				},
-				{
-          type: this.$auth.hasPermi('monitoring:group-off:query') ? 'button' : '',
-
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-          type: this.$auth.hasPermi('monitoring:group-off:export') ? 'button' : '',
-					// type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
-		};
-	},
-	created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-    this.listQuery.startTime = yesterday.getTime(), [end.getTime()];
-    this.listQuery.endTime = end.getTime()
-
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [yesterday.getTime(),end.getTime()];
-		});
-		this.getDataList();
-		this.getPdLineList();
-	},
-	methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-      exportTable.Sheets.Sheet1.A1.v = '序号' //导出表格第一列表头为序号
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '班组生产报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getGroupTeamPage(params).then((res) => {
-				this.formConfig[1].selectOptions = res.data.list || [];
-			});
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.teamId = val.teamId || undefined;
-					this.listQuery.reportType = val.reportType || undefined;
-          this.listQuery.startTime = val.timeVal
-						? val.timeVal[0]
-            : undefined;
-          this.listQuery.endTime = val.timeVal
-            ? val.timeVal[1]
-            : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-      this.dataListLoading = true;
-      console.log(this.listQuery);
-
-      const arr = ['班', '日', '', '月', '年']; // 索引0对应班，1对应日，3对应月，4对应年，索引2留空
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				if (!response.data.list) {
-					this.showData = [];
-					this.dataListLoading = false;
-					return;
-				}
-				this.tableData = response.data?.list.map((item, index) => {
-          item.reportType = arr[item.reportType] || item.reportType;
-          item.drillOrCoating = item.drillNum + "/" + item.coatingNum
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
-				this.listQuery.total = response.data?.total;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-      const time = val.data.timeVal ? parseTime(val.data.timeVal[0]) + '-' + parseTime(val.data.timeVal[1]) : '- '
-      const teamName = val.data.teamName?val.data.teamName:'- '
-      const teamLeader = val.data.teamLeader?val.data.teamLeader:'- '
-			this.addOrEditTitle =
-				'时间：' +
-				time +
-				' 班组：' +
-				teamName +
-				' 组长：' +
-				teamLeader +
-				' 详情';
-			this.$nextTick(() => {
-				this.$refs.grDetail.init(val.data.id);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
-		// 每页数
-		sizeChangeHandle(val) {
-			this.listQuery.pageSize = val;
-			this.listQuery.pageNo = 1;
-			this.getDataList();
-		},
-		// 当前页
-		currentChangeHandle(val) {
-			this.listQuery.pageNo = val;
-			this.getDataList();
-		},
-	},
-};
-</script>

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

@@ -262,14 +262,6 @@ export default {
             tooltip: {
               valueFormatter: (value) => `${value} %`,
             },
-            label: {
-              show: true,
-              position: 'top',
-              distance: 6,
-              fontSize: 11,
-              color: '#333333',
-              formatter: (params) => `${params.value}` // 显示单位
-            },
             data: this.barData.map((item) => item.processingRatio),
           },
         ],

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

@@ -77,7 +77,7 @@ const tableProps = [
   },
   {
     prop: 'palletNum',
-    label: '一托玻璃数量/片'
+    label: '下片托数'
   },
   {
     prop: 'startTime',
@@ -92,7 +92,7 @@ const tableProps = [
     width: 160
   },
 	{
-		prop: 'length',
+		prop: 'outputNum',
     label: '玻璃长度/mm'
 	},
 	{
@@ -101,7 +101,7 @@ const tableProps = [
 	},
 	{
     prop: 'thick',
-    label: '玻璃厚度/mm'
+    label: '玻璃长度/mm'
 	},
 ];
 
@@ -204,88 +204,94 @@ export default {
 				);
 			});
 		},
-    exportXlsx() {
-      if (!this.showData.length) {
-        this.$message.warning('暂无数据可导出');
-        return;
-      }
+		test() {
+			var target = document.getElementsByClassName("right-aside")[0]
+			target.style.background = '#FFFFFF'
+			var that = this
+			setTimeout(() => {
+				html2canvas(target).then(function(canvas) {
+						var contentWidth = canvas.width
+						var contentHeight = canvas.height
 
-      this.exportLoading = true;
+						// 一页pdf显示html页面生成的canvas高度
+						var pageHeight = contentHeight / 592.28 * 841.89
+						// 未生成pdf的html页面高度
+						var leftHeight = contentHeight
+						// 页面偏移
+						var position = 0
+						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
+						var imgWidth = 595.28
+						var imgHeight = 592.28 / contentWidth * contentHeight
 
+						var pageData = canvas.toDataURL('image/jpeg', 1.0)
+
+						console.log('nihc URL', leftHeight, pageHeight)
+
+						var pdf = new jsPDF('', 'pt', 'a4')
+
+						if (leftHeight < pageHeight) {
+							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
+						} else {
+							while(leftHeight > 0) {
+								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+								leftHeight -= pageHeight
+								position -= 841.89
+								// 避免空白页
+								if (leftHeight > 0) {
+									pdf.addPage()
+								}
+							}
+						}
+
+						pdf.save(that.fileName + '工段统计.pdf')
+				})
+			}, 300)
+		},
+		exportECL() {
+			let tables = document.querySelector('.el-table').cloneNode(true)
+			const fix = tables.querySelector('.el-table__fixed')
+			const fixRight = tables.querySelector('.el-table__fixed-right')
+			if (fix) {
+				tables.removeChild(tables.querySelector('.el-table__fixed'))
+			}
+			if (fixRight) {
+				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
+			}
+			let exportTable = XLSX.utils.table_to_book(tables)
+
+      var exportTableOut = XLSX.write(exportTable, {
+        bookType: 'xlsx', bookSST: true, type: 'array'
+      })
+      // sheetjs.xlsx为导出表格的标题名称
       try {
-        // 1. 处理导出数据（格式化时间字段）
-        const exportData = this.showData.map(item => {
-          const formatItem = { ...item };
-          // 格式化时间字段
-          if (formatItem.startTime) formatItem.startTime = parseTime(formatItem.startTime);
-          if (formatItem.endTime) formatItem.endTime = parseTime(formatItem.endTime);
-          return formatItem;
-        });
-
-        // 2. 构建表头映射：{ prop: label }，只保留表格配置中存在的列
-        const headerMap = {};
-        this.tableProps.forEach(col => {
-          if (col.prop && col.label) {
-            headerMap[col.prop] = col.label;
-          }
-        });
-
-        // 3. 转换数据：将prop键名替换为label，按tableProps顺序排列列
-        const formattedData = exportData.map(item => {
-          const newItem = {};
-          // 按表格配置顺序遍历列，确保Excel列顺序与表格一致
-          this.tableProps.forEach(col => {
-            const prop = col.prop;
-            const label = col.label;
-            if (prop && label) {
-              // 处理可能的undefined值，避免导出为空字符串
-              newItem[label] = item[prop] ?? '';
-            }
-          });
-          return newItem;
-        });
-
-        // 4. 创建工作表（使用处理后的带label表头的数据）
-        const worksheet = XLSX.utils.json_to_sheet(formattedData);
-
-        // 5. 创建工作簿并添加工作表
-        const workbook = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(workbook, worksheet, '下片日志数据');
-
-        // 6. 生成Excel文件
-        const excelBuffer = XLSX.write(workbook, {
-          bookType: 'xlsx',
-          type: 'array'
-        });
-
-        // 7. 保存文件
-        const blob = new Blob([excelBuffer], {
-          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-        });
-
-        // 8. 生成文件名（包含查询条件信息）
-        let fileName = '下片历史';
-        if (this.listQuery.productionLineId) {
-          const lineItem = this.formConfig[0].selectOptions.find(
-            item => item.id === this.listQuery.productionLineId
-          );
-          if (lineItem) fileName += lineItem.name + '_';
-        }
-        if (this.listQuery.thick) {
-          fileName += this.listQuery.thick + '_';
-        }
-        // 添加时间戳避免文件名重复
-        fileName + '.xlsx';
-
-        FileSaver.saveAs(blob, fileName);
-        this.$message.success('导出成功');
-      } catch (error) {
-        console.error('导出失败:', error);
-        this.$message.error('导出失败，请重试');
-      } finally {
-        this.exportLoading = false;
+        FileSaver.saveAs(new Blob([exportTableOut], {
+          type: 'application/octet-stream'
+        }), this.fileName + '工段统计.xlsx')
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, exportTableOut)
       }
+      return exportTableOut
     },
+		exportPdf() {
+			this.test()
+			setTimeout(() =>{
+				this.dialogVisible = false
+				this.showData = this.tableData
+			}, 600)
+
+		},
+		exportXlsx() {
+			this.exportECL()
+			this.dialogVisible = false
+			this.showData = this.tableData
+		},
+		handleClose(done) {
+			this.$confirm('确认关闭？')
+				.then(_ => {
+					done();
+				})
+				.catch(_ => {});
+		},
 		getPdLineList() {
 			getPdList().then((res) => {
 				this.formConfig[0].selectOptions = res.data || []
@@ -308,16 +314,15 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-          this.listQuery.productionLineId = val.productionLineId ? val.productionLineId : undefined;
-          this.listQuery.thick = val.thick ? val.thick : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
+          this.listQuery.productId = val.productId ? val.productId : undefined;
+          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
+          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
 
 					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
 					this.getDataList();
 					break;
 				case 'export':
-          this.exportXlsx();
+					this.handleExport();
 					break;
 				default:
 					console.log(val);
@@ -345,6 +350,12 @@ export default {
       this.listQuery.pageNo = val;
       this.getDataList();
     },
+		handleExport() {
+			if (this.selectedList.length > 0) {
+				this.showData = this.selectedList
+			}
+			this.dialogVisible = true
+    }
 	},
 };
 </script>

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

@@ -77,7 +77,7 @@ const tableProps = [
   },
   {
     prop: 'palletNum',
-    label: '一托玻璃数量/片'
+    label: '下片托数'
   },
   {
     prop: 'startTime',
@@ -92,7 +92,7 @@ const tableProps = [
     width: 160
   },
 	{
-    prop: 'length',
+		prop: 'outputNum',
     label: '玻璃长度/mm'
 	},
 	{
@@ -358,6 +358,8 @@ export default {
     handleExport() {
       // 处理查询参数
       let params = { ...this.listQuery };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
       this.$modal.confirm('是否确认导出下片日志?').then(() => {
         this.exportLoading = true;
         return exportDownLogData(params);

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

@@ -262,14 +262,6 @@ export default {
             tooltip: {
               valueFormatter: (value) => `${value} %`,
             },
-            label: {
-              show: true,
-              position: 'top',
-              distance: 6,
-              fontSize: 11,
-              color: '#333333',
-              formatter: (params) => `${params.value}` // 显示单位
-            },
             data: this.barData.map((item) => item.processingRatio),
           },
         ],

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

@@ -1,8 +1,14 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2024-12-02 13:44:47
+ * @LastEditors: zwq
+ * @Description:
+-->
 <template>
   <div class="app-container">
     <!-- :isFold="true" 控制展开 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick"
-      @select-changed="selectType" />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <base-table v-if="tableData.length" class="right-aside" v-loading="dataListLoading" :table-props="tableProps"
       :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@@ -11,47 +17,34 @@
     <div v-else class="no-data-bg"></div>
     <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
       @pagination="getDataList" />
+    <!-- <el-dialog
+			title="提示"
+			:visible.sync="dialogVisible"
+			width="30%"
+			:before-close="handleClose">
+			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
+  		<el-button type="success" @click="exportPdf">pdf</el-button>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			</span>
+		</el-dialog> -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
   </div>
 </template>
 
 <script>
-import Vue from 'vue';
 import AddOrUpdate from './add-or-updata';
-
 import { parseTime } from '../../mixins/code-filter';
-import { getCostOriginRadioHisData, getPdList } from '@/api/core/monitoring/index';
+import { getCostOriginRadioHisData, getPdList  } from '@/api/core/monitoring/index'
+import * as XLSX from 'xlsx'
+import FileSaver from 'file-saver'
+import jsPDF from 'jspdf'
+import html2canvas from 'html2canvas'
 import { exportCostOriginRadioHisData } from '../../../../api/core/monitoring';
 
-// Vue2 中注册全局方法（如果需要）
-Vue.prototype.$download = Vue.prototype.$download || {
-  excel: (response, fileName) => {
-    const blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
-    const url = window.URL.createObjectURL(blob);
-    const aLink = document.createElement('a');
-    aLink.style.display = 'none';
-    aLink.href = url;
-    aLink.setAttribute('download', fileName);
-    document.body.appendChild(aLink);
-    aLink.click();
-    document.body.removeChild(aLink);
-    window.URL.revokeObjectURL(url);
-  }
-};
-
-Vue.prototype.$modal = Vue.prototype.$modal || {
-  confirm: (message) => {
-    return new Promise((resolve, reject) => {
-      if (window.confirm(message)) {
-        resolve();
-      } else {
-        reject();
-      }
-    });
-  }
-};
-
 const tableProps = [
+
   {
     prop: 'reportType',
     label: '报表类型'
@@ -59,11 +52,12 @@ const tableProps = [
   {
     prop: 'time',
     label: '日期',
+    // filter: parseTime,
     width: 160
   },
-  {
+	{
     prop: 'bindObjectName',
-    label: '产线'
+		label: '产线'
   },
   {
     prop: 'thick',
@@ -73,11 +67,11 @@ const tableProps = [
     prop: 'speed',
     label: '在线速度'
   },
-  {
+	{
     prop: 'width',
     label: '掰边宽度'
-  },
-  {
+	},
+	{
     prop: 'inArea',
     label: '拉引量/㎡'
   },
@@ -85,83 +79,21 @@ const tableProps = [
     prop: 'outArea',
     label: '下片面积/㎡'
   },
-  {
+	{
     prop: 'ratio',
-    label: '良品率/%'
-  },
+    label: '良品率'
+	},
 ];
 
-/**
- * 工具函数：获取选择时间所在周的起始和结束时间（Vue2 兼容）
- * @param {String|Date} selectTime - 选择的时间（支持格式：yyyy-MM-dd、yyyy-MM-dd HH:mm:ss 或 Date 对象）
- * @returns {Array} [startDate, endDate] - 所在周周一 00:00:00 至 周日 23:59:59（Date 对象）
- */
-function getSelectedWeekRange(selectTime) {
-  // 兼容 String 类型时间和 Date 对象，统一转为 Date 实例
-  const targetDate = new Date(selectTime);
-  // 处理无效日期（若传入非法时间，返回当前时间的本周范围）
-  // if (isNaN(targetDate.getTime())) {
-  //   console.warn('传入的时间格式无效，将使用当前时间计算本周范围');
-  //   return getCurrentWeekRange(); // 可根据需求改为抛出错误或返回空
-  // }
-
-  const day = targetDate.getDay() || 7; // 周日为 7（避免周日 -0 天仍为周日）
-  const start = new Date(targetDate);
-  start.setDate(targetDate.getDate() - day + 1); // 计算所在周的周一
-  start.setHours(0, 0, 0, 0); // 重置时分秒为 00:00:00.000
-
-  const end = new Date(start);
-  end.setDate(start.getDate() + 6); // 周一 +6 天 = 周日
-  end.setHours(23, 59, 59, 999); // 重置时分秒为 23:59:59.999
-
-  return [start, end];
-}
-
-/**
- * 工具函数：获取选择时间所在年的起始和结束时间（Vue2 兼容）
- * @param {String|Date} selectTime - 选择的时间（支持格式：yyyy-MM-dd、yyyy-MM-dd HH:mm:ss 或 Date 对象）
- * @returns {Array} [startDate, endDate] - 所在年 1月1日 00:00:00 至 12月31日 23:59:59（Date 对象）
- */
-function getSelectedYearRange(selectTime) {
-  // 兼容 String 类型时间和 Date 对象，统一转为 Date 实例
-  const targetDate = new Date(selectTime);
-  // 处理无效日期（若传入非法时间，返回当前时间的本年范围）
-  // if (isNaN(targetDate.getTime())) {
-  //   console.warn('传入的时间格式无效，将使用当前时间计算本年范围');
-  //   return getCurrentYearRange(); // 可根据需求改为抛出错误或返回空
-  // }
-
-  const year = targetDate.getFullYear(); // 获取选择时间的年份
-  const start = new Date(year, 0, 1); // 所在年 1月1日（月份从 0 开始）
-  start.setHours(0, 0, 0, 0); // 重置时分秒为 00:00:00.000
-
-  const end = new Date(year, 11, 31); // 所在年 12月31日（11 代表 12 月）
-  end.setHours(23, 59, 59, 999); // 重置时分秒为 23:59:59.999
-
-  return [start, end];
-}
-
-// 格式化时间为 yyyy-MM-dd HH:mm:ss（Vue2 兼容）
-function formatDateTime(date) {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-}
-
 export default {
   components: {
     AddOrUpdate
   },
-  data() {
-    return {
-      urlOptions: {
-        getDataListURL: getCostOriginRadioHisData
-      },
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostOriginRadioHisData
+			},
       tableData: [],
       listQuery: {
         pageSize: 10,
@@ -169,368 +101,181 @@ export default {
         total: 1,
         bindObjectId: undefined,
         statisticType: undefined,
-        startTime: undefined,
-        endTime: undefined
       },
-      pdLineList: [],
+      pdLineList:[],
       exportLoading: false,
       dataListLoading: false,
-      selectedList: [],
-      dialogVisible: false,
+			selectedList: [],
+			dialogVisible: false,
       addOrEditTitle: '',
       addOrUpdateVisible: false,
-      tableProps,
+			tableProps,
       tableBtn: [
         {
           type: 'edit',
           btnName: '编辑',
         },
-      ].filter(v => v),
-      fileName: '',
+      ].filter((v) => v),
+			tableData: [],
+			fileName: '',
       formConfig: [
         {
           type: 'select',
-          label: '报表类型',
-          onchange: true,
+          label: '维度',
           selectOptions: [
-            { id: '0', name: '班组' },
-            { id: '1', name: '日' },
-            { id: '2', name: '周' },
-            { id: '3', name: '月' },
-            { id: '4', name: '年' }
-          ],
-          param: 'statisticType',
-          index: 1,
-          extraOptions: [
             {
-              parent: 'statisticType',
-              type: 'datePicker',
-              label: '统计时间',
-              dateType: 'daterange',
-              format: 'yyyy-MM-dd',
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              rangeSeparator: '-',
-              startPlaceholder: '开始时间',
-              endPlaceholder: '结束时间',
-              param: 'timeVal',
-              defaultTime: ['00:00:00', '23:59:59'],
-              defaultSelect: [],
-              width: 250,
-              key: 'datePicker-0', // 唯一 key，触发重新渲染
-              appendToBody: true // 优化定位：挂载到 body 下
+              id: '0',
+              name:'班组'
             },
-            // 日 - 日期范围选择
             {
-              parent: 'statisticType',
-              type: 'datePicker',
-              label: '统计时间',
-              dateType: 'daterange',
-              format: 'yyyy-MM-dd',
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              rangeSeparator: '-',
-              startPlaceholder: '开始时间',
-              endPlaceholder: '结束时间',
-              param: 'timeValDay',
-              defaultTime: ['00:00:00', '23:59:59'],
-              defaultSelect: [],
-              width: 250,
-              key: 'datePicker-1', // 唯一 key，触发重新渲染
-              appendToBody: true // 优化定位：挂载到 body 下
+              id: '1',
+              name: '日'
             },
-            // 周 - 单个日期选择（自动获取本周范围）
             {
-              parent: 'statisticType',
-              type: 'datePicker',
-              label: '统计时间',
-              dateType: 'week',
-              placeholder: '选择日期',
-              format: 'yyyy 第 WW 周',
-              pickerOptions: {
-                firstDayOfWeek: 1 // 数字1表示周一作为周的第一天（0=周日，1=周一，依此类推）
-              },
-              valueFormat: 'yyyy-MM-dd',
-              param: 'timeValWeek',
-              width: 250,
-              key: 'datePicker-2', // 唯一 key，触发重新渲染
-              appendToBody: true // 优化定位：挂载到 body 下
+              id: '2',
+              name: '周'
             },
-            // 月 - 日期范围选择
             {
-              parent: 'statisticType',
-              type: 'datePicker',
-              label: '统计时间',
-              dateType: 'monthrange',
-              format: 'yyyy-MM-dd',
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              rangeSeparator: '-',
-              startPlaceholder: '开始时间',
-              endPlaceholder: '结束时间',
-              param: 'timeValMonth',
-              defaultTime: ['00:00:00', '23:59:59'],
-              width: 250,
-              key: 'datePicker-3', // 唯一 key，触发重新渲染
-              appendToBody: true // 优化定位：挂载到 body 下
+              id: '3',
+              name: '月'
             },
-            // 年 - 单个日期选择（自动获取本年范围）
             {
-              parent: 'statisticType',
-              type: 'datePicker',
-              label: '统计时间',
-              dateType: 'year',
-              placeholder: '选择年份',
-              format: 'yyyy-MM-dd',
-              valueFormat: 'yyyy-MM-dd',
-              param: 'timeValYear',
-              width: 250,
-              key: 'datePicker-4', // 唯一 key，触发重新渲染
-              appendToBody: true // 优化定位：挂载到 body 下
+              id: '4',
+              name: '年'
             }
-          ]
+          ],
+          param: 'statisticType'
         },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
           param: 'bindObjectId'
         },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary',
+
+				{
+          type: 'datePicker',
+          label: '统计开始时间',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultTime: ['00:00:00', '23:59:59'],
+          defaultSelect: []
         },
-        {
-          type: 'separate',
-        },
-        {
-          type: 'button',
-          btnName: '导出',
-          name: 'export',
-          color: 'warning',
-        }
-      ],
-    };
-  },
-  watch: {
-    // 监听报表类型变化，强制刷新日期选择器
-    'listQuery.statisticType'(newVal, oldVal) {
-      if (newVal !== oldVal && this.$refs.searchBarForm) {
-        // 触发 search-bar 组件重新渲染（如果 search-bar 支持）
-        if (this.$refs.searchBarForm.$forceUpdate) {
-          this.$refs.searchBarForm.$forceUpdate();
-        }
-        // 延迟重置定位，确保 DOM 已更新
-        setTimeout(() => {
-          const datePickerEl = this.$refs.searchBarForm.$el.querySelector('.el-date-picker');
-          if (datePickerEl) {
-            // 触发 Element UI 日期选择器重新计算定位（内部方法）
-            const datePickerInstance = datePickerEl.__vue__;
-            if (datePickerInstance && datePickerInstance.updatePopper) {
-              datePickerInstance.updatePopper();
-            }
-          }
-        }, 100);
-      }
-    }
-  },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				}
+			],
+		};
+	},
   mounted() {
-    // Vue2 中 $refs 需在 $nextTick 中访问（确保 DOM 渲染完成）
-    this.$nextTick(() => {
-      if (this.$refs.searchBarForm) {
-        this.$refs.searchBarForm.formInline.statisticType = '1';
-      }
-    });
+    this.$refs.searchBarForm.formInline.statisticType = '1';
     this.listQuery.statisticType = '1';
-    this.getDataList();
-    this.getPdLineList();
-  },
+		this.getDataList()
+    this.getPdLineList()
+	},
   methods: {
-    selectType(val) {
-      // 报表类型切换时的回调（如需扩展可在此添加逻辑）
-      console.log('报表类型切换:', val);
-    },
     handleClick(val) {
-      console.log('操作按钮点击:', val);
+      console.log(val);
       if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
-        // Vue2 中 $nextTick 确保子组件已渲染
+        this.addOrUpdateVisible= true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data);
         });
       }
-    },
-    getPdLineList() {
-      getPdList().then(res => {
-        // Vue2 中数组赋值需确保响应式
-        this.$set(this.formConfig[1], 'selectOptions', res.data || []);
-        this.pdLineList = res.data || [];
-      }).catch(err => {
-        console.error('获取产线列表失败:', err);
-      });
-    },
-    selectChange(val) {
-      console.log('选择变更:', val);
-      this.selectedList = val;
+		},
+
+		getPdLineList() {
+			getPdList().then((res) => {
+        this.formConfig[1].selectOptions = res.data || []
+        this.pdLineList = res.data || []; // 保存产线数据
+			})
+		},
+		selectChange(val) {
+      console.log(val)
+      this.selectedList = val
     },
     buttonClick(val) {
-      console.log('头部按钮点击:', val);
-      switch (val.btnName) {
-        case 'search':
-          this.listQuery.pageNo = 1;
-          this.listQuery.pageSize = 10;
+      console.log('val', val);
+
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
           this.listQuery.bindObjectId = val.bindObjectId ? val.bindObjectId : undefined;
           this.listQuery.statisticType = val.statisticType ? val.statisticType : undefined;
+          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
+          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
 
-          // 处理不同时间维度的时间范围
-          this.handleTimeRange(val);
-
-          this.getDataList();
-          break;
-        case 'export':
-          this.handleExport();
-          break;
-        default:
-          console.log('未知按钮:', val);
-      }
-    },
-    // 处理不同时间维度的时间范围
-    handleTimeRange(val) {
-      const statisticType = val.statisticType;
-      const timeVal = val.timeVal;
-
-      const timeValDay = val.timeValDay;
-
-      const timeValWeek = val.timeValWeek;
-      const timeValMonth = val.timeValMonth;
-      const timeValYear = val.timeValYear;
-
-
-      // 重置时间参数
-      this.listQuery.startTime = undefined;
-      this.listQuery.endTime = undefined;
-
-      switch (statisticType) {
-        case '0': // 班组 - 沿用原时间范围
-          if (timeVal && timeVal.length === 2) {
-            this.listQuery.startTime = timeVal[0];
-            this.listQuery.endTime = timeVal[1];
-          }
-          break;
-        case '1': // 日 - 沿用原时间范围
-          if (timeValDay && timeValDay.length === 2) {
-            this.listQuery.startTime = timeValDay[0];
-            this.listQuery.endTime = timeValDay[1];
-          }
-          break;
-        case '3': // 月 - 沿用原时间范围
-          if (timeValMonth && timeValMonth.length === 2) {
-            this.listQuery.startTime = timeValMonth[0];
-            this.listQuery.endTime = timeValMonth[1];
-          }
-          break;
-        case '2': // 周 - 自动计算本周范围
-          if (timeValWeek) {
-            const [start, end] = getSelectedWeekRange(timeValWeek);
-            this.listQuery.startTime = formatDateTime(start);
-            this.listQuery.endTime = formatDateTime(end);
-          }
-          break;
-        case '4': // 年 - 自动计算本年范围
-          if (timeValYear) {
-            const [start, end] = getSelectedYearRange(timeValYear);
-            this.listQuery.startTime = formatDateTime(start);
-            this.listQuery.endTime = formatDateTime(end);
-          }
-          break;
-      }
-    },
-    // 获取数据列表
+					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
+					this.getDataList();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery)
-        .then(response => {
-          const arr = ['班组', '日', '周', '月', '年'];
-          // Vue2 中数组赋值确保响应式
-          this.tableData = (response.data?.list || []).map(item => {
-            item.reportType = arr[this.listQuery.statisticType] || '';
-            item.statisticType = this.listQuery.statisticType;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        const arr = ['班组','日', '周', '月', '年'];
+        this.tableData = response.data?.list?.map((item) => {
+          item.reportType = arr[this.listQuery.statisticType];
+          item.statisticType = this.listQuery.statisticType
 
-            // 匹配产线名称
-               // const targetLine = this.pdLineList.find(line => line.id === item.bindObjectId);
-              // item.bindObjectName = targetLine ? targetLine.name : ''
-            return item;
-          })
-          this.listQuery.total = response.data?.total || 0;
-        })
-        .catch(err => {
-          console.error('获取数据失败:', err);
-          this.tableData = [];
-          this.listQuery.total = 0;
-        })
-        .finally(() => {
-          this.dataListLoading = false;
+          // 匹配 bindObjectName
+          const targetLine = this.pdLineList.find(line => line.id === item.bindObjectId);
+          item.bindObjectName = targetLine ? targetLine.name : ''; // 赋值名称，无匹配则为空
+          return item;
         });
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
     },
-    // 每页数变更
+    // 每页数
     sizeChangeHandle(val) {
       this.listQuery.pageSize = val;
       this.listQuery.pageNo = 1;
       this.getDataList();
     },
-    // 当前页变更
+    // 当前页
     currentChangeHandle(val) {
       this.listQuery.pageNo = val;
       this.getDataList();
     },
-    // 导出处理
     handleExport() {
-      const params = { ...this.listQuery };
-      // 移除分页参数
-      delete params.pageNo;
-      delete params.pageSize;
-      delete params.total;
-
-      this.$modal.confirm('是否确认导出原片报表?')
-        .then(() => {
-          this.exportLoading = true;
-          return exportCostOriginRadioHisData(params);
-        })
-        .then(response => {
-          this.$download.excel(response, '原片报表.xls');
-        })
-        .catch(err => {
-          console.error('导出失败:', err);
-        })
-        .finally(() => {
-          this.exportLoading = false;
-        });
+      // 处理查询参数
+      let params = { ...this.listQuery };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出原片报表?').then(() => {
+        this.exportLoading = true;
+        return exportCostOriginRadioHisData(params);
+      }).then(response => {
+        this.$download.excel(response, '原片报表.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
     }
-  },
-  // Vue2 中监听数据变化（如需）
-  watch: {
-    'listQuery.statisticType'(newVal) {
-      console.log('报表类型变更:', newVal);
-      // 可添加类型变更后的额外逻辑
-    }
-  }
+	},
 };
 </script>
-
-<style scoped>
-.app-container {
-  padding: 16px;
-}
-
-.no-data-bg {
-  height: 400px;
-  background-color: #f5f7fa;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #999;
-}
-
-.right-aside {
-  margin-bottom: 16px;
-}
-</style>

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

@@ -1,274 +0,0 @@
-<template>
-  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
-    <el-form :inline="true" ref="searchBarForm" :model="formInline" class="searchBar">
-      <span class="blue-block" v-if="removeBlue ? false : true"></span>
-      <template v-for="item in formConfig">
-        <el-form-item v-if="item.type !== ''" :key="item.param" :label="item.label ? item.label : ''"
-          :required="item.required ? item.required : false">
-          <el-input v-if="item.type === 'input'" v-model="formInline[item.param]"
-            :size="item.size ? item.size : 'small'" clearable :disabled="item.disabled ? item.disabled : false"
-            :style="item.width ? 'width:' + item.width + 'px' : 'width:200px'"
-            :placeholder="item.placeholder ? item.placeholder : ''" />
-          <el-select v-if="item.type === 'select'" v-model="formInline[item.param]"
-            :size="item.size ? item.size : 'small'" :filterable="item.filterable ? item.filterable : false"
-            :multiple="item.multiple ? item.multiple : false" :clearable="item.clearable === false ? false : true"
-            :style="item.width ? 'width:' + item.width + 'px' : 'width:200px'" :placeholder="item.label" @change="
-              item.onchange
-                ? $emit('select-changed', {
-                  param: item.param,
-                  value: formInline[item.param]
-                })
-                : null
-              ">
-            <el-option v-for="(sub, i) in item.selectOptions" :key="i"
-              :label="item.labelField ? sub[item.labelField] : sub['name']"
-              :value="item.valueField ? sub[item.valueField] : sub['id']" />
-          </el-select>
-          <el-date-picker v-if="item.type === 'datePicker'" :key="item.param" :size="item.size ? item.size : 'small'"
-            v-model="formInline[item.param]" :type="item.dateType" :format="item.format ? item.format : 'yyyy-MM-dd'"
-            :value-format="item.valueFormat ? item.valueFormat : null" :default-time="item.defaultTime || null"
-            :range-separator="item.rangeSeparator || null" :start-placeholder="item.startPlaceholder || null"
-            :end-placeholder="item.endPlaceholder || null" :placeholder="item.placeholder"
-            :picker-options="item.pickerOptions ? item.pickerOptions : null"
-            :clearable="item.clearable === false ? false : true"
-            :style="item.width ? 'width:' + item.width + 'px' : (item.dateType === 'datetimerange' ? 'width:340px' : (item.dateType === 'daterange' ? 'width:220px' : 'width:140px'))" />
-          <el-autocomplete v-if="item.type === 'autocomplete'" v-model="formInline[item.param]"
-            :value-key="item.valueKey ? item.valueKey : 'value'" :size="item.size ? item.size : 'small'"
-            :fetch-suggestions="item.querySearch" :placeholder="item.placeholder"
-            :clearable="item.clearable === false ? false : true"
-            :style="item.width ? 'width:' + item.width + 'px' : 'width:200px'" filterable />
-          <el-cascader v-if="item.type === 'cascader'" v-model="formInline[item.param]" :options="item.selectOptions"
-            :props="item.cascaderProps" :size="item.size ? item.size : 'small'"
-            :clearable="item.clearable === false ? false : true"
-            :show-all-levels="item.showAllLevels === false ? false : true"
-            :collapse-tags="item.collapseTags === true ? true : false"
-            :style="item.width ? 'width:' + item.width + 'px' : 'width:200px'" @change="
-              item.onChange
-                ? $emit('cascader-change', {
-                  param: item.param,
-                  value: formInline[item.param]
-                })
-                : null
-              "></el-cascader>
-          <el-button v-if="item.type === 'button'" :type="item.color" :size="item.size ? item.size : 'small'"
-            :plain="item.plain ? item.plain : false" :round="item.round ? item.round : false"
-            @click="headBtnClick(item.name)">{{ item.btnName }}</el-button>
-          <span v-if="item.type === 'separate'" class="separateStyle"></span>
-          <!-- 可用于显示其他按钮 -->
-        </el-form-item>
-      </template>
-      <el-form-item>
-        <slot></slot>
-      </el-form-item>
-    </el-form>
-    <span v-if="isFold" class="foldClass" @click='switchMode'>
-      {{ isExpand ? '收起' : '展开' }}
-      <i class="iconfont" :class="isExpand ? 'icon-upward' : 'icon-downward'"></i>
-    </span>
-  </div>
-</template>
-<script>
-export default {
-  name: 'SearchBar',
-  props: {
-    formConfigs: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    removeBlue: {
-      type: Boolean,
-      default: false
-    },
-    isFold: {// 多行模式（默认否）
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    const formInline = {}
-    const formConfig = this.formConfigs
-    let hasExtraOptions = false
-    for (const obj of formConfig) {
-      if (obj.type !== 'button') {
-        if (obj.defaultSelect === false || obj.defaultSelect === 0) {
-          formInline[obj.param] = obj.defaultSelect
-        } else {
-          formInline[obj.param] = obj.defaultSelect || '' // defaultSelect下拉框默认选中项
-        }
-      }
-      if (obj.extraOptions) {
-        hasExtraOptions = true
-      }
-    }
-    return {
-      formInline,
-      formConfig,
-      hasExtraOptions,
-      isExpand: false // 是否展开（默认否）
-    }
-  },
-  watch: {
-    formConfig: {
-      handler() {
-        for (const obj of this.formConfig) {
-          if (obj.defaultSelect) {
-            this.formInline[obj.param] = obj.defaultSelect
-          } else if (obj.defaultSelect === null) {
-            // 需要手动从外部清除选项缓存的情况，确保在外部配置项中可直接设置null
-            this.formInline[obj.param] = ''
-          }
-        }
-      },
-      deep: true,
-      immediate: true
-    },
-    formInline: {
-      handler: function () {
-        this.$forceUpdate()
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    init() {
-      if (this.hasExtraOptions) {
-        // 如果有额外参数就处理，如果没有就算了
-        for (const obj of this.formConfig) {
-          if (obj.extraOptions) {
-            // 注: 对obj.extraOptions的选择是互斥的!
-            this.$watch(
-              `formInline.${obj.param}`,
-              function (newVal) {
-                let deleteCount = 0
-                if (obj.index + 1 < this.formConfig.length) {
-                  // 如果obj不是最后一个配置
-                  const nextConfig = this.formConfig[obj.index + 1]
-                  if (nextConfig.parent && nextConfig.parent === obj.param)
-                    deleteCount = 1
-                }
-                const currentConfig = Object.assign(
-                  {},
-                  obj.extraOptions[newVal]
-                )
-                this.formConfig.splice(
-                  obj.index + 1,
-                  deleteCount,
-                  currentConfig
-                )
-                // 修改 formInline
-                this.$set(this.formInline, currentConfig.param, '')
-              },
-              { immediate: true }
-            )
-          }
-        }
-      }
-    },
-    headBtnClick(btnName) {
-      this.formInline.btnName = btnName
-      this.$emit('headBtnClick', this.formInline)
-    },
-    resetForm() {
-      this.$refs.searchBarForm.resetFields()
-      const formInline = {}
-      const formConfig = this.formConfigs
-      for (const obj of formConfig) {
-        if (obj.type !== 'button') {
-          if (obj.defaultSelect === false || obj.defaultSelect === 0) {
-            formInline[obj.param] = obj.defaultSelect
-          } else {
-            formInline[obj.param] = obj.defaultSelect || '' // defaultSelect下拉框默认选中项
-          }
-        }
-      }
-      this.formInline = formInline
-    },
-    switchMode() {// 展开和收起切换
-      this.isExpand = !this.isExpand
-      const element = this.$refs.searchBarRef
-      if (this.isExpand) {
-        element.classList.remove('divHeight')
-      } else {
-        element.classList.add('divHeight')
-      }
-    }
-  }
-}
-</script>
-<style>
-.searchBarBox {
-  width: 100%;
-  position: relative;
-  margin-bottom: 8px;
-}
-
-.searchBarBox::after {
-  content: "";
-  display: block;
-  clear: both;
-}
-
-.divHeight {
-  height: 45px;
-  overflow: hidden;
-}
-
-.searchBar .blue-block {
-  display: inline-block;
-  float: left;
-  width: 4px;
-  height: 16px;
-  background-color: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8px;
-  margin-top: 12px;
-}
-
-.searchBar .el-form-item {
-  margin-bottom: 4px;
-}
-
-.searchBar .el-date-editor .el-range__icon {
-  font-size: 16px;
-  color: #0B58FF;
-}
-
-.searchBar .el-input__prefix .el-icon-date {
-  font-size: 16px;
-  color: #0B58FF;
-}
-
-.searchBar .el-input__prefix .el-icon-time {
-  font-size: 16px;
-  color: #0B58FF;
-}
-
-.searchBar .separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
-}
-
-.searchBarBox .foldClass {
-  position: absolute;
-  top: 14px;
-  right: 0;
-  cursor: pointer;
-  font-size: 12px;
-  color: #0B58FF;
-}
-
-.searchBarBox .foldClass .iconfont {
-  font-size: 14px;
-}
-</style>

src/views/cost/components/SmallTitle.vue

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

src/views/cost/components/add-or-updata.vue

@@ -0,0 +1,442 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 15:07:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-07 15:35:14
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="circle-container">
+			<div v-for="(item, index) in dotArr" :key="index" class="circle-wrapper">
+				<div
+					class="circle"
+					:style="{
+						background: stepNum == index + 1 ? '#0B58FF' : '',
+					}">
+					{{ index + 1 }}
+				</div>
+				<div
+					class="circle-text"
+					:style="{
+						color: stepNum == index + 1 ? '#0B58FF' : '',
+					}">
+					{{ item.name }}
+				</div>
+				<!-- 圆点后面的虚线 -->
+				<div v-if="index < 2" class="connector" />
+			</div>
+		</div>
+		<div v-if="stepNum == 1">
+			<div class="topTip">
+				1.可选择库区、巷道，同批次创建任务搬运仅支持同一产品型号。
+				<br />
+				2.须在本页下方填写搬运数量，搬运数量仅支持双数，且数量≤当前可用库存总量。
+			</div>
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤一：选择产品及起点
+			</small-title>
+			<el-form
+				:model="dataForm"
+				:rules="dataRule"
+				ref="dataForm"
+				@keyup.enter.native="dataFormSubmit()"
+				label-position="top"
+				label-width="80px">
+				<el-row :gutter="10">
+					<el-col :span="6">
+						<el-form-item label="搬运对象" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val1"
+								placeholder="请选择搬运对象">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6" v-if="dataForm.val1 == 1">
+						<el-form-item label="产品名称" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val2"
+								placeholder="请选择产品名称">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6" v-if="dataForm.val1 == 1">
+						<el-form-item label="规格型号" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val2"
+								placeholder="请选择规格型号">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="搬运数量" prop="val4">
+							<el-input
+								v-model="dataForm.val4"
+								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+								<template slot="append">盘</template>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="10">
+					<el-col :span="12">
+						<el-form-item label="起点信息" prop="val5">
+							<el-radio-group v-model="dataForm.val5">
+								<el-radio :label="1">按策略自动选择</el-radio>
+								<el-radio :label="2">指定起点</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div v-if="dataForm.val5 == 2" class="potBG-div">
+				<div>
+					<el-row :gutter="10">
+						<el-col :span="10">
+							起点库区:
+							<el-select
+								style="width: 200px; margin-left: 10px"
+								v-model="startPot"
+								size="small"
+								placeholder="请选择起点库区">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-col>
+						<el-col :span="13" style="text-align: right; line-height: 36px">
+							<span
+								class="num1-startPot-status"
+								style="background-color: #5ab45a" />
+							可选
+							<span class="num1-startPot-status" />
+							不可选
+							<span
+								class="num1-startPot-status"
+								style="background-color: #e9b100" />
+							已选
+						</el-col>
+					</el-row>
+					<div class="potTitleBG">
+						<div v-for="item in Object.keys(startPotList)" :key="item">
+							<div class="potTitle">
+								{{ item }}
+							</div>
+							<div class="potList">
+								<div
+									class="pot"
+									v-for="sitem in startPotList[item]"
+									:key="sitem.id"
+									:style="{
+										backgroundColor: potBGcolor[sitem.status],
+										cursor: sitem.status > 0 ? 'pointer' : '',
+									}"
+									@click="sitem.status > 0 && setStartPot(sitem)"
+									:title="sitem.name">
+									{{ sitem.name }}
+								</div>
+							</div>
+						</div>
+					</div>
+						<el-divider></el-divider>
+						<div style="text-align: right">可用库存总量 <span style="color:#409EFF;font-size:16px">12</span> 盘</div>
+				</div>
+			</div>
+		</div>
+		<div v-if="stepNum == 2">
+			<div class="topTip">
+				1.指定终点库位，下发后会锁定所属巷道仅本批次任务进入。
+				<br />
+				2.指定终点库位选位规则：仅可从巷道最里空对位选位。
+				<br />
+				3.只选择库区或巷道时，该方式下当前终点为候选位置，系统将根据策略与现场实际情况自动确定最终终点库位。
+			</div>
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤二：选择终点
+			</small-title>
+		</div>
+		<div v-if="stepNum == 3">
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤三：预览与下发
+			</small-title>
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from './SmallTitle';
+export default {
+	components: {
+		SmallTitle,
+	},
+	data() {
+		return {
+			dotArr: [
+				{
+					name: '选择起点',
+				},
+				{
+					name: '选择终点',
+				},
+				{
+					name: '预览下发',
+				},
+			],
+			potBGcolor: ['', '#dafadc', '#f8f0c4'],
+			stepNum: 1, // 当前第几步
+			//第一步参数
+			dataForm: {
+				id: undefined,
+				val1: undefined,
+				val2: undefined,
+				val3: undefined,
+				val4: undefined,
+				val5: 1,
+			},
+			options1: [
+				{
+					label: '产品',
+					value: 1,
+				},
+				{
+					label: '空盘',
+					value: 2,
+				},
+			],
+			dataRule: {},
+			startPot: undefined, //起点库区选择的类型
+			startPotList: {
+				//起点库区List
+				G01: [
+					{
+						id: '001',
+						name: 'L001',
+						status: 1,
+					},
+					{
+						id: '002',
+						name: 'R002',
+						status: 1,
+					},
+					{
+						id: '003',
+						name: 'L003',
+						status: 0,
+					},
+					{
+						id: '004',
+						name: 'R004',
+						status: 0,
+					},
+				],
+				G02: [
+					{
+						id: '005',
+						name: 'L005',
+					},
+					{
+						id: '006',
+						name: 'R006',
+					},
+					{
+						id: '007',
+						name: 'L007',
+					},
+					{
+						id: '008',
+						name: 'R008',
+					},
+				],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || undefined;
+			this.$nextTick(() => {
+				if (this.dataForm.id) {
+				} else {
+				}
+			});
+		},
+		//上一步
+		upSubmit() {
+			if (this.stepNum == 2) {
+				this.stepNum -= 1;
+				this.$emit('setSN', this.stepNum);
+			} else if (this.stepNum == 3) {
+				this.stepNum -= 1;
+				this.$emit('setSN', this.stepNum);
+			}
+		},
+		//下一步
+		nextSubmit() {
+			if (this.stepNum == 1) {
+				this.stepNum += 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+			if (this.stepNum == 2) {
+				this.stepNum += 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+			if (this.stepNum == 3) {
+				this.stepNum = 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+		},
+		cancelStep() {},
+
+		// 第一步方法
+		setStartPot(data) {
+			data.status = data.status == 1 ? 2 : 1;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.topTip {
+	background-color: #ebebeb;
+	padding: 10px 20px;
+	border-radius: 5px;
+	line-height: 25px;
+}
+</style>
+<!-- //库位点的样式 -->
+<style scoped>
+.potBG-div {
+	width: 100%;
+	margin: 10px;
+	border: 1px solid gainsboro;
+	box-shadow: 2px 2px 2px gainsboro, -1px -1px 3px gainsboro;
+	padding: 15px;
+}
+.num1-startPot-status {
+	margin-left: 5px;
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	border: 1px solid gainsboro;
+}
+.potTitleBG {
+	margin-top: 10px;
+	overflow-x: auto;
+	display: flex;
+}
+.potTitle {
+	width: 82px;
+	background-color: rgb(169, 235, 249);
+	border-radius: 3px;
+	margin-right: 5px;
+	text-align: center;
+	color: #000000;
+	letter-spacing: 1px;
+	margin-bottom: 10px;
+}
+.potList {
+	width: 82px;
+	display: grid;
+	grid-template-columns: 40px 40px;
+	gap: 2px;
+}
+.pot {
+	width: 40px;
+	text-align: center;
+	border: 1px solid gainsboro;
+	border-radius: 3px;
+	padding: 5px 0;
+	margin-bottom: 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+</style>
+
+<!-- //序号圆点 -->
+<style scoped>
+.circle-container {
+	height: 110px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20px;
+	width: 90%;
+	overflow-x: auto;
+	margin: auto;
+}
+
+.circle-wrapper {
+	position: relative;
+	display: flex;
+	align-items: center;
+}
+
+.circle {
+	width: 52px;
+	height: 52px;
+	border-radius: 50%;
+	background: #8db1ff;
+	font-weight: 500;
+	font-size: 31px;
+	color: #ffffff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: relative;
+	z-index: 2;
+	cursor: pointer;
+}
+.circle-text {
+	position: absolute;
+	top: 60px;
+	left: -15px;
+	color: #8db1ff;
+	width: 82px;
+	text-align: center;
+}
+
+/* 下半圆虚线边框 */
+.circle::after {
+	content: '';
+	position: absolute;
+	bottom: -6px; /* 2px边框 + 2px间隙 */
+	left: -4px;
+	right: -4px;
+	height: 30px; /* 半圆高度 */
+	border-radius: 0 0 60px 60px;
+	border: 1px dashed #0b58ff;
+	border-top: none;
+	z-index: 1;
+}
+
+.connector {
+	width: 160px; /* 计算连接线长度 */
+	height: 2px;
+	border-bottom: 1px dashed rgb(11, 88, 255, 1);
+	margin: 0 5px;
+	z-index: 1;
+}
+</style>