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

Reviewed-on: #442

.env.dev

@@ -13,7 +13,7 @@ VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.8.22:48080'
-VUE_APP_BASE_API = 'http://172.16.33.65:48082'
+VUE_APP_BASE_API = 'http://172.16.32.79:48082'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -42,19 +42,16 @@
   },
   "dependencies": {
     "@babel/parser": "7.18.4",
-    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
-    "chinese-lunar": "^0.1.4",
     "clipboard": "2.0.8",
     "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
-    "el-tree-transfer": "^2.4.7",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",

src/api/core/analysis/index.js

@@ -25,10 +25,10 @@ export function getCT(data) {
 // 获取产线平衡分析数据（new）
 export function getNewCTNow(data) {
   return request({
-		url: '/analysis/production-analysis/getNewCTNow',
+    url: '/analysis/production-analysis/getNewCTNow',
-		method: 'post',
+    method: 'post',
-		data: data,
+    data: data
-	});
+  })
 }
 // 获取产线平衡分析数据趋势图（new）
 export function getNewCTCharts(data) {
@@ -39,10 +39,9 @@ export function getNewCTCharts(data) {
   })
 }
 // 获取产线平衡分析数据设备list（new）
-export function getNewCTDet(data) {
+export function getNewCTDet(id) {
   return request({
-		url: '/analysis/production-analysis/getNewCTDet',
+    url: '/analysis/production-analysis/getNewCTDet?lineId='+id,
-    method: 'post',
+    method: 'get',
-    data:data
+  })
-	});
 }

src/api/core/monitoring/auto.js

@@ -41,55 +41,28 @@ export function getProductAuto(data) {
   })
 }
 
-export function getPdlAutoReportNewSearchNow(data) {
-	return request({
-		url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
-		method: 'post',
-		data: data,
-		timeout: 60000,
-	});
-}
-
-
 // 班组自动报表分页
 export function getTeamReportPage(data) {
   return request({
-    url: '/monitoring/team-auto-report/page',
+		url: '/monitoring/group-off-record/page',
-    method: 'post',
+		method: 'post',
-    data: data
+		data: data,
-  })
+	});
 }
 
 // 班组自动报表分页详细
 export function getTeamReportPageDet(id) {
   return request({
-    url: '/monitoring/team-auto-report/pageDet?id=' + id,
+    url: '/monitoring/group-off-record/get?id=' + id,
     method: 'get',
   })
 }
 
-// 获取产品当班数据
+export function exportGroupProductReportExcel(data) {
-export function getProcessAutoReportGroup(data) {
+  return request({
-	return request({
+		url: '/monitoring/group-off-record/export-det-excel',
-		url: '/monitoring/production-monitor/getProcessAutoReportGroup',
+		method: 'get',
-		method: 'post',
+		params: data,
-		data: data,
+		responseType: 'blob',
-	});
-}
-
-// 获取产品当天数据
-export function getProcessAutoReportDay(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportDay',
-		method: 'post',
-		data: data,
-	});
-}
-// 获取产品历史数据
-export function getProcessAutoReportNew(data) {
-	return request({
-		url: '/monitoring/production-monitor/getProcessAutoReportNew',
-		method: 'post',
-		data: data,
 	});
 }

src/api/core/monitoring/index.js

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

src/api/group/Schedule.js

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

src/api/group/calendar.js

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

src/api/group/groupSetting.js

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

src/api/group/holidaySetting.js

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

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

src/api/order/index.js

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

src/assets/icons/svg/fullscreen.svg

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

src/assets/icons/svg/refresh.svg

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

src/assets/icons/svg/unFullscreen.svg

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

src/components/ButtonNav/index.vue

@@ -1,30 +1,16 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2024-04-02 09:49:36
-    description:
--->
-
 <template>
   <!-- 按钮切换 -->
   <div v-if="buttonMode" class="button-nav">
-    <button
+    <button v-for="m in menus" :key="m" @click="handleClick(m)"
-      v-for="m in menus"
-      :key="m"
-      @click="currentMenu = m"
       :data-text="m"
       :class="[m === currentMenu ? 'active' : '']"
-    ></button>
+      ></button>
   </div>
   <!-- 标签切换 -->
   <div v-else class="custom-tabs" style="height: 100%; width: 100%">
-    <el-tabs class="tag-nav" v-model="currentMenu" style="height: 100%">
+    <el-tabs class="tag-nav" v-model="currentMenu" style="height: 100%" @tab-click="handleTabClick">
-      <el-tab-pane
+      <el-tab-pane v-for="(m, idx) in menus" :key="m" :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
-        v-for="(m, idx) in menus"
+        :name="m">
-        :key="m"
-        :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
-        :name="m"
-      >
         <slot :name="`tab${idx + 1}`"></slot>
       </el-tab-pane>
     </el-tabs>
@@ -39,14 +25,17 @@ export default {
       type: Array,
       required: true,
       default: () => [],
-      validator: (val) => {
+      validator: (val) => val.length > 0,
-        return val.length > 0;
-      },
     },
     buttonMode: {
       type: Boolean,
       default: true,
     },
+    // 新增：支持外部传入选中值（v-model 绑定）
+    value: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -54,16 +43,34 @@ export default {
     };
   },
   created() {
-    this.currentMenu = this.menus[0];
+    // 优先使用外部传入的 value，否则默认第一个
+    this.currentMenu = this.value || this.menus[0];
   },
   watch: {
+    // 监听外部 value 变化，同步到内部 currentMenu
+    value(newVal) {
+      this.currentMenu = newVal;
+    },
+    // 监听内部 currentMenu 变化，通知外部
     currentMenu(val) {
-      this.$emit("change", val);
+      this.$emit("input", val); // 触发 v-model 同步
+      this.$emit("change", val); // 保留原 change 事件
+    },
+  },
+  methods: {
+    // 按钮点击事件
+    handleClick(m) {
+      this.currentMenu = m;
+    },
+    // 标签点击事件（el-tabs 自带）
+    handleTabClick(tab) {
+      this.currentMenu = tab.name;
     },
   },
 };
 </script>
 
+<!-- 样式不变 -->
 <style scoped lang="scss">
 .button-nav {
   width: 100%;
@@ -81,7 +88,7 @@ export default {
     border: none;
     background: #fff;
     border-radius: 8px;
-    padding: 16px;
+    padding: 15px;
     color: #888;
     letter-spacing: 2px;
     flex: 1;
@@ -108,22 +115,24 @@ export default {
 </style>
 
 <style scoped>
-.custom-tabs >>> .el-tabs__header {
+.custom-tabs>>>.el-tabs__header {
   margin-bottom: 8px;
   display: inline-block;
   /* transform: translateY(-12px); */
 }
-.custom-tabs >>> .el-tabs__item {
+
+.custom-tabs>>>.el-tabs__item {
   padding-left: 0px !important;
   padding-right: 0px !important;
   line-height: 36px !important;
   height: 36px;
 }
 
-.custom-tabs >>> .el-tabs__content {
+.custom-tabs>>>.el-tabs__content {
   height: calc(100% - 42px);
 }
-.custom-tabs >>> .el-tab-pane {
+
+.custom-tabs>>>.el-tab-pane {
   box-sizing: border-box;
   height: 100%;
   padding: 20px;

src/main.js

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

src/mixins/basic-page.js

@@ -16,7 +16,7 @@ export default {
       },
       tableData: [], //table数据
       listQuery: { //分页
-        pageSize: 20,
+        pageSize: 10,
         pageNo: 1,
         total: 1,
       },

src/router/index.js

@@ -76,7 +76,7 @@ export const constantRoutes = [
     children: [
       {
         path: "index",
-        component: (resolve) => require(["@/views/home/index"], resolve),
+        component: (resolve) => require(["@/views/core/base/factory/index"], resolve),
         name: "首页",
         meta: { title: "首页", icon: "dashboard", affix: true },
         hidden: true

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 {getPath, getTenantEnable} from "@/utils/ruoyi";
-import { refreshToken } from "@/api/login";
+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()
+    tryHideFullScreenLoading()
-  console.log(error)
+    console.log(error)
-  Promise.reject(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 有两个不同的返回信息
+      Notification.error({
-      return res.data
+        title: msg
+      })
     }
     return Promise.reject('error')
   } else {
     return res.data
   }
 }, error => {
-  tryHideFullScreenLoading()
+    tryHideFullScreenLoading()
-  console.log('err' + error)
+    console.log('err' + error)
-  let { message } = error;
+    let {message} = error;
-  if (message === "Network Error") {
+    if (message === "Network Error") {
-    message = "后端接口连接异常";
+      message = "后端接口连接异常";
-  } else if (message.includes("timeout")) {
+    } else if (message.includes("timeout")) {
-    message = "系统接口请求超时";
+      message = "系统接口请求超时";
-  } else if (message.includes("Request failed with status code")) {
+    } else if (message.includes("Request failed with status code")) {
-    message = "系统接口" + message.substr(message.length - 3) + "异常";
+      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: '重新登录',
+        confirmButtonText: '重新登录',
-      cancelButtonText: '取消',
+        cancelButtonText: '取消',
-      type: 'warning'
+        type: 'warning'
-    }
+      }
     ).then(() => {
       isRelogin.show = false;
       store.dispatch('LogOut').then(() => {

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

@@ -80,18 +80,8 @@ export default {
 			immediate: true,
 		},
 	},
-  methods: {
+	methods: {
-    getUniqueTimes() {
+		initChart() {
-      const { edgeCt, temperCt, downCt } = this.barData;
-      // 合并所有包含时间的数组
-      const allTimeEntries = [...(edgeCt || []), ...(temperCt || []), ...(downCt || [])];
-      // 提取时间戳并去重（使用 Set）
-      const uniqueTimes = [...new Set(allTimeEntries.map(item => item.recordTime))];
-      // 按时间戳排序（确保时间顺序正确）
-      return uniqueTimes.sort((a, b) => a - b);
-    },
-    initChart() {
-      const uniqueTimes = this.getUniqueTimes();
 			const _this = this;
 			this.chart.setOption({
 				title: {
@@ -134,7 +124,9 @@ export default {
 				},
 				xAxis: {
 					type: 'category',
-          data: uniqueTimes.map(time => parseTime(time, '{m}-{d} {h}:{i}')),
+					data: this.barData.edgeCt.map((item) => {
+						return parseTime(item.recordTime, '{m}-{d} {h}:{i}');
+					}),
 					axisPointer: {
 						type: 'shadow',
 					},
@@ -160,50 +152,44 @@ export default {
 						end: 100,
 					},
 				],
-        series: [
+				series: [
-          {
+					{
-            name: '磨边节拍',
+						name: '磨边节拍',
-            type: 'line',
+						type: 'line',
-            tooltip: {
+						tooltip: {
-              valueFormatter: function (value) {
+							valueFormatter: function (value) {
-                return value + 'pcs/min';
+								return value + 'pcs/min';
-              },
+							},
-            },
+						},
-            data: uniqueTimes.map(time => {
+						data: this.barData.edgeCt.map((item) => {
-              // 查找当前时间对应的 ct 值，没有则补 null（图表中会显示为断点）
+							return item.ct;
-              const match = this.barData.edgeCt.find(item => item.recordTime === time);
+						}),
-              return match ? match.ct : 0;
+					},
-            })
+					{
-          },
+						name: '钢化节拍',
-          // 钢化节拍
+						type: 'line',
-          {
+						tooltip: {
-            name: '钢化节拍',
+							valueFormatter: function (value) {
-            type: 'line',
+								return value + 'pcs/min';
-            tooltip: {
+							},
-              valueFormatter: function (value) {
+						},
-                return value + 'pcs/min';
+						data: this.barData.temperCt.map((item) => {
-              },
+							return item.ct;
-            },
+						}),
-            data: uniqueTimes.map(time => {
+					},
-              const match = this.barData.temperCt.find(item => item.recordTime === time);
+					{
-              return match ? match.ct : 0;
+						name: '下片节拍',
-            })
+						type: 'line',
-          },
+						tooltip: {
-          // 下片节拍
+							valueFormatter: function (value) {
-          {
+								return value + 'pcs/min';
-            name: '下片节拍',
+							},
-            type: 'line',
+						},
-            tooltip: {
+						data: this.barData.downCt.map((item) => {
-              valueFormatter: function (value) {
+							return item.ct;
-                return value + 'pcs/min';
+						}),
-              },
+					},
-            },
+				],
-            data: uniqueTimes.map(time => {
-              const match = this.barData.downCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          }
-        ]
 			});
 		},
 	},

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

@@ -119,12 +119,12 @@ export default {
 	},
 	methods: {
 		// 获取数据列表
-		init(lId, startTime, endTime) {
+		init(lineId, startTime, endTime) {
 			this.eqChartData = [];
 			this.time.startTime = startTime;
 			this.time.endTime = endTime;
 			this.dataListLoading = true;
-      getNewCTDet({ lineId: [lId], startTime, endTime }).then((response) => {
+			getNewCTDet(lineId).then((response) => {
 				this.tableData = response.data;
 				this.dataListLoading = false;
 			});

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

@@ -183,7 +183,7 @@ export default {
 		// 获取当前时间
 		const now = new Date();
 		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime());
+		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
 		// 设置为00:00:00
 		yesterday.setHours(0, 0, 0, 0);
 		// 设置为23:59:59

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

@@ -80,7 +80,7 @@ export default {
 					defaultSelect: [],
 					multiple: true,
 					filterable: true,
-					width: 200,
+					width: 400,
 				},
 				{
 					type: 'datePicker',

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

@@ -1,104 +1,157 @@
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="60%">
+	<el-drawer
-    <small-title slot="title" :no-padding="true">
+		:visible.sync="visible"
-      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		:show-close="false"
-    </small-title>
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
 
-    <div class="content">
+		<div class="content">
-      <div class="visual-part">
+			<div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" label-position="top"
+				<el-form
-          @keyup.enter.native="dataFormSubmit">
+					ref="dataForm"
-          <el-row :gutter="20">
+					:model="dataForm"
-            <el-col :span="12">
+					:rules="dataRule"
-              <el-form-item label="产品编码" prop="code">
+					label-width="100px"
-                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入产品编码" />
+					label-position="top"
-              </el-form-item>
+					@keyup.enter.native="dataFormSubmit">
-            </el-col>
+					<el-row :gutter="20">
-            <el-col :span="12">
+						<el-col :span="12">
-              <el-form-item label="产品名称" prop="name">
+							<el-form-item label="产品编码" prop="code">
-                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入产品名称" />
+								<el-input
-              </el-form-item>
+									v-model="dataForm.code"
-            </el-col>
+									clearable
-          </el-row>
+									:disabled="isdetail"
-          <el-row :gutter="20">
+									placeholder="请输入产品编码" />
-            <el-col :span="12">
+							</el-form-item>
-              <el-form-item label="产品类型" prop="typeDictValue">
+						</el-col>
-                <el-select v-model="dataForm.typeDictValue" style="width: 100%" :disabled="isdetail"
+						<el-col :span="12">
-                  placeholder="请选择产品类型">
+							<el-form-item label="产品名称" prop="name">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)" :key="dict.value" :label="dict.label"
+								<el-input
-                    :value="dict.value" />
+									v-model="dataForm.name"
-                </el-select>
+									clearable
-              </el-form-item>
+									:disabled="isdetail"
-            </el-col>
+									placeholder="请输入产品名称" />
-            <el-col :span="12">
+							</el-form-item>
-              <el-form-item label="单位" prop="unitDictValue">
+						</el-col>
-                <el-select v-model="dataForm.unitDictValue" style="width: 100%" :disabled="isdetail"
+					</el-row>
-                  placeholder="请选择单位">
+					<el-row :gutter="20">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)" :key="dict.value" :label="dict.label"
+						<el-col :span="12">
-                    :value="dict.value" />
+							<el-form-item label="产品类型" prop="typeDictValue">
-                </el-select>
+								<el-select
-              </el-form-item>
+									v-model="dataForm.typeDictValue"
-            </el-col>
+									style="width: 100%"
-          </el-row>
+									:disabled="isdetail"
-          <el-row :gutter="20">
+									placeholder="请选择产品类型">
-            <el-col :span="12">
+									<el-option
-              <el-form-item label="原片规格" prop="originalSpecifications">
+										v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)"
-                <el-input :disabled="isdetail" v-model="dataForm.originalSpecifications" placeholder="请输入原片规格" />
+										:key="dict.value"
-              </el-form-item>
+										:label="dict.label"
-            </el-col>
+										:value="dict.value" />
-            <el-col :span="12">
+								</el-select>
-              <el-form-item label="原片单位平方数" prop="originalArea">
+							</el-form-item>
-                <el-input :disabled="isdetail" v-model="dataForm.originalArea" placeholder="请输入原片单位平方数" />
+						</el-col>
-              </el-form-item>
+						<el-col :span="12">
-            </el-col>
+							<el-form-item label="单位" prop="unitDictValue">
-          </el-row>
+								<el-select
-          <el-row :gutter="20">
+									v-model="dataForm.unitDictValue"
-            <el-col :span="12">
+									style="width: 100%"
-              <el-form-item label="深加工规格" prop="specifications">
+									:disabled="isdetail"
-                <el-input :disabled="isdetail" v-model="dataForm.specifications" placeholder="请输入深加工规格" />
+									placeholder="请选择单位">
-              </el-form-item>
+									<el-option
-            </el-col>
+										v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
-            <el-col :span="12">
+										:key="dict.value"
-              <el-form-item label="深加工单位平方数" prop="area">
+										:label="dict.label"
-                <el-input :disabled="isdetail" v-model="dataForm.area" placeholder="请输入深加工单位平方数" />
+										:value="dict.value" />
-              </el-form-item>
+								</el-select>
-            </el-col>
+							</el-form-item>
-          </el-row>
+						</el-col>
-          <el-row :gutter="20">
+					</el-row>
-            <el-col :span="12">
+					<el-row :gutter="20">
-              <el-form-item label="完成单位产品用时" prop="processTime">
+						<el-col :span="12">
-                <el-input :disabled="isdetail" v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" />
+							<el-form-item label="原片规格" prop="originalSpecifications">
-              </el-form-item>
+								<el-input
-            </el-col>
+									:disabled="isdetail"
-            <el-col :span="12">
+									v-model="dataForm.originalSpecifications"
-              <el-form-item label="	加工属性" prop="processType">
+									placeholder="请输入原片规格" />
-                <el-select v-model="dataForm.processType" clearable style="width: 100%" :disabled="isdetail"
+							</el-form-item>
-                  placeholder="请选择加工属性">
+						</el-col>
-                  <el-option v-for="dict in processTypeList" :key="dict.id" :label="dict.label"
+						<el-col :span="12">
-                    :value="dict.id" />
+							<el-form-item label="原片单位平方数" prop="originalArea">
-                </el-select>
+								<el-input
-              </el-form-item>
+									:disabled="isdetail"
-            </el-col>
+									v-model="dataForm.originalArea"
-          </el-row>
+									placeholder="请输入原片单位平方数" />
-        </el-form>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="深加工规格" prop="specifications">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.specifications"
+									placeholder="请输入深加工规格" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="深加工单位平方数" prop="area">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.area"
+									placeholder="请输入深加工单位平方数" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="24">
+							<el-form-item label="完成单位产品用时" prop="processTime">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.processTime"
+									placeholder="请输入完成单位产品用时" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
 
-        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+				<small-title
-          产品属性列表
+					style="margin: 16px 0; padding-left: 8px"
-        </small-title>
+					:no-padding="true">
+					产品属性列表
+				</small-title>
 
-        <div class="attr-list">
+				<div class="attr-list">
-          <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+					<base-table
-            :add-button-show="isdetail ? null : '添加属性'" @emitButtonClick="addNew()" :table-data="productAttributeList">
+						:table-props="tableProps"
-            <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+						:page="listQuery.pageNo"
-              @clickBtn="handleClick" />
+						:limit="listQuery.pageSize"
-          </base-table>
+						:add-button-show="isdetail ? null : '添加属性'"
-          <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
+						@emitButtonClick="addNew()"
-            :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
+						:table-data="productAttributeList">
-        </div>
+						<method-btn
-      </div>
+							v-if="!isdetail"
-    </div>
+							slot="handleBtn"
+							:width="120"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleClick" />
+					</base-table>
+					<pagination
+						v-show="listQuery.total > 0"
+						:total="listQuery.total"
+						:page.sync="listQuery.pageNo"
+						:limit.sync="listQuery.pageSize"
+						:page-sizes="[5, 10, 15]"
+						@pagination="getList" />
+				</div>
+			</div>
+		</div>
 
-    <!-- <div style="position: absolute; bottom: 24px; right: 24px">
+		<!-- <div style="position: absolute; bottom: 24px; right: 24px">
 			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
 			<el-button v-if="isdetail" type="primary" @click="goEdit()">
 				编辑
@@ -114,19 +167,22 @@
 			</span>
 		</div> -->
 
-    <div class="drawer-body__footer">
+		<div class="drawer-body__footer">
-      <el-button style="" @click="goback()">取消</el-button>
+			<el-button style="" @click="goback()">取消</el-button>
-      <el-button v-if="isdetail" type="primary" @click="goEdit()">
+			<el-button v-if="isdetail" type="primary" @click="goEdit()">
-        编辑
+				编辑
-      </el-button>
+			</el-button>
-      <el-button v-else type="primary" @click="dataFormSubmit()">
+			<el-button v-else type="primary" @click="dataFormSubmit()">
-        确定
+				确定
-      </el-button>
+			</el-button>
-    </div>
+		</div>
 
-    <product-attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id"
+		<product-attr-add
-      @refreshDataList="getList" />
+			v-if="addOrUpdateVisible"
-  </el-drawer>
+			ref="addOrUpdate"
+			:product-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
 </template>
 
 <script>
@@ -190,31 +246,13 @@ export default {
 				specifications: '', // 深加工规格
 				unitDictValue: '', // 单位id
 				originalSpecifications: '', // 原片规格
-        originalArea: 0, // 原片单位平方数
+				originalArea: 0, // 原片单位平方数
-        processType:undefined,
 			},
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
 				total: 0,
-      },
+			},
-      processTypeList: [
-        {
-          id: '0',
-          label:'压花丝印'
-        },
-        {
-          id: '1',
-          label: '无印打孔'
-        },
-        {
-          id: '2',
-          label: '单层镀膜'
-        }, {
-          id: '3',
-          label: '双层镀膜'
-        }
-      ],
 			dataRule: {
 				code: [
 					{

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

@@ -6,17 +6,31 @@
  * @Description:
 -->
 <template>
-  <div class="app-container">
+	<div class="app-container">
-
+		<search-bar
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+			:formConfigs="formConfig"
-    <base-table v-if="showData.length" class="right-aside" v-loading="dataListLoading" :table-props="tableProps"
+			ref="searchBarForm"
-      :page="listQuery.pageNo" :limit="listQuery.pageSize" :selectWidth="55" :table-data="showData"
+			@headBtnClick="buttonClick" />
-      @selection-change="selectChange">
+		<base-table
-    </base-table>
+			v-if="showData.length"
-    <div v-else class="no-data-bg"></div>
+			class="right-aside"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			v-loading="dataListLoading"
-      @pagination="getDataList" />
+			:table-props="tableProps"
-    <!-- <div v-show="false" ref="pdf">
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:selectWidth="55"
+			:table-data="showData"
+			@selection-change="selectChange"
+			>
+		</base-table>
+		<div v-else class="no-data-bg"></div>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList"
+		/>
+		<!-- <div v-show="false" ref="pdf">
 			<base-table
 				v-loading="dataListLoading"
 				:table-props="tableProps"
@@ -25,15 +39,19 @@
 				:table-data="selectedList"
 			/>
 		</div> -->
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+		<el-dialog
-      <el-button type="primary" @click="exportXlsx">xlsx</el-button>
+			title="提示"
-      <el-button type="success" @click="exportPdf">pdf</el-button>
+			:visible.sync="dialogVisible"
-      <span slot="footer" class="dialog-footer">
+			width="30%"
-        <el-button @click="dialogVisible = false">取 消</el-button>
+			:before-close="handleClose">
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-      </span>
+  		<el-button type="success" @click="exportPdf">pdf</el-button>
-    </el-dialog>
+			<span slot="footer" class="dialog-footer">
-  </div>
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
@@ -185,8 +203,7 @@ export default {
 				}
 			],
 		};
-  },
+	},
-
 	created() {
 		this.getDataList()
 		this.getPdLineList()

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

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

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

@@ -1,61 +1,47 @@
 <template>
-	<div>
+  <div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
+    <div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['当前', '历史']" @change="currentMenu">
+      <ButtonNav :menus="['当前', '历史']" @change="currentMenu" v-model="activeName">
-				<template v-slot:tab1>
+        <!-- <template v-slot:tab1>
-					<div>当前</div>
+          <div>当前</div>
-				</template>
+        </template>
-				<template v-slot:tab2>
+        <template v-slot:tab2>
-					<div>历史</div>
+          <div>历史</div>
-				</template>
+        </template> -->
-			</ButtonNav>
+      </ButtonNav>
-		</div>
+    </div>
-		<div class="app-container energyOverlimitLog">
+    <div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
+      <div v-if="activeName === '历史' && routeType !== 'order'">
-				<!-- 搜索工作栏 -->
+        <!-- 搜索工作栏 -->
-				<search-bar
+        <search-bar :formConfigs="formConfig" ref="searchBarForm" @select-changed="handleSearchBarChanged"
-					:formConfigs="formConfig"
+          @headBtnClick="buttonClick" />
-					ref="searchBarForm"
+      </div>
-					@select-changed="handleSearchBarChanged"
+      <h2 v-else>
-					@headBtnClick="buttonClick" />
+        订单名称:{{ name }}
-			</div>
+        订单编码:{{ code }}
-			<div v-show="activeName === 'now'"></div>
+        <el-button    v-hasPermi="['base:core-work-order:export']" type="primary" @click="handleExport">导出</el-button>
-			<!-- 列表 -->
+      </h2>
-			<div v-if="activeName === 'his'">
+      <div v-show="activeName === '当前'"></div>
-				<base-table-s
+      <!-- 列表 -->
-					:page="1"
+      <div v-if="activeName === '历史'">
-					:limit="100"
+        <base-table-s :page="1" :limit="100" :table-props="tableProps" :table-data="tableData"
-					:table-props="tableProps"
+          :max-height="tableH / 2"></base-table-s>
-					:table-data="tableData"
+        <div v-if="listQuery.lineId.length !== 1 && tableData.length > 0">
-					:max-height="tableH / 2"></base-table-s>
+          <barChart style="margin-top: 50px" ref="barChart" height="600px" :bar-data="tableData" />
-				<div v-if="listQuery.lineId.length !== 1 && tableData.length > 0">
+        </div>
-					<barChart
+      </div>
-						style="margin-top: 50px"
+      <div v-if="activeName === '当前'">
-						ref="barChart"
+        <span class="blue-block"></span>
-						height="600px"
+        <span class="tip">当班数据</span>
-						:bar-data="tableData" />
+        <base-table-s :page="1" :limit="100" :table-props="tableProps" :table-data="tableData2"
-				</div>
+          :max-height="tableH / 2" />
-			</div>
+        <span class="blue-block"></span>
-			<div v-if="activeName === 'now'">
+        <span class="tip">当天数据</span>
-				<span class="blue-block"></span>
+        <base-table-s :page="1" :limit="100" :table-props="tableProps" :table-data="tableData3"
-				<span class="tip">当班数据</span>
+          :max-height="tableH / 2" />
-				<base-table-s
+      </div>
-					:page="1"
+    </div>
-					:limit="100"
+  </div>
-					:table-props="tableProps"
-					:table-data="tableData2"
-					:max-height="tableH / 2" />
-				<span class="blue-block"></span>
-				<span class="tip">当天数据</span>
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData3"
-					:max-height="tableH / 2" />
-			</div>
-		</div>
-	</div>
 </template>
 
 <script>
@@ -95,7 +81,7 @@ const tableProps = [
 		prop: 'inputN',
 		label: '投入',
     align: 'center',
-		children: [ 
+		children: [
 			{
 				prop: 'inputNum',
 				label: '投入数量/片',
@@ -280,7 +266,10 @@ export default {
 		return {
 			urlOptions: {
 				getDataListURL: getPdlAutoReportNewSearch,
-			},
+      },
+      routeType: 'line',
+      code: '',
+      name:'',
 			formConfig: [
 				{
 					type: 'select',
@@ -294,7 +283,8 @@ export default {
 					label: '产线',
 					selectOptions: [],
 					param: 'lineId',
-					multiple: true,
+          multiple: true,
+          defaultSelect:[]
 				},
 				{
 					type: 'datePicker',
@@ -305,7 +295,8 @@ export default {
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					param: 'timeVal',
+          param: 'timeVal',
+          defaultSelect:[],
 					width: 350,
 				},
 				{
@@ -318,8 +309,8 @@ export default {
 					type: 'separate',
 				},
 				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+          type: this.$auth.hasPermi('|base:core-work-order:export') ? 'button' : '',
-					type: 'button',
+					// type: 'button',
 					btnName: '导出',
 					name: 'export',
 					color: 'warning',
@@ -328,7 +319,7 @@ export default {
 			listQuery: {
 				lineId: [],
 			},
-			activeName: 'now',
+      activeName: '当前',
 			tableProps,
 			tableData: [],
 			tableData2: [],
@@ -340,10 +331,32 @@ export default {
 		baseTableS,
 		barChart,
 	},
-	created() {
+	mounted() {
-		this.getPdLineList();
+    this.getPdLineList()
-	},
+    this.$nextTick(() => {
-	methods: {
+      const tab = this.$route.query.tab; // 获取路由参数
+      console.log(this.$route.query);
+      this.routeType = this.$route.query.buttonType === 'order' ? 'order' : 'line'
+      this.code = this.$route.query.code
+      this.name = this.$route.query.name
+
+      if (tab === 'his') {
+        // 路由参数为 his 时，切换到“历史”标签
+        this.activeName = '历史'; // 注意：这里直接传标签名（'历史'），不是'his'
+        this.formConfig[1].defaultSelect = this.$route.query.lineId
+        this.formConfig[2].defaultSelect[0] = this.$route.query.startProduceTime
+        this.formConfig[2].defaultSelect[1] = this.$route.query.finishProduceTime
+        // this.buttonClick()
+        this.listQuery.lineId = this.$route.query.lineId
+      } else {
+        this.activeName = '当前'; // 默认“当前”标签
+      }
+    })
+
+
+  // ... 其他方法 ...
+  },
+  methods: {
 		getPdLineList() {
 			getPdList().then((res) => {
 				this.formConfig[1].selectOptions = res.data || [];
@@ -363,7 +376,7 @@ export default {
 					this.listQuery.lineId = val.lineId || [];
 					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
 					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					if (this.activeName === 'his') {
+					if (this.activeName === '历史') {
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -375,13 +388,19 @@ export default {
 				default:
 					console.log(val);
 			}
-		},
+    },
-		currentMenu(val) {
+    currentMenu(val) {
-			this.activeName = val === '历史' ? 'his' : 'now';
+      this.activeName = val; // 同步标签名到 activeName
-			if (this.activeName === 'his') {
+      let actualName = val === '历史' ? 'his' : 'now'; // 转换为内部状态
-				this.$refs.searchBarForm.resetForm();
+
-				this.listQuery.factoryId = undefined;
+    // 后续逻辑不变（根据 activeName 加载对应数据）
-				this.listQuery.lineId = [];
+      if (actualName === 'his') {
+				// this.$refs.searchBarForm.resetForm();
+        this.listQuery.factoryId = undefined;
+        if (!this.$route.query.lineId) {
+          this.listQuery.lineId = [];
+
+        }
 				// 获取当前时间
 				const now = new Date();
 				// 获取前一天的同一时间
@@ -404,39 +423,98 @@ export default {
 				this.getDataList2();
 			}
 		},
-		// 获取数据列表
+
-		getDataList() {
+    getDataList() {
-			if (this.listQuery.startTime) {
+      if (this.listQuery.startTime) {
-				this.dataListLoading = true;
+        this.dataListLoading = true;
-				this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+
-					this.tableData = response.data.map((item, index) => {
+        // 判断是否为order类型且lineId有值
-						item.originalLossNum = item.original?.lossNum;
+        if (this.routeType === 'order' && this.listQuery.lineId?.length) {
-						item.originalLossArea = item.original?.lossArea;
+          // 存储所有接口请求的Promise
-						item.edgeLossNum = item.edge?.lossNum;
+          const requests = this.listQuery.lineId.map(lineId => {
-						item.edgeLossArea = item.edge?.lossArea;
+            // 复制原有查询参数，替换当前lineId
-						item.drillLossNum = item.drill?.lossNum;
+            const params = { ...this.listQuery, lineId: [lineId] };
-						item.drillLossArea = item.drill?.lossArea;
+            return this.urlOptions.getDataListURL(params);
-						item.coatingLossNum = item.coating?.lossNum;
+          });
-						item.coatingLossArea = item.coating?.lossArea;
+
-						item.silkLossNum = item.silk?.lossNum;
+          // 并行执行所有请求
-						item.silkLossArea = item.silk?.lossArea;
+          Promise.all(requests)
-						item.temperingLossNum = item.tempering?.lossNum;
+            .then(responses => {
-						item.temperingLossArea = item.tempering?.lossArea;
+              // 合并所有接口返回的数据
-						item.packingLossNum = item.packing?.lossNum;
+              this.tableData = responses.flatMap(response => {
-						item.packingLossArea = item.packing?.lossArea;
+                return response.data.map(item => {
-						return item;
+                  // 处理嵌套属性
-					});
+                  item.originalLossNum = item.original?.lossNum;
-					this.$nextTick(() => {
+                  item.originalLossArea = item.original?.lossArea;
-            if(this.tableData.length>0){
+                  item.edgeLossNum = item.edge?.lossNum;
-              this.$refs.barChart.initChart();
+                  item.edgeLossArea = item.edge?.lossArea;
-            }
+                  item.drillLossNum = item.drill?.lossNum;
-					});
+                  item.drillLossArea = item.drill?.lossArea;
-					this.dataListLoading = false;
+                  item.coatingLossNum = item.coating?.lossNum;
-				});
+                  item.coatingLossArea = item.coating?.lossArea;
-			} else {
+                  item.silkLossNum = item.silk?.lossNum;
-				this.$message.warning('请选择时间范围');
+                  item.silkLossArea = item.silk?.lossArea;
-			}
+                  item.temperingLossNum = item.tempering?.lossNum;
-		},
+                  item.temperingLossArea = item.tempering?.lossArea;
+                  item.packingLossNum = item.packing?.lossNum;
+                  item.packingLossArea = item.packing?.lossArea;
+                  return item;
+                });
+              });
+
+              this.$nextTick(() => {
+                if (this.tableData.length > 0) {
+                  this.$refs.barChart.initChart();
+                }
+              });
+            })
+            .catch(error => {
+              console.error('接口请求失败:', error);
+              this.$message.error('数据加载失败，请重试');
+            })
+            .finally(() => {
+              this.dataListLoading = false;
+            });
+        } else {
+          // 非order类型或无lineId时，正常单次请求
+          this.urlOptions.getDataListURL(this.listQuery)
+            .then(response => {
+              this.tableData = response.data.map((item, index) => {
+                item.originalLossNum = item.original?.lossNum;
+                item.originalLossArea = item.original?.lossArea;
+                item.edgeLossNum = item.edge?.lossNum;
+                item.edgeLossArea = item.edge?.lossArea;
+                item.drillLossNum = item.drill?.lossNum;
+                item.drillLossArea = item.drill?.lossArea;
+                item.coatingLossNum = item.coating?.lossNum;
+                item.coatingLossArea = item.coating?.lossArea;
+                item.silkLossNum = item.silk?.lossNum;
+                item.silkLossArea = item.silk?.lossArea;
+                item.temperingLossNum = item.tempering?.lossNum;
+                item.temperingLossArea = item.tempering?.lossArea;
+                item.packingLossNum = item.packing?.lossNum;
+                item.packingLossArea = item.packing?.lossArea;
+                return item;
+              });
+
+              this.$nextTick(() => {
+                if (this.tableData.length > 0) {
+                  this.$refs.barChart.initChart();
+                }
+              });
+            })
+            .catch(error => {
+              console.error('接口请求失败:', error);
+              this.$message.error('数据加载失败，请重试');
+            })
+            .finally(() => {
+              this.dataListLoading = false;
+            });
+        }
+      } else {
+        this.$message.warning('请选择时间范围');
+      }
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getPdlAutoReportNewSearchNow().then((response) => {

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

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

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

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

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

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

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

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

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

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

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

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

src/views/core/monitoring/rawFilmReport/add-or-updata.vue

@@ -1,221 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" width="40%">
-    <small-title slot="title" :no-padding="true">
-      {{ !dataForm.id ? '新增' : '编辑' }}
-    </small-title>
-
-    <div class="content">
-      <div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
-          @keyup.enter.native="dataFormSubmit">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="维度" prop="statisticType">
-                <el-select v-model="dataForm.statisticType" style="width: 100%" placeholder="请选择维度">
-                  <el-option v-for="item in statisticTypeList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="厚度" prop="modifyThick">
-                <el-input v-model="dataForm.modifyThick" placeholder="请输入厚度" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="在线速度" prop="modifySpeed">
-                <el-input v-model="dataForm.modifySpeed" placeholder="请输入在线速度" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="宽度" prop="modifyWidth">
-                <el-input v-model="dataForm.modifyWidth" placeholder="请输入宽度" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="拉引量" prop="modifyInArea">
-                <el-input v-model="dataForm.modifyInArea" placeholder="请输入拉引量" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="下片面积" prop="modifyOutArea">
-                <el-input v-model="dataForm.modifyOutArea" placeholder="请输入下片面积" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="良品率" prop="modifyRatio">
-                <el-input v-model="dataForm.modifyRatio" placeholder="请输入良品率" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button style="" @click="goback()">取消</el-button>
-      <el-button  type="primary" @click="dataFormSubmit()">
-        确定
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { editCostOriginRadioHisData } from '@/api/core/monitoring/index'
-import { parseTime } from '../../mixins/code-filter';
-import SmallTitle from './SmallTitle';
-export default {
-	components: { SmallTitle },
-	data() {
-		return {
-			visible: false,
-			addOrUpdateVisible: false,
-      statisticTypeList: [
-        {
-          id: '0',
-          name: '班组'
-        },
-        {
-          id: '1',
-          name: '日'
-        },
-        {
-          id: '2',
-          name: '周'
-        },
-        {
-          id: '3',
-          name: '月'
-        },
-        {
-          id: '4',
-          name: '年'
-        }
-      ],
-			dataForm: {
-				id: null,
-        statisticType:undefined,
-        modifyThick: undefined,
-        modifySpeed: undefined,
-        modifyWidth: undefined,
-        modifyInArea: undefined,
-        modifyOutArea: undefined,
-        modifyRatio: undefined,
-			},
-			dataRule: {
-        statisticType: [
-					{
-						required: true,
-						message: '维度不能为空',
-						trigger: 'blur',
-					},
-					// {
-					// 	type: 'number',
-					// 	message: '产品编码为数字类型',
-					// 	trigger: 'blur',
-					// 	transfom: 'val => Number(val)',
-					// },
-				],
-			},
-		};
-	},
-	methods: {
-    init(data) {
-      console.log(data,'data');
-
-			this.dataForm.id = data.id || null;
-			this.visible = true;
-			this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields();
-        this.dataForm = {
-          id: data.id || null,
-          statisticType: data.statisticType || undefined,
-          modifyThick: data.thick || undefined, // 厚度对应
-          modifySpeed: data.speed || undefined, // 在线速度对应
-          modifyWidth: data.width || undefined, // 掰边宽度对应
-          modifyInArea: data.inArea || undefined, // 拉引量对应
-          modifyOutArea: data.outArea || undefined, // 下片面积对应
-          modifyRatio: data.ratio || undefined, // 良品率对应
-        };
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-            editCostOriginRadioHisData(this.dataForm).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-				}
-			});
-		},
-		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-form-item__label {
-	padding: 0;
-}
-
-.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 >>> .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 >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>

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

@@ -1,281 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <!-- :isFold="true" 控制展开 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table v-if="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"
-        @clickBtn="handleClick" />
-    </base-table>
-    <div v-else class="no-data-bg"></div>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
-    <!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
-  </div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import { parseTime } from '../../mixins/code-filter';
-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';
-
-const tableProps = [
-
-  {
-    prop: 'reportType',
-    label: '报表类型'
-  },
-  {
-    prop: 'time',
-    label: '日期',
-    // filter: parseTime,
-    width: 160
-  },
-	{
-    prop: 'bindObjectName',
-		label: '产线'
-  },
-  {
-    prop: 'thick',
-    label: '厚度'
-  },
-  {
-    prop: 'speed',
-    label: '在线速度'
-  },
-	{
-    prop: 'width',
-    label: '掰边宽度'
-	},
-	{
-    prop: 'inArea',
-    label: '拉引量/㎡'
-  },
-  {
-    prop: 'outArea',
-    label: '下片面积/㎡'
-  },
-	{
-    prop: 'ratio',
-    label: '良品率'
-	},
-];
-
-export default {
-  components: {
-    AddOrUpdate
-  },
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCostOriginRadioHisData
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        bindObjectId: undefined,
-        statisticType: undefined,
-      },
-      pdLineList:[],
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'edit',
-          btnName: '编辑',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			fileName: '',
-      formConfig: [
-        {
-          type: 'select',
-          label: '维度',
-          selectOptions: [
-            {
-              id: '0',
-              name:'班组'
-            },
-            {
-              id: '1',
-              name: '日'
-            },
-            {
-              id: '2',
-              name: '周'
-            },
-            {
-              id: '3',
-              name: '月'
-            },
-            {
-              id: '4',
-              name: '年'
-            }
-          ],
-          param: 'statisticType'
-        },
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'bindObjectId'
-        },
-
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-  mounted() {
-    this.$refs.searchBarForm.formInline.statisticType = '1';
-    this.listQuery.statisticType = '1';
-		this.getDataList()
-    this.getPdLineList()
-	},
-  methods: {
-    handleClick(val) {
-      console.log(val);
-      if (val.type === 'edit') {
-        this.addOrUpdateVisible= true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data);
-        });
-      }
-		},
-
-		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', 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.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 = ['班组','日', '周', '月', '年'];
-        this.tableData = response.data?.list?.map((item) => {
-          item.reportType = arr[this.listQuery.statisticType];
-          item.statisticType = this.listQuery.statisticType
-
-          // 匹配 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() {
-      // 处理查询参数
-      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(() => { });
-    }
-	},
-};
-</script>

src/views/cost/costStatistics/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<!-- <div style="background: #f2f4f9; height: 40px; width: 100%">
+		<div style="background: #f2f4f9; height: 40px; width: 100%">
 			<ButtonNav :menus="['按日期', '按规格']" @change="currentMenu">
 				<template v-slot:tab1>
 					<div>按日期</div>
@@ -9,7 +9,7 @@
 					<div>按规格</div>
 				</template>
 			</ButtonNav>
-		</div> -->
+		</div>
 		<div class="app-container energyOverlimitLog">
 			<div v-show="activeName === 'his'">
 				<!-- 搜索工作栏 -->
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,36 +86,32 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
 	{
 		prop: 'originArea',
 		label: '原片下片面积',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepArea',
 		label: '深加工下片面积',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'originPrice',
 		label: '原片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepPrice',
 		label: '深加工成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'price',
 		label: '总成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
@@ -248,12 +244,19 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
 			this.formConfig2[0].startPlaceholder = '开始时间';
 			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -271,7 +274,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -331,19 +334,12 @@ export default {
 				this.otherMethods(val);
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
 			if (this.activeName === 'his') {
 				exportURL = exportCostSumExcel;
-        title = '总成本统计';
+        title = '总成本统计-按日期';
 			} else {
 				exportURL = exportRawStatisticsRealtimeExcel;
         title = '总成本统计-按规格';

src/views/cost/deep/24hourCostMonitor/index.vue

@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();

src/views/cost/deep/costDeepEnergy/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,27 +86,24 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	// {
+	{
-	// 	prop: 'bindObjectName',
+		prop: 'bindObjectName',
-	// 	label: '监控对象',
+		label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
-	// {
+	{
-	// 	prop: 'meterName',
+		prop: 'meterName',
-	// 	label: '抄表名',
+		label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -118,24 +115,20 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	// {
+	{
-	// 	prop: 'bindObjectName',
+		prop: 'bindObjectName',
-	// 	label: '监控对象',
+		label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
-	// {
+	{
-	// 	prop: 'meter',
+		prop: 'meter',
-	// 	label: '抄表名',
+		label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -214,16 +207,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'button',
@@ -272,18 +262,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[1].startPlaceholder = '开始时间';
+			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -294,18 +292,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -327,26 +320,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/deep/costDeepOthercostHis/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,12 +87,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -102,14 +99,9 @@ const tableProps = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -118,7 +110,6 @@ const tableProps2 = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -191,16 +182,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'button',
@@ -249,20 +237,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[1].startPlaceholder = '开始时间';
+			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -273,18 +267,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -306,26 +295,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {

src/views/cost/deep/costDeepOthercostLog/index.vue

@@ -65,7 +65,6 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -162,7 +161,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -175,7 +174,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime

src/views/cost/deep/costDeepOthercostRule/typeRule.vue

@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${Number(injectData.price)}元`
+					? `每天等价,${injectData.price}元`
 					: injectData.type == 2
-					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>

src/views/cost/deep/costDeepRatioHis/index.vue

@@ -52,7 +52,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -85,12 +85,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -103,27 +100,22 @@ const tableProps = [
 	{
 		prop: 'innum',
 		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 ];
 const tableProps2 = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -136,17 +128,15 @@ const tableProps2 = [
 	{
 		prop: 'innum',
 		label: '进片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '出片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 ];
 export default {
@@ -180,15 +170,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
 				},
 				{
 					type: 'button',
@@ -237,15 +225,22 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
 						this.getDataList();
@@ -258,12 +253,12 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					this.handleExport();
 					break;
@@ -314,20 +309,10 @@ export default {
 				this.otherMethods(val);
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		successSubmit() {
 			this.handleCancel();
-			if (this.activeName === 'his') {
+			const val = this.activeName === 'his' ? '产线良品率' : 'now';
-				this.getDataList();
+			this.currentMenu(val);
-			} else {
-				this.getDataList2();
-			}
 		},
 		/** 导出按钮操作 */
 		handleExport() {

src/views/cost/deep/costStatistics/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,12 +87,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '时间',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -105,42 +102,33 @@ const tableProps = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -152,35 +140,30 @@ const tableProps2 = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -242,16 +225,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'select',
@@ -308,20 +288,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[0].startPlaceholder = '开始时间';
+			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -332,18 +318,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -365,26 +346,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/index.vue

@@ -1,430 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 顶部日期&筛选栏 -->
-		<el-row :gutter="20" class="top-bar">
-			<el-col :span="8">
-				<el-date-picker
-					v-model="dateRange"
-					type="daterange"
-					range-separator="~"
-					start-placeholder="开始日期"
-					end-placeholder="结束日期"
-					value-format="yyyy-MM-dd" />
-				<el-button type="primary" style="margin-left: 10px">查询</el-button>
-			</el-col>
-			<el-col :span="16">
-				<el-tag type="info" @click="changeTime('yesterday')">昨日</el-tag>
-				<el-tag type="info" @click="changeTime('week')">本周</el-tag>
-				<el-tag type="info" @click="changeTime('month')">本月</el-tag>
-				<el-tag type="info" @click="changeTime('year')">本年</el-tag>
-			</el-col>
-		</el-row>
-
-		<!-- 成本概览卡片 -->
-		<el-row :gutter="20" class="card-row">
-			<el-col :span="8">
-				<el-card class="cost-card">
-					<div class="card-title">总制造成本（元/平米）</div>
-					<div class="card-content">
-						<div>
-							目标
-							<span class="target-val">16</span>
-						</div>
-						<div>
-							实际
-							<span class="actual-val">12.8</span>
-						</div>
-						<el-progress :stroke-width="13" :percentage="80" color="#42b983" />
-					</div>
-				</el-card>
-			</el-col>
-			<el-col :span="8">
-				<el-card class="cost-card">
-					<div class="card-title">原片成本（元/平米）</div>
-					<div class="card-content">
-						<div>
-							目标
-							<span class="target-val">16</span>
-						</div>
-						<div>
-							实际
-							<span class="actual-val">12.8</span>
-						</div>
-						<el-progress :stroke-width="13" :percentage="99" color="#42b983" />
-					</div>
-				</el-card>
-			</el-col>
-			<el-col :span="8">
-				<el-card class="cost-card">
-					<div class="card-title">加工成本（元/平米）</div>
-					<div class="card-content">
-						<div>
-							目标
-							<span class="target-val">16</span>
-						</div>
-						<div>
-							实际
-							<span class="actual-val">12.8</span>
-						</div>
-						<el-progress :stroke-width="13" :percentage="99" color="#42b983" />
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-
-		<!-- 成本构成区域 -->
-		<el-row :gutter="20" class="composition-row">
-			<!-- 饼图 -->
-			<el-col :span="6">
-				<el-card class="composition-card">
-					<div class="card-title">成本构成</div>
-					<div id="costPie" class="chart" style="height: 350px"></div>
-				</el-card>
-			</el-col>
-			<!-- 原片/加工成本子项 -->
-			<el-col :span="18">
-				<el-card class="composition-card">
-					<div class="card-title">成本构成</div>
-
-					<!-- 原片成本子项 -->
-					<div class="sub-cost-group">
-						<div class="sub-cost-title">原片成本</div>
-						<div class="sub-cost">
-							<div
-								v-for="(item, idx) in rawSubCosts"
-								:key="idx"
-								class="sub-cost-div">
-								<div class="sub-cost-name">
-									{{ item.name }}
-									<div class="sub-cost-val">{{ item.val }}</div>
-								</div>
-								<div style="text-align: center">
-									<el-progress
-										type="circle"
-										:percentage="89"
-										:width="60"
-										:stroke-width="10"
-										:show-text="false"
-										color="#e74c3c" />
-								</div>
-								<div class="sub-cost-name">
-									目标
-									<span class="red-text">{{ item.target }}</span>
-								</div>
-								<div class="sub-cost-name">
-									完成率
-									<span class="red-text">89%</span>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<el-divider></el-divider>
-					<!-- 加工成本子项 -->
-					<div class="sub-cost-group" style="margin-top: 20px">
-						<div class="sub-cost-title">加工成本</div>
-						<div class="sub-cost">
-							<div
-								v-for="(item, idx) in processSubCosts"
-								:key="idx"
-								class="sub-cost-div">
-								<div class="sub-cost-name">
-									{{ item.name }}
-									<div class="sub-cost-val">{{ item.val }}</div>
-								</div>
-								<div style="text-align: center">
-									<el-progress
-										type="circle"
-										:percentage="89"
-										:width="60"
-										:stroke-width="10"
-										:show-text="false"
-										color="#e74c3c" />
-								</div>
-								<div class="sub-cost-name">
-									目标
-									<span class="red-text">{{ item.target }}</span>
-								</div>
-								<div class="sub-cost-name">
-									完成率
-									<span class="red-text">89%</span>
-								</div>
-							</div>
-						</div>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-
-		<!-- 趋势图区域 -->
-		<el-row :gutter="20" class="trend-row">
-			<!-- 总制造成本趋势 -->
-			<el-col :span="8">
-				<el-card class="trend-card">
-					<div class="card-title">总制造成本趋势</div>
-					<div id="totalTrend" class="chart" style="height: 300px"></div>
-				</el-card>
-			</el-col>
-			<!-- 原片/加工成本趋势 -->
-			<el-col :span="8">
-				<el-card class="trend-card">
-					<div class="card-title">原片/加工成本趋势</div>
-					<el-tabs v-model="costTab" type="card" style="margin-bottom: 10px">
-						<el-tab-pane label="原片成本" name="raw"></el-tab-pane>
-						<el-tab-pane label="加工成本" name="process"></el-tab-pane>
-					</el-tabs>
-					<div id="rawProcessTrend" class="chart" style="height: 300px"></div>
-				</el-card>
-			</el-col>
-			<!-- 单项成本趋势 -->
-			<el-col :span="8">
-				<el-card class="trend-card">
-					<div class="card-title">单项成本趋势</div>
-					<el-tabs v-model="itemTab" type="card" style="margin-bottom: 10px">
-						<el-tab-pane label="人工成本" name="labor"></el-tab-pane>
-						<el-tab-pane label="原料成本" name="material"></el-tab-pane>
-						<el-tab-pane label="制造费用" name="expense"></el-tab-pane>
-						<el-tab-pane label="玻璃热耗" name="heat"></el-tab-pane>
-						<el-tab-pane label="原片成品率" name="yield"></el-tab-pane>
-					</el-tabs>
-					<div id="itemTrend" class="chart" style="height: 300px"></div>
-				</el-card>
-			</el-col>
-		</el-row>
-	</div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'CostDashboard',
-	data() {
-		return {
-			dateRange: ['2023-05-06', '2023-05-06'],
-			costTab: 'raw',
-			itemTab: 'labor',
-			// 原片成本子项
-			rawSubCosts: [
-				{ name: '人工成本', val: 4.56, target: 4.32 },
-				{ name: '原料成本', val: 4.56, target: 4.32 },
-				{ name: '原片制造费用', val: 4.56, target: 4.32 },
-				{ name: '玻璃热耗', val: 4.56, target: 4.32 },
-				{ name: '原片成品率', val: 4.56, target: 4.32 },
-			],
-			// 加工成本子项
-			processSubCosts: [
-				{ name: '人工成本', val: 4.56, target: 4.32 },
-				{ name: '加工动力成本', val: 4.56, target: 4.32 },
-				{ name: '加工制造费用', val: 4.56, target: 4.32 },
-				{ name: '加工投入产出率', val: 4.56, target: 4.32 },
-			],
-			// 趋势图模拟数据
-			trendX: ['00:00', '01:00', '02:00'],
-			trendY: [20, 40, 50],
-			targetY: 12.54,
-		};
-	},
-	mounted() {
-		this.initCostPie();
-		this.initTotalTrend();
-		this.initRawProcessTrend();
-		this.initItemTrend();
-	},
-	methods: {
-		// 切换时间范围（示例）
-		changeTime(type) {
-			// 实际项目中需根据type请求对应数据
-			console.log('切换时间:', type);
-		},
-		// 初始化成本构成饼图
-		initCostPie() {
-			const pieChart = echarts.init(document.getElementById('costPie'));
-			pieChart.setOption({
-				tooltip: { trigger: 'item' },
-				legend: {
-					orient: 'horizontal', // 水平排列
-					bottom: 0, // 放在底部
-					icon: 'circle',
-					left: 'center',
-					formatter: function (name) {
-						return name;
-					},
-				},
-				series: [
-					{
-						type: 'pie',
-						data: [
-							{ name: '原料成本(4.2元)', value: 29.9 },
-							{ name: '动力成本(2.1元)', value: 24 },
-							{ name: '人工成本(1.5元)', value: 24 },
-							{ name: '辅料成本(0.5元)', value: 21.2 },
-							{ name: '制造费用(0.5元)', value: 21.2 },
-						],
-						label: { show: false },
-						labelLine: { show: false },
-						bottom: 10,
-					},
-				],
-			});
-			window.addEventListener('resize', () => pieChart.resize());
-		},
-		// 初始化总制造成本趋势图
-		initTotalTrend() {
-			const totalChart = echarts.init(document.getElementById('totalTrend'));
-			totalChart.setOption({
-				grid: { top: 20, bottom: 30, left: 30, right: 10 },
-				xAxis: { type: 'category', data: this.trendX },
-				yAxis: { type: 'value', min: -20, max: 60 },
-				series: [
-					{
-						name: '实际值',
-						type: 'line',
-						data: this.trendY,
-						lineStyle: { color: '#409eff' },
-					},
-					{
-						name: '目标值',
-						type: 'line',
-						data: [this.targetY, this.targetY, this.targetY],
-						lineStyle: { type: 'dashed', color: '#e6a23c' },
-					},
-				],
-			});
-			window.addEventListener('resize', () => totalChart.resize());
-		},
-		// 初始化原片/加工成本趋势图
-		initRawProcessTrend() {
-			const rpChart = echarts.init(document.getElementById('rawProcessTrend'));
-			rpChart.setOption({
-				grid: { top: 10, bottom: 20, left: 20, right: 10 },
-				xAxis: { type: 'category', data: this.trendX },
-				yAxis: { type: 'value', min: -20, max: 60 },
-				series: [
-					{
-						name: '实际值',
-						type: 'line',
-						data: this.trendY,
-						lineStyle: { color: '#409eff' },
-					},
-					{
-						name: '目标值',
-						type: 'line',
-						data: [this.targetY, this.targetY, this.targetY],
-						lineStyle: { type: 'dashed', color: '#e6a23c' },
-					},
-				],
-			});
-			window.addEventListener('resize', () => rpChart.resize());
-		},
-		// 初始化单项成本趋势图
-		initItemTrend() {
-			const itemChart = echarts.init(document.getElementById('itemTrend'));
-			itemChart.setOption({
-				grid: { top: 10, bottom: 20, left: 20, right: 10 },
-				xAxis: { type: 'category', data: this.trendX },
-				yAxis: { type: 'value', min: -20, max: 60 },
-				series: [
-					{
-						name: '实际值',
-						type: 'line',
-						data: this.trendY,
-						lineStyle: { color: '#409eff' },
-					},
-					{
-						name: '目标值',
-						type: 'line',
-						data: [this.targetY, this.targetY, this.targetY],
-						lineStyle: { type: 'dashed', color: '#e6a23c' },
-					},
-				],
-			});
-			window.addEventListener('resize', () => itemChart.resize());
-		},
-	},
-};
-</script>
-
-<style scoped>
-.top-bar {
-	margin-bottom: 20px;
-}
-.card-row,
-.composition-row {
-	margin-bottom: 20px;
-}
-.cost-card .card-title {
-	font-size: 22px;
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-.cost-card .card-content {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: 10px;
-	align-items: center;
-	font-size: 18px;
-}
-.target-val {
-	color: #666;
-	margin-left: 5px;
-	font-size: 20px;
-}
-.actual-val {
-	color: #42b983;
-	margin-left: 5px;
-	font-size: 20px;
-}
-.composition-card {
-	height: 480px;
-}
-.composition-card .card-title {
-	font-size: 18px;
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-.sub-cost {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-	gap: 10px;
-	align-items: center;
-}
-.sub-cost-group .sub-cost-title {
-	font-size: 16px;
-	font-weight: bold;
-	margin-bottom: 10px;
-}
-.sub-cost-group .sub-cost-div {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: 10px;
-	align-items: center;
-	border: 1px solid rgb(220, 220, 220, 0.5);
-	padding: 10px;
-}
-.sub-cost-name {
-	text-align: center;
-	margin-top: 5px;
-	font-size: 14px;
-}
-.sub-cost-val {
-	font-size: 16px;
-	font-weight: bold;
-}
-.completion {
-	text-align: center;
-	font-size: 12px;
-	color: #666;
-}
-.red-text {
-	color: #e74c3c;
-}
-.trend-card {
-  height: 450px;
-}
-.trend-card .card-title {
-	font-size: 16px;
-	font-weight: bold;
-	margin-bottom: 10px;
-}
-</style>

src/views/cost/indexDetail.vue

@@ -1,199 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps1"
-			:page="1"
-			:limit="100"
-			:table-data="tableData1"></base-table>
-		<base-table
-			:table-props="tableProps2"
-			:page="1"
-			:limit="100"
-			:table-data="tableData2"></base-table>
-	</div>
-</template>
-
-<script>
-import { getDetailData } from '@/api/cost/allCost';
-import moment from 'moment';
-
-const tableProps1 = [
-	{
-		prop: 'name',
-		label: '成本项目-原片',
-	},
-	{
-		prop: 'f1',
-		label: '本期领用',
-		children: [
-			{
-				prop: 'quantity',
-				label: '数量',
-			},
-			{
-				prop: 'price',
-				label: '单价',
-			},
-			{
-				prop: 'sumPrice',
-				label: '金额',
-			},
-		],
-	},
-	{
-		prop: 'sprice',
-		label: '单位成本',
-	},
-];
-
-const tableProps2 = [
-	{
-		prop: 'name',
-		label: '成本项目-加工',
-	},
-	{
-		prop: 'quantity',
-		label: '耗用数量',
-	},
-	{
-		prop: 'price',
-		label: '平均耗用单价',
-	},
-	{
-		prop: 'sumPrice',
-		label: '总成本',
-	},
-	{
-		prop: 'sprice',
-		label: '综合单位成本',
-	},
-];
-export default {
-	data() {
-		return {
-			tableProps1,
-			tableData1: [],
-			tableProps2,
-			tableData2: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				statisticType: 1,
-			},
-			activeName: '日',
-			startTime:
-				moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-			endTime:
-				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-						{ id: 4, name: '年' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					// 日期选择
-					type: 'datePicker',
-					// label: '日期',
-					dateType: 'date',
-					placeholder: '选择日期',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
-					param: 'timeday',
-					clearable: false,
-					pickerOptions: {
-						disabledDate(time) {
-							return (time.getTime()+ 3600 * 1000 * 24) > Date.now();
-						},
-						shortcuts: [
-							{
-								text: '今天',
-								onClick(picker) {
-									picker.$emit('pick', new Date());
-								},
-							},
-							{
-								text: '昨天',
-								onClick(picker) {
-									const date = new Date();
-									date.setTime(date.getTime() - 3600 * 1000 * 24);
-									picker.$emit('pick', date);
-								},
-							},
-							{
-								text: '一周前',
-								onClick(picker) {
-									const date = new Date();
-									date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-									picker.$emit('pick', date);
-								},
-							},
-						],
-					},
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '返回首页',
-					name: 'back',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	created() {},
-	mounted() {
-		this.listQuery.startTime = this.startTime;
-    this.$refs.searchBarForm.formInline.timeday = this.startTime.substr(0, 10)
-		this.getDataList();
-	},
-	methods: {
-		// 获取数据列表
-		getDataList() {
-			getDetailData(this.listQuery).then((response) => {
-				this.tableData1 = response.data.odata;
-				this.tableData2 = response.data.ddata;
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-          console.log(val.timeday)
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.timeday
-						? val.timeday + ' 00:00:00'
-						: null;
-					this.getDataList();
-					break;
-				case 'back':
-          this.$router.go(-1)
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/cost/raw/24hourCostMonitor/index.vue

@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();

src/views/cost/raw/costEnergy/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,27 +86,24 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	// {
+	{
-	// 	prop: 'bindObjectName',
+		prop: 'bindObjectName',
-	// 	label: '监控对象',
+		label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
-	// {
+	{
-	// 	prop: 'meterName',
+		prop: 'meterName',
-	// 	label: '抄表名',
+		label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -118,24 +115,20 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	// {
+	{
-	// 	prop: 'bindObjectName',
+		prop: 'bindObjectName',
-	// 	label: '监控对象',
+		label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
-	// {
+	{
-	// 	prop: 'meter',
+		prop: 'meter',
-	// 	label: '抄表名',
+		label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
+		filter: (val) => (val != null ? val : '--'),
-	// },
+	},
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -214,16 +207,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'button',
@@ -247,11 +237,10 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [
+			tableBtn: [{
-				{
+							type: 'edit',
-					type: 'edit',
+							btnName: '编辑',
-					btnName: '编辑',
+					  }
-				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -273,18 +262,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[1].startPlaceholder = '开始时间';
+			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -295,16 +292,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.listQuery.endTime = val.searchTime
-					if (this.activeName === 'his') {
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						this.listQuery.endTime = val.searchTime
+						: null;
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -326,26 +320,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-		getNavDataList() {
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/raw/costMaterial/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-27 09:18:43
+ * @LastEditTime: 2024-09-05 15:34:28
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
 						placeholder="请输入原料名称" />
 				</el-form-item>
 			</el-col>
-			<!-- <el-col :span="12">
+			<el-col :span="12">
 				<el-form-item label="单价" prop="matPrice">
 					<el-input
 						v-model="dataForm.matPrice"
@@ -31,7 +31,7 @@
 						placeholder="请输入单价" />
 					(元/吨)
 				</el-form-item>
-			</el-col> -->
+			</el-col>
 			<el-col :span="12">
 				<el-form-item label="累计用量" prop="quantity">
 					<el-input-number

src/views/cost/raw/costMaterial/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,12 +87,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'materialName',
@@ -100,13 +97,13 @@ const tableProps = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(千克)',
+		label: '累计使用量(吨)',
+	},
+	{
+		prop: 'matPrice',
+		label: '单价(元/吨)',
+		align: 'right',
 	},
-	// {
-	// 	prop: 'matPrice',
-	// 	label: '单价(元/千克)',
-	// 	align: 'right',
-	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -114,10 +111,6 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
 	{
 		prop: 'materialName',
 		label: '原料名称',
@@ -130,13 +123,13 @@ const tableProps2 = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(千克)',
+		label: '累计使用量(吨)',
+	},
+	{
+		prop: 'materialPrice',
+		label: '单价(元/吨)',
+		align: 'right',
 	},
-	// {
-	// 	prop: 'materialPrice',
-	// 	label: '单价(元/千克)',
-	// 	align: 'right',
-	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -211,16 +204,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'button',
@@ -244,11 +234,10 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [
+			tableBtn: [{
-				{
+							type: 'edit',
-					type: 'edit',
+							btnName: '编辑',
-					btnName: '编辑',
+					  }
-				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -270,20 +259,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[1].startPlaceholder = '开始时间';
+			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -294,18 +289,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -327,26 +317,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-		getNavDataList() {
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/raw/costOriginRatioHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-06-13 10:59:54
+ * @LastEditTime: 2024-09-05 15:33:16
  * @Description:
 -->
 <template>
@@ -15,9 +15,7 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item
+				<el-form-item label="产线" prop="bindObjectName">
-					:label="activeName === 'his' ? '产线' : '工段'"
-					prop="bindObjectName">
 					<el-input
 						style="width: 100%"
 						v-model="dataForm.bindObjectName"
@@ -35,7 +33,7 @@
 						placeholder="选择所属日期"></el-date-picker>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
+			<el-col :span="12">
 				<el-form-item label="厚度" prop="thick">
 					<el-input-number
 						:min="0"
@@ -45,7 +43,7 @@
 						placeholder="请输入厚度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
+			<el-col :span="12">
 				<el-form-item label="在线速度" prop="speed">
 					<el-input-number
 						:min="0"
@@ -55,7 +53,7 @@
 						placeholder="请输入在线速度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
+			<el-col :span="12">
 				<el-form-item label="掰边宽度" prop="width">
 					<el-input-number
 						:min="0"
@@ -66,27 +64,25 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item
+				<el-form-item label="拉引量" prop="inArea">
-					:label="activeName === 'his' ? '拉引量' : '进片数'"
-					prop="inArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.inArea"
-						clearable />
+						clearable
-					{{ activeName === 'his' ? '(m²)' : '片' }}
+						placeholder="请输入拉引量" />
+					(m²)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item
+				<el-form-item label="下片面积" prop="outArea">
-					:label="activeName === 'his' ? '下片面积' : '出片数'"
-					prop="outArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.outArea"
-						clearable />
+						clearable
-					{{ activeName === 'his' ? '(m²)' : '片' }}
+						placeholder="请输入下片面积" />
+					(m²)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -133,12 +129,10 @@ export default {
 				recTime: undefined,
 			},
 			dataRule: {},
-			activeName: 'his',
 		};
 	},
 	methods: {
-		init(val, statisticType, activeName) {
+		init(val, statisticType) {
-			this.activeName = activeName;
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
@@ -154,22 +148,17 @@ export default {
 				if (!valid) {
 					return false;
 				}
-				let udata = {
+				const udata = {
 					id: this.dataForm.id,
 					statisticType: this.dataForm.statisticType,
+					modifyThick: this.dataForm.thick,
+					modifySpeed: this.dataForm.speed,
+					modifyWidth: this.dataForm.width,
 					modifyInArea: this.dataForm.inArea,
 					modifyOutArea: this.dataForm.outArea,
 					modifyRatio:
 						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
 				};
-				if (this.activeName === 'his') {
-					udata = {
-						...udata,
-						modifyThick: this.dataForm.thick,
-						modifySpeed: this.dataForm.speed,
-						modifyWidth: this.dataForm.width,
-					};
-				}
 				// 修改的提交
 				this.urlOptions.updateURL(udata).then((response) => {
 					this.$modal.msgSuccess('修改成功');

src/views/cost/raw/costOriginRatioHis/index.vue

@@ -1,71 +1,42 @@
 <template>
-	<div>
+	<div class="app-container energyOverlimitLog">
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
+		<!-- 搜索工作栏 -->
-			<ButtonNav :menus="['产线良品率', '工段良品率']" @change="currentMenu">
+		<search-bar
-				<template v-slot:tab1>
+			:formConfigs="formConfig"
-					<div>产线良品率</div>
+			ref="searchBarForm"
-				</template>
+			@headBtnClick="buttonClick" />
-				<template v-slot:tab2>
+		<!-- 列表 -->
-					<div>工段良品率</div>
+		<base-table
-				</template>
+			:page="listQuery.pageNo"
-			</ButtonNav>
+			:limit="listQuery.pageSize"
-		</div>
+			:table-props="tableProps"
-		<div class="app-container energyOverlimitLog">
+			:table-data="tableData"
-			<search-bar
+			:max-height="tableH">
-				:formConfigs="formConfig"
+			<method-btn
-				ref="searchBarForm"
+				v-if="tableBtn.length"
-				@headBtnClick="buttonClick" />
+				slot="handleBtn"
-			<!-- 列表 -->
+				:width="80"
-			<div v-if="activeName === 'his'">
+				label="操作"
-				<base-table
+				:method-list="tableBtn"
-					:page="listQuery.pageNo"
+				@clickBtn="handleClick" />
-					:limit="listQuery.pageSize"
+		</base-table>
-					:table-props="tableProps"
+		<pagination
-					:table-data="tableData"
+			:page.sync="listQuery.pageNo"
-					:max-height="tableH">
+			:limit.sync="listQuery.pageSize"
-					<method-btn
+			:total="listQuery.total"
-						v-if="tableBtn.length"
+			@pagination="getDataList" />
-						slot="handleBtn"
+		<base-dialog
-						:width="80"
+			:dialogTitle="addOrEditTitle"
-						label="操作"
+			:dialogVisible="addOrUpdateVisible"
-						:method-list="tableBtn"
+			@cancel="handleCancel"
-						@clickBtn="handleClick" />
+			@confirm="handleConfirm"
-				</base-table>
+			:before-close="handleCancel"
-			</div>
+			width="50%">
-			<div v-if="activeName === 'now'">
+			<add-or-update
-				<base-table
+				ref="addOrUpdate"
-					:page="listQuery.pageNo"
+				:name-arr="formConfig[1].selectOptions"
-					:limit="listQuery.pageSize"
+				@refreshDataList="successSubmit"></add-or-update>
-					:table-props="tableProps2"
+		</base-dialog>
-					:table-data="tableData2"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					:name-arr="formConfig[1].selectOptions"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
 	</div>
 </template>
 
@@ -73,27 +44,16 @@
 import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import { getLinePage } from '@/api/base/productionLine';
-import {
+import { getcostOriginRatioHisPage,exportcostOriginRatioHisExcel } from '@/api/cost/costOriginRatioHis';
-	getcostOriginRatioHisPage,
-	getcostOriginWSRatioHisPage,
-	exportcostOriginWSRatioHisExcel,
-	exportcostOriginRatioHisExcel,
-} from '@/api/cost/costOriginRatioHis';
 import { parseTime } from '@/filter/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
     width:130,
 	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -102,67 +62,27 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
-    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'speed',
 		label: '在线速度',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'width',
 		label: '掰边宽度',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
-	},
-];
-const tableProps2  = [
-	{
-		prop: 'time',
-		label: '日期',
-    width:130,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '工段',
-    width:145,
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'inArea',
-		label: '进片数',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outArea',
-		label: '出片数',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 export default {
@@ -196,15 +116,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
 				},
 				{
 					type: 'button',
@@ -225,27 +143,23 @@ export default {
 			listQuery: {
 				statisticType: 1,
 			},
-			activeName: 'his',
 			tableProps,
-			tableProps2,
 			tableBtn: [{
 							type: 'edit',
 							btnName: '编辑',
 					  }
 			].filter((v) => v),
 			tableData: [],
-			tableData2: [],
 		};
 	},
 	components: {
 		AddOrUpdate,
-		ButtonNav,
 	},
 	created() {
     const params ={
       pageNo: 1,
       pageSize: 100,
-      pdType: 0
+      pdType: 1
     }
 		getLinePage(params).then((response) => {
 			this.formConfig[1].selectOptions = response.data.list;
@@ -253,33 +167,36 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
+					this.getDataList();
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
 					break;
 				case 'add':
 					this.addOrUpdateHandle();
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					this.handleExport();
 					break;
@@ -287,74 +204,23 @@ export default {
 					console.log(val);
 			}
 		},
-		currentMenu(val) {
-			this.activeName = val === '产线良品率' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.bindObjectId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.bindObjectId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			getcostOriginWSRatioHisPage(this.listQuery).then((response) => {
-				this.tableData2 = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
 		//tableBtn点击
 		handleClick(val) {
 			if (val.type === 'edit') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '编辑';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(
+					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-						val.data,
-						this.listQuery.statisticType,
-						this.activeName
-					);
 				});
 			} else {
 				this.otherMethods(val);
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		successSubmit() {
-			this.handleCancel();
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
-			if (this.activeName === 'his') {
 				exportURL = exportcostOriginRatioHisExcel;
-				title = '原片-产线良品率';
+        title = '原片成本-原片良品率';
-			} else {
-				exportURL = exportcostOriginWSRatioHisExcel;
-				title = '原片-工段良品率';
-			}
 			// 处理查询参数
 			let params = { ...this.listQuery };
 			params.pageNo = undefined;

src/views/cost/raw/costOthercostHis/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,12 +87,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '日期',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -105,10 +102,6 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -189,16 +182,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'button',
@@ -247,20 +237,24 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -271,18 +265,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -308,13 +297,6 @@ export default {
 				this.getDataList2();
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {

src/views/cost/raw/costOthercostLog/index.vue

@@ -65,7 +65,6 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -162,7 +161,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -175,7 +174,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime

src/views/cost/raw/costOthercostRule/typeRule.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-12-05 13:45:59
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-25 16:20:38
+ * @LastEditTime: 2024-04-15 17:12:03
  * @Description
 -->
 <template>
@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${Number(injectData.price)}元`
+					? `每天等价,${injectData.price}元`
 					: injectData.type == 2
-					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>

src/views/cost/raw/costStatistics/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getNavDataList" />
+				@pagination="getDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,12 +87,9 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'time',
+		prop: 'recTime',
 		label: '时间',
-	},
+		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -101,41 +98,32 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
-    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -147,40 +135,34 @@ const tableProps2 = [
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+		filter: (val) => (val ? val * 100 + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -242,16 +224,13 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'datetimerange',
+					dateType: 'daterange',
-					format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
-					width: 350,
-					clearable: false,
 				},
 				{
 					type: 'select',
@@ -308,20 +287,26 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
+			if (val.statisticType === 2) {
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年第{w}周');
+			}else{
+				this.tableProps[0].filter = (val) =>
+					parseTime(val, '{y}年{m}月{d}日');
+      }
+			this.formConfig2[0].startPlaceholder = '开始时间';
+			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
 					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -332,18 +317,13 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
+						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
 					this.handleExport();
 					break;
 				default:
@@ -365,26 +345,15 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.$nextTick(() => {
+				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
-					this.$refs.searchBarForm2.formInline.searchTime = [
+				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/group/Calendar/holidayLog.vue

@@ -1,96 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-23 13:43:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 21:13:10
- * @Description:
--->
-<template>
-	<div class="app-container" style="padding-top: 0">
-		<div v-for="item in groupClassArr" :key="item.planId">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				{{ item.deptName + ' - ' + item.planName }}
-			</small-title>
-			<base-table
-				:table-props="tableProps"
-				:table-data="
-					tableData.filter((titem) => titem.schedulingPlanId == item.planId)
-				"></base-table>
-		</div>
-	</div>
-</template>
-
-<script>
-import SmallTitle from '../Schedule/SmallTitle';
-
-const tableProps = [
-	{
-		prop: 'classesName',
-		label: '班次名称',
-	},
-	{
-		prop: 'workTime',
-		label: '班次时间',
-	},
-	{
-		prop: 'teamName',
-		label: '班组名称',
-	},
-	{
-		prop: 'teamLeader',
-		label: '组长',
-	},
-	{
-		prop: 'teamLeaderPhone',
-		label: '组长电话',
-	},
-];
-
-export default {
-	components: {
-		SmallTitle,
-	},
-	data() {
-		return {
-			tableProps,
-			tableData: [],
-			groupClassArr: [],
-		};
-	},
-	created() {},
-	methods: {
-		init(det, detSort) {
-			this.tableData = det;
-			//返回计划名和id
-			const arr = det.map((item) => {
-				const obj = {
-					planName: item.schedulingPlanName,
-					planId: item.schedulingPlanId,
-					deptName: item.belongDeptName,
-				};
-				return obj;
-			});
-			//去重
-			const map = new Map();
-			arr.forEach((item) => {
-				if (!map.has(item.planId)) {
-					map.set(item.planId, item);
-				}
-			});
-			const newArr = Array.from(map.values());
-			// 创建B数组中id的顺序映射
-			const orderMap = new Map();
-			detSort.forEach((item, index) => {
-				orderMap.set(item, index);
-			});
-
-			// 根据B的顺序对A进行排序
-			this.groupClassArr = [...newArr].sort((a, b) => {
-				const orderA = orderMap.get(a.planId);
-				const orderB = orderMap.get(b.planId);
-				return orderA - orderB;
-			});
-		},
-	},
-};
-</script>

src/views/group/Calendar/index.vue

@@ -1,612 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-23 13:43:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-25 09:39:43
- * @Description:
--->
-<template>
-	<div
-		class="app-container"
-		style="
-			background-color: #f2f4f9;
-			padding: 0;
-			display: grid;
-			grid-template-columns: 1fr 5fr;
-			gap: 10px;
-		">
-		<div class="head-container">
-			<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
-				<el-tab-pane label="部门" name="first"></el-tab-pane>
-				<el-tab-pane label="班组" name="second"></el-tab-pane>
-			</el-tabs>
-			<div v-if="activeName == 'first'">
-				<el-input
-					v-model="deptName"
-					placeholder="请输入部门名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="deptOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree"
-					node-key="id"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick" />
-			</div>
-			<div v-else>
-				<el-input
-					v-model="groupName"
-					placeholder="请输入班组名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="groupOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree1"
-					node-key="id"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick1" />
-			</div>
-		</div>
-		<div class="groupTeamScheduling">
-			<div class="operationArea">
-				<el-form :inline="true" class="demo-form-inline">
-					<span class="blue-block"></span>
-					<el-form-item label="月份选择">
-						<el-date-picker
-							v-model="startDay"
-							type="month"
-							placeholder="选择月"
-							size="small"
-							@change="selectMonth"
-							:clearable="false"
-							style="width: 120px"></el-date-picker>
-						<span
-							style="color: #909399; font-size: 12px"
-							v-if="activeName == 'first'">
-							提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
-						</span>
-						<span v-else style="margin-left: 10px">
-							组长:
-							<span style="font-weight: 600; margin: 0 10px">
-								{{ showTeamName?.leaderName || '-' }}
-							</span>
-							组长电话:
-							<span style="font-weight: 600; margin: 0 10px">
-								{{ showTeamName?.leaderPhone || '-' }}
-							</span>
-						</span>
-					</el-form-item>
-					<el-form-item style="float: right">
-						<el-button
-							size="small"
-							type="primary"
-							@click="(startDay = new Date()), getHolidayPage()">
-							跳转到今天
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-			<!-- 日历区域 -->
-			<div class="calenderArea">
-				<el-calendar v-model="startDay">
-					<template slot="dateCell" slot-scope="{ data }">
-						<div v-if="data.type === 'current-month'">
-							<!-- 日期 -->
-							<div class="dateStyle">
-								<el-row :gutter="20">
-									<!-- 公历和农历 -->
-									<el-col :span="18">
-										{{ Number(data.day.split('-')[2]) }}
-										<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-									</el-col>
-									<!-- 显示假或班 -->
-									<el-col :span="6">
-										<div
-											class="work-tip"
-											:style="{
-												backgroundColor: HolidayList[
-													Number(data.day.split('-')[2]) - 1
-												]?.isHoliday
-													? '#67C23A'
-													: '#409EFF',
-											}">
-											{{
-												HolidayList[Number(data.day.split('-')[2]) - 1]
-													?.isHoliday
-													? '假'
-													: '班'
-											}}
-											<!-- //变更节假日未更新排班计划的角标 -->
-											<div
-												class="subIcon"
-												v-if="
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.isUpdate
-												">
-												<el-tooltip
-													effect="dark"
-													content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
-													placement="top">
-													<i class="el-icon-warning" style="color: #f56c6c"></i>
-												</el-tooltip>
-											</div>
-										</div>
-									</el-col>
-									<!-- 显示排班 -->
-									<div
-										v-if="
-											HolidayList[Number(data.day.split('-')[2]) - 1]?.det
-												.length > 0
-										">
-										<el-col
-											:span="24"
-											v-for="(item, index) in HolidayList[
-												Number(data.day.split('-')[2]) - 1
-											]?.det.filter(
-												(item) =>
-													item.schedulingPlanId ==
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.schedulingPlanId
-											)"
-											:key="index">
-											<el-tooltip
-												effect="dark"
-												content="点击展示全部排班计划"
-												placement="top-start">
-												<div
-													class="holiday-div"
-													:style="{
-														backgroundColor: holidayDivColor[item?.classesCode],
-													}"
-													@click="
-														holidayLog(
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.det,
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.date,
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.detSort
-														)
-													"
-													:title="
-														item.classesName +
-														' | ' +
-														item.teamName +
-														' | ' +
-														item.workTime
-													">
-													{{
-														item.classesName +
-														' | ' +
-														item.teamName +
-														' | ' +
-														item.workTime
-													}}
-												</div>
-											</el-tooltip>
-										</el-col>
-									</div>
-								</el-row>
-							</div>
-						</div>
-						<div
-							v-else
-							style="font-size: 20px; font-weight: 500; text-align: left">
-							<el-row :gutter="20">
-								<el-col :span="24">
-									{{ Number(data.day.split('-')[2]) }}
-									<span style="font-size: 12px">
-										{{ getLunarDate(data.day) }}
-									</span>
-								</el-col>
-							</el-row>
-						</div>
-					</template>
-				</el-calendar>
-			</div>
-		</div>
-		<base-dialog
-			:dialogTitle="dialogTitle"
-			:dialogVisible="logVisible"
-			@cancel="cancelLog"
-			:before-close="cancelLog"
-			:destroy-on-close="true"
-			width="70%">
-			<holiday-log ref="holidayLogRef"></holiday-log>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button size="small" class="btnTextStyle" @click="cancelLog">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import { solarToLunar } from 'chinese-lunar';
-
-import { getUserProfile } from '@/api/system/user';
-import { listByDeptId } from '@/api/group/Schedule';
-import { getEnableData } from '@/api/group/holidaySetting';
-import {
-	getDeptSchedulingList,
-	getClassSchedulingList,
-} from '@/api/group/calendar';
-import holidayLog from './holidayLog';
-
-export default {
-	name: '',
-	components: {
-		holidayLog,
-	},
-	data() {
-		return {
-			activeName: 'first',
-			startDay: '', // 查询参数
-			HolidayList: [],
-			// 选择的部门名称
-			showDeptName: undefined,
-			showTeamName: {},
-			// 部门树选项
-			deptOptions: undefined,
-			groupOptions: undefined,
-			// 查询的部门名称
-			deptName: undefined,
-			groupName: undefined,
-
-			topDept: {}, // 保存当前用户的部门id为最高级部门id
-			deptId: undefined,
-			teamId: undefined,
-
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-			logVisible: false,
-			dialogTitle: '',
-			holidayDivColor: ['#67c23a', '#69d983', '#f5c931', '#4fa6f0'],
-		};
-	},
-	watch: {
-		// 根据名称筛选部门树
-		deptName(val) {
-			this.$refs.tree.filter(val);
-		},
-		groupName(val) {
-			this.$refs.tree1.filter(val);
-		},
-	},
-	created() {
-		this.startDay = new Date();
-		// 查询用户个人信息
-		getUserProfile().then((response) => {
-			this.showDeptName = response.data.dept.name || '';
-			this.topDept = {
-				name: response.data.dept.name || '',
-				id: response.data.dept.id || '',
-			}; // 保存当前用户的部门为最高级部门id
-			this.deptId = response.data.dept.id || '';
-			this.getHolidayPage();
-			this.getTreeselect();
-		});
-	},
-	methods: {
-		getHolidayPage() {
-			const now = new Date(this.startDay);
-			const year = now.getFullYear();
-			const month = now.getMonth();
-			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
-			const lastDate = new Date(year, month + 1, 0).getDate();
-			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
-				lastDate
-			).padStart(2, '0')}`;
-
-			this.HolidayList = [];
-			if (this.activeName == 'first') {
-				getDeptSchedulingList({
-					deptId: this.deptId,
-					startTime: Date.parse(startTime),
-					endTime: Date.parse(endTime),
-				}).then((res) => {
-					this.HolidayList = res.data;
-				});
-			} else {
-				getClassSchedulingList({
-					teamId: this.teamId,
-					startTime: Date.parse(startTime),
-					endTime: Date.parse(endTime),
-				}).then((res) => {
-					this.HolidayList = res.data;
-				});
-			}
-		},
-		// 切换月份
-		selectMonth() {
-			this.getHolidayPage();
-		},
-		/** 查询部门下拉树结构 */
-		getTreeselect() {
-			getEnableData().then((response) => {
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree1(response.data, 'id'));
-				this.$nextTick(() => {
-					this.$refs.tree.setCurrentKey(this.deptId);
-				});
-			});
-			listByDeptId(this.topDept.id).then((response) => {
-				this.groupOptions = [];
-				this.groupOptions.push(...response.data);
-			});
-		},
-		//大整数精度丢失
-		handleTree1(data, fid) {
-			const id = fid || 'id';
-			const parentId = 'parentId';
-			const children = 'children';
-			const rootId =
-				data
-					.map((item) => item[parentId].toString())
-					.reduce((min, current) => {
-						if (current.length < min.length) return current;
-						if (current.length > min.length) return min;
-						return current < min ? current : min;
-					}) || 0;
-			//对源数据深度克隆
-			const cloneData = JSON.parse(JSON.stringify(data));
-			//循环所有项
-			const treeData = cloneData.filter((father) => {
-				let branchArr = cloneData.filter((child) => {
-					//返回每一项的子级数组
-					return father[id] == child[parentId];
-				});
-				branchArr.length > 0 ? (father.children = branchArr) : '';
-				//返回第一层
-				return father[parentId] == rootId;
-			});
-			return treeData !== '' ? treeData : data;
-		},
-		// 筛选节点
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		tabsClick() {
-			if (this.activeName == 'second' && this.groupOptions.length > 0) {
-				this.teamId = this.groupOptions[0].id;
-				this.showTeamName = {
-					leaderName: this.groupOptions[0].leaderName || '-',
-					leaderPhone: this.groupOptions[0].leaderPhone || '-',
-				};
-				this.$nextTick(() => {
-					this.$refs.tree1.setCurrentKey(this.teamId);
-				});
-			} else if (this.activeName == 'first') {
-				this.deptId = this.topDept.id;
-				this.$nextTick(() => {
-					this.$refs.tree.setCurrentKey(this.deptId);
-				});
-			}
-			this.getHolidayPage();
-		},
-		// 节点单击事件
-		handleNodeClick(data) {
-			this.deptId = data.id;
-			this.showDeptName = data.name;
-			this.getHolidayPage();
-		},
-		handleNodeClick1(data) {
-			this.teamId = data.id;
-			this.showTeamName = {
-				leaderName: data.leaderName || '-',
-				leaderPhone: data.leaderPhone || '-',
-			};
-			this.getHolidayPage();
-		},
-		//获取农历
-		getLunarDate(solarDate) {
-			try {
-				const [year, month, day] = solarDate.split('-').map(Number);
-
-				const date = new Date(year, month - 1, day);
-				const lunar = solarToLunar(date);
-
-				// 将数字月份和日期转换为中文
-				const monthMap = {
-					1: '正',
-					2: '二',
-					3: '三',
-					4: '四',
-					5: '五',
-					6: '六',
-					7: '七',
-					8: '八',
-					9: '九',
-					10: '十',
-					11: '冬',
-					12: '腊',
-				};
-
-				const dayMap = {
-					1: '初一',
-					2: '初二',
-					3: '初三',
-					4: '初四',
-					5: '初五',
-					6: '初六',
-					7: '初七',
-					8: '初八',
-					9: '初九',
-					10: '初十',
-					11: '十一',
-					12: '十二',
-					13: '十三',
-					14: '十四',
-					15: '十五',
-					16: '十六',
-					17: '十七',
-					18: '十八',
-					19: '十九',
-					20: '二十',
-					21: '廿一',
-					22: '廿二',
-					23: '廿三',
-					24: '廿四',
-					25: '廿五',
-					26: '廿六',
-					27: '廿七',
-					28: '廿八',
-					29: '廿九',
-					30: '三十',
-				};
-
-				// 返回 "三月初四" 格式
-				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
-			} catch (error) {
-				console.log(error);
-				return '';
-			}
-		},
-		holidayLog(det, date, detSort) {
-			this.dialogTitle = this.showDeptName + '-' + date + '-排班详情';
-			this.logVisible = true;
-			this.$nextTick(() => {
-				this.$refs.holidayLogRef.init(det, detSort);
-			});
-		},
-		cancelLog() {
-			this.dialogTitle = '';
-			this.logVisible = false;
-		},
-	},
-};
-</script>
-<style lang="scss">
-.head-container {
-	padding: 20px 10px 0;
-	background-color: #fff;
-	border-radius: 8px;
-	height: 100%;
-}
-.groupTeamScheduling {
-	.operationArea {
-		padding: 14px 10px 0 16px;
-		margin-bottom: 8px;
-		background-color: #fff;
-		border-radius: 8px;
-		.blue-block {
-			display: inline-block;
-			width: 4px;
-			height: 16px;
-			background-color: #0b58ff;
-			border-radius: 1px;
-			margin-right: 8px;
-			margin-top: 10px;
-		}
-		.el-form-item {
-			margin-bottom: 10px;
-		}
-	}
-	// 日历
-	.calenderArea {
-		padding: 14px 10px 0 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		min-height: calc(100vh - 120px - 8px - 168px);
-		.el-calendar__body {
-			padding: 10px 16px 16px 0;
-		}
-		.el-calendar__header {
-			display: none;
-		}
-		.el-calendar-table > thead {
-			height: 48px;
-			font-size: 20px;
-			font-weight: 500;
-			color: #000000;
-			background-color: rgba(242, 244, 249, 1);
-		}
-		.el-calendar-table__row {
-			height: 133px;
-			.prev,
-			.next {
-				pointer-events: none;
-			}
-			.is-selected,
-			.is-today {
-				background-color: #e4f0fd;
-			}
-			.el-calendar-day {
-				padding: 0;
-				height: 100%;
-				:hover {
-					background-color: #e4f0fd;
-				}
-				.dateStyle {
-					font-size: 20px;
-					font-weight: 500;
-					color: #000000;
-					text-align: left;
-					height: 133px;
-					line-height: 28px;
-					padding: 10px;
-					overflow: hidden;
-
-					.lunar-date {
-						display: inline-block;
-						font-size: 12px;
-						color: #909399;
-					}
-					.work-tip {
-						background: #87c1ff;
-						color: white;
-						font-size: 18px;
-						width: 30px;
-						text-align: center;
-						float: right;
-						position: relative;
-						.subIcon {
-							position: absolute;
-							top: -18px;
-							right: -10px;
-							font-size: 10px;
-						}
-					}
-					.holiday-div {
-						background-color: #67c23a;
-						border-radius: 3px;
-						height: 25px;
-						text-align: center;
-						font-size: 12px;
-						line-height: 24px;
-						color: #fff;
-						margin-bottom: 2px;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-				}
-			}
-		}
-	}
-}
-</style>

src/views/group/Schedule/SmallTitle.vue

@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: $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/group/Schedule/add-group.vue

@@ -1,173 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:27:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 22:00:10
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			ref="groupTableRef"
-			:id="'groupTableSelectRef'"
-			row-key="id"
-			:selectWidth="55"
-			@selection-change="selectChange"
-			:table-props="tableProps"
-			:page="1"
-			:limit="999"
-			:table-data="tableData"></base-table>
-	</div>
-</template>
-
-<script>
-import { getGroupPage } from '@/api/group/groupSetting';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-		width: 100,
-	},
-	{
-		prop: 'deptName',
-		label: '所属部门',
-	},
-	{
-		prop: 'leaderName',
-		label: '组长',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true,
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getGroupPage,
-			},
-			tableProps,
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '班组编号',
-					placeholder: '班组编号',
-					param: 'code',
-				},
-				{
-					type: 'input',
-					label: '班组名称',
-					placeholder: '班组名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			formInline: {
-				pageNo: 1,
-				pageSize: 100,
-				code: '',
-				name: '',
-				deptId: undefined,
-			},
-			selectedList: [],
-			selectedArr: [], //已选的班组，从父组件传过来的
-		};
-	},
-	created() {},
-	methods: {
-		init(id, tableData) {
-			this.formInline.deptId = id;
-			this.selectedArr = tableData || [];
-			this.$nextTick(() => {
-				this.getDataList();
-			});
-		},
-		// 获取数据列表
-		getDataList() {
-			this.urlOptions.getDataListURL(this.formInline).then((response) => {
-				this.tableData = response.data.list.filter(item=>item.enabled===1);
-        this.tableData.forEach(item=>item.teamId= item.id)
-				this.$nextTick(() => {
-					if (this.selectedArr.length > 0) {
-						this.setSelectedRows();
-					}
-				});
-			});
-		},
-		setSelectedRows() {
-			const table = this.$refs.groupTableRef.$children[0];
-
-			// 先清空选择
-			table.clearSelection();
-
-			this.selectedArr.forEach((item) => {
-				const rowInTable = this.tableData.find((i) => i.teamId === item.teamId);
-				if (rowInTable) {
-					//这里一定要用table.tableData，这样才是指向同一个数组
-					this.$set(table.store.states, 'selection', [
-						...table.store.states.selection,
-						table.tableData.find((i) => i.teamId === item.teamId),
-					]);
-				}
-			});
-
-			// 强制更新视图
-			this.$nextTick(() => {
-				table.$forceUpdate();
-				this.$forceUpdate();
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.formInline.name = val.name;
-					this.formInline.code = val.code;
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		selectChange(val) {
-			this.selectedList = val;
-		},
-		// 判断两个数组是否有重复的 id,去重
-		hasDuplicateIds(arr1, arr2) {
-			return arr2.filter(
-				(item2) => !arr1.some((item1) => item1.teamId === item2.teamId)
-			);
-		},
-
-		dataFormSubmit() {
-			if (this.selectedList && this.selectedList.length > 0) {
-				this.selectedList = this.hasDuplicateIds(
-					this.selectedArr,
-					this.selectedList
-				);
-				this.$emit('refreshTableData', this.selectedList);
-			} else if (this.selectedArr.length > 0) {
-				this.$message('请不要重复添加数组');
-			}
-		},
-	},
-};
-</script>

src/views/group/Schedule/bind-line.vue

@@ -1,110 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-25 15:49:17
- * @Description:
--->
-<template>
-	<div style="width: 100%; display: flex; justify-content: center">
-		<tree-transfer
-			:title="title"
-			:from_data="fromData"
-			:to_data="toData"
-			@add-btn="add"
-			@remove-btn="remove"
-			pid="fid"
-			:node_key="'uniqueId'"
-			:defaultProps="{
-				label: 'name',
-				children: 'children',
-			}"
-			height="450px"
-			style="padding-bottom: 20px"
-			:mode="mode"
-			filter
-			openAll></tree-transfer>
-	</div>
-</template>
-
-<script>
-import treeTransfer from 'el-tree-transfer';
-import { getGroupPlanTree } from '@/api/group/Schedule';
-
-export default {
-	components: { treeTransfer },
-	data() {
-		return {
-			title: ['待选', '已选'],
-			mode: 'transfer',
-			fromData: [], //左边内容
-			toData: [], //右边已选内容
-		};
-	},
-	methods: {
-		init(val) {
-			this._pageIndex = val._pageIndex - 1;
-			this.fromData = [];
-			this.toData = [];
-			getGroupPlanTree().then((res) => {
-				res.data.forEach((item) => {
-					item.productionLineId = 0;
-				});
-				this.fromData = this.generateUniqueData(res.data);
-				this.$nextTick(() => {
-					this.toData = val.bindLineTree || [];
-					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
-				});
-			});
-		},
-		generateUniqueData(data) {
-			return data.map((node) => this.processNode(node));
-		},
-		processNode(node) {
-			// 创建唯一ID：类型-原始ID
-			const uniqueId = node.type+'L'+node.id;
-			if (node.type > 0) {
-				node.fid = (node.type - 1)+'L'+node.pid;
-			}
-
-			return {
-				...node,
-				uniqueId,
-				children: node.children
-					? node.children.map((child) => this.processNode(child))
-					: [],
-			};
-		},
-		// 监听穿梭框组件添加
-		add(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData, obj);
-		},
-		// 监听穿梭框组件移除
-		remove(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		/** 消除组件左边与右边选中数据相同项 */
-		// 处理过滤数据
-		getFilterLeftData(data, selData) {
-			for (let i = data.length - 1; i >= 0; i--) {
-				for (let j = selData.length - 1; j >= 0; j--) {
-					if (data[i] && data[i].id === selData[j].id) {
-						// 当id相等可以删除的情况 即：没有子级可以删除；
-						if (!data[i].children || data[i].children.length == 0) {
-							data.splice(i, 1);
-						} else {
-							this.getFilterLeftData(data[i].children, selData[j].children);
-						}
-					}
-				}
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$emit('refreshTableData', this._pageIndex, this.toData);
-		},
-	},
-};
-</script>

src/views/group/Schedule/detail.vue

@@ -1,206 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-21 14:27:23
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-25 15:14:53
- * @Description:
--->
-<template>
-	<div>
-		<div class="info-div">
-			<div>
-				<span class="title">计划编号:</span>
-				{{ infoData.code }}
-			</div>
-			<div>
-				<span class="title">计划状态:</span>
-				{{ ['', '草稿', '已确认', '已作废'][infoData.status] }}
-			</div>
-			<div>
-				<span class="title">计划名称:</span>
-				{{ infoData.name }}
-			</div>
-			<div>
-				<span class="title">部门:</span>
-				{{ infoData.deptName }}
-			</div>
-			<div>
-				<span class="title">开始时间:</span>
-				{{ parseTime(infoData.startDay) }}
-			</div>
-			<div>
-				<span class="title">结束时间:</span>
-				{{ parseTime(infoData.endDay) }}
-			</div>
-			<div>
-				<span class="title">周末休假方式:</span>
-				{{ ['', '双休', '周六休', '周日休', '不休'][infoData.weekType] }}
-			</div>
-			<div>
-				<span class="title">倒班方式:</span>
-				{{ ['', '长白班', '两班倒', '三班倒'][infoData.shiftType] }}
-			</div>
-			<div>
-				<span class="title">同班次连排:</span>
-				{{ infoData.shiftSustainedNum }}日
-			</div>
-			<div>
-				<span class="title">创建人:</span>
-				{{ infoData.creatorName }}
-			</div>
-			<div>
-				<span class="title">创建时间:</span>
-				{{ parseTime(infoData.createTime) }}
-			</div>
-			<div v-if="infoData.status == 3">
-				<span class="title">作废时间:</span>
-				{{ parseTime(infoData.disableTime) }}
-			</div>
-			<div>
-				<span class="title">备注:</span>
-				{{ infoData.remark }}
-			</div>
-		</div>
-		<div>
-			<el-tabs v-model="activeName" stretch>
-				<el-tab-pane label="班次" name="first"></el-tab-pane>
-				<el-tab-pane label="班组" name="second"></el-tab-pane>
-			</el-tabs>
-			<base-table
-				v-if="activeName == 'first'"
-				:table-props="tableProps1"
-				:page="1"
-				:limit="10"
-				:table-data="tableData1"></base-table>
-			<base-table
-				v-else
-				:table-props="tableProps2"
-				:page="1"
-				:limit="10"
-				:table-data="tableData2"></base-table>
-		</div>
-	</div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import { getPlan } from '@/api/group/Schedule';
-
-const tableProps1 = [
-	{
-		prop: 'name',
-		label: '班次名称',
-	},
-	{
-		prop: 'startTime',
-		label: '开始时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'endTime',
-		label: '结束时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-const tableProps2 = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'isProduction',
-		label: '是否生产班组',
-		filter: (val) => {
-			return val ? '是' : '否';
-		},
-		width: 110,
-	},
-	{
-		prop: 'lineName',
-		label: '产线及工段',
-	},
-];
-export default {
-	data() {
-		return {
-			infoData: {},
-			activeName: 'first',
-			tableProps1,
-			tableData1: [],
-			tableProps2,
-			tableData2: [],
-		};
-	},
-	methods: {
-		init(id) {
-			this.infoData = {};
-			getPlan(id).then((res) => {
-				this.infoData = res.data || {};
-				this.tableData1 = res.data?.groupPlanClassesBaseVOList.sort(
-					(a, b) => a.sort - b.sort
-				);
-				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
-				this.tableData2.forEach((item, index) => {
-					let lineName = '';
-					if (item.isProduction) {
-						lineName = this.setLineName(item.bindLineTree);
-					}
-					this.$set(this.tableData2[index], 'lineName', lineName);
-				});
-			});
-		},
-		//提取绑定的产线工段名展示出来
-		setLineName(val) {
-			if (!val || val.length === 0) return '';
-
-			const currentLevelNames = val.map((item) => item.name);
-
-			// 处理当前层级显示
-			let currentDisplay = '';
-			if (currentLevelNames.length > 1) {
-				currentDisplay = `(${currentLevelNames.join(' 、 ')})`;
-			} else {
-				currentDisplay = currentLevelNames[0];
-			}
-
-			// 查找所有子节点（取第一个有子节点的元素）
-			const childNode = val.find(
-				(item) => item.children && item.children.length > 0
-			);
-			if (childNode) {
-				const childPath = this.setLineName(childNode.children);
-				if (childPath) {
-					return `${currentDisplay} / ${childPath}`;
-				}
-			}
-
-			return currentDisplay;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.info-div {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: 10px;
-}
-.title {
-	font-weight: bold;
-}
-</style>

src/views/group/Schedule/edit-class.vue

@@ -1,148 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-04 14:08:47
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="排序" prop="sort">
-					<el-input-number
-						style="width: 100%"
-						v-model="dataForm.sort"
-						:step="1"
-						:min="1"
-						step-strictly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班次名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入班次名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="开始时间" prop="startTime">
-					<el-time-picker
-						style="width: 100%"
-						format="H:mm"
-						value-format="HH:mm:ss"
-						v-model="dataForm.startTime"
-            @change="timeFun('start')"
-						placeholder="选择时间"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="结束时间" prop="endTime">
-					<el-time-picker
-						style="width: 100%"
-						format="H:mm"
-						value-format="HH:mm:ss"
-						v-model="dataForm.endTime"
-            @change="timeFun('end')"
-						placeholder="选择时间"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否跨天" prop="daySpan">
-					<el-switch
-						v-model="dataForm.daySpan"
-            disabled
-						:active-value="1"
-						:inactive-value="0"
-						active-text="隔天"
-						inactive-text="当天"></el-switch>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	components: {},
-	data() {
-		return {
-			dataForm: {
-				id: undefined,
-				sort: undefined,
-				name: undefined,
-				startTime: undefined,
-				endTime: undefined,
-				daySpan: 0,
-				code: 1,
-				remark: undefined,
-			},
-			_pageIndex: 1,
-			dataRule: {
-				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
-				name: [
-					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
-				],
-				startTime: [
-					{ required: true, message: '开始时间不能为空', trigger: 'change' },
-				],
-				endTime: [
-					{ required: true, message: '结束时间不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val) {
-			this._pageIndex = val._pageIndex - 1;
-			this.dataForm.sort = val._pageIndex || 1;
-			this.dataForm.name = val.name || undefined;
-			this.dataForm.startTime = val.startTime || undefined;
-			this.dataForm.endTime = val.endTime || undefined;
-			this.dataForm.remark = val.remark || undefined;
-			this.dataForm.daySpan = val.daySpan || 0;
-			this.dataForm.code = val.code || 1;
-		},
-    timeFun(val) {
-      if (this.dataForm.startTime && this.dataForm.endTime) {
-        if (this.dataForm.startTime > this.dataForm.endTime) {
-          this.dataForm.daySpan = 1
-        } else if (this.dataForm.startTime < this.dataForm.endTime) {
-          this.dataForm.daySpan = 0
-        } else {
-          if (val === 'start') {
-            this.dataForm.startTime = ''
-          } else {
-            this.dataForm.endTime = ''
-          }
-          this.$modal.msgWarning('班次开始时间和结束时间不能相同')
-        }
-      }
-    },
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.$emit('refreshTableData', this._pageIndex, this.dataForm);
-			});
-		},
-	},
-};
-</script>

src/views/group/Schedule/index.vue

@@ -1,622 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 15:07:24
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-28 09:56:09
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<div class="searchBarBox">
-			<el-form
-				:inline="true"
-				ref="searchBarForm"
-				:model="formInline"
-				class="searchBar">
-				<span class="blue-block" />
-				<el-form-item label="计划编号" prop="code">
-					<el-input
-						v-model="formInline.code"
-						clearable
-						size="small"
-						placeholder="请输入计划编号" />
-				</el-form-item>
-				<el-form-item label="计划名称" prop="name">
-					<el-input
-						v-model="formInline.name"
-						clearable
-						size="small"
-						placeholder="请输入计划名称" />
-				</el-form-item>
-				<el-form-item label="开始时间" prop="startDay">
-					<el-date-picker
-						v-model="formInline.startDay"
-						size="small"
-						type="datetime"
-						value-format="yyyy-MM-dd HH:mm:ss"
-						placeholder="选择日期时间"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="结束时间" prop="endDay">
-					<el-date-picker
-						v-model="formInline.endDay"
-						size="small"
-						type="datetime"
-						value-format="yyyy-MM-dd HH:mm:ss"
-						placeholder="选择日期时间"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="部门" prop="deptId">
-					<dept-select
-						style="width: 200px"
-						ref="deptSelect"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-				<el-form-item label="状态" prop="status">
-					<el-select
-						v-model="formInline.status"
-						size="small"
-						clearable
-						placeholder="请选择状态">
-						<el-option
-							v-for="item in options"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-hasPermi="['base:group-scheduling-plan:query']"
-						@click="buttonClick({ btnName: 'search' })">
-						查询
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-scheduling-plan:query']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
-						重置
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-scheduling-plan:create']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="success"
-						size="small"
-						:plain="true"
-						v-hasPermi="['base:group-scheduling-plan:create']"
-						@click="buttonClick({ btnName: 'add' })">
-						新增
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="warning"
-						plain
-						size="small"
-						@click="handleExport"
-						:loading="exportLoading"
-						v-hasPermi="['base:group-scheduling-plan:export']">
-						导出
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="270"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			:destroy-on-close="true"
-			append-to-body
-			width="60%">
-			<add-or-update
-				ref="addOrUpdate"
-				@setSN="setStepNum"
-				@refreshDataList="successSubmit"></add-or-update>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								v-if="stepNum > 1"
-								size="small"
-								class="btnTextStyle"
-								@click="handleConfirm('up')">
-								上一步
-							</el-button>
-							<el-button
-								size="small"
-								class="btnTextStyle"
-								@click="handleCancel">
-								取消
-							</el-button>
-							<el-button
-								v-if="stepNum == 3"
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								plain
-								@click="successSubmit">
-								保存草稿
-							</el-button>
-							<el-button
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								@click="handleConfirm">
-								{{ stepNum < 3 ? '下一步' : '确认并执行' }}
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-		<base-dialog
-			:dialogTitle="'排班计划详情'"
-			:dialogVisible="detailVisible"
-			@cancel="detailCancel"
-			:before-close="detailCancel"
-			:destroy-on-close="true"
-			append-to-body
-			width="50%">
-			<detail ref="detailRef"></detail>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								size="small"
-								class="btnTextStyle"
-								@click="detailCancel">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import deptSelect from './../deptSelect.vue';
-import basicPage from '@/mixins/basic-page';
-import subSpan from './subSpan.vue';
-import subStatus from './subStatus.vue';
-import detail from './detail.vue';
-import { parseTime } from '@/filter/code-filter';
-import {
-	getGroupPlanPage,
-	deleteGroupPlan,
-	copyPlan,
-	disablePlan,
-	updateScheduleLater,
-	exportExcel,
-} from '@/api/group/Schedule';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '计划编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '计划名称',
-		width: 100,
-	},
-	{
-		prop: 'startDay',
-		label: '开始时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'endDay',
-		label: '结束时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'shiftType',
-		label: '倒班方式',
-		filter: (val) => {
-			return val ? ['', '长白班', '两班倒', '三班倒'][val] : '-';
-		},
-		width: 110,
-	},
-	{
-		prop: 'shiftSustainedNum',
-		label: '同班次连排',
-		width: 110,
-		subcomponent: subSpan,
-	},
-	{
-		prop: 'deptName',
-		label: '部门',
-	},
-	{
-		prop: 'status',
-		label: '计划状态',
-		width: 110,
-		subcomponent: subStatus,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getGroupPlanPage,
-				deleteURL: deleteGroupPlan,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-plan:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'equal',
-										name: 'status',
-										value: 1,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'equal',
-										name: 'status',
-										value: 1,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:query')
-					? {
-							type: 'detail',
-							btnName: '查看',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'unequal',
-										name: 'status',
-										value: 1,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')
-					? {
-							type: 'cancel',
-							btnName: '作废',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'equal',
-										name: 'status',
-										value: 2,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-holiday:update')
-					? {
-							type: 'sync',
-							btnName: '同步节假日',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'equal',
-										name: 'status',
-										value: 2,
-									},
-									{
-										type: 'equal',
-										name: 'updateFlag',
-										value: true,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:create')
-					? {
-							type: 'copy',
-							btnName: '复制',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			options: [
-				{
-					value: '1',
-					label: '草稿',
-				},
-				{
-					value: '2',
-					label: '已确认',
-				},
-				{
-					value: '3',
-					label: '已作废',
-				},
-			],
-			formInline: {
-				code: null,
-				name: null,
-				startDay: null,
-				endDay: null,
-				deptId: null,
-				status: null,
-			},
-			stepNum: 1, // 新增编辑时当前第几步
-			detailVisible: false,
-			// 导出遮罩层
-			exportLoading: false,
-		};
-	},
-	components: {
-		AddOrUpdate,
-		deptSelect,
-		detail,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					if (this.formInline.startDay > this.formInline.endDay) {
-						this.$message('开始时间不得晚于结束时间');
-						return;
-					}
-					this.listQuery = {
-						pageNo: 1,
-						pageSize: 20,
-						total: 1,
-						...this.formInline,
-					};
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetFields();
-					this.formInline.name = null;
-					this.formInline.code = null;
-					this.formInline.deptId = null;
-					this.$refs.deptSelect.clear();
-					this.formInline.status = null;
-					this.formInline.startDay = null;
-					this.formInline.endDay = null;
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '添加排班计划';
-					this.addOrUpdateVisible = true;
-					this.$nextTick(() => {
-						this.$refs.addOrUpdate.init();
-					});
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		setDeptId(val) {
-			this.formInline.deptId = val;
-		},
-		setStepNum(val) {
-			this.stepNum = val;
-		},
-		successSubmit() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-			this.stepNum = 1;
-			this.getDataList();
-		},
-		// dialog取消
-		handleCancel() {
-			this.$refs.addOrUpdate.cancelStep();
-		},
-		handleConfirm(val) {
-			if (val == 'up') {
-				this.$refs.addOrUpdate.upSubmit();
-			} else {
-				this.$refs.addOrUpdate.nextSubmit();
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.stepNum = 3;
-					this.$refs.addOrUpdate.init(val.data.id, true);
-				});
-			} else if (val.type === 'delete') {
-				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
-			} else if (val.type === 'detail') {
-				this.detailVisible = true;
-				this.$nextTick(() => {
-					this.$refs.detailRef.init(val.data.id);
-				});
-			} else if (val.type === 'cancel') {
-				disablePlan(val.data.id).then((res) => {
-					this.$modal.msgSuccess('作废成功');
-					this.getDataList();
-				});
-			} else if (val.type === 'sync') {
-				this.$confirm(
-					'当前节假日包含尚未同步的节假日变更，是否立即将上述节假日同步更新到排班计划？',
-					'同步节假日',
-					{
-						confirmButtonText: '确认同步',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						updateScheduleLater({
-							planId: val.data.id,
-							logId: val.data.updateLogId,
-						}).then((res) => {
-							this.$modal.msgSuccess('同步节假日成功');
-							this.getDataList();
-						});
-					})
-					.catch((res) => {
-						this.getDataList();
-						this.$message({
-							type: 'info',
-							message: '已取消',
-						});
-					});
-			} else if (val.type === 'copy') {
-				copyPlan(val.data.id).then((res) => {
-					this.$modal.msgSuccess('复制成功');
-					this.getDataList();
-				});
-			}
-		},
-		detailCancel() {
-			this.detailVisible = false;
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.formInline };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '排班计划.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-
-<style scope>
-.searchBarBox {
-	width: 100%;
-	position: relative;
-	margin-bottom: 8px;
-}
-.searchBarBox::after {
-	content: '';
-	display: block;
-	clear: both;
-}
-.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 .separateStyle {
-	display: inline-block;
-	width: 1px;
-	height: 24px;
-	background: #e8e8e8;
-	vertical-align: middle;
-}
-.searchBar .vue-treeselect__control {
-	height: 32px !important;
-	line-height: 32px !important;
-	margin: 4px 0;
-}
-body .el-dialog__header {
-	font-size: 16px;
-	color: rgba(0, 0, 0, 0.85);
-	font-weight: 500;
-	padding: 13px 24px;
-	border-bottom: 1px solid #e9e9e9;
-}
-body .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/group/Schedule/propSpan.vue

@@ -1,36 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-21 13:54:52
- * @Description:
--->
-<template>
-	<span>
-		<el-tag
-			v-if="injectData.work"
-			size="small"
-			:type="['', 'success', 'warning'][injectData.sort]">
-			{{ injectData[injectData.prop] }}
-		</el-tag>
-		<el-tag v-else effect="dark" size="small" type="info">
-			{{ injectData[injectData.prop] }}
-		</el-tag>
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/group/Schedule/propfirstSpan.vue

@@ -1,33 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:13:26
- * @Description:
--->
-<template>
-	<div>
-		<div>
-			{{ injectData.name.split('/')[0] }}
-		</div>
-		<div>
-			{{ injectData.name.split('/')[1] }}
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/group/Schedule/sortSet.vue

@@ -1,44 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:40:08
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-04 16:08:57
- * @Description:
--->
-<template>
-	<div>
-		<el-button type="text" size="mini" @click="moveUp()" style="display:inline-block">↑</el-button>
-		<el-button type="text" size="mini" @click="moveDown()" style="display:inline-block;float:right">↓</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {
-		moveUp() {
-			const val = {
-				type: 'up',
-				index: this.injectData._pageIndex - 1,
-			};
-			this.$emit('emitData', val);
-		},
-		moveDown() {
-			const val = {
-				type: 'down',
-				index: this.injectData._pageIndex - 1,
-			};
-			this.$emit('emitData', val);
-		},
-	},
-};
-</script>

src/views/group/Schedule/subSpan.vue

@@ -1,33 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-04 10:54:19
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.shiftSustainedNum?injectData.shiftSustainedNum:'') +
-			(injectData.shiftSustainedType
-				? ['', '日', '周', '月', '季'][injectData.shiftSustainedType]
-				: '')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/group/Schedule/subStatus.vue

@@ -1,31 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:40:08
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 16:43:11
- * @Description:
--->
-<template>
-	<el-tag
-		v-if="injectData.status"
-     size="medium"
-		:type="['', '', 'success', 'warning'][injectData.status]">
-		{{ ['', '草稿', '已确认', '已作废'][injectData.status] }}
-	</el-tag>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/group/base/groupReport/gr-detail.vue

@@ -6,208 +6,224 @@
  * @Description:
 -->
 <template>
-	<div>
+  <div>
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <el-table id="detail" :data="tableData" :header-cell-style="{
-			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">
-			border
+      <el-table-column prop="lineName" label="产线" align="center" />
-			:span-method="arraySpanMethod"
+      <!-- <el-table-column prop="sizes" width="105" showOverflowtooltip align="center" label="规格" /> -->
-			v-loading="dataListLoading"
+      <!-- <el-table-column prop="process" label="产品工艺" align="center" /> -->
-			style="width: 100%"
+      <el-table-column prop="inputN" label="磨边" align="center">
-			ref="dataList">
+        <el-table-column prop="edgeNum" label="投入数量/片" />
-			<el-table-column prop="lineName" label="产线" align="center" />
+        <el-table-column prop="edgeTime" label="数据上报时间">
-			<el-table-column
+          <template v-slot="scope">
-				prop="sizes"
+            <span>
-				width="105"
+              {{
-				showOverflowtooltip
+              scope.row.reportType === 0
-        align="center"
+              ? parseTime(scope.row.edgeTime)
-				label="规格" />
+              : '-'
-			<el-table-column prop="process" label="产品工艺" align="center" />
+              }}
-			<el-table-column prop="inputN" label="投入" align="center">
+            </span>
-				<el-table-column prop="inputNum" label="投入数量/片" />
+          </template>
-				<el-table-column prop="inputArea" label="投入面积/m²">
+        </el-table-column>
-					<template v-slot="scope">
+      </el-table-column>
-						<span>
+      <el-table-column prop="outputN" label="打孔/丝印" align="center">
-							{{
+        <el-table-column prop="drillCoating" label="投入数量">
-								scope.row.inputArea != null
+          <template v-slot="scope">
-									? scope.row.inputArea.toFixed(2)
+            <span>
-									: '-'
+              {{
-							}}
+              (scope.row.drillNum ?? '-')
-						</span>
+              + '/'
-					</template>
+              + (scope.row.coatingNum ?? '-')
-				</el-table-column>
+              }}
-			</el-table-column>
+            </span>
-			<el-table-column prop="outputN" label="产出" align="center">
+          </template>
-				<el-table-column prop="outputNum" label="产出数量/片" />
+        </el-table-column>
-				<el-table-column prop="outputArea" label="产出面积/m²">
+        <el-table-column prop="coatingTime" label="数据上报时间">
-					<template v-slot="scope">
+          <template v-slot="scope">
-						<span>
+            <span>
-							{{
+              {{
-								scope.row.outputArea != null
+  scope.row.reportType === 0
-									? scope.row.outputArea.toFixed(2)
+              ? parseTime(scope.row.coatingTime)
-									: '-'
+              : '-'
-							}}
+              }}
-						</span>
+            </span>
-					</template>
+          </template>
-				</el-table-column>
+        </el-table-column>
-			</el-table-column>
+      </el-table-column>
-			<el-table-column prop="lossN" label="不良" align="center">
+      <el-table-column prop="lossN" label="镀膜" align="center">
-				<el-table-column prop="lossNum" label="不良数量/片" />
+        <el-table-column prop="silkNum" label="投入数量" />
-				<el-table-column prop="lossArea" label="不良面积/m²">
+        <el-table-column prop="silkTime" label="数据上报时间">
-					<template v-slot="scope">
+          <template v-slot="scope">
-						<span>
+            <span>
-							{{
+              {{
-								scope.row.lossArea != null ? scope.row.lossArea.toFixed(2) : '-'
+  scope.row.reportType === 0
-							}}
+              ? parseTime(scope.row.silkTime)
-						</span>
+              : '-'
-					</template>
+              }}
-				</el-table-column>
+            </span>
-			</el-table-column>
+          </template>
-			<el-table-column prop="lossRatio" label="不良率/%">
+        </el-table-column>
-				<template v-slot="scope">
+      </el-table-column>
-					<span>
+      <el-table-column prop="lossN" label="钢化" align="center">
-						{{
+        <el-table-column prop="temperingNum" label="投入数量" />
-							scope.row.lossRatio != null ? scope.row.lossRatio.toFixed(2) : '-'
+        <el-table-column prop="temperingTime" label="数据上报时间">
-						}}
+          <template v-slot="scope">
-					</span>
+            <span>
-				</template>
+              {{
-			</el-table-column>
+  scope.row.reportType === 0
-			<el-table-column prop="outputRatio" label="投入产出率/%">
+              ? parseTime(scope.row.temperingTime)
-				<template v-slot="scope">
+              : '-'
-					<span>
+              }}
-						{{
+            </span>
-							scope.row.outputRatio != null
+          </template>
-								? scope.row.outputRatio.toFixed(2)
+        </el-table-column>
-								: '-'
+      </el-table-column>
-						}}
+      <el-table-column prop="lossN" label="包装" align="center">
-					</span>
+        <el-table-column prop="packingNum" label="投入数量" />
-				</template>
+        <el-table-column prop="packingTime" label="数据上报时间">
-			</el-table-column>
+          <template v-slot="scope">
-			<el-table-column prop="processingRatio" label="加工成品率/%">
+            <span>
-				<template v-slot="scope">
+              {{
-					<span>
+  scope.row.reportType === 0
-						{{
+              ? parseTime(scope.row.packingTime)
-							scope.row.processingRatio != null
+              : '-'
-								? scope.row.processingRatio.toFixed(2)
+              }}
-								: '-'
+            </span>
-						}}
+          </template>
-					</span>
+        </el-table-column>
-				</template>
+      </el-table-column>
-			</el-table-column>
+      <!-- <el-table-column prop="lossRatio" label="不良率/%">
-			<el-table-column prop="lossD" label="不良详情" align="center">
+        <template v-slot="scope">
-				<el-table-column prop="original" label="原片" align="center">
+          <span>
-					<el-table-column prop="originalLossNum" label="原片不良/片" />
+            {{
-					<el-table-column prop="originalLossArea" label="原片不良/m²">
+            scope.row.lossRatio != null ? scope.row.lossRatio.toFixed(2) : '-'
-						<template v-slot="scope">
+            }}
-							<span>
+          </span>
-								{{
+        </template>
-									scope.row.originalLossArea != null
+      </el-table-column>
-										? scope.row.originalLossArea.toFixed(2)
+      <el-table-column prop="outputRatio" label="投入产出率/%">
-										: '-'
+        <template v-slot="scope">
-								}}
+          <span>
-							</span>
+            {{
-						</template>
+            scope.row.outputRatio != null
-					</el-table-column>
+            ? scope.row.outputRatio.toFixed(2)
-				</el-table-column>
+            : '-'
-				<el-table-column prop="edge" label="磨边" align="center">
+            }}
-					<el-table-column prop="edgeLossNum" label="磨边不良/片" />
+          </span>
-					<el-table-column prop="edgeLossArea" label="磨边不良/m²">
+        </template>
-						<template v-slot="scope">
+      </el-table-column>
-							<span>
+      <el-table-column prop="processingRatio" label="加工成品率/%">
-								{{
+        <template v-slot="scope">
-									scope.row.edgeLossArea != null
+          <span>
-										? scope.row.edgeLossArea.toFixed(2)
+            {{
-										: '-'
+            scope.row.processingRatio != null
-								}}
+            ? scope.row.processingRatio.toFixed(2)
-							</span>
+            : '-'
-						</template>
+            }}
-					</el-table-column>
+          </span>
-				</el-table-column>
+        </template>
-				<el-table-column prop="drill" label="打孔" align="center">
+      </el-table-column>
-					<el-table-column prop="drillLossNum" label="打孔不良/片" />
+      <el-table-column prop="lossD" label="不良详情" align="center">
-					<el-table-column prop="drillLossArea" label="打孔不良/m²">
+        <el-table-column prop="original" label="原片" align="center">
-						<template v-slot="scope">
+          <el-table-column prop="originalLossNum" label="原片不良/片" />
-							<span>
+          <el-table-column prop="originalLossArea" label="原片不良/m²">
-								{{
+            <template v-slot="scope">
-									scope.row.drillLossArea != null
+              <span>
-										? scope.row.drillLossArea.toFixed(2)
+                {{
-										: '-'
+                scope.row.originalLossArea != null
-								}}
+                ? scope.row.originalLossArea.toFixed(2)
-							</span>
+                : '-'
-						</template>
+                }}
-					</el-table-column>
+              </span>
-				</el-table-column>
+            </template>
-				<el-table-column prop="coating" label="镀膜" align="center">
+          </el-table-column>
-					<el-table-column prop="coatingLossNum" label="镀膜不良/片" />
+        </el-table-column>
-					<el-table-column prop="coatingLossArea" label="镀膜不良/m²">
+        <el-table-column prop="edge" label="磨边" align="center">
-						<template v-slot="scope">
+          <el-table-column prop="edgeLossNum" label="磨边不良/片" />
-							<span>
+          <el-table-column prop="edgeLossArea" label="磨边不良/m²">
-								{{
+            <template v-slot="scope">
-									scope.row.coatingLossArea != null
+              <span>
-										? scope.row.coatingLossArea.toFixed(2)
+                {{
-										: '-'
+                scope.row.edgeLossArea != null
-								}}
+                ? scope.row.edgeLossArea.toFixed(2)
-							</span>
+                : '-'
-						</template>
+                }}
-					</el-table-column>
+              </span>
-				</el-table-column>
+            </template>
-				<el-table-column prop="silk" label="丝印" align="center">
+          </el-table-column>
-					<el-table-column prop="silkLossNum" label="丝印不良/片" />
+        </el-table-column>
-					<el-table-column prop="silkLossArea" label="丝印不良/m²">
+        <el-table-column prop="drill" label="打孔" align="center">
-						<template v-slot="scope">
+          <el-table-column prop="drillLossNum" label="打孔不良/片" />
-							<span>
+          <el-table-column prop="drillLossArea" label="打孔不良/m²">
-								{{
+            <template v-slot="scope">
-									scope.row.silkLossArea != null
+              <span>
-										? scope.row.silkLossArea.toFixed(2)
+                {{
-										: '-'
+                scope.row.drillLossArea != null
-								}}
+                ? scope.row.drillLossArea.toFixed(2)
-							</span>
+                : '-'
-						</template>
+                }}
-					</el-table-column>
+              </span>
-				</el-table-column>
+            </template>
-				<el-table-column prop="tempering" label="钢化" align="center">
+          </el-table-column>
-					<el-table-column prop="temperingLossNum" label="钢化不良/片" />
+        </el-table-column>
-					<el-table-column prop="temperingLossArea" label="钢化不良/m²">
+        <el-table-column prop="coating" label="镀膜" align="center">
-						<template v-slot="scope">
+          <el-table-column prop="coatingLossNum" label="镀膜不良/片" />
-							<span>
+          <el-table-column prop="coatingLossArea" label="镀膜不良/m²">
-								{{
+            <template v-slot="scope">
-									scope.row.temperingLossArea != null
+              <span>
-										? scope.row.temperingLossArea.toFixed(2)
+                {{
-										: '-'
+                scope.row.coatingLossArea != null
-								}}
+                ? scope.row.coatingLossArea.toFixed(2)
-							</span>
+                : '-'
-						</template>
+                }}
-					</el-table-column>
+              </span>
-				</el-table-column>
+            </template>
-				<el-table-column prop="packing" label="包装" align="center">
+          </el-table-column>
-					<el-table-column prop="packingLossNum" label="包装不良/片" />
+        </el-table-column>
-					<el-table-column prop="packingLossArea" label="包装不良/m²">
+        <el-table-column prop="silk" label="丝印" align="center">
-						<template v-slot="scope">
+          <el-table-column prop="silkLossNum" label="丝印不良/片" />
-							<span>
+          <el-table-column prop="silkLossArea" label="丝印不良/m²">
-								{{
+            <template v-slot="scope">
-									scope.row.packingLossArea != null
+              <span>
-										? scope.row.packingLossArea.toFixed(2)
+                {{
-										: '-'
+                scope.row.silkLossArea != null
-								}}
+                ? scope.row.silkLossArea.toFixed(2)
-							</span>
+                : '-'
-						</template>
+                }}
-					</el-table-column>
+              </span>
-				</el-table-column>
+            </template>
-			</el-table-column>
+          </el-table-column>
-		</el-table>
+        </el-table-column>
-	</div>
+        <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 } from '@/api/core/monitoring/auto';
+import { getTeamReportPageDet, exportGroupProductReportExcel } from '@/api/core/monitoring/auto';
 import * as XLSX from 'xlsx';
 import FileSaver from 'file-saver';
 
@@ -215,7 +231,8 @@ export default {
 	components: {},
 	data() {
 		return {
-			tableData: [],
+      tableData: [],
+      id:null,
 			dataListLoading: false,
 			formConfig: [
 				{
@@ -233,7 +250,8 @@ export default {
 	mounted() {},
 	methods: {
 		// 获取数据列表
-		init(id) {
+    init(id) {
+      this.id = id
 			this.dataListLoading = true;
 			getTeamReportPageDet(id).then((response) => {
 				this.tableData = response.data?.map((item, index) => {
@@ -259,17 +277,17 @@ export default {
 				this.dataListLoading = false;
 			});
 		},
-		arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+		// arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-			if (row.isSummaryReport) {
+		// 	if (row.isSummaryReport) {
-				if (columnIndex === 0) {
+		// 		if (columnIndex === 0) {
-					return [1, 3];
+		// 			return [1, 3];
-				} else if (columnIndex === 1) {
+		// 		} else if (columnIndex === 1) {
-					return [0, 0];
+		// 			return [0, 0];
-				} else if (columnIndex === 2) {
+		// 		} else if (columnIndex === 2) {
-					return [0, 0];
+		// 			return [0, 0];
-				}
+		// 		}
-			}
+		// 	}
-		},
+		// },
 
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -280,27 +298,33 @@ export default {
 					console.log(val);
 			}
 		},
-		handleExport() {
+    handleExport() {
-			let tables = document.querySelector('#detail').cloneNode(true);
+      this.$modal.confirm('是否确认导出').then(() => {
-			let exportTable = XLSX.utils.table_to_book(tables);
+          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, {
+			// var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
+			// 	bookType: 'xlsx',
-				bookSST: true,
+			// 	bookSST: true,
-				type: 'array',
+			// 	type: 'array',
-			});
+			// });
-			// sheetjs.xlsx为导出表格的标题名称
+			// // sheetjs.xlsx为导出表格的标题名称
-			try {
+			// try {
-				FileSaver.saveAs(
+			// 	FileSaver.saveAs(
-					new Blob([exportTableOut], {
+			// 		new Blob([exportTableOut], {
-						type: 'application/octet-stream',
+			// 			type: 'application/octet-stream',
-					}),
+			// 		}),
-					'班组生产报表-详情.xlsx'
+			// 		'班组生产报表-详情.xlsx'
-				);
+			// 	);
-			} catch (e) {
+			// } catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
+			// 	if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
+			// }
-			return exportTableOut;
+			// return exportTableOut;
 		},
 	},
 };

src/views/group/base/groupReport/index.vue

@@ -74,7 +74,7 @@ const tableProps = [
     fixed: true
 	},
 	{
-		prop: 'reportName',
+    prop: 'reportDate',
 		label: '日期',
 		width: 180,
     fixed: true
@@ -89,211 +89,241 @@ const tableProps = [
 		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: '投入',
+		label: '下片',
 		align: 'center',
 		children: [
 			{
-				prop: 'inputNum',
+        prop: 'downNum',
-				label: '投入数量/片',
+				label: '成品数量',
         width:100
 			},
 			{
-				prop: 'inputArea',
+        prop: 'scrapNum',
-				label: '投入面积/m²',
+				label: '废片数量',
         width:100
-			},
+      },
-		],
+      {
-	},
+        prop: 'inputOutputRate',
-	{
+        label: '投入产出率',
-		prop: 'outputN',
+        width: 100
-		label: '产出',
+      },
-		align: 'center',
+      {
-		children: [
+        prop: 'yieldRate',
-			{
+        label: '加工成品率',
-				prop: 'outputNum',
+        width: 100
-				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
-					},
-				],
-			},
 		],
 	},
+	// {
+	// 	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 {
@@ -309,17 +339,22 @@ export default {
 			listQuery: {
         reportType: 1,
 				pageSize: 10,
-				pageNo: 1,
+        pageNo: 1,
+        startTime: undefined,
+        endTime: undefined,
 				total: 1,
 			},
 			fileName: '',
 			dataListLoading: false,
 			tableProps,
-			tableBtn: [
+      tableBtn: [
-				{
+        this.$auth.hasPermi(`monitoring:group-off:update`)
-					type: 'eq',
+          ? {
-					btnName: '详情',
+            type: 'eq',
-				},
+            btnName: '详情',
+          }
+          : undefined,
+
 			].filter((v) => v),
 			showData: [],
 			tableData: [],
@@ -339,15 +374,19 @@ export default {
 				{
 					type: 'select',
 					label: '报表类型',
-					selectOptions: [
+          selectOptions: [
+            {
+              id: 0,
+              name: '班',
+            },
 						{
 							id: 1,
 							name: '日',
 						},
-						{
+						// {
-							id: 2,
+						// 	id: 2,
-							name: '周',
+						// 	name: '周',
-						},
+						// },
 						{
 							id: 3,
 							name: '月',
@@ -364,15 +403,16 @@ export default {
 					type: 'datePicker',
 					label: '时间范围',
 					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+          format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+          valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 				},
 				{
-					type: 'button',
+          type: this.$auth.hasPermi('monitoring:group-off:query') ? 'button' : '',
+
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
@@ -381,8 +421,8 @@ export default {
 					type: 'separate',
 				},
 				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+          type: this.$auth.hasPermi('monitoring:group-off:export') ? 'button' : '',
-					type: 'button',
+					// type: 'button',
 					btnName: '导出',
 					name: 'export',
 					color: 'warning',
@@ -402,7 +442,9 @@ export default {
 		// 设置为23:59:59
 		const end = new Date(yesterday.getTime());
 		end.setHours(23, 59, 59, 59);
-		this.listQuery.reportStartTime = [yesterday.getTime(),end.getTime()];
+    this.listQuery.startTime = yesterday.getTime(), [end.getTime()];
+    this.listQuery.endTime = end.getTime()
+
 		this.$nextTick(() => {
 			this.$refs.searchBarForm.formInline.timeVal = [yesterday.getTime(),end.getTime()];
 		});
@@ -461,9 +503,12 @@ export default {
 					this.listQuery.factoryId = val.factoryId || undefined;
 					this.listQuery.teamId = val.teamId || undefined;
 					this.listQuery.reportType = val.reportType || undefined;
-					this.listQuery.reportStartTime = val.timeVal
+          this.listQuery.startTime = val.timeVal
-						? val.timeVal
+						? val.timeVal[0]
-						: undefined;
+            : undefined;
+          this.listQuery.endTime = val.timeVal
+            ? val.timeVal[1]
+            : undefined;
 					this.getDataList();
 					break;
 				case 'export':
@@ -475,8 +520,10 @@ export default {
 		},
 		// 获取数据列表
 		getDataList() {
-			this.dataListLoading = true;
+      this.dataListLoading = true;
-			const arr = ['日', '周', '月', '年'];
+      console.log(this.listQuery);
+
+      const arr = ['班', '日', '', '月', '年']; // 索引0对应班，1对应日，3对应月，4对应年，索引2留空
 			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
 				if (!response.data.list) {
 					this.showData = [];
@@ -484,7 +531,8 @@ export default {
 					return;
 				}
 				this.tableData = response.data?.list.map((item, index) => {
-					item.reportType = arr[item.reportType - 1];
+          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;
@@ -508,7 +556,7 @@ export default {
 		},
 		handleClick(val) {
 			this.addOrUpdateVisible = true;
-      const time = val.data.reportName?val.data.reportName:'- '
+      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 =

src/views/group/deptSelect.vue

@@ -1,63 +0,0 @@
-<template>
-	<treeselect
-		v-model="deptId"
-		:options="deptOptions"
-		:show-count="true"
-		sise="small"
-		ref="treeselect"
-		placeholder="请选择归属部门"
-		@input="setId"
-		:normalizer="normalizer" />
-</template>
-
-<script>
-import Treeselect from '@riophae/vue-treeselect';
-import '@riophae/vue-treeselect/dist/vue-treeselect.css';
-import { listSimpleDepts } from '@/api/system/dept';
-
-export default {
-	components: { Treeselect },
-	data() {
-		return {
-			deptId: undefined,
-			deptOptions: undefined,
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-		};
-	},
-	created() {
-		this.getTreeselect();
-	},
-	methods: {
-		/** 查询部门下拉树结构  */
-		getTreeselect() {
-			listSimpleDepts().then((response) => {
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
-			});
-		},
-    // 子组件返回id
-		setId(val) {
-			this.$emit('DeptId', val);
-		},
-    // 父组件赋值id
-		setID(id) {
-			this.deptId = id;
-		},
-		clear() {
-			this.$refs.treeselect.clear();
-		},
-		// 格式化部门的下拉框
-		normalizer(node) {
-			return {
-				id: node.id,
-				label: node.name,
-				children: node.children,
-			};
-		},
-	},
-};
-</script>

src/views/group/groupSetting/add-or-updata.vue

@@ -1,267 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-27 14:49:34
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="班组编号" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入班组编号" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="班组名称" prop="name">
-					<el-input
-						:disabled="nameDisable"
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入班组名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="部门" prop="deptId">
-					<dept-select
-						style="width: 100%"
-						ref="deptSelect"
-						v-model="dataForm.deptId"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="组长" prop="leaderId">
-					<el-select
-						style="width: 100%"
-						v-model="dataForm.leaderId"
-						@change="setLeaderName"
-						filterable
-						placeholder="请选择组长">
-						<el-option
-							v-for="item in leaderArr"
-							:key="item.id"
-							:label="item.nickname"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="组长电话" prop="leaderPhone">
-					<el-input
-						v-model="dataForm.leaderPhone"
-						clearable
-						maxlength="11"
-						placeholder="请输入组长电话" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="班组人数" prop="num">
-					<el-input-number
-						style="width: 100%"
-						v-model="dataForm.num"
-						:step="1"
-						:min="0"
-						step-strictly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="生产班组" prop="isProduction">
-					<el-select
-						style="width: 100%"
-						@change="setIsProduction"
-						v-model="dataForm.isProduction"
-						placeholder="请选择是否为生产班组">
-						<el-option
-							v-for="item in options"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import deptSelect from './../deptSelect.vue';
-import { listSimpleUsers } from '@/api/system/user';
-import {
-	createGroup,
-	updateGroup,
-	getGroup,
-	getCode,
-	updateIsProduction,
-} from '@/api/group/groupSetting';
-
-export default {
-	mixins: [basicAdd],
-	components: {
-		deptSelect,
-	},
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createGroup,
-				updateURL: updateGroup,
-				infoURL: getGroup,
-				optionArrUrl: [listSimpleUsers], //需要获取下拉框的方法数组
-			},
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				leaderId: undefined,
-				leaderName: undefined,
-				leaderPhone: undefined,
-				deptId: undefined,
-				isProduction: undefined,
-				num: undefined,
-				remark: undefined,
-			},
-			setData: true,
-			nameDisable: false, //班组被使用时，班组名称不能修改
-			leaderArr: [],
-			options: [
-				{
-					value: true,
-					label: '是',
-				},
-				{
-					value: false,
-					label: '否',
-				},
-			],
-			dataRule: {
-				code: [
-					{ required: true, message: '班组编码不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '班组名称不能为空', trigger: 'blur' },
-				],
-				deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
-				leaderId: [
-					{ required: true, message: '组长不能为空', trigger: 'change' },
-				],
-				isProduction: [
-					{ required: true, message: '生产班组不能为空', trigger: 'change' },
-				],
-				leaderPhone: [
-					{
-						pattern:
-							/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-						message: '请输入正确的手机号码',
-						trigger: 'blur',
-					},
-				],
-			},
-		};
-	},
-	methods: {
-		setDeptId(val) {
-			this.dataForm.deptId = val;
-		},
-		/** 获取下拉框数组 */
-		getArr() {
-			this.urlOptions.optionArrUrl[0]()
-				.then(({ data: res }) => {
-					this.leaderArr = res;
-				})
-				.catch(() => {});
-		},
-		setDataForm() {
-			this.$refs.deptSelect.setID(this.dataForm.deptId);
-			this.nameDisable = false;
-			updateIsProduction(this.dataForm.id).then(({ data }) => {
-				if (data) {
-					this.$notify({
-						title: '警告',
-						message: '当前班组仍参与排班计划或正在执行工单。班组名称不能修改',
-						type: 'warning',
-					});
-					this.nameDisable = true;
-				}
-			});
-		},
-		setIsProduction() {
-			// 修改的提交
-			if (this.dataForm.id && this.nameDisable) {
-				this.$confirm(
-					'当前班组仍参与排班计划或正在执行工单。<br/>修改<strong> 是否是生产班组 </strong>不会自动更新排班内容，可能导致排班信息与班组属性不一致，请注意核查！<br/>是否确认修改是否是生产班组？',
-					'修改是否是生产班组',
-					{
-						dangerouslyUseHTMLString: true,
-						confirmButtonText: '确认修改',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {})
-					.catch((res) => {
-						this.$message({
-							type: 'info',
-							message: '已取消',
-						});
-						this.dataForm.isProduction = !this.dataForm.isProduction;
-					});
-			}
-		},
-		setLeaderName(val) {
-			this.leaderArr.map((item) => {
-				if (val === item.id) {
-					this.dataForm.leaderName = item.nickname;
-				}
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				if (!this.dataForm.deptId) {
-					this.$message('部门不能为空');
-					return;
-				}
-				// 修改的提交
-				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/group/groupSetting/changeStatus.vue

@@ -1,76 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:41:12
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-27 14:19:39
- * @Description:
--->
-<template>
-	<el-switch
-		@change="changeStatus"
-		size="small"
-		v-model="injectData.enabled"
-		:active-value="1"
-		:inactive-value="0"></el-switch>
-</template>
-
-<script>
-import { updateGroup, updateIsProduction } from '@/api/group/groupSetting';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {
-		changeStatus(val) {
-			const pdata = { ...this.injectData, enabled: val };
-			updateIsProduction(this.injectData.id).then(({ data }) => {
-				if (data) {
-					this.$confirm(
-						'当前班组仍参与排班计划或正在执行工单。<br/>修改<strong> 班组状态 </strong>不会自动更新排班内容，可能导致排班信息与班组属性不一致，请注意核查！<br/>是否确认修改班组状态？',
-						'更新班组状态',
-						{
-							dangerouslyUseHTMLString: true,
-							confirmButtonText: '确认修改',
-							cancelButtonText: '取消',
-							type: 'warning',
-						}
-					)
-						.then(() => {
-							updateGroup(pdata).then((res) => {
-								if (res.code === 0 || res.code === 200) {
-									this.$modal.msgSuccess('修改成功');
-									this.$emit('emitData');
-								} else {
-									this.$modal.msg(res.msg);
-								}
-							});
-						})
-						.catch((res) => {
-							this.$emit('emitData');
-							this.$message({
-								type: 'info',
-								message: '已取消',
-							});
-						});
-				} else {
-					updateGroup(pdata).then((res) => {
-						if (res.code === 0 || res.code === 200) {
-							this.$modal.msgSuccess('修改成功');
-							this.$emit('emitData');
-						} else {
-							this.$modal.msg(res.msg);
-						}
-					});
-				}
-			});
-		},
-	},
-};
-</script>

src/views/group/groupSetting/index.vue

@@ -1,289 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:27:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 21:50:40
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<div class="searchBarBox">
-			<el-form
-				:inline="true"
-				ref="searchBarForm"
-				:model="formInline"
-				class="searchBar">
-				<span class="blue-block" />
-				<el-form-item label="班组编号" prop="code">
-					<el-input
-						v-model="formInline.code"
-						clearable
-						size="small"
-						placeholder="请输入班组编号" />
-				</el-form-item>
-				<el-form-item label="部门" prop="deptId">
-					<dept-select
-						style="width: 200px"
-						ref="deptSelect"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-				<el-form-item label="班组名称" prop="name">
-					<el-input
-						v-model="formInline.name"
-						clearable
-						size="small"
-						placeholder="请输入班组名称" />
-				</el-form-item>
-				<el-form-item label="组长" prop="leaderName">
-					<el-input
-						v-model="formInline.leaderName"
-						clearable
-						size="small"
-						placeholder="请输入组长" />
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-hasPermi="['base:group-team:query']"
-						@click="buttonClick({ btnName: 'search' })">
-						查询
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-team:query']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
-						重置
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-team:create']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="success"
-						size="small"
-						:plain="true"
-						v-hasPermi="['base:group-team:create']"
-						@click="buttonClick({ btnName: 'add' })">
-						新增
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			:destroy-on-close="true"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import deptSelect from './../deptSelect.vue';
-import basicPage from '@/mixins/basic-page';
-import changeStatus from './changeStatus.vue';
-import { parseTime } from '@/filter/code-filter';
-import { getGroupPage } from '@/api/group/groupSetting';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 210,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'deptName',
-		label: '所属部门',
-		width: 110,
-	},
-	{
-		prop: 'leaderName',
-		label: '组长',
-	},
-	{
-		prop: 'leaderPhone',
-		label: '组长电话',
-		width: 110,
-	},
-	{
-		prop: 'num',
-		label: '人数',
-		width: 70,
-	},
-	{
-		prop: 'isProduction',
-		label: '是否生产班组',
-		filter: (val) => {
-			return val ? '是' : '否';
-		},
-		width: 110,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'enabled',
-		label: '班组状态',
-		subcomponent: changeStatus,
-		width: 80,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getGroupPage,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-team:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formInline: {
-				code: '',
-				name: '',
-				deptId: '',
-				leaderName: '',
-			},
-		};
-	},
-	components: {
-		AddOrUpdate,
-		deptSelect,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery = {
-						pageNo: 1,
-						pageSize: 20,
-						total: 1,
-						...this.formInline,
-					};
-					this.getDataList();
-					break;
-				case 'reset':
-					this.formInline.name = null;
-					this.formInline.code = null;
-					this.formInline.deptId = null;
-					this.$refs.deptSelect.clear();
-					this.formInline.leaderName = null;
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		setDeptId(val) {
-			this.formInline.deptId = val;
-		},
-	},
-};
-</script>
-
-<style scope>
-.searchBarBox {
-	width: 100%;
-	position: relative;
-	margin-bottom: 8px;
-}
-.searchBarBox::after {
-	content: '';
-	display: block;
-	clear: both;
-}
-.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 .separateStyle {
-	display: inline-block;
-	width: 1px;
-	height: 24px;
-	background: #e8e8e8;
-	vertical-align: middle;
-}
-.searchBar .vue-treeselect__control {
-	height: 32px !important;
-	line-height: 32px !important;
-	margin: 4px 0;
-}
-</style>

src/views/group/holidaySetting/add-or-updata.vue

@@ -1,603 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-12-11 10:47:50
- * @Description:
--->
-<template>
-	<div>
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			@keyup.enter.native="dataFormSubmit()"
-			label-position="top"
-			label-width="80px">
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="节假日名称" prop="name">
-						<el-input
-							ref="inputWidth"
-							v-model="dataForm.name"
-							clearable
-							:disabled="detail"
-							placeholder="请输入节假日名称" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="日历类型" prop="calendarType">
-						<el-select
-							v-model="dataForm.calendarType"
-							:disabled="detail"
-							style="width: 100%">
-							<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="12">
-					<el-form-item label="日期类型" prop="dateType">
-						<el-select
-							style="width: 100%"
-							:disabled="detail"
-							v-model="dataForm.dateType">
-							<el-option
-								v-for="item in options2"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item
-						v-if="dataForm.dateType == 1 && dataForm.calendarType == 1"
-						label="日期"
-						prop="dateDay">
-						<el-date-picker
-							:disabled="detail"
-							style="width: 100%"
-							key="date"
-							v-model="dataForm.dateDay"
-							type="date"
-							placeholder="选择日期"
-							format="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
-							@blur="$forceUpdate()"
-							:picker-options="pickerOptions"></el-date-picker>
-					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 1"
-						label="日期"
-						prop="dateDayArr">
-						<el-date-picker
-							:disabled="detail"
-							style="width: 100%"
-							key="daterange"
-							v-model="dataForm.dateDayArr"
-							type="daterange"
-							format="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							@blur="$forceUpdate()"
-							:picker-options="pickerOptions"></el-date-picker>
-					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 1 && dataForm.calendarType == 2"
-						label="日期"
-						prop="dateDayChinese">
-						<j-date-picker
-							ref="JDatePicker1"
-							style="line-height: 18px"
-							v-model="dataForm.dateDayChinese"
-							id="value1"
-							:width="width1"
-							:placeholder="placeholder"
-							:picker-options="pickerOptions"
-							:rangeSeparator="rangeSeparator"
-							@change="onDateChange"
-							:disabled="detail"
-							:showLunarClass="showLunarClass"
-							:showLunarControl="showLunarControl"
-							type="DATE"
-							:showBackYears="showBackYears"
-							:showLunarIcon="showLunarIcon"
-							:format="format"></j-date-picker>
-					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 2"
-						label="日期"
-						prop="dateDayArrChinese">
-						<j-date-picker
-							style="line-height: 18px"
-							ref="JDatePicker2"
-							v-model="dataForm.dateDayArrChinese"
-							id="value2"
-							:width="width1"
-							:placeholder="placeholder"
-							:picker-options="pickerOptions"
-							:rangeSeparator="rangeSeparator"
-							@change="onDateChange"
-							:disabled="detail"
-							:showLunarClass="showLunarClass"
-							:showLunarControl="showLunarControl"
-							type="DATERANGE"
-							:showBackYears="showBackYears"
-							:showLunarIcon="showLunarIcon"
-							:format="format"></j-date-picker>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="是否每年重复" prop="repeat">
-						<el-select
-							v-model="dataForm.repeat"
-							:disabled="detail"
-							style="width: 100%">
-							<el-option
-								v-for="item in options3"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12" v-if="detail">
-					<el-form-item label="来源" prop="inherited">
-						<el-radio-group disabled v-model="dataForm.inherited">
-							<el-radio :label="true">继承</el-radio>
-							<el-radio :label="false">自定义</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<el-dialog
-			title="删除确认"
-			:visible.sync="dialogVisible"
-			width="30%"
-			append-to-body>
-			<span>
-				确认删除该节假日吗？
-				<br />
-				该节假日已被排班计划使用，建议确认是否同步更新排班计划。
-				<br />
-				此操作不可恢复，请确认是否继续
-			</span>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button @click="onlyDelete">仅删除</el-button>
-				<el-button type="primary" @click="deleteAndUpdate">
-					删除并更新
-				</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import JDatePicker from './components/JDatePicker.vue';
-import {
-	createHoliday,
-	updateHoliday,
-	checkDeleteHoliday,
-	deleteHoliday,
-	updateSchedule,
-	getHoliday,
-} from '@/api/group/holidaySetting';
-
-export default {
-	components: {
-		JDatePicker,
-	},
-	data() {
-		return {
-			dataForm: {
-				id: undefined,
-				name: undefined,
-				calendarType: 1,
-				dateType: 1,
-				dateDay: undefined,
-				dateDayArr: [],
-				dateDayChinese: undefined,
-				dateDayArrChinese: [],
-				noRepeatYear: undefined,
-				noRepeatYearChinese: undefined,
-				repeat: true,
-				inherited: true, //	是否为继承
-				deptId: undefined,
-			},
-			detail: false,
-			inherited: true,
-			options1: [
-				{
-					value: 1,
-					label: '公历(阳历)',
-				},
-				{
-					value: 2,
-					label: '农历(阴历)',
-				},
-			],
-			options2: [
-				{
-					value: 1,
-					label: '单天',
-				},
-				{
-					value: 2,
-					label: '时间段',
-				},
-			],
-			options3: [
-				{
-					value: false,
-					label: '否，本年度有效',
-				},
-				{
-					value: true,
-					label: '是，每年循环生效',
-				},
-			],
-			dataRule: {
-				name: [
-					{ required: true, message: '节假日名称不能为空', trigger: 'blur' },
-				],
-				calendarType: [
-					{ required: true, message: '日历类型不能为空', trigger: 'change' },
-				],
-				dateType: [
-					{ required: true, message: '日期类型不能为空', trigger: 'change' },
-				],
-				dateDay: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				dateDayArr: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				dateDayChinese: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				dateDayArrChinese: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				repeat: [
-					{
-						required: true,
-						message: '是否每年重复不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-			pickerOptions: {
-				disabledDate(time) {
-					return time.getTime() < Date.now();
-				},
-			},
-			dialogVisible: false,
-			//农历组件数据
-			showLunarClass: 'LUNAR', //农历日期的展示类型 MIX(混合)FULLLUNAR(全农历)LUNAR(农历)NUMBER(数字)
-			showBackYears: 2, //向后展示年数;见于年份列表;
-			showLunarIcon: true, //是否显示农历控制组件
-			showLunarControl: false, //是否显示农历控制组件
-			width1: '300', //这个设置成100%，原组件写死了px需要修改
-			format: 'yyyy-MM-dd',
-			placeholder: '',
-			rangeSeparator: '-',
-			editable: true,
-			clearable: true,
-			pickerOptions: {
-				disabledDate(time) {
-					return time.getTime() < Date.now() - 8.64e7;
-				},
-			},
-		};
-	},
-
-	watch: {
-		'dataForm.calendarType': function (newValue, oldValue) {
-			this.$nextTick(() => {
-				if (this.$refs.JDatePicker1) {
-					this.$refs.JDatePicker1.isLunar = true; //默认转为农历
-					this.$refs.JDatePicker1.onLunarChange();
-				}
-				if (this.$refs.JDatePicker2) {
-					this.$refs.JDatePicker2.isLunar = true;
-					this.$refs.JDatePicker2.onLunarChange();
-				}
-			});
-		},
-		'dataForm.dateType': function (newValue, oldValue) {
-			this.$nextTick(() => {
-				if (this.$refs.JDatePicker1) {
-					this.$refs.JDatePicker1.isLunar = true; //默认转为农历
-					this.$refs.JDatePicker1.onLunarChange();
-				}
-				if (this.$refs.JDatePicker2) {
-					this.$refs.JDatePicker2.isLunar = true;
-					this.$refs.JDatePicker2.onLunarChange();
-				}
-			});
-		},
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.width1 = this.$refs.inputWidth.$el.offsetWidth + '';
-		});
-	},
-	methods: {
-		init(deptId, val, detail, inherited) {
-			this.dataForm.deptId = deptId || undefined;
-			this.dataForm.id = val.holidayId || undefined;
-			this.dataForm.inherited = val.isInherit || false;
-			this.detail = detail || false;
-			this.inherited = inherited; //编辑的时候，该部门如果是自定义的，但这个val数据是继承的，修改之后，则变成自定义的inherited
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					getHoliday(this.dataForm.id).then((res) => {
-						//设置年份，不重复的直接用返回的年份，重复的直接用当年年份
-						let year = new Date().getFullYear();
-						if (res.data.calendarType == 1 && !res.data.repeat) {
-							year = res.data.noRepeatYear;
-						} else if (res.data.calendarType == 2 && !res.data.repeat) {
-							year = res.data.noRepeatYearChinese;
-						}
-
-						this.dataForm = res.data;
-						if (
-							this.dataForm.dateType == 1 &&
-							this.dataForm.calendarType == 1
-						) {
-							this.dataForm.dateDay =
-								year + '-' + this.dataForm.oneDay.slice(-5);
-						} else if (
-							this.dataForm.dateType == 2 &&
-							this.dataForm.calendarType == 1
-						) {
-							let num = this.compareMonthDay(
-								this.dataForm.startDay.slice(-5),
-								this.dataForm.endDay.slice(-5)
-							);
-							this.dataForm.dateDayArr = [
-								year + '-' + this.dataForm.startDay.slice(-5),
-								(num > 0 ? year : year + 1) +
-									'-' +
-									this.dataForm.endDay.slice(-5),
-							];
-						} else if (
-							this.dataForm.dateType == 1 &&
-							this.dataForm.calendarType == 2
-						) {
-							this.dataForm.dateDayChinese =
-								'L' + year + this.dataForm.oneDayChinese.slice(-6);
-						} else if (
-							this.dataForm.dateType == 2 &&
-							this.dataForm.calendarType == 2
-						) {
-							let num = this.compareMonthDay(
-								this.dataForm.startDayChinese.slice(-6),
-								this.dataForm.endDayChinese.slice(-6)
-							);
-							this.dataForm.dateDayArrChinese = [
-								'L' + year + this.dataForm.startDayChinese.slice(-6),
-								'L' +
-									(num > 0 ? year : year + 1) +
-									+this.dataForm.endDayChinese.slice(-6),
-							];
-						}
-					});
-				}
-			});
-		},
-		//用于比较日期大小，判断年份是否要加1
-		compareMonthDay(dateStr1, dateStr2) {
-			const [month1, day1] = dateStr1.split('-').map(Number);
-			const [month2, day2] = dateStr2.split('-').map(Number);
-
-			if (month1 !== month2) {
-				return month2 - month1;
-			}
-			return day2 - day1;
-		},
-		editHoliday() {
-			this.detail = false;
-		},
-		deleteHoliday() {
-			//删除节假日基础信息前校验是否影响排班
-			checkDeleteHoliday(this.dataForm.id).then((res) => {
-				if (res.data) {
-					this.dialogVisible = true;
-				} else {
-					this.$confirm(
-						'确认删除该节假日吗？<br/>此操作不可恢复，请确认是否继续',
-						'删除确认',
-						{
-							dangerouslyUseHTMLString: true,
-							confirmButtonText: '确认删除',
-							cancelButtonText: '取消',
-							type: 'warning',
-						}
-					)
-						.then(() => {
-							deleteHoliday(this.dataForm.id).then((res) => {
-								console.log(res);
-								this.$modal.msgSuccess('删除成功');
-								this.$emit('refreshPage');
-							});
-						})
-						.catch(() => {
-							this.$message({
-								type: 'info',
-								message: '已取消',
-							});
-						});
-				}
-			});
-		},
-		onlyDelete() {
-			deleteHoliday(this.dataForm.id).then((res) => {
-				this.dialogVisible = false;
-				this.$modal.msgSuccess('删除成功');
-				this.$emit('refreshPage');
-			});
-		},
-		deleteAndUpdate() {
-			deleteHoliday(this.dataForm.id).then((res) => {
-				this.dialogVisible = false;
-				this.$modal.msgSuccess('删除成功');
-				updateSchedule({ logId: res.data.logId }).then((res1) => {
-					this.$modal.msgSuccess('更新成功');
-				});
-				this.$emit('refreshPage');
-			});
-		},
-		onDateChange(val) {
-			console.log(val);
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				if (this.dataForm.dateType == 1 && this.dataForm.calendarType == 1) {
-					const [year, month, day] = this.dataForm.dateDay.split('-');
-					this.dataForm.oneDay = `--${month}-${day}`;
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 1
-				) {
-					const [year, month, day] = this.dataForm.dateDayArr[0].split('-');
-					this.dataForm.startDay = `--${month}-${day}`;
-					const [year1, month1, day1] = this.dataForm.dateDayArr[1].split('-');
-					this.dataForm.endDay = `--${month1}-${day1}`;
-				} else if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 2
-				) {
-					this.dataForm.oneDayChinese =
-						'--' + this.dataForm.dateDayChinese.slice(-5);
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 2
-				) {
-					this.dataForm.startDayChinese =
-						'--' + this.dataForm.dateDayArrChinese[0].slice(-5);
-					this.dataForm.endDayChinese =
-						'--' + this.dataForm.dateDayArrChinese[1].slice(-5);
-				}
-				//是否每年重复，不重复的话需要传  年份
-				if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 1 &&
-					!this.dataForm.repeat
-				) {
-					const [year, month, day] = this.dataForm.dateDay.split('-');
-					this.dataForm.noRepeatYear = year;
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 1 &&
-					!this.dataForm.repeat
-				) {
-					const [year, month, day] = this.dataForm.dateDayArr[0].split('-');
-					this.dataForm.noRepeatYear = year;
-				} else if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 2 &&
-					!this.dataForm.repeat
-				) {
-					this.dataForm.noRepeatYearChinese =
-						this.dataForm.dateDayChinese.slice(1, 5);
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 2 &&
-					!this.dataForm.repeat
-				) {
-					this.dataForm.noRepeatYearChinese =
-						this.dataForm.dateDayArrChinese[0].slice(1, 5);
-				}
-				// 修改的提交
-				if (this.dataForm.id) {
-					if (!this.inherited) {
-						this.dataForm.inherited = false;
-					}
-					updateHoliday(this.dataForm).then((res) => {
-						if (res.code === 0 || res.code === 200) {
-							if (!res.data.updateFlag) {
-								this.$modal.msgSuccess('修改成功');
-								this.$emit('refreshPage');
-							} else {
-								this.$confirm(
-									'新增节假日影响已有排班计划，是否立即更新？',
-									'更新排班',
-									{
-										confirmButtonText: '立即更新',
-										cancelButtonText: '暂不更新',
-										type: 'warning',
-									}
-								)
-									.then(() => {
-										updateSchedule({ logId: res.data.logId }).then((res1) => {
-											this.$modal.msgSuccess('更新成功');
-										});
-										this.$emit('refreshPage');
-									})
-									.catch(() => {
-										this.$message({
-											type: 'info',
-											message: '已取消',
-										});
-										this.$emit('refreshPage');
-									});
-							}
-						} else {
-							this.$modal.msg(res.msg);
-						}
-					});
-					return;
-				}
-				// 添加的提交
-				createHoliday(this.dataForm).then((res) => {
-					if (res.code === 0 || res.code === 200) {
-						if (!res.data.updateFlag) {
-							this.$modal.msgSuccess('新增成功');
-							this.$emit('refreshPage');
-						} else {
-							this.$confirm(
-								'新增节假日影响已有排班计划，是否立即更新？',
-								'更新排班',
-								{
-									confirmButtonText: '立即更新',
-									cancelButtonText: '暂不更新',
-									type: 'warning',
-								}
-							)
-								.then(() => {
-									updateSchedule({ logId: res.data.logId }).then((res1) => {
-										this.$modal.msgSuccess('更新成功');
-									});
-									this.$emit('refreshPage');
-								})
-								.catch(() => {
-									this.$message({
-										type: 'info',
-										message: '已取消',
-									});
-									this.$emit('refreshPage');
-								});
-						}
-					} else {
-						this.$modal.msg(res.msg);
-					}
-				});
-			});
-		},
-	},
-};
-</script>

src/views/group/holidaySetting/components/JDatePicker.vue

@@ -1,735 +0,0 @@
-<template>
-  <div class="full-jcalendar" :style="{width:handleWidth+'px'}">
-
-    <p class="input-icon__tip" v-show="isLunar && showLunarIcon">
-      <i v-if="isLeap">闰</i>
-      <i v-else>农</i>
-    </p>
-    <p class="input-icon" @mouseover="onInputOver" @mouseout="onInputOut">
-      <i class="iconfont el-icon-date" ></i>
-      <i class="iconfont icon-richeng" v-show="!clearVisible"></i>
-      <i class="iconfont icon-guanbi is-clear" v-show="clearable && clearVisible" @click="onClearInput"></i>
-    </p>
-
-    <input type="text" :value="inputText" :class="['input__inner',{'is-disabled':disabled}]" :placeholder="placeholder" @click="onInputFocus" :readonly="!editable || type.toUpperCase() ==='DATERANGE' || (isLunar && showLunarClass.toUpperCase()!='NUMBER')" :disabled="disabled" @input="inputText = $event.target.value" @change="handleInputChange" />
-
-    <!--日期控件弹窗主体-->
-    <div class="full-jcalendar__main" :class="{'is-daterange':type.toUpperCase() === 'DATERANGE'}" v-show="calendarVisible">
-      <!--单日期模式-->
-      <div v-show="type.toUpperCase() === 'DATE'">
-
-        <div class="full-jcalendar-header">
-          <span class="title-year" @click="showYearList">{{year}}年</span>
-          <span style="width:10px;"></span>
-          <span class="title-month" @click="monthVisible = true">{{month}}月</span>
-          <span style="width:10px;" v-if="showLunarControl"></span>
-          <label v-if="showLunarControl"><input type="checkbox" v-model="isLunar" @change="onLunarChange" />农历</label>
-          <!-- header 切换月份 -->
-          <p class="prev-month" @click.stop="goPrev"><i class="icon iconfont el-icon-arrow-left"></i></p>
-          <p class="next-month" @click.stop="goNext"><i class="icon iconfont el-icon-arrow-right"></i></p>
-        </div>
-        <!-- body  日期和事件 -->
-        <div class="full-jcalendar__body">
-          <div class="weeks">
-            <strong class="week">日</strong>
-            <strong class="week">一</strong>
-            <strong class="week">二</strong>
-            <strong class="week">三</strong>
-            <strong class="week">四</strong>
-            <strong class="week">五</strong>
-            <strong class="week">六</strong>
-          </div>
-          <!--日期 周  行-->
-          <div class="week-row" v-for="(week,index) in calendarDatas" :key="index">
-            <!--日期 日  单元格-->
-            <div class="day-cell" v-for="(day,index) in week" :key="index"
-                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'select':day.isSelect,'not-cur-month': !day.isCurMonth }]"
-                 @click="onDateSelect(day)">
-              <!-- 日期 节气 农历 -->
-              <div class="day-number">
-                <p class="solar">
-                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
-                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
-                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
-                </p>
-                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
-                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
-                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
-                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
-                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
-                  <span v-else>{{day.lDate.IDayCn}}</span>
-                </p>
-              </div>
-
-            </div>
-
-          </div>
-        </div>
-
-        <!-- 月份切换 -->
-        <div class="full-jcalendar__month" v-show="monthVisible">
-
-          <div class="full-jcalendar-header">
-            <span>{{month}}月</span>
-          </div>
-
-          <div class="full-jcalendar__body">
-            <ul class="data-list">
-              <li @click="onMonthSelect(m-1)" v-for="m in 12" :key="m">{{m}}月</li>
-            </ul>
-            <p class="clearfix"></p>
-            <p class="close" @click="monthVisible=false">取 消</p>
-          </div>
-
-        </div>
-        <!-- 年份切换 -->
-        <div class="full-jcalendar__year" v-show="yearVisible">
-
-          <div class="full-jcalendar-header">
-            <span>{{year}}年</span>
-            <!-- header 年份翻页 -->
-            <p class="prev-month" @click.stop="goYearPrevList"><i class="icon iconfont el-icon-arrow-left"></i></p>
-            <p class="next-month" @click.stop="goYearNextList"><i class="icon iconfont el-icon-arrow-right"></i></p>
-          </div>
-
-          <div class="full-jcalendar__body">
-            <ul class="data-list">
-              <li :class="{'select-year':(m + startYear -1)==year,'curr-year':(m + startYear -1)==todayYear}" @click="onYearSelect(m + startYear -1)" v-for="m in 12" :key="m">{{m + startYear -1}}</li>
-            </ul>
-            <p class="clearfix"></p>
-            <p class="close" @click="yearVisible=false">取 消</p>
-          </div>
-        </div>
-
-      </div>
-
-      <!--日期段模式-->
-      <div class="date-range__month leftMonth" v-if="type.toUpperCase() === 'DATERANGE'">
-        <div class="full-jcalendar-header">
-          <span class="title-year">{{year}}年</span>
-          <span style="width:10px;"></span>
-          <span class="title-month">{{month}}月</span>
-          <span style="width:10px;" v-if="showLunarControl"></span>
-          <label v-if="showLunarControl"><input type="checkbox" v-model="isLunar" @change="onLunarChange" />农历</label>
-          <!-- header 切换月份 -->
-          <p class="prev-year" @click.stop="goYearPrev"><i class="icon iconfont el-icon-d-arrow-left"></i></p>
-          <p class="prev-month" @click.stop="goPrev"><i class="icon iconfont el-icon-arrow-left"></i></p>
-        </div>
-        <!-- body  日期和事件 -->
-        <div class="full-jcalendar__body">
-          <div class="weeks">
-            <strong class="week">日</strong>
-            <strong class="week">一</strong>
-            <strong class="week">二</strong>
-            <strong class="week">三</strong>
-            <strong class="week">四</strong>
-            <strong class="week">五</strong>
-            <strong class="week">六</strong>
-          </div>
-          <!--日期 周  行-->
-          <div class="week-row" v-for="(week,index) in calendarDatas" :key="index" @mouseout="onMouseOut">
-            <!--日期 日  单元格-->
-            <div class="day-cell" v-for="(day,index) in week" :key="index"
-                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'choose':isChoose(day),'select':isSelect(day),'not-cur-month': !day.isCurMonth }]"
-                 @click="onDateSelect(day)" @mouseover="onMouseOver(day)">
-              <!-- 日期 节气 农历 -->
-              <div class="day-number">
-                <p class="solar">
-                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
-                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
-                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
-                </p>
-                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
-                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
-                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
-                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
-                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
-                  <span v-else>{{day.lDate.IDayCn}}</span>
-                </p>
-              </div>
-
-            </div>
-
-          </div>
-        </div>
-      </div>
-      <div class="date-range__month" v-if="type.toUpperCase() === 'DATERANGE'">
-
-        <div class="full-jcalendar-header">
-          <span class="title-year">{{year2}}年</span>
-          <span style="width:10px;"></span>
-          <span class="title-month">{{month2}}月</span>
-          <!-- header 切换月份 -->
-          <p class="next-year" @click.stop="goYearNext"><i class="icon iconfont el-icon-d-arrow-right"></i></p>
-          <p class="next-month" @click.stop="goNext"><i class="icon iconfont el-icon-arrow-right"></i></p>
-        </div>
-        <!-- body  日期和事件 -->
-        <div class="full-jcalendar__body">
-          <div class="weeks">
-            <strong class="week">日</strong>
-            <strong class="week">一</strong>
-            <strong class="week">二</strong>
-            <strong class="week">三</strong>
-            <strong class="week">四</strong>
-            <strong class="week">五</strong>
-            <strong class="week">六</strong>
-          </div>
-          <!--日期 周  行-->
-          <div class="week-row" v-for="(week,index) in calendarDatas2" :key="index" @mouseout="onMouseOut">
-            <!--日期 日  单元格-->
-            <div class="day-cell" v-for="(day,index) in week" :key="index"
-                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'choose':isChoose(day),'select':isSelect(day),'not-cur-month': !day.isCurMonth }]"
-                 @click="onDateSelect(day)" @mouseover="onMouseOver(day);">
-              <!-- 日期 节气 农历 -->
-              <div class="day-number">
-                <p class="solar">
-                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
-                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
-                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
-                </p>
-                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
-                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
-                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
-                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
-                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
-                  <span v-else>{{day.lDate.IDayCn}}</span>
-                </p>
-              </div>
-
-            </div>
-
-          </div>
-        </div>
-
-      </div>
-
-      <div class="clearfix"></div>
-    </div>
-
-  </div>
-</template>
-<script>
-  import moment from 'moment';
-  import JDatePickerScript from './JDatePicker.js'
-
-  export default {
-    props: {
-      width: {
-        type: String,
-        default: '200',
-      },
-      value: {
-        type:[String,Date,Array],
-        default: ''
-      },
-      placeholder:{
-        type: String,
-        default: ''
-      },
-      format: {
-        type: String,
-        default: 'YYYY-MM-DD'
-      },
-      showLunarClass: {
-        type: String,
-        default: 'NUMBER',//共四种，FULLLUNAR－全农历格式：丁酉[鸡]年己酉月乙巳日；LUNAR－中文格式：丁酉[鸡]年七月廿三；NUMBER－数字格式：2017-09-13；MIX格式：丁酉(2017)[鸡]年七月廿三；
-      },
-      showLunarIcon:{
-        type: Boolean,
-        default: false,
-      },
-      showBackYears:{
-        type: Number,
-        default: 2,
-      },
-      showLunarControl:{
-        type: Boolean,
-        default: true,
-      },
-      disabled:{
-        type: Boolean,
-        default: false,
-      },
-      editable:{
-        type: Boolean,
-        default: true,
-      },
-      clearable:{
-        type: Boolean,
-        default: true,
-      },
-      type:{
-        type: String,
-        default: "DATE",//DATE - 日期类型；DATERANGE － 时间段；
-      },
-      rangeSeparator:{
-        type: String,
-        default: "-",//时间段分隔符
-      },
-      pickerOptions:{
-        type:Object,
-        default:null
-      },
-    },
-    computed: {
-      handleWidth: function () {
-        let w = this.width.toString();
-        if (w == null || w == '') {
-          return 200;
-        }
-        if (w.indexOf('px') > -1) w = w.replace(/px/, '');
-        let w0 = parseInt(w) || 0;
-        if (w0 == 0) {
-          return 200;
-        }
-        return w0;
-      },
-    },
-    watch: {
-      'value': function (newValue, oldValue) {
-        this.inputText = '';
-        this.isLeap = false;
-        this.isLunar = false;
-
-        this.handleInputText(newValue);
-
-      },
-      'showLunarIcon': function (newValue, oldValue) {
-      },
-    },
-    data () {
-      return {
-        inputText:'',
-        startYear:0,//年份列表的起始年份
-        monthDay: '',//月份日期类型，用来比较日期
-        selectDay:[],//type=daterange,存放点击选中的时间值；
-        chooseDay:[],//type=daterange,存放鼠标移动所选时间段；
-        year: 0,
-        month: 0,
-        year2: 0,
-        month2: 0,
-        isCurrMonth: true,
-        calendarDatas: [],
-        calendarDatas2: [],
-        calendarVisible: false,//日历显示开关
-        yearVisible: false,//年份选择开关
-        monthVisible: false,//月份选择开关
-        clearVisible:false,//清除按钮开关
-        isLunar: false,//是否启用农历
-        isLeap: false,//是否闰月
-      }
-    },
-    created () {
-      let month = moment()
-      this.monthDay = month.toISOString();
-      this.todayYear = month.year();
-      this.loadCalendar();
-
-      document.addEventListener('click', (e) => {
-        let icon = this.$el.querySelector('.input-icon');
-        let input = this.$el.querySelector('.input__inner');
-        let main = this.$el.querySelector('.full-jcalendar__main');
-        if (!icon.contains(e.target) && !input.contains(e.target) && !main.contains(e.target)) {
-          this.calendarVisible = false;
-          if (this.selectDay.length > 0) {
-            this.monthDay = this.selectDay[0];
-          }
-        }
-      });
-
-      this.handleInputText(this.value,true);
-    },
-    methods: {
-      handleInputText(newValue,isNeedEmit){
-        if (newValue == undefined || newValue == null || !newValue.toString().length) return;
-
-        let valueDay = '', valueDay2 = '', result = '';
-
-        if (this.type.toUpperCase() == 'DATE') {
-          //单日期模式
-          newValue = newValue.toString();
-          let isLunar  = newValue.indexOf('L') > -1;
-          this.isLunar = isLunar;
-
-          if (isLunar) {
-            //农历模式
-            let showLunarClass = this.showLunarClass.toUpperCase();
-            let lunarDate      = JDatePickerScript.calendar.getSolar(newValue);
-
-            valueDay = new Date(lunarDate.cYear + '-' + lunarDate.cMonth + '-' + lunarDate.cDay).toISOString();
-
-            if (showLunarClass == 'NUMBER') {
-              result = moment(new Date(lunarDate.lYear + '-' + lunarDate.lMonth + '-' + lunarDate.lDay)).format(this.format.toUpperCase());
-            }
-            else if (showLunarClass == 'MIX') {
-              result = lunarDate.gzYear + '(' + lunarDate.lYear + ')[' + lunarDate.Animal + ']年 ' + lunarDate.IMonthCn + lunarDate.IDayCn;
-            }
-            else if (showLunarClass == 'FULLLUNAR') {
-              result = lunarDate.gzYear + '[' + lunarDate.Animal + ']年 ' + lunarDate.gzMonth + '月 ' + lunarDate.gzDay + '日';
-            }
-            else if (showLunarClass == 'LUNAR') {
-              result = lunarDate.gzYear + '[' + lunarDate.Animal + ']年 ' + lunarDate.IMonthCn + lunarDate.IDayCn;
-            }
-
-          } else {
-            //公历模式
-            let date = new Date(newValue);
-            valueDay = date.toISOString();
-            result   = moment(date).format(this.format.toUpperCase());
-            this.$emit('input',moment(date).format('YYYY-MM-DD'))
-          }
-          this.monthDay  = valueDay;
-          this.selectDay = [valueDay];
-          this.inputText = result;
-          this.loadCalendar();
-          return;
-        }
-        if (this.type.toUpperCase() == 'DATERANGE') {
-          //时间段模式
-          //判断newValue是否为数组；ES2005以上支持isArray
-          if (Array.isArray(newValue) && newValue.length == 2) {
-            let beginDt = newValue[0];
-            let endDt = newValue[1];
-            //判断value是否为日期类型
-            if(beginDt == undefined || beginDt == null || !beginDt.toString().length) return;
-            if(endDt == undefined || endDt == null || !endDt.toString().length) return;
-            beginDt = beginDt.toString();
-            endDt = endDt.toString();
-
-            let isLunar  = beginDt.indexOf('L') > -1;
-            this.isLunar = isLunar;
-            if (isLunar) {
-              //农历模式
-              let beginDateResult = '', endDateResult = '';
-              let showLunarClass  = this.showLunarClass.toUpperCase();
-
-              let beginLunarDate = JDatePickerScript.calendar.getSolar(beginDt);
-              let endLunarDate  = JDatePickerScript.calendar.getSolar(endDt);
-
-              valueDay  = new Date(beginLunarDate.cYear + '-' + beginLunarDate.cMonth + '-' + beginLunarDate.cDay).toISOString();
-              valueDay2 = new Date(endLunarDate.cYear + '-' + endLunarDate.cMonth + '-' + endLunarDate.cDay).toISOString();
-
-              if (showLunarClass == 'NUMBER') {
-                beginDateResult = moment(new Date(beginLunarDate.lYear + '-' + beginLunarDate.lMonth + '-' + beginLunarDate.lDay)).format(this.format.toUpperCase());
-                endDateResult   = moment(new Date(endLunarDate.lYear + '-' + endLunarDate.lMonth + '-' + endLunarDate.lDay)).format(this.format.toUpperCase());
-              }
-              else if (showLunarClass == 'MIX') {
-                beginDateResult = beginLunarDate.gzYear + '(' + beginLunarDate.lYear + ')[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.IMonthCn + beginLunarDate.IDayCn;
-                endDateResult   = endLunarDate.gzYear + '(' + endLunarDate.lYear + ')[' + endLunarDate.Animal + ']年 ' + endLunarDate.IMonthCn + endLunarDate.IDayCn;
-              }
-              else if (showLunarClass == 'FULLLUNAR') {
-                beginDateResult = beginLunarDate.gzYear + '[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.gzMonth + '月 ' + beginLunarDate.gzDay + '日';
-                endDateResult   = endLunarDate.gzYear + '[' + endLunarDate.Animal + ']年 ' + endLunarDate.gzMonth + '月 ' + endLunarDate.gzDay + '日';
-              }
-              else if (showLunarClass == 'LUNAR') {
-                beginDateResult = beginLunarDate.gzYear + '[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.IMonthCn + beginLunarDate.IDayCn;
-                endDateResult   = endLunarDate.gzYear + '[' + endLunarDate.Animal + ']年 ' + endLunarDate.IMonthCn + endLunarDate.IDayCn;
-              }
-
-              result = beginDateResult + ' ' + this.rangeSeparator + ' ' + endDateResult;
-
-            } else {
-              //公历模式
-              if(isNeedEmit){
-                this.$emit('input',[moment(new Date(beginDt)).format('YYYY-MM-DD'),moment(new Date(endDt)).format('YYYY-MM-DD')]);
-                return;
-              }
-
-              let beginDate = new Date(beginDt);
-              let endDate   = new Date(endDt);
-              valueDay      = beginDate.toISOString();
-              valueDay2     = endDate.toISOString();
-              result        = moment(beginDate).format(this.format.toUpperCase()) + ' ' + this.rangeSeparator + ' ' + moment(endDate).format(this.format.toUpperCase());
-            }
-            this.monthDay   = valueDay;
-            this.selectDay  = [valueDay, valueDay2];
-            this.chooseDay  = [valueDay, valueDay2];
-            this.inputText  = result;
-            this.loadCalendar();
-          }
-        }
-      },
-      handleInputChange(e){
-        let result = e.target.value;
-        if(this.type.toUpperCase() == 'DATE'){
-          //单日期
-          if(this.isLunar){
-            //农历 NUMBER 模式
-            if(this.showLunarClass.toUpperCase() == 'NUMBER') {
-              let regex = /\d{4}[-\.\/]\d{1,2}[-\.\/]\d{1,2}/;
-              if (!regex.test(result)) return;
-              result = result.replace(/\./g, '-').replace(/\//g, '-');
-              result = 'L' + moment(new Date(result)).format('YYYY-MM-DD');
-            }
-          }else{
-            let regex = /\d{4}[-\.\/]\d{1,2}[-\.\/]\d{1,2}/;
-            if (!regex.test(result)) return;
-            result = result.replace(/\./g, '-').replace(/\//g, '-');
-            result = moment(new Date(result)).format('YYYY-MM-DD');
-          }
-        }
-        this.$emit('change',result);
-        this.$emit('input',result);
-
-      },
-      onClearInput(){
-        if(this.type.toUpperCase() == 'DATERANGE'){
-          this.$emit('change',[]);
-          this.$emit('input', []);
-        }else {
-          this.$emit('change', '');
-          this.$emit('input',  '');
-        }
-        this.selectDay = [];
-        this.chooseDay = [];
-        this.monthDay = moment().toISOString();
-        this.clearVisible = false;
-      },
-      onInputOver(){
-        if(this.disabled) return;
-        if(this.value ==null || this.value == '')return;
-        this.clearVisible = true;
-      },
-      onInputOut(){
-        this.clearVisible = false;
-      },
-      isNotOptional(day){
-        if (this.pickerOptions != null && this.pickerOptions != undefined && 'disabledDate' in this.pickerOptions) {
-          return this.pickerOptions.disabledDate(new Date(day.date));
-        }
-        return false;
-      },
-      isChoose(day){
-        //是否在选中时间段区域内
-        if(this.type.toUpperCase() == 'DATERANGE') {
-          if(this.chooseDay.length == 2){
-            let currDay = moment(day.date);
-            return currDay.isSameOrAfter(this.chooseDay[0]) & currDay.isSameOrBefore(this.chooseDay[1]) & day.isCurMonth;
-          }
-        }
-        return false;
-      },
-      isSelect(day){
-        return this.chooseDay.length>0 & moment(day.date).isSame(new Date(this.chooseDay[0]),'day') & day.isCurMonth;
-      },
-      onInputFocus(){
-        if(this.disabled) return;
-        this.loadCalendar();
-        this.calendarVisible = true;
-      },
-      onLunarChange(){
-        if (this.value != null && this.value != '' && this.value.length > 0) {
-          if (this.type.toUpperCase() == 'DATERANGE') {
-            //时间段模式
-            if (this.isLunar) {
-              //由公历到农历
-              //判断日期结果集中日期格式是否为农历，若是不作处理直接返回。
-              if(this.value[0].indexOf('L')>-1) return;
-              let beginDay       = JDatePickerScript.calendar.getLunar(this.value[0].replace(/L/,'').replace(/R/,''));
-              let endDay         = JDatePickerScript.calendar.getLunar(this.value[1].replace(/L/,'').replace(/R/,''));
-              let beginDayResult = 'L' + (beginDay.isLeap ? 'R' : '') + moment(new Date(beginDay.lYear + '-' + beginDay.lMonth + '-' + beginDay.lDay)).format('YYYY-MM-DD');
-              let endDayResult   = 'L' + (endDay.isLeap ? 'R' : '') + moment(new Date(endDay.lYear + '-' + endDay.lMonth + '-' + endDay.lDay)).format('YYYY-MM-DD');
-
-              this.$emit('change',[beginDayResult,endDayResult]);
-              this.$emit('input' ,[beginDayResult,endDayResult]);
-            } else {
-              //由农历到公历
-              //判断日期结果集中日期格式是否为农历，若不是不作处理直接返回。
-              if(this.value[0].indexOf('L') == -1) return;
-              let beginDay       = JDatePickerScript.calendar.getSolar(this.value[0]);
-              let endDay         = JDatePickerScript.calendar.getSolar(this.value[1]);
-              let beginDayResult = moment(new Date(beginDay.cYear + '-' + beginDay.cMonth + '-' + beginDay.cDay)).format('YYYY-MM-DD');
-              let endDayResult   = moment(new Date(endDay.cYear + '-' + endDay.cMonth + '-' + endDay.cDay)).format('YYYY-MM-DD');
-
-              this.$emit('change',[beginDayResult,endDayResult]);
-              this.$emit('input' ,[beginDayResult,endDayResult]);
-            }
-          } else {
-            //单日期模式
-            let day,result = '';
-            if (this.isLunar) {
-              //由公历到农历
-              //判断日期结果中日期格式是否为农历，若是不作处理直接返回。
-              if(this.value.indexOf('L')>-1) return;
-              day = JDatePickerScript.calendar.getLunar(this.value.replace(/L/,'').replace(/R/,''));
-              result = 'L' + (day.isLeap ? 'R' : '') + moment(new Date(day.lYear + '-' + day.lMonth + '-' + day.lDay)).format('YYYY-MM-DD');
-              this.$emit('change', result);
-              this.$emit('input' , result);
-            } else {
-              //由农历到公历
-              //判断日期结果中日期格式是否为农历，若不是不作处理直接返回。
-              if(this.value.indexOf('L') == -1) return;
-              day = JDatePickerScript.calendar.getSolar(this.value);
-              result = moment(new Date(day.cYear + '-' + day.cMonth + '-' + day.cDay)).format('YYYY-MM-DD');
-              this.$emit('change', new Date(result));
-              this.$emit('input' , new Date(result));
-            }
-          }
-
-        }
-      },
-      showYearList(){
-        //公式：A ＝ 默认当前年所在页面的起始年；S ＝ 选择日期所在年份；Z(pagesize) = 12; Math.ceil : 向上入，有小数就向上＋1；
-        // result = A - Math.ceil( (A-S) / Z ) * Z;
-        let A = this.todayYear + parseInt(this.showBackYears) - 11;
-        this.startYear = A - Math.ceil((A - this.year )/12) * 12;
-
-        this.yearVisible = true;
-      },
-      goYearPrevList(){
-        if(this.startYear<1912) return;
-        this.startYear -= 12;
-      },
-      goYearNextList(){
-        if(this.startYear>=this.todayYear + parseInt(this.showBackYears) - 11) return;
-        this.startYear += 12;
-      },
-      goYearPrev(){
-        this.monthDay = moment(this.monthDay).subtract(1,'years').toISOString();
-        this.loadCalendar();
-      },
-      goYearNext(){
-        this.monthDay = moment(this.monthDay).add(1,'years').toISOString();
-        this.loadCalendar();
-      },
-      goPrev () {
-        let newMonth = moment(this.monthDay).subtract(1, 'months');
-        this.monthDay = newMonth.toISOString();
-        this.loadCalendar()
-      },
-      goNext () {
-        let newMonth = moment(this.monthDay).add(1, 'months');
-        this.monthDay = newMonth.toISOString();
-        this.loadCalendar()
-      },
-      onMouseOver(day){
-        if (this.selectDay.length == 1) {
-          let currDay = moment(day.date);
-          let beginDt = this.selectDay[0];
-          if (currDay.isAfter(beginDt)) {
-            this.chooseDay = [beginDt, currDay.toISOString()];
-          }
-        }
-      },
-      onMouseOut(){
-        if (this.selectDay.length < 2) {
-          this.chooseDay = [];
-        }
-      },
-      onDateSelect(day){
-        if(this.isNotOptional(day)) return;
-        let dayDate = new Date(day.date).toISOString();
-        if(this.type.toUpperCase() == 'DATERANGE') {
-          if (this.selectDay.length >= 2) {
-            this.selectDay = [];
-            this.chooseDay = [];
-          }
-          //判断日期；1、第一次选中，直接加入结果集为时间段起始日期；
-          // 2、小于起始日期，则重置结果集，所选日期为结果集起始日期；
-          // 3、大于等于起始日期，加入结果集为时间段结束日期；可返回结果。
-          if (this.selectDay.length > 0) {
-            if (moment(dayDate).isSameOrAfter(this.selectDay[0])) {
-              this.selectDay.push(dayDate);
-            }else{
-                this.selectDay = [dayDate];
-            }
-          }else {
-            this.selectDay.push(dayDate);
-          }
-          //校正日历控件展示月份到起始月份或当前月份
-          //this.monthDay = new Date(this.selectDay[0]).toISOString();
-          //判断结果集是否符合条件，数组selectDay.length＝＝2；返回结果；隐藏控件；
-          if (this.selectDay.length == 2) {
-            if(this.isLunar) {
-              let beginLunarDateResult = '', endLunarDateResult = '';
-              let beginLunar = JDatePickerScript.calendar.getLunar(this.selectDay[0]);
-              beginLunarDateResult = 'L' + (beginLunar.isLeap ? 'R' : '') + moment(new Date(beginLunar.lYear + '-' + beginLunar.lMonth + '-' + beginLunar.lDay)).format("YYYY-MM-DD");
-              endLunarDateResult = 'L' + (day.lDate.isLeap ? 'R' : '') + moment(new Date(day.lDate.lYear + '-' + day.lDate.lMonth + '-' + day.lDate.lDay)).format("YYYY-MM-DD");
-              this.$emit('change', [beginLunarDateResult, endLunarDateResult])
-              this.$emit('input' , [beginLunarDateResult, endLunarDateResult])
-            }else{
-              this.$emit('change', [moment(this.selectDay[0]).format('YYYY-MM-DD'), moment(this.selectDay[1]).format('YYYY-MM-DD')])
-              this.$emit('input' , [moment(this.selectDay[0]).format('YYYY-MM-DD'), moment(this.selectDay[1]).format('YYYY-MM-DD')])
-            }
-            this.calendarVisible = false;
-          }
-        }else {
-          let result = day.date;
-          if (this.isLunar) {
-            let tip = 'L' + (day.lDate.isLeap ? 'R' : '');
-            let date = new Date(day.lDate.lYear + '-' + day.lDate.lMonth + '-' + day.lDate.lDay).toISOString();
-            result = tip + moment(date).format("YYYY-MM-DD")
-          }
-          this.monthDay = dayDate;
-          this.calendarVisible = false;
-          this.$emit('change', result);
-          this.$emit('input' , result);
-        }
-      },
-      onMonthSelect(command){
-        let newMonth = moment(this.monthDay).month(command)
-        this.monthDay = newMonth.toISOString();
-        this.loadCalendar();
-        this.monthVisible = false;
-      },
-      onYearSelect(command){
-        let newMonth = moment(this.monthDay).year(command)
-        this.monthDay = newMonth.toISOString();
-        this.yearVisible = false;
-        this.monthVisible = true;
-      },
-      loadCalendar () {
-        if(this.monthDay==null || this.monthDay == ''){
-            this.monthDay = moment().toISOString();
-        }
-
-        let startDate = moment(this.monthDay).startOf('month').format('YYYY-MM-DD');
-        let currentMonth = moment(startDate);
-        this.year = currentMonth.year();
-        this.month = currentMonth.month() + 1;
-        this.calendarDatas = this.handleCalendar(currentMonth);
-
-        if(this.type.toUpperCase() == 'DATERANGE'){
-            //时间段模式
-          let currentMonth2 = currentMonth.clone().add(1,'months');
-          this.year2 = currentMonth2.year();
-          this.month2 = currentMonth2.month() + 1;
-          this.calendarDatas2 = this.handleCalendar(currentMonth2);
-        }
-      },
-      handleCalendar(currentMonth){
-
-        let start = currentMonth.clone()
-        start.subtract(start.day(), 'd')
-        let calendars = [];
-
-        for (let iWeek = 0; iWeek < 6; iWeek++) {
-          let week = []
-          if (iWeek > 0 && !start.isSame(currentMonth, 'month')) {
-            break;
-          }
-          for (let iDay = 0; iDay < 7; iDay++) {
-            week.push({
-              day: start.date(),
-              isToday: start.isSame(new Date(), 'day'),
-              isSelect: this.selectDay.length>0 && start.isSame(new Date(this.selectDay[0]),'day'),
-              isCurMonth: start.isSame(currentMonth, 'month'),
-              weekIndex:iWeek,
-              week: iDay,
-              date: start.clone().format('YYYY-MM-DD'),
-              lDate: JDatePickerScript.calendar.getLunar(start.clone().format('YYYY-MM-DD')),
-            });
-            start.add(1, 'd')
-          }
-          calendars.push(week)
-        }
-
-        return calendars;
-      }
-    },
-
-  }
-</script>
-
-<style src="../theme/public.css" scoped>
-</style>

src/views/group/holidaySetting/components/index.js

@@ -1,13 +0,0 @@
-import jDatePicker from './JDatePicker.vue' // 导入组件
-const jLunarDatePicker = {
-  install(Vue, options) {
-    Vue.component(jDatePicker.name, jDatePicker) // vuePayKeyboard.name 组件的name属性
-    // 类似通过 this.$xxx 方式调用插件的 其实只是挂载到原型上而已
-    // Vue.prototype.$xxx  // 最终可以在任何地方通过 this.$xxx 调用
-    // 虽然没有明确规定用$开头  但是大家都默认遵守这个规定
-  }
-}
-if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(jLunarDatePicker);
-}
-export default jLunarDatePicker // 导出..

src/views/group/holidaySetting/components/jDatePicker.js

@@ -1,626 +0,0 @@
-/**
- * @1900-2100区间内的公历、农历互转
- * @charset UTF-8
- * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
- */
-const calendar = {
-
-  /**
-   * 农历1900-2100的润大小信息表
-   * @Array Of Property
-   * @return Hex
-   */
-  lunarInfo:[0x04bd8,0x04ae0,0x0a570,0x054d5,0x0d260,0x0d950,0x16554,0x056a0,0x09ad0,0x055d2,//1900-1909
-    0x04ae0,0x0a5b6,0x0a4d0,0x0d250,0x1d255,0x0b540,0x0d6a0,0x0ada2,0x095b0,0x14977,//1910-1919
-    0x04970,0x0a4b0,0x0b4b5,0x06a50,0x06d40,0x1ab54,0x02b60,0x09570,0x052f2,0x04970,//1920-1929
-    0x06566,0x0d4a0,0x0ea50,0x06e95,0x05ad0,0x02b60,0x186e3,0x092e0,0x1c8d7,0x0c950,//1930-1939
-    0x0d4a0,0x1d8a6,0x0b550,0x056a0,0x1a5b4,0x025d0,0x092d0,0x0d2b2,0x0a950,0x0b557,//1940-1949
-    0x06ca0,0x0b550,0x15355,0x04da0,0x0a5b0,0x14573,0x052b0,0x0a9a8,0x0e950,0x06aa0,//1950-1959
-    0x0aea6,0x0ab50,0x04b60,0x0aae4,0x0a570,0x05260,0x0f263,0x0d950,0x05b57,0x056a0,//1960-1969
-    0x096d0,0x04dd5,0x04ad0,0x0a4d0,0x0d4d4,0x0d250,0x0d558,0x0b540,0x0b6a0,0x195a6,//1970-1979
-    0x095b0,0x049b0,0x0a974,0x0a4b0,0x0b27a,0x06a50,0x06d40,0x0af46,0x0ab60,0x09570,//1980-1989
-    0x04af5,0x04970,0x064b0,0x074a3,0x0ea50,0x06b58,0x055c0,0x0ab60,0x096d5,0x092e0,//1990-1999
-    0x0c960,0x0d954,0x0d4a0,0x0da50,0x07552,0x056a0,0x0abb7,0x025d0,0x092d0,0x0cab5,//2000-2009
-    0x0a950,0x0b4a0,0x0baa4,0x0ad50,0x055d9,0x04ba0,0x0a5b0,0x15176,0x052b0,0x0a930,//2010-2019
-    0x07954,0x06aa0,0x0ad50,0x05b52,0x04b60,0x0a6e6,0x0a4e0,0x0d260,0x0ea65,0x0d530,//2020-2029
-    0x05aa0,0x076a3,0x096d0,0x04afb,0x04ad0,0x0a4d0,0x1d0b6,0x0d250,0x0d520,0x0dd45,//2030-2039
-    0x0b5a0,0x056d0,0x055b2,0x049b0,0x0a577,0x0a4b0,0x0aa50,0x1b255,0x06d20,0x0ada0,//2040-2049
-    /**Add By JJonline@JJonline.Cn**/
-    0x14b63,0x09370,0x049f8,0x04970,0x064b0,0x168a6,0x0ea50, 0x06b20,0x1a6c4,0x0aae0,//2050-2059
-    0x0a2e0,0x0d2e3,0x0c960,0x0d557,0x0d4a0,0x0da50,0x05d55,0x056a0,0x0a6d0,0x055d4,//2060-2069
-    0x052d0,0x0a9b8,0x0a950,0x0b4a0,0x0b6a6,0x0ad50,0x055a0,0x0aba4,0x0a5b0,0x052b0,//2070-2079
-    0x0b273,0x06930,0x07337,0x06aa0,0x0ad50,0x14b55,0x04b60,0x0a570,0x054e4,0x0d160,//2080-2089
-    0x0e968,0x0d520,0x0daa0,0x16aa6,0x056d0,0x04ae0,0x0a9d4,0x0a2d0,0x0d150,0x0f252,//2090-2099
-    0x0d520],//2100
-
-  /**
-   * 公历每个月份的天数普通表
-   * @Array Of Property
-   * @return Number
-   */
-  solarMonth:[31,28,31,30,31,30,31,31,30,31,30,31],
-
-  /**
-   * 天干地支之天干速查表
-   * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
-   * @return Cn string
-   */
-  Gan:["\u7532","\u4e59","\u4e19","\u4e01","\u620a","\u5df1","\u5e9a","\u8f9b","\u58ec","\u7678"],
-
-  /**
-   * 天干地支之地支速查表
-   * @Array Of Property
-   * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
-   * @return Cn string
-   */
-  Zhi:["\u5b50","\u4e11","\u5bc5","\u536f","\u8fb0","\u5df3","\u5348","\u672a","\u7533","\u9149","\u620c","\u4ea5"],
-
-  /**
-   * 天干地支之地支速查表<=>生肖
-   * @Array Of Property
-   * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
-   * @return Cn string
-   */
-  Animals:["\u9f20","\u725b","\u864e","\u5154","\u9f99","\u86c7","\u9a6c","\u7f8a","\u7334","\u9e21","\u72d7","\u732a"],
-
-  /**
-   * 24节气速查表
-   * @Array Of Property
-   * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
-   * @return Cn string
-   */
-  solarTerm:["\u5c0f\u5bd2","\u5927\u5bd2","\u7acb\u6625","\u96e8\u6c34","\u60ca\u86f0","\u6625\u5206","\u6e05\u660e","\u8c37\u96e8","\u7acb\u590f","\u5c0f\u6ee1","\u8292\u79cd","\u590f\u81f3","\u5c0f\u6691","\u5927\u6691","\u7acb\u79cb","\u5904\u6691","\u767d\u9732","\u79cb\u5206","\u5bd2\u9732","\u971c\u964d","\u7acb\u51ac","\u5c0f\u96ea","\u5927\u96ea","\u51ac\u81f3"],
-
-  /**
-   * 1900-2100各年的24节气日期速查表
-   * @Array Of Property
-   * @return 0x string For splice
-   */
-  sTermInfo:['9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f',
-    '97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f',
-    'b027097bd097c36b0b6fc9274c91aa','9778397bd19801ec9210c965cc920e','97b6b97bd19801ec95f8c965cc920f',
-    '97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2','9778397bd197c36c9210c9274c91aa',
-    '97b6b97bd19801ec95f8c965cc920e','97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec95f8c965cc920e','97bcf97c3598082c95f8e1cfcc920f',
-    '97bd097bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f',
-    '97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c359801ec95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd097bd07f595b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9210c8dc2','9778397bd19801ec9210c9274c920e','97b6b97bd19801ec95f8c965cc920f',
-    '97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e',
-    '97b6b97bd19801ec95f8c965cc920f','97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e','97bd07f1487f595b0b0bc920fb0722',
-    '7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
-    '97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e','97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf7f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
-    '97bcf7f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
-    '9778397bd097c36b0b6fc9210c91aa','97b6b97bd197c36c9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e',
-    '97b6b7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36b0b70c9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9274c91aa',
-    '97b6b7f0e47f531b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
-    '9778397bd097c36b0b6fc9210c91aa','97b6b7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','977837f0e37f149b0723b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c35b0b6fc9210c8dc2',
-    '977837f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc9210c8dc2','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','977837f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
-    '977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
-    '977837f0e37f14998082b0723b06bd','7f07e7f0e37f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f595b0b0bb0b6fb0722','7f0e37f0e37f14898082b0723b02d5',
-    '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f531b0b0bb0b6fb0722',
-    '7f0e37f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e37f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35',
-    '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f149b0723b0787b0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0723b06bd',
-    '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722','7f0e37f0e366aa89801eb072297c35',
-    '7ec967f0e37f14998082b0723b06bd','7f07e7f0e37f14998083b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14898082b0723b02d5','7f07e7f0e37f14998082b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66aa89801e9808297c35','665f67f0e37f14898082b0723b02d5',
-    '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66a449801e9808297c35',
-    '665f67f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e36665b66a449801e9808297c35','665f67f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721','7f0e26665b66a449801e9808297c35','665f67f0e37f1489801eb072297c35',
-    '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722'],
-
-  /**
-   * 数字转中文速查表
-   * @Array Of Property
-   * @trans ['日','一','二','三','四','五','六','七','八','九','十']
-   * @return Cn string
-   */
-  nStr1:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341"],
-
-  /**
-   * 日期转农历称呼速查表
-   * @Array Of Property
-   * @trans ['初','十','廿','卅']
-   * @return Cn string
-   */
-  nStr2:["\u521d","\u5341","\u5eff","\u5345"],
-
-  /**
-   * 月份转农历称呼速查表
-   * @Array Of Property
-   * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
-   * @return Cn string
-   */
-  nStr3:["\u6b63","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u51ac","\u814a"],
-
-  /**
-   * 农历节日
-   */
-  lunarFestival:{"1-1":"春节","1-15":"上元节","2-2":"龙抬头","5-5":"端午","7-7":"七夕","7-15":"中元节","8-15":"中秋","9-9":"重阳","10-15":"下元节","12-8":"腊八","12-23":"小年"},
-  /**
-   * 公历节日
-   */
-  solarFestival:{"1-1":"元旦","2-14":"情人节","3-8":"妇女节","3-12":"植树节","4-1":"愚人节","5-1":"劳动节","5-4":"青年节","6-1":"儿童节","7-1":"建党节","8-1":"建军节","9-10":"教师节","10-1":"国庆节","11-1":"万圣节","12-24":"平安夜","12-25":"圣诞节"},
-
-  /**
-   * 返回农历y年一整年的总天数
-   * @param lunar Year
-   * @return Number
-   * @eg:var count = calendar.lYearDays(1987) ;//count=387
-   */
-  lYearDays:function(y) {
-    var i, sum = 348;
-    for(i=0x8000; i>0x8; i>>=1) { sum += (calendar.lunarInfo[y-1900] & i)? 1: 0; }
-    return(sum+calendar.leapDays(y));
-  },
-
-  /**
-   * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
-   * @param lunar Year
-   * @return Number (0-12)
-   * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
-   */
-  leapMonth:function(y) { //闰字编码 \u95f0
-    return(calendar.lunarInfo[y-1900] & 0xf);
-  },
-
-  /**
-   * 返回农历y年闰月的天数 若该年没有闰月则返回0
-   * @param lunar Year
-   * @return Number (0、29、30)
-   * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
-   */
-  leapDays:function(y) {
-    if(calendar.leapMonth(y))  {
-      return((calendar.lunarInfo[y-1900] & 0x10000)? 30: 29);
-    }
-    return(0);
-  },
-
-  /**
-   * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
-   * @param lunar Year
-   * @return Number (-1、29、30)
-   * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
-   */
-  monthDays:function(y,m) {
-    if(m>12 || m<1) {return -1}//月份参数从1至12，参数错误返回-1
-    return( (calendar.lunarInfo[y-1900] & (0x10000>>m))? 30: 29 );
-  },
-
-  /**
-   * 返回公历(!)y年m月的天数
-   * @param solar Year
-   * @return Number (-1、28、29、30、31)
-   * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
-   */
-  solarDays:function(y,m) {
-    if(m>12 || m<1) {return -1} //若参数错误 返回-1
-    var ms = m-1;
-    if(ms==1) { //2月份的闰平规律测算后确认返回28或29
-      return(((y%4 == 0) && (y%100 != 0) || (y%400 == 0))? 29: 28);
-    }else {
-      return(calendar.solarMonth[ms]);
-    }
-  },
-
-  /**
-   * 农历年份转换为干支纪年
-   * @param  lYear 农历年的年份数
-   * @return Cn string
-   */
-  toGanZhiYear:function(lYear) {
-    var ganKey = (lYear - 3) % 10;
-    var zhiKey = (lYear - 3) % 12;
-    if(ganKey == 0) ganKey = 10;//如果余数为0则为最后一个天干
-    if(zhiKey == 0) zhiKey = 12;//如果余数为0则为最后一个地支
-    return calendar.Gan[ganKey-1] + calendar.Zhi[zhiKey-1];
-
-  },
-
-  /**
-   * 公历月、日判断所属星座
-   * @param  cMonth [description]
-   * @param  cDay [description]
-   * @return Cn string
-   */
-  toAstro:function(cMonth,cDay) {
-    var s   = "\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf";
-    var arr = [20,19,21,21,21,22,23,23,23,23,22,22];
-    return s.substr(cMonth*2 - (cDay < arr[cMonth-1] ? 2 : 0),2) + "\u5ea7";//座
-  },
-
-  /**
-   * 传入offset偏移量返回干支
-   * @param offset 相对甲子的偏移量
-   * @return Cn string
-   */
-  toGanZhi:function(offset) {
-    return calendar.Gan[offset%10] + calendar.Zhi[offset%12];
-  },
-
-  /**
-   * 传入公历(!)y年获得该年第n个节气的公历日期
-   * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
-   * @return day Number
-   * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
-   */
-  getTerm:function(y,n) {
-    if(y<1900 || y>2100) {return -1;}
-    if(n<1 || n>24) {return -1;}
-    var _table = calendar.sTermInfo[y-1900];
-    var _info = [
-      parseInt('0x'+_table.substr(0,5)).toString() ,
-      parseInt('0x'+_table.substr(5,5)).toString(),
-      parseInt('0x'+_table.substr(10,5)).toString(),
-      parseInt('0x'+_table.substr(15,5)).toString(),
-      parseInt('0x'+_table.substr(20,5)).toString(),
-      parseInt('0x'+_table.substr(25,5)).toString()
-    ];
-    var _calday = [
-      _info[0].substr(0,1),
-      _info[0].substr(1,2),
-      _info[0].substr(3,1),
-      _info[0].substr(4,2),
-
-      _info[1].substr(0,1),
-      _info[1].substr(1,2),
-      _info[1].substr(3,1),
-      _info[1].substr(4,2),
-
-      _info[2].substr(0,1),
-      _info[2].substr(1,2),
-      _info[2].substr(3,1),
-      _info[2].substr(4,2),
-
-      _info[3].substr(0,1),
-      _info[3].substr(1,2),
-      _info[3].substr(3,1),
-      _info[3].substr(4,2),
-
-      _info[4].substr(0,1),
-      _info[4].substr(1,2),
-      _info[4].substr(3,1),
-      _info[4].substr(4,2),
-
-      _info[5].substr(0,1),
-      _info[5].substr(1,2),
-      _info[5].substr(3,1),
-      _info[5].substr(4,2),
-    ];
-    return parseInt(_calday[n-1]);
-  },
-
-  /**
-   * 传入农历数字月份返回汉语通俗表示法
-   * @param lunar month
-   * @return Cn string
-   * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
-   */
-  toChinaMonth:function(m) { // 月 => \u6708
-    if(m>12 || m<1) {return -1} //若参数错误 返回-1
-    var s = calendar.nStr3[m-1];
-    s+= "\u6708";//加上月字
-    return s;
-  },
-
-  /**
-   * 传入年份月份返回第n个星期日的日期数字
-   * @param y 年份
-   * @param m 月份
-   * @param n 第几个星期日 ( 5>n>0的数字 一个月一般就4个星期日，最多5个)
-   * @return 日期数字；3 ＝ getSunday(2017,9,1); 九月的第一个星期日是3号；超出返回-1
-   */
-  getSunday(y,m,n){
-    var d = new Date(y+'-' + m + '-1');
-    var d2= new Date(y+'-'+(m+1)+'-1');
-    d2.setDate(0);
-    var maxDay = d2.getDate();//传入月份的最后一天
-
-    var week = d.getDay();
-    var first = 1;
-    if(week>0) first = d.getDate() + (7 - week);
-    var result = (n-1)*7 + first;
-    if(result>maxDay) return -1;
-    return result;
-  },
-  /**
-   * 传入农历日期数字返回汉字表示法
-   * @param lunar day
-   * @return Cn string
-   * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
-   */
-  toChinaDay:function(d){ //日 => \u65e5
-    var s;
-    switch (d) {
-      case 10:
-        s = '\u521d\u5341'; break;
-      case 20:
-        s = '\u4e8c\u5341'; break;
-        break;
-      case 30:
-        s = '\u4e09\u5341'; break;
-        break;
-      default :
-        s = calendar.nStr2[Math.floor(d/10)];
-        s += calendar.nStr1[d%10];
-    }
-    return(s);
-  },
-
-  /**
-   * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
-   * @param y year
-   * @return Cn string
-   * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
-   */
-  getAnimal: function(y) {
-    return calendar.Animals[(y - 4) % 12]
-  },
-  /**
-   * 判断 当天为 此年的第几天
-   * @param date
-   * @returns {number}
-   */
-  getCyclical:function(date){
-    var nowDate = new Date(date);
-    var initTime = new Date(date);
-    initTime.setMonth(0); // 本年初始月份
-    initTime.setDate(1); // 本年初始时间
-    var differenceVal = nowDate - initTime ; // 今天的时间减去本年开始时间，获得相差的时间
-    return Math.ceil(differenceVal/(24*60*60*1000));
-  },
-  /**
-   * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
-   * @param y  solar year
-   * @param m  solar month
-   * @param d  solar day
-   * @return JSON object
-   * @eg:console.log(calendar.solar2lunar(1987,11,01));
-   */
-  solar2lunar:function (y,m,d) { //参数区间1900.1.31~2100.12.31
-    //年份限定、上限
-    if(y<1900 || y>2100) {
-      return -1;// undefined转换为数字变为NaN
-    }
-    //公历传参最下限
-    if(y==1900&&m==1&&d<31) {
-      return -1;
-    }
-    //未传参  获得当天
-    if(!y) {
-      var objDate = new Date();
-    }else {
-      var objDate = new Date(y,parseInt(m)-1,d)
-    }
-    var i, leap=0, temp=0;
-    //修正ymd参数
-    var y = objDate.getFullYear(),
-      m = objDate.getMonth()+1,
-      d = objDate.getDate();
-    var offset = (Date.UTC(objDate.getFullYear(),objDate.getMonth(),objDate.getDate()) - Date.UTC(1900,0,31))/86400000;
-    for(i=1900; i<2101 && offset>0; i++) {
-      temp    = calendar.lYearDays(i);
-      offset -= temp;
-    }
-    if(offset<0) {
-      offset+=temp; i--;
-    }
-
-    //是否今天
-    var isTodayObj = new Date(),
-      isToday    = false;
-    if(isTodayObj.getFullYear()==y && isTodayObj.getMonth()+1==m && isTodayObj.getDate()==d) {
-      isToday = true;
-    }
-    //星期几
-    var nWeek = objDate.getDay(),
-      cWeek  = calendar.nStr1[nWeek];
-    //数字表示周几顺应天朝周一开始的惯例
-    if(nWeek==0) {
-      nWeek = 7;
-    }
-    //农历年
-    var year   = i;
-    var leap   = calendar.leapMonth(i); //闰哪个月
-    var isLeap = false;
-
-    //效验闰月
-    for(i=1; i<13 && offset>0; i++) {
-      //闰月
-      if(leap>0 && i==(leap+1) && isLeap==false){
-        --i;
-        isLeap = true; temp = calendar.leapDays(year); //计算农历闰月天数
-      }
-      else{
-        temp = calendar.monthDays(year, i);//计算农历普通月天数
-      }
-      //解除闰月
-      if(isLeap==true && i==(leap+1)) { isLeap = false; }
-      offset -= temp;
-    }
-    // 闰月导致数组下标重叠取反
-    if(offset==0 && leap>0 && i==leap+1)
-    {
-      if(isLeap){
-        isLeap = false;
-      }else{
-        isLeap = true; --i;
-      }
-    }
-    if(offset<0)
-    {
-      offset += temp;
-      --i;
-    }
-    //农历月
-    var month      = i;
-    //农历日
-    var day        = offset +1;
-    //天干地支处理
-    var sm         = m-1;
-    var gzY        = calendar.toGanZhiYear(year);
-
-    // 当月的两个节气
-    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
-    var firstNode  = calendar.getTerm(y,(m*2-1));//返回当月「节」为几日开始
-    var secondNode = calendar.getTerm(y,(m*2));//返回当月「节」为几日开始
-
-    // 依据12节气修正干支月
-    var gzM        = calendar.toGanZhi((y-1900)*12+m+11);
-    if(d>=firstNode) {
-      gzM        = calendar.toGanZhi((y-1900)*12+m+12);
-    }
-
-    //传入的日期的节气与否
-    var isTerm = false;
-    var Term   = null;
-    if(firstNode==d) {
-      isTerm  = true;
-      Term    = calendar.solarTerm[m*2-2];
-    }
-    if(secondNode==d) {
-      isTerm  = true;
-      Term    = calendar.solarTerm[m*2-1];
-    }
-    //日柱 当月一日与 1900/1/1 相差天数
-    var dayCyclical = Date.UTC(y,sm,1,0,0,0,0)/86400000+25567+10;
-    var gzD         = calendar.toGanZhi(dayCyclical+d-1);
-    //(年-1900) * 5 + (年-1900+3) / 4 + 9 + 当年年初起累积日数
-    // var dayCyclical = (y-1900)*5 + (y-1900+3)/4 + 9 +(this.getCyclical(y+'-'+m+'-'+d))
-    // var gzD         = calendar.toGanZhi(dayCyclical-1);
-    //该日期所属的星座
-    var astro       = calendar.toAstro(m,d);
-    //该日期所有的节日
-    var festival    = [];
-    //农历传统节日
-    var lf = calendar.lunarFestival[month+'-'+day];
-    if(lf != undefined && lf != null && lf != '') festival.push(lf);
-    if(month==12 && (isLeap?day == calendar.leapDays(year):calendar.monthDays(month-1)==29?day == 30:day == 29)) festival.push('除夕');
-
-    //公历节日
-    var sf = calendar.solarFestival[m+'-'+d];
-    if(sf != undefined && sf != null && sf != '') festival.push(sf);
-    if(m==5 && d==calendar.getSunday(y,m,2)) festival.push('母亲节');
-    if(m==6 && d==calendar.getSunday(y,m,3)) festival.push('父亲节');
-
-    return {'lYear':year,'lMonth':month,'lDay':day,'isFestival':festival.length>0,'festival':festival,'Animal':calendar.getAnimal(year),'IMonthCn':(isLeap?"\u95f0":'')+calendar.toChinaMonth(month),'IDayCn':calendar.toChinaDay(day),'cYear':y,'cMonth':m,'cDay':d,'gzYear':gzY,'gzMonth':gzM,'gzDay':gzD,'isToday':isToday,'isLeap':isLeap,'nWeek':nWeek,'ncWeek':"\u661f\u671f"+cWeek,'isTerm':isTerm,'Term':Term,'astro':astro};
-  },
-
-  getLunar:function (date) {
-    var D;
-    if(date==undefined){
-      D = new Date();
-    }else{
-      D = new Date(date);
-    }
-    D.setHours(D.getHours()+8)//根据国际UTC标准，中国时区应为：UTC+8
-    var cY  =   D.getUTCFullYear();
-    var cM  =   D.getUTCMonth()+1;
-    var cD  =   D.getUTCDate();
-    //console.log('getLunar:月'+cM+'--'+cD+'日')
-    return calendar.solar2lunar(cY,cM,cD);
-  },
-
-  /**
-   * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
-   * @param y  lunar year
-   * @param m  lunar month
-   * @param d  lunar day
-   * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
-   * @return JSON object
-   * @eg:console.log(calendar.lunar2solar(1987,9,10));
-   */
-  lunar2solar:function(y,m,d,isLeapMonth) {   //参数区间1900.1.31~2100.12.1
-    var isLeapMonth = !!isLeapMonth;
-    var leapOffset  = 0;
-    var leapMonth   = calendar.leapMonth(y);
-    var leapDay     = calendar.leapDays(y);
-    if(isLeapMonth&&(leapMonth!=m)) {return -1;}//传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
-    if(y==2100&&m==12&&d>1 || y==1900&&m==1&&d<31) {return -1;}//超出了最大极限值
-    var day  = calendar.monthDays(y,m);
-    var _day = day;
-    //bugFix 2016-9-25
-    //if month is leap, _day use leapDays method
-    if(isLeapMonth) {
-      _day = calendar.leapDays(y,m);
-    }
-    if(y < 1900 || y > 2100 || d > _day) {return -1;}//参数合法性效验
-
-    //计算农历的时间差
-    var offset = 0;
-    for(var i=1900;i<y;i++) {
-      offset+=calendar.lYearDays(i);
-    }
-    var leap = 0,isAdd= false;
-    for(var i=1;i<m;i++) {
-      leap = calendar.leapMonth(y);
-      if(!isAdd) {//处理闰月
-        if(leap<=i && leap>0) {
-          offset+=calendar.leapDays(y);isAdd = true;
-        }
-      }
-      offset+=calendar.monthDays(y,i);
-    }
-    //转换闰月农历 需补充该年闰月的前一个月的时差
-    if(isLeapMonth) {offset+=day;}
-    //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
-    var stmap   =   Date.UTC(1900,1,30,0,0,0);
-    var calObj  =   new Date((offset+d-31)*86400000+stmap);
-    var cY      =   calObj.getUTCFullYear();
-    var cM      =   calObj.getUTCMonth()+1;
-    var cD      =   calObj.getUTCDate();
-
-    return calendar.solar2lunar(cY,cM,cD);
-  },
-  /**
-   * 传入农历日期
-   * @param date 类型String，格式：L2017-01-02；闰月：LR2017-06-03
-   * @returns {*|JSON}
-   */
-  getSolar(date) {
-    if(date == undefined || date == null || date == '' || date.indexOf('L') == -1) return null;
-    var isLeapMonth = date.indexOf('R')>-1;
-    var D = date.replace(/L/,'').replace(/R/,'').split('-');
-    var cY  =   parseInt(D[0]);
-    var cM  =   parseInt(D[1]);
-    var cD  =   parseInt(D[2]);
-    return calendar.lunar2solar(cY,cM,cD,isLeapMonth);
-  },
-};
-export default { calendar }

src/views/group/holidaySetting/holidayLog.vue

@@ -1,186 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-      :isFold="true"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import { deptHolidayLogList } from '@/api/group/holidaySetting';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '操作时间',
-		filter: parseTime
-	},
-	{
-		prop: 'opPeopleName',
-		label: '操作人'
-	},
-	{
-		prop: 'deptName',
-		label: '部门'
-	},
-	{
-		prop: 'opType',
-		label: '操作类型',
-    filter: (val)=>{return val?['','创建','删除','修改','-','-'][val]:'-'}
-	},
-	{
-		prop: 'name',
-		label: '节假日名称'
-	},
-	{
-		prop: 'opDet',
-		label: '修改内容'
-	},
-	{
-		prop: 'planType',
-		label: '更新排班计划',
-    filter: (val)=>{return val?['','是','否','无排班计划'][val]:'-'}
-	},
-];
-
-export default {
-	data() {
-		return {
-      listQuery: { //分页
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-			tableProps,
-			tableData: [],
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
-				},
-				{
-					type: 'input',
-					label: '操作人',
-					placeholder: '操作人',
-					param: 'opPeopleName',
-				},
-				{
-					type: 'select',
-					label: '操作类型',
-					selectOptions: [
-						{
-							id: 1,
-							name: '创建',
-						},
-						{
-							id: 2,
-							name: '删除',
-						},
-						{
-							id: 3,
-							name: '修改',
-						},
-						{
-							id: 4,
-							name: '解除继承',
-						},
-						{
-							id: 5,
-							name: '恢复继承',
-						},
-					],
-					param: 'opType',
-				},
-				{
-					type: 'select',
-					label: '更新排班计划',
-					selectOptions: [
-						{
-							id: 1,
-							name: '是',
-						},
-						{
-							id: 2,
-							name: '否',
-						},
-						{
-							id: 3,
-							name: '无排班计划',
-						},
-					],
-					param: 'planType',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '重置',
-					name: 'reset',
-				},
-			],
-		};
-	},
-	created() {},
-	methods: {
-    // 获取数据列表
-    getDataList() {
-      deptHolidayLogList(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-      });
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.createTime = val.createTime || [];
-					this.listQuery.planType = val.planType || undefined;
-					this.listQuery.opType = val.opType || undefined;
-					this.listQuery.opPeopleName = val.opPeopleName || undefined;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/group/holidaySetting/index.vue

@@ -1,847 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:54:06
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-24 16:11:20
- * @Description:
--->
-<template>
-	<div
-		class="app-container"
-		style="
-			background-color: #f2f4f9;
-			padding: 0;
-			display: grid;
-			grid-template-columns: 1fr 5fr;
-			gap: 10px;
-		">
-		<div class="head-container">
-			<el-input
-				v-model="deptName"
-				placeholder="请输入部门名称"
-				clearable
-				size="small"
-				prefix-icon="el-icon-search"
-				style="margin-bottom: 20px" />
-			<el-tree
-				:data="deptOptions"
-				:props="defaultProps"
-				:expand-on-click-node="false"
-				:filter-node-method="filterNode"
-				ref="tree"
-				node-key="id"
-				default-expand-all
-				highlight-current
-				@node-click="handleNodeClick" />
-		</div>
-		<div class="groupTeamScheduling">
-			<div class="operationArea">
-				<el-row>
-					<el-col :span="6">
-						<div style="height: 40px; font-size: 16px">
-							<span style="color: #409eff; font-weight: 600">
-								{{ showDeptName }}
-							</span>
-							节假日设置
-							<span
-								:style="{
-									color: inherited ? '#67c23a' : '#b5b839',
-									fontSize: '12px',
-									fontWeight: 600,
-								}"
-								v-show="ishasParent">
-								{{ inherited ? '继承模式' : '自定义模式' }}
-							</span>
-						</div>
-					</el-col>
-					<el-col :span="18" v-if="!ishasParent">
-						<div style="float: right">
-							<el-button
-								size="small"
-								type="primary"
-								style="margin-right: 10px"
-								v-hasPermi="['base:group-holiday:create']"
-								@click="addHoliday">
-								新增节假日
-							</el-button>
-							<el-button
-								size="small"
-								v-hasPermi="['base:group-holiday-log:query']"
-								@click="holidayLog">
-								节假日变更记录
-							</el-button>
-						</div>
-					</el-col>
-					<el-col :span="18" v-else style="text-align: right">
-						<el-button
-							size="small"
-							type="primary"
-							:disabled="inherited"
-							v-hasPermi="['base:group-holiday:create']"
-							@click="addHoliday">
-							新增节假日
-						</el-button>
-						<el-button
-							size="small"
-							type="success"
-							:disabled="inherited"
-							v-hasPermi="['base:group-holiday:update']"
-							@click="reExtends">
-							恢复继承
-						</el-button>
-						<el-button
-							size="small"
-							type="warning"
-							:disabled="!inherited"
-							v-hasPermi="['base:group-holiday:update']"
-							@click="disExtends">
-							解除继承
-						</el-button>
-						<el-button
-							size="small"
-							:disabled="inherited"
-							v-hasPermi="['base:group-holiday-log:query']"
-							@click="holidayLog">
-							节假日变更记录
-						</el-button>
-					</el-col>
-				</el-row>
-			</div>
-			<div class="operationArea">
-				<el-form :inline="true" class="demo-form-inline">
-					<span class="blue-block"></span>
-					<el-form-item label="月份选择">
-						<el-date-picker
-							v-model="startDay"
-							type="month"
-							placeholder="选择月"
-							size="small"
-							@change="selectMonth"
-							:clearable="false"
-							style="width: 120px"></el-date-picker>
-					</el-form-item>
-					<el-form-item label="继承上一级的节假日" v-show="ishasParent">
-						<div
-							style="
-								width: 36px;
-								height: 36px;
-								background-color: #67c23a;
-								border-radius: 3px;
-							"></div>
-					</el-form-item>
-					<el-form-item label="本级自定义的节假日" v-show="ishasParent">
-						<div
-							style="
-								width: 36px;
-								height: 36px;
-								background-color: #b5b839;
-								border-radius: 3px;
-							"></div>
-					</el-form-item>
-					<el-form-item style="float: right">
-						<el-button
-							size="small"
-							type="primary"
-							@click="(startDay = new Date()), getHolidayPage()">
-							跳转到今天
-						</el-button>
-					</el-form-item>
-				</el-form>
-				<div v-if="!ishasParent">
-					<el-tag
-						type="warning"
-						closable
-						v-if="showTag1"
-						@close="handleClose(1)"
-						style="margin-bottom: 10px; color: black">
-						<i class="el-icon-warning" style="color: #ffbd02"></i>
-						当前节假日设置为组织架构中最高层级配置，默认自动继承至下属部门。子部门可选择
-						<span style="color: red">解除继承</span>
-						设置后进行独立修改，解除后不再继承上级设置
-					</el-tag>
-				</div>
-				<div v-else>
-					<div v-if="inherited">
-						<el-tag
-							type="warning"
-							closable
-							v-if="showTag2"
-							@close="handleClose(2)"
-							style="margin-bottom: 10px; color: black">
-							<i class="el-icon-warning" style="color: #ffbd02"></i>
-							当前部门继承上级节假日设置，默认不可修改。可通过
-							<span style="color: red">解除继承</span>
-							进行自定义，解除后将不再继承。
-						</el-tag>
-					</div>
-					<div v-else>
-						<el-tag
-							type="warning"
-							closable
-							v-if="showTag3"
-							@close="handleClose(3)"
-							style="margin-bottom: 10px; color: black">
-							<i class="el-icon-warning" style="color: #ffbd02"></i>
-							当前部门已解除继承，节假日可自由配置。点击
-							<span style="color: red">恢复继承</span>
-							将清空当前设置并同步上级节假日。
-						</el-tag>
-					</div>
-				</div>
-			</div>
-			<!-- 日历区域 -->
-			<div class="calenderArea">
-				<el-calendar v-model="startDay">
-					<template slot="dateCell" slot-scope="{ data }">
-						<div v-if="data.type === 'current-month'">
-							<!-- 日期 -->
-							<div
-								class="dateStyle"
-								@click="
-									new Date(data.day).getTime() >=
-										new Date().setHours(0, 0, 0, 0) &&
-										(!ishasParent || !inherited) &&
-										HolidayList[Number(data.day.split('-')[2]) - 1]
-											?.isHoliday &&
-										showDetail(HolidayList[Number(data.day.split('-')[2]) - 1])
-								">
-								<el-row :gutter="20">
-									<!-- 公历和农历 -->
-									<el-col :span="18">
-										{{ Number(data.day.split('-')[2]) }}
-										<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-									</el-col>
-									<!-- 显示假或班 -->
-									<el-col :span="6">
-										<div
-											class="work-tip"
-											:style="{
-												backgroundColor: HolidayList[
-													Number(data.day.split('-')[2]) - 1
-												]?.isHoliday
-													? '#67C23A'
-													: '#409EFF',
-											}">
-											{{
-												HolidayList[Number(data.day.split('-')[2]) - 1]
-													?.isHoliday
-													? '假'
-													: '班'
-											}}
-										</div>
-									</el-col>
-									<!-- 显示假期名和操作 -->
-									<el-col
-										:span="24"
-										v-if="
-											HolidayList[Number(data.day.split('-')[2]) - 1]?.isHoliday
-										">
-										<div
-											class="holiday-div"
-											:style="{
-												backgroundColor: ishasParent
-													? HolidayList[Number(data.day.split('-')[2]) - 1]
-															.isInherit
-														? '#67c23a'
-														: '#b5b839'
-													: '',
-											}">
-											{{
-												HolidayList[Number(data.day.split('-')[2]) - 1]
-													?.holidayName
-											}}
-											<span
-												class="holiday-div-btn"
-												v-if="
-													(!ishasParent || !inherited) &&
-													new Date(data.day).getTime() >=
-														new Date().setHours(0, 0, 0, 0)
-												">
-												<i class="el-icon-more" style="color: #fff"></i>
-											</span>
-										</div>
-									</el-col>
-								</el-row>
-							</div>
-						</div>
-						<div
-							v-else
-							style="font-size: 20px; font-weight: 500; text-align: left">
-							<el-row :gutter="20">
-								<el-col :span="24">
-									{{ Number(data.day.split('-')[2]) }}
-									<span style="font-size: 12px">
-										{{ getLunarDate(data.day) }}
-									</span>
-								</el-col>
-							</el-row>
-						</div>
-					</template>
-				</el-calendar>
-			</div>
-		</div>
-		<base-dialog
-			:dialogTitle="dialogTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="cancel"
-			@confirm="handleConfirm"
-			:before-close="cancel"
-			:destroy-on-close="true"
-			class="addDialog"
-			width="40%">
-			<add-or-updata
-				ref="addOrUpdataRef"
-				@refreshPage="successSubmit"></add-or-updata>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								v-if="!detail"
-								size="small"
-								class="btnTextStyle"
-								@click="cancel">
-								取消
-							</el-button>
-							<el-button
-								v-if="!detail"
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								@click="handleConfirm">
-								确定
-							</el-button>
-							<el-button
-								v-if="detail"
-								size="small"
-								type="primary"
-								class="btnTextStyle"
-								v-hasPermi="['base:group-holiday:update']"
-								@click="editHoliday">
-								修改
-							</el-button>
-							<el-button
-								v-if="detail"
-								class="btnTextStyle"
-								size="small"
-								v-hasPermi="['base:group-holiday:delete']"
-								@click="deleteHoliday">
-								删除
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-		<base-dialog
-			dialogTitle="节假日变更记录"
-			:dialogVisible="logVisible"
-			@cancel="cancelLog"
-			:before-close="cancelLog"
-			:destroy-on-close="true"
-			width="70%">
-			<holiday-log ref="holidayLogRef"></holiday-log>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button size="small" class="btnTextStyle" @click="cancelLog">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import { solarToLunar } from 'chinese-lunar';
-
-import { getUserProfile } from '@/api/system/user';
-import {
-	deptHolidayList,
-	getEnableData,
-	disExtends,
-	reExtends,
-	updateSchedule,
-	getSet,
-} from '@/api/group/holidaySetting';
-
-import addOrUpdata from './add-or-updata.vue';
-import holidayLog from './holidayLog';
-
-export default {
-	name: '',
-	components: {
-		addOrUpdata,
-		holidayLog,
-	},
-	data() {
-		return {
-			startDay: '', // 查询参数
-			HolidayList: [],
-			// 部门树选项
-			deptOptions: undefined,
-			// 查询的部门名称
-			deptName: undefined,
-			// 选择的部门名称
-			showDeptName: undefined,
-			topDeptId: undefined, // 保存当前用户的部门id为最高级部门id
-			parentId: undefined, // 保存部门点击时对象的父id，用于解除和恢复继承
-			deptId: undefined,
-			ishasParent: false, // 判断是否有上级,false,则表示为最高级
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-			dialogTitle: undefined,
-			addOrUpdateVisible: false,
-			detail: false,
-			logVisible: false,
-			inherited: true, //该部门是否为继承状态
-			showTag1: true, //tag标签是否显示的
-			showTag2: true,
-			showTag3: true,
-		};
-	},
-	watch: {
-		// 根据名称筛选部门树
-		deptName(val) {
-			this.$refs.tree.filter(val);
-		},
-	},
-	created() {
-		this.startDay = new Date();
-		// 查询用户个人信息
-		getUserProfile().then((response) => {
-			this.showDeptName = response.data.dept.name || '';
-			this.topDeptId = response.data.dept.id || ''; // 保存当前用户的部门id为最高级部门id
-			this.deptId = response.data.dept.id || '';
-			this.getTreeselect();
-			this.getSet();
-		});
-	},
-	methods: {
-		getHolidayPage() {
-			const now = new Date(this.startDay);
-			const year = now.getFullYear();
-			const month = now.getMonth();
-			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
-			const lastDate = new Date(year, month + 1, 0).getDate();
-			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
-				lastDate
-			).padStart(2, '0')}`;
-
-			this.HolidayList = [];
-			deptHolidayList({
-				deptId: this.deptId,
-				startTime: Date.parse(startTime),
-				endTime: Date.parse(endTime),
-			}).then((res) => {
-				this.HolidayList = res.data;
-			});
-		},
-		// 切换月份
-		selectMonth() {
-			this.getHolidayPage();
-		},
-		/** 查询部门下拉树结构 */
-		getTreeselect() {
-			getEnableData().then((response) => {
-				// 遍历部门，判断当前帐号的部门是否有为最上级
-				const nowDept = response.data.filter((i) => i.id == this.topDeptId);
-				this.ishasParent = nowDept[0].hasParent;
-				this.parentId = nowDept[0].parentId;
-
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree1(response.data, 'id'));
-				this.$nextTick(() => {
-					this.$refs.tree.setCurrentKey(this.deptId);
-				});
-			});
-		},
-		//大整数精度丢失
-		handleTree1(data, fid) {
-			const id = fid || 'id';
-			const parentId = 'parentId';
-			const children = 'children';
-			const rootId =
-				data
-					.map((item) => item[parentId].toString())
-					.reduce((min, current) => {
-						if (current.length < min.length) return current;
-						if (current.length > min.length) return min;
-						return current < min ? current : min;
-					}) || 0;
-			//对源数据深度克隆
-			const cloneData = JSON.parse(JSON.stringify(data));
-			//循环所有项
-			const treeData = cloneData.filter((father) => {
-				let branchArr = cloneData.filter((child) => {
-					//返回每一项的子级数组
-					return father[id] == child[parentId];
-				});
-				branchArr.length > 0 ? (father.children = branchArr) : '';
-				//返回第一层
-				return father[parentId] == rootId;
-			});
-			return treeData !== '' ? treeData : data;
-		},
-		// 根据部门id查询该部门是否是继承
-		getSet() {
-			getSet({ id: this.deptId }).then((res) => {
-				this.inherited = res.data;
-			});
-			this.getHolidayPage();
-		},
-		// 筛选节点
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		// 节点单击事件
-		handleNodeClick(data) {
-			this.deptId = data.id;
-			this.showDeptName = data.name;
-			this.ishasParent = data.hasParent;
-			this.parentId = data.parentId;
-			this.getSet();
-			this.showTag1 = true;
-			this.showTag2 = true;
-			this.getHolidayPage();
-		},
-		//获取农历
-		getLunarDate(solarDate) {
-			try {
-				const [year, month, day] = solarDate.split('-').map(Number);
-
-				const date = new Date(year, month - 1, day);
-				const lunar = solarToLunar(date);
-
-				// 将数字月份和日期转换为中文
-				const monthMap = {
-					1: '正',
-					2: '二',
-					3: '三',
-					4: '四',
-					5: '五',
-					6: '六',
-					7: '七',
-					8: '八',
-					9: '九',
-					10: '十',
-					11: '冬',
-					12: '腊',
-				};
-
-				const dayMap = {
-					1: '初一',
-					2: '初二',
-					3: '初三',
-					4: '初四',
-					5: '初五',
-					6: '初六',
-					7: '初七',
-					8: '初八',
-					9: '初九',
-					10: '初十',
-					11: '十一',
-					12: '十二',
-					13: '十三',
-					14: '十四',
-					15: '十五',
-					16: '十六',
-					17: '十七',
-					18: '十八',
-					19: '十九',
-					20: '二十',
-					21: '廿一',
-					22: '廿二',
-					23: '廿三',
-					24: '廿四',
-					25: '廿五',
-					26: '廿六',
-					27: '廿七',
-					28: '廿八',
-					29: '廿九',
-					30: '三十',
-				};
-
-				// 返回 "三月初四" 格式
-				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
-			} catch (error) {
-				console.log(error);
-				return '';
-			}
-		},
-		addHoliday() {
-			this.addOrUpdateVisible = true;
-			this.detail = false;
-			this.dialogTitle = '新增节假日';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId, {
-					inherited: this.inherited,
-				});
-			});
-		},
-		disExtends() {
-			this.$confirm(
-				'当前节假日设置继承自上级部门，解除继承后将不再自动同步上级设置。<br/>系统将保留当前节假日配置作为初始数据，您可以自定义修改。<br/>是否确认解除继承？',
-				'解除继承',
-				{
-					dangerouslyUseHTMLString: true,
-					confirmButtonText: '确认解除',
-					cancelButtonText: '取消',
-					type: 'warning',
-				}
-			)
-				.then(() => {
-					disExtends({ id: this.deptId, pid: this.parentId }).then((res) => {
-						if (!res.data.updateFlag) {
-							this.$modal.msgSuccess('操作成功');
-							this.getSet();
-						} else {
-							this.$confirm(
-								'新增节假日影响已有排班计划，是否立即更新？',
-								'更新排班',
-								{
-									confirmButtonText: '立即更新',
-									cancelButtonText: '暂不更新',
-									type: 'warning',
-								}
-							)
-								.then(() => {
-									updateSchedule({ logId: res.data.logId }).then((res1) => {
-										this.$modal.msgSuccess('更新成功');
-										this.getSet();
-									});
-								})
-								.catch(() => {
-									this.$message({
-										type: 'info',
-										message: '已取消',
-									});
-								});
-						}
-					});
-				})
-				.catch((res) => {
-					console.log(res);
-					this.$message({
-						type: 'info',
-						message: '已取消',
-					});
-				});
-		},
-		reExtends() {
-			this.$confirm(
-				'恢复继承后，当前部门将重新同步未来时间的上级部门的节假日设置，现有自定义配置将被清空并替换为上级设置，不可恢复。<br/>是否确认继续？',
-				'恢复继承',
-				{
-					dangerouslyUseHTMLString: true,
-					confirmButtonText: '确认恢复继承',
-					cancelButtonText: '取消',
-					type: 'warning',
-				}
-			)
-				.then(() => {
-					reExtends({ id: this.deptId, pid: this.parentId }).then((res) => {
-						if (!res.data.updateFlag) {
-							this.$modal.msgSuccess('操作成功');
-							this.getSet();
-						} else {
-							this.$confirm(
-								'新增节假日影响已有排班计划，是否立即更新？',
-								'更新排班',
-								{
-									confirmButtonText: '立即更新',
-									cancelButtonText: '暂不更新',
-									type: 'warning',
-								}
-							)
-								.then(() => {
-									updateSchedule({ logId: res.data.logId }).then((res1) => {
-										this.$modal.msgSuccess('更新成功');
-										this.getSet();
-									});
-								})
-								.catch(() => {
-									this.$message({
-										type: 'info',
-										message: '已取消',
-									});
-									this.getSet();
-								});
-						}
-					});
-				})
-				.catch(() => {
-					this.$message({
-						type: 'info',
-						message: '已取消',
-					});
-				});
-		},
-		holidayLog() {
-			this.logVisible = true;
-			this.$nextTick(() => {
-				this.$refs.holidayLogRef.getDataList();
-			});
-		},
-		cancel() {
-			this.getHolidayPage();
-			this.addOrUpdateVisible = false;
-		},
-		successSubmit() {
-			this.cancel();
-			this.getHolidayPage();
-		},
-		handleConfirm() {
-			this.$refs.addOrUpdataRef.dataFormSubmit();
-		},
-		showDetail(val) {
-			this.addOrUpdateVisible = true;
-			this.detail = true;
-			this.dialogTitle = '节假日详情';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId, val, true, this.inherited); //编辑的时候，该部门如果是自定义的，但这个val数据是继承的，修改之后，则变成自定义的inherited
-			});
-		},
-		editHoliday() {
-			this.detail = false;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.editHoliday();
-			});
-		},
-		deleteHoliday() {
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.deleteHoliday();
-			});
-		},
-		cancelLog() {
-			this.logVisible = false;
-		},
-		handleClose(val) {
-			if (val == 1) {
-				this.showTag1 = false;
-			} else if (val == 2) {
-				this.showTag2 = false;
-			} else {
-				this.showTag3 = false;
-			}
-		},
-	},
-};
-</script>
-<style lang="scss">
-.head-container {
-	padding: 20px 10px 0;
-	background-color: #fff;
-	height: 100%;
-	border-radius: 8px;
-}
-.groupTeamScheduling {
-	.operationArea {
-		padding: 14px 10px 0 16px;
-		margin-bottom: 8px;
-		background-color: #fff;
-		border-radius: 8px;
-		.blue-block {
-			display: inline-block;
-			width: 4px;
-			height: 16px;
-			background-color: #0b58ff;
-			border-radius: 1px;
-			margin-right: 8px;
-			margin-top: 10px;
-		}
-		.el-form-item {
-			margin-bottom: 10px;
-		}
-	}
-	// 日历
-	.calenderArea {
-		padding: 14px 10px 0 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		min-height: calc(100vh - 120px - 8px - 168px);
-		.el-calendar__body {
-			padding: 10px 16px 16px 0;
-		}
-		.el-calendar__header {
-			display: none;
-		}
-		.el-calendar-table > thead {
-			height: 48px;
-			font-size: 20px;
-			font-weight: 500;
-			color: #000000;
-			background-color: rgba(242, 244, 249, 1);
-		}
-		.el-calendar-table__row {
-			height: 133px;
-			.prev,
-			.next {
-				pointer-events: none;
-			}
-			.is-selected,
-			.is-today {
-				background-color: #e4f0fd;
-			}
-			.el-calendar-day {
-				padding: 0;
-				height: 100%;
-				:hover {
-					background-color: #e4f0fd;
-				}
-				.dateStyle {
-					font-size: 20px;
-					font-weight: 500;
-					color: #000000;
-					text-align: left;
-					height: 133px;
-					line-height: 28px;
-					padding: 10px;
-
-					.lunar-date {
-						display: inline-block;
-						font-size: 12px;
-						color: #909399;
-					}
-					.work-tip {
-						background: #87c1ff;
-						color: white;
-						font-size: 18px;
-						width: 30px;
-						text-align: center;
-						float: right;
-					}
-					.holiday-div {
-						background-color: #67c23a;
-						border-radius: 3px;
-						height: 25px;
-						text-align: center;
-						line-height: 24px;
-						color: #fff;
-						.holiday-div-btn {
-							float: right;
-							transform: rotate(90deg);
-							font-size: 14px;
-							pointer-events: none;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-.addDialog {
-	.el-dialog__body {
-		overflow: visible;
-	}
-}
-</style>

src/views/group/holidaySetting/theme/font/iconfont/iconfont.svg

@@ -1,319 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-Created by FontForge 20120731 at Sat Apr 15 15:55:39 2017
- By admin
-</metadata>
-<defs>
-<font id="iconfont" horiz-adv-x="1024" >
-  <font-face 
-    font-family="iconfont"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    panose-1="2 0 6 3 0 0 0 0 0 0"
-    ascent="896"
-    descent="-128"
-    x-height="792"
-    bbox="0 -224 1273 896.22"
-    underline-thickness="0"
-    underline-position="0"
-    unicode-range="U+0078-E810"
-  />
-<missing-glyph 
- />
-    <glyph glyph-name=".notdef" 
- />
-    <glyph glyph-name=".notdef" 
- />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341" 
- />
-    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001" 
-d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
-t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
-t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
-    <glyph glyph-name="sousuo" unicode="&#xe602;" horiz-adv-x="1000" 
-d="M808 54l-73 75q48 76 48 167q0 130 -90.5 222t-218 92t-218 -92t-90.5 -222t90.5 -222t217.5 -92q67 0 128 28l22 -23v0l60 -60q25 -26 62 -26t62.5 26t25.5 63.5t-26 63.5zM262 296.5q0 89.5 62 153t150 63.5t150.5 -63.5t62.5 -153t-62.5 -153t-150.5 -63.5t-150 63.5
-t-62 153z" />
-    <glyph glyph-name="tingzhi" unicode="&#xe61d;" 
-d="M511 809q106 0 199 -41q93 -40 161.5 -108.5t109 -161t40.5 -198t-40.5 -198.5t-109 -161.5t-161.5 -109t-198.5 -40.5t-197.5 41q-93 40 -161.5 108.5t-109 161.5t-40.5 198.5t40.5 198t109 161t161 109t197.5 40.5v0zM764 231q34 0 61.5 18t27.5 53q0 34 -27.5 50.5
-t-61.5 16.5h-501q-34 0 -62.5 -16.5t-28.5 -50.5q0 -35 28.5 -53t62.5 -18h501v0zM764 231z" />
-    <glyph glyph-name="bianji" unicode="&#xe69e;" 
-d="M502 330zM380 -16v0l-191 -35l38 188v0zM681 591l-69 -69l153 -153l69 69zM262 171l153 -153l316 317l-153 153z" />
-    <glyph glyph-name="icon01" unicode="&#xe600;" 
-d="M858 43l-179 177q18 38 18 80q0 77 -54.5 131.5t-132.5 54.5q-25 0 -49 -6l79 -80q25 -25 23.5 -61.5t-28.5 -63t-63.5 -28t-61.5 22.5l-79 80q-7 -24 -7 -50q0 -77 54.5 -132t131.5 -55q43 0 80 19l179 -178q17 -17 42 -16t43 20q19 18 20 43t-16 42v0zM810 -29
-q-13 0 -22.5 9t-9.5 22t9.5 22t22.5 9t22 -9t9 -22t-9 -22t-22 -9v0zM901 383h-18h-42h-1q-12 1 -23 9h-1q-26 17 -25 47q0 8 3 17q3 10 9 17l9 10l21 21l13 12q13 18 13 40.5t-14 40.5l-36 37q-18 14 -41 14.5t-40 -13.5l-14 -13l-29 -30v0v0q-26 -21 -57 -7q-10 4 -18 12
-q-13 14 -15 32v14v29v19q-3 22 -19 37.5t-39 18.5h-52q-22 -2 -38 -18t-20 -38v-18v-30v-13v0v0v-2v-2v-1q-1 -1 -1 -4l-1 -1l-0.5 -2l-0.5 -2v0q-1 -1 -3 -5v0q-4 -10 -13 -17q-15 -13 -36 -13q-20 0 -35 12l-9 10l-21 20l-13 13q-17 14 -40 13.5t-40 -14.5l-37 -36
-q-14 -18 -14.5 -40.5t12.5 -40.5l13 -13l30 -30v0q1 0 1.5 -1l0.5 -1l0.5 -1t1 -1.5t0.5 -1t1 -1.5l0.5 -0.5t0.5 -1.5l0.5 -1t1.5 -2v-1t0.5 -2t1.5 -2v-1t0.5 -2.5t0.5 -2.5v0q1 -3 1 -5v0q4 -27 -16 -46v0q-14 -14 -33 -16h-13h-30h-18q-22 -3 -38 -19t-18 -38v-53
-q2 -22 17.5 -38t38.5 -19h18l42 -1q5 0 5 -1h2q2 -1 3 -1q18 -5 29 -20t11 -33v0q0 -20 -12 -35l-10 -9v0l-21 -21l-13 -13q-13 -18 -13 -40.5t14 -39.5l37 -37q18 -15 40.5 -15t40.5 14l12 12l31 30v0v1q1 0 2 1t2 1q1 1 2 1l2 2l1.5 0.5l1.5 0.5l2 1q1 0 2 1q2 0 2 1v0v0
-l5 1v0q1 0 2.5 0.5t2.5 0.5v0h4q26 1 43 -16q13 -13 16 -33v-13v-30v-18q2 -22 18.5 -38t38.5 -18h52q23 2 39 17.5t19 37.5v18v31v12v0q2 15 11 28l2 2l0.5 1t1.5 1q5 5 11 9v0q1 1 3 2q1 1 2 1v0h1l1.5 0.5l1.5 0.5l-50 50q-32 -9 -68 -9q-102 0 -173.5 71.5t-70.5 172.5
-q0 102 71.5 173.5t173 71.5t173 -72t71.5 -173q0 -35 -10 -67l50 -49q4 7 12 16q7 7 18 11q8 4 14 4h14h30h17q23 3 38.5 19t18.5 39v52q-2 23 -18 39t-38 19v0zM901 383z" />
-    <glyph glyph-name="shijian" unicode="&#xe620;" 
-d="M511.5 684q-104.5 0 -192.5 -51t-139.5 -139.5t-51.5 -193t51.5 -193t139.5 -139.5t192.5 -51t193 51t139.5 139.5t51 193t-51 193t-139.5 139.5t-193 51zM511.5 -48q-94.5 0 -175 46.5t-127 127t-46.5 175t46.5 175t127 127t175 46.5t175 -46.5t127.5 -127t47 -175
-t-47 -175t-127.5 -127t-175 -46.5zM704 301h-175v226q0 8 -5 13t-12.5 5t-12.5 -5t-5 -13v-244q0 -7 5 -12t13 -5h192q7 0 12 5t5 12t-5 12.5t-12 5.5z" />
-    <glyph glyph-name="weixin" unicode="&#xe60f;" 
-d="M669 495q14 0 30 -2q-20 95 -110.5 157.5t-206.5 62.5q-130 0 -222 -77.5t-92 -189.5q0 -124 126 -212l-31 -94l109 55q80 -16 110 -16q14 0 30 1q-10 33 -10 66q0 103 77.5 176t189.5 73zM500 580q18 0 28.5 -11t10.5 -28.5t-10.5 -28.5t-28.5 -11t-32.5 11.5
-t-14.5 28.5t14.5 28t32.5 11zM280 501q-18 0 -32.5 11.5t-14.5 28.5t14.5 28t32.5 11t29 -11t11 -28.5t-11 -28.5t-29 -11zM956 250q0 93 -80 160.5t-187 67.5q-112 0 -189.5 -67t-77.5 -161.5t77.5 -161t189.5 -66.5q31 0 94 16l86 -47l-23 78q110 83 110 181zM602 289
-q-11 0 -21 10t-10 21.5t10 21.5t21 10q17 0 28.5 -9.5t11.5 -22t-11.5 -22t-28.5 -9.5zM775 289q-12 0 -21.5 10t-9.5 21.5t9.5 21.5t21.5 10q17 0 28 -9.5t11 -22t-11 -22t-28 -9.5z" />
-    <glyph glyph-name="fenxiang1" unicode="&#xe655;" 
-d="M770 222q-38 0 -71.5 -16.5t-55.5 -46.5l-249 125q7 21 7 43q0 25 -8 48l248 124q22 -31 56 -48.5t73 -17.5q65 0 111.5 46.5t46.5 112t-46.5 111.5t-112 46t-112 -46t-46.5 -112q0 -9 1 -18l-261 -131q-46 44 -109 44q-65 0 -111.5 -46.5t-46.5 -112t46.5 -112
-t112 -46.5t111.5 47l259 -130q-2 -11 -2 -22q0 -65 46.5 -111.5t112 -46.5t112 46.5t46.5 112t-46.5 111.5t-111.5 46v0z" />
-    <glyph glyph-name="qq" unicode="&#xe649;" 
-d="M856 184q-6 81 -83 167q3 7 4.5 21.5t-5 37.5t-22.5 40v2q0 107 -67 177t-164 71q-97 -1 -163.5 -71t-66.5 -177v-2q-17 -17 -23 -40t-5 -37.5t4 -21.5q-77 -86 -83 -167q-2 -41 12 -59q7 -7 17 -4.5t23.5 17.5t24.5 38q13 -46 54 -100q-26 -6 -42 -24t-17 -36.5t7 -35.5
-q23 -38 93 -38q106 0 150 42q5 5 15 5t16 -5q43 -42 149 -42q70 0 94 38q7 17 6.5 35.5t-16.5 36.5t-42 24q40 54 53 100q11 -23 24.5 -38t24 -17.5t16.5 4.5q14 18 12 59z" />
-    <glyph glyph-name="xinzeng" unicode="&#xe642;" 
-d="M739 330h-188v207q0 22 -34 24q-16 1 -24.5 -6t-8.5 -18v-207h-199q-1 0 -4.5 0.5t-9 -1t-11 -4t-9.5 -8.5t-4 -14q0 -15 2.5 -24t7.5 -12.5t9 -4t11 -0.5h207l-1 -217v-6t0.5 -6t0.5 -5.5t1 -6t2.5 -5t4 -5t5.5 -3t7.5 -2t10.5 -0.5q35 0 35 42l1 214h189q42 0 42 36
-q0 16 -10.5 24.5t-21.5 7.5h-11zM518.5 770q-97.5 0 -186.5 -38t-153 -102.5t-102 -153t-38 -186.5t38 -186.5t102 -153t153 -102.5t186.5 -38t186.5 38t153.5 102t102.5 153t38 187t-38 186.5t-102.5 153t-153.5 102.5t-186.5 38zM519 -126q-113 0 -209 55.5t-151.5 151.5
-t-55.5 209t55.5 209t151.5 151.5t209 55.5t208.5 -55.5t151.5 -151.5t56 -209t-56 -209t-151.5 -151.5t-208.5 -55.5z" />
-    <glyph glyph-name="tishi" unicode="&#xe64d;" 
-d="M512.5 193q-10.5 0 -18 7.5t-7.5 17.5v328q0 10 7.5 17.5t18 7.5t18 -7.5t7.5 -17.5v-328q0 -10 -7.5 -17.5t-18 -7.5zM512.5 27q-10.5 0 -18 7.5t-7.5 17.5v2q0 11 7.5 18.5t18 7.5t18 -7.5t7.5 -18.5v-2q0 -10 -7.5 -17.5t-18 -7.5zM512.5 -135q-88.5 0 -168.5 34
-q-78 33 -138.5 93.5t-93.5 138.5q-34 81 -34 169t34 169q33 78 93.5 138.5t138.5 93.5q80 34 168.5 34t169.5 -34q78 -33 138.5 -93.5t93.5 -138.5q34 -81 34 -169t-34 -169q-33 -78 -93.5 -138.5t-138.5 -93.5q-81 -34 -169.5 -34zM513 684q-77 0 -147 -29t-124.5 -83.5
-t-83.5 -124.5t-29 -147t29 -147t83.5 -124.5t124.5 -83.5t147 -29t147 29t124.5 83.5t83.5 124.5t29 147t-29 147t-83.5 124.5t-124.5 83.5t-147 29z" />
-    <glyph glyph-name="shijian1" unicode="&#xe6fb;" 
-d="M513 -202q-102 0 -195 39.5t-160 106.5t-107 160t-40 195.5t40 195.5t107 160t160 107t195 40t195 -40t160 -107t107 -160t40 -195.5t-40 -195.5t-107 -160t-160 -106.5t-195 -39.5zM513 745q-91 0 -173 -35.5t-142 -95t-95 -142t-35 -173t35 -173t95 -142t142 -95
-t173 -35.5t173 35.5t142 95t95 142t35 173t-35 173t-95 142t-142 95t-173 35.5zM770 174q-5 -11 -16.5 -15.5t-22.5 0.5l-236 79q-18 9 -17 29l-0.5 1t-0.5 2v326q0 12 9 21t21 9t20.5 -9t8.5 -21v-310l220 -73q11 -5 15 -16.5t-1 -22.5z" />
-    <glyph glyph-name="iconfontweibowukuang" unicode="&#xe661;" 
-d="M727 341q-16 3 -20.5 9.5t-0.5 11.5l3 4q1 3 3 7t6 15.5t4.5 22.5t-4.5 25.5t-16 25.5q-14 14 -37 18.5t-46 1t-44 -9t-33 -11.5l-13 -5q-10 -3 -17 -4.5t-10.5 0t-5.5 3.5t-2 7.5t1 9t3 12.5t3 14q0 15 -2.5 27.5t-11 27t-23 22t-41 7t-62.5 -12.5q-35 -12 -71.5 -36
-t-64 -49.5t-50 -49.5t-34.5 -40l-12 -15q-33 -44 -48.5 -87.5t-16.5 -65t0 -21.5q6 -48 30 -86.5t57 -62t78.5 -40t86.5 -24.5t88 -11q76 -6 157 11.5t151 61t99 103.5q17 36 17.5 67t-10.5 51t-29.5 35t-34 22t-27.5 9v0zM415 28q-110 -5 -188 42.5t-78 119.5t77.5 124
-t188.5 57q112 5 188.5 -37t76.5 -113q0 -73 -78 -130.5t-187 -62.5v0zM385 307q-30 -3 -53.5 -13.5t-37 -23.5t-22.5 -30t-12.5 -30.5t-4.5 -28t-0.5 -19.5t0.5 -8v0v-5t2 -11.5t5.5 -16.5t12 -17t19.5 -15q67 -32 126 -19.5t94 58.5q14 17 18.5 42t-2 50.5t-22.5 47
-t-48.5 33t-74.5 6.5v0zM348 116q-20 -2 -35 8t-15 27q0 18 14 32.5t34 16.5q23 2 37.5 -9t14.5 -29q0 -16 -14.5 -30t-35.5 -16v0zM435 189q-7 -5 -14.5 -4.5t-11.5 6.5t-2 14.5t9 13.5q8 6 15.5 5t11.5 -7q3 -7 1 -15t-9 -13v0zM798 400q9 0 16 6t8 14v3q4 32 -1 57
-t-16.5 39t-26.5 23t-30.5 11.5t-28.5 3t-21 -0.5l-8 -1q-10 0 -17 -7t-7 -17t7 -17t17 -7q32 6 50.5 0.5t26 -19.5t9 -28t0.5 -25l-2 -11q0 -10 7 -17t17 -7v0zM781 679q-51 12 -121 -1l-1.5 -1l-1.5 -1h-1q-11 -3 -18.5 -12.5t-7.5 -21.5q0 -14 10.5 -24.5t25.5 -10.5
-q18 3 31 8q6 0 18.5 1.5t33.5 -3.5t42 -13t43 -26.5t37 -43.5q28 -60 11 -115q-7 -17 -7 -34q0 -14 10 -22.5t25 -8.5t23 5.5t11 23.5v0q19 57 14.5 102.5t-20 79t-43.5 58t-56 39t-58 21.5v0zM781 679z" />
-    <glyph glyph-name="delete" unicode="&#xe616;" 
-d="M768 -128h-96v672h-96v-672h-128v672h-96v-672h-96v672h512v-672zM416 704h192v-64h-192v64zM880 640h-176v96q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45v-96h-176q-20 0 -34 -14t-14 -34t14 -34t34 -14h16v-704q0 -26 19 -45t45 -19h576q26 0 45 19t19 45v704h16
-q20 0 34 14t14 34t-14 34t-34 14z" />
-    <glyph glyph-name="dizhi" unicode="&#xe685;" 
-d="M512 -212q-16 17 -41.5 47.5t-92 115.5t-117 161.5t-92 166.5t-41.5 149q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5q0 -59 -41.5 -149t-92 -166.5t-116.5 -161.5t-92.5 -115.5t-41.5 -47.5v0zM512 684q-106 0 -181 -75t-75 -181t75 -181t181 -75t181 75
-t75 181t-75 181t-181 75z" />
-    <glyph glyph-name="guanbi" unicode="&#xe637;" 
-d="M481.5 748q-97.5 0 -186 -37.5t-152.5 -101.5t-102 -153t-38 -186t38 -185.5t102 -152.5t152.5 -102t186 -38t186 38t152.5 102t102 152.5t38 185.5t-38 186t-102 153t-152.5 101.5t-186 37.5zM683 69v0q-10 -10 -24 -10t-24 10l-153 153l-154 -154v0q-10 -10 -24 -10
-t-24 10t-10 24t10 24l153 154l-153 154q-10 10 -10 24t10 24v0q10 10 24 10t24 -10l153 -154l154 154v0q10 10 24 10t24 -10t10 -24t-10 -24l-153 -154l153 -153q10 -10 10 -24t-10 -24z" />
-    <glyph glyph-name="shoucang1" unicode="&#xe604;" 
-d="M512 727q-16 0 -26 -22l-95 -191q-11 -23 -36 -41t-50 -22l-211 -30q-25 -4 -29.5 -18.5t12.5 -32.5l154 -149q17 -17 26.5 -46.5t5.5 -53.5l-36 -211q-3 -18 3 -27.5t18 -9.5q10 0 22 6l189 99q22 12 53 12t53 -12l189 -99q12 -6 22 -6q12 0 18 9.5t3 27.5l-36 211
-q-4 24 5.5 53.5t26.5 46.5l154 149q17 18 12.5 32.5t-29.5 18.5l-211 30q-25 4 -50 22t-36 41l-95 191q-10 22 -26 22v0z" />
-    <glyph glyph-name="phone" unicode="&#xe622;" 
-d="M295 688q34 0 60 -28q15 -16 39 -44q24 -26 22 -58.5t-28 -56.5l-13 -11q-30 -27 -45 -39q-42 -34 -33 -89t46 -112q67 -102 160 -157q20 -12 61 -26q14 -5 29 -5q33 0 60 25q17 17 53 48l5 4q27 23 57 23q35 0 62 -29q23 -25 39 -43q23 -27 21.5 -58t-27.5 -55l-6 -6
-q-41 -47 -103 -76q-19 -7 -41 -7q-27 0 -63 10q-123 35 -247 146q-160 143 -234 314q-41 97 -34 171q5 51 41 81q13 11 38 34q17 15 25 22q26 22 56 22zM295 735q-48 0 -87 -34q-7 -6 -28.5 -25t-33.5 -29q-52 -43 -58 -113q-9 -87 38 -194q77 -181 245 -331
-q133 -119 266 -156q43 -12 76 -12q32 0 59 10q19 9 37 20t30.5 20t23.5 18.5t17 16t10.5 11.5t4.5 6q40 37 42.5 87t-32.5 91q-17 19 -40 44q-42 45 -97 45q-48 0 -88 -35q-43 -37 -60 -54q-13 -12 -27 -12q-7 0 -14 3q-36 12 -52 22q-83 49 -144 142q-32 49 -39 94
-q-5 28 15 43q14 11 60 53q41 37 44 89t-33 93q-25 28 -41 45q-40 42 -94 42v0z" />
-    <glyph glyph-name="bianji1" unicode="&#xe64a;" 
-d="M784 525l-126 126l63 63q15 15 37.5 15t37.5 -15l51 -51q15 -15 15 -37.5t-15 -37.5zM418 159l-126 126l342 340l126 -126zM191 56l77 205l124 -125zM756 13q14 0 23 -9.5t9 -22.5t-9 -22.5t-23 -9.5h-564q-13 0 -22 9.5t-9 22.5t9 22.5t22 9.5h564z" />
-    <glyph glyph-name="guanbi1" unicode="&#xe609;" 
-d="M512 739q-117 0 -216.5 -58t-157.5 -157.5t-58 -216.5t58 -216.5t157.5 -157.5t216.5 -58t216.5 58t157.5 157.5t58 216.5t-58 216.5t-157.5 157.5t-216.5 58zM721 150l-53 -52l-156 157l-156 -157l-53 52l157 157l-157 156l52 53l157 -157l156 157l53 -53l-157 -156z
-" />
-    <glyph glyph-name="cuowu" unicode="&#xe617;" 
-d="M564 276l289 288q10 10 10 24.5t-10 25t-24.5 10.5t-24.5 -11l-290 -287l-286 287q-11 11 -25 11t-24.5 -10.5t-10.5 -25t10 -24.5l287 -287l-289 -288q-10 -10 -10 -24.5t10 -25t24.5 -10.5t24.5 11l289 287l289 -290q11 -10 25.5 -10t24.5 10t10 24.5t-10 24.5
-l-289 290v0zM564 276z" />
-    <glyph glyph-name="tupian" unicode="&#xe6a0;" 
-d="M975 714h-926q-21 0 -35 -14t-14 -34v-732q0 -20 14 -34t35 -14h926q21 0 35 14t14 34v732q0 20 -14 34t-35 14zM926 147l-180 180q-16 17 -39.5 17t-39.5 -17l-211 -211l-91 91q-14 15 -35.5 15t-37.5 -15l-192 -192q-3 8 -3 17v536q0 21 14.5 35t34.5 14h731
-q21 0 35 -14t14 -35v-421zM316.5 519q-40.5 0 -68.5 -28.5t-28 -68.5t28 -68.5t68.5 -28.5t69 28.5t28.5 68.5t-28.5 68.5t-69 28.5z" />
-    <glyph glyph-name="yonghuming" unicode="&#xe618;" 
-d="M705 -212q-5 0 -10 3q-22 14 -52.5 20.5t-51.5 7.5h-24h-38v0h-477q-8 0 -14 5.5t-6 14.5v24q-2 41 23 84q22 38 62 65q49 32 123 45h1q28 2 76 15q66 18 72 33q1 3 2 5q2 11 -1 43q-3 34 -17 66t-25.5 47.5t-33.5 39.5q-19 22 -26 32q-30 45 -34 97v1q0 21 19 38l1 1v0
-q0 2 -1 8v3q-6 31 -6.5 74t4.5 74q2 24 15.5 49.5t22 34.5t14.5 14v0q13 11 18 19l1 2q0 1 -0.5 2l-0.5 1q-7 15 -4 27q3 19 25 25q8 2 23 2l1 1q47 2 75 0q53 -4 98 -14.5t71.5 -21.5t48 -24t27.5 -18.5t9 -9.5h1q22 -27 33 -67q3 -12 4 -21q7 -43 4 -104q-1 -22 -5 -48
-q-1 -5 0 -7l3 -3q10 -10 13 -20q2 -7 2 -17v-1q-3 -52 -34 -97q-7 -10 -26 -32q-21 -24 -33 -39.5t-26 -47.5t-17 -66q-2 -32 0 -43q1 -2 1 -5q1 -1 4 -4.5t21 -12t48 -16.5q48 -13 76 -15v0h1q74 -14 123 -46q41 -27 63 -65q24 -42 21 -83v-24q0 -9 -5.5 -14.5t-14.5 -5.5
-h-189q-8 0 -14 5.5t-6 14t6 14.5t14 6h169v4v2q3 30 -17 63q-18 29 -50 50q-42 27 -107 39q-42 6 -81 16q-87 23 -99 59q-8 14 -4 64q4 41 20 78t29.5 54.5t36.5 44.5q18 20 24 28q23 34 26 76v4l-4 4l-5 5q-12 16 -9 38q4 25 5 45q3 57 -4 95v1q-1 7 -3 17q-8 30 -25 51
-q-15 15 -49 32q-71 34 -178 42q-25 2 -70 -1h-1h-8q6 -15 2 -27q-2 -6 -6 -13q-8 -13 -26 -28q-4 -4 -10.5 -11t-16.5 -25.5t-11 -34.5v-3q-5 -27 -4.5 -67t5.5 -68v-3q6 -29 -11 -45h-1q-5 -5 -5 -6v0q-1 -1 -1 -2q4 -42 27 -76q6 -8 23 -28q23 -27 36.5 -44.5t29.5 -54.5
-t20 -78q4 -49 -3 -64q-12 -36 -100 -59q-41 -11 -80 -16q-65 -11 -106 -38q-33 -21 -51 -50q-20 -34 -18 -64v-2v-4h457h38v0h24v0q10 0 24.5 -1.5t47 -10t53.5 -22.5q7 -5 9 -13t-3 -15q-6 -9 -17 -9v0zM629 116q0 -1 1 -1q-1 0 -1 1v0zM396 116l-1 -1l1 1v0z" />
-    <glyph glyph-name="mima" unicode="&#xe61e;" 
-d="M511 285q-22 0 -38 -15.5t-16 -37.5q0 -24 18 -40v-49q0 -15 10.5 -25.5t25.5 -10.5t25 10.5t10 25.5v49q18 16 18 40q0 22 -15.5 37.5t-37.5 15.5v0zM760 445h-35v89q0 89 -63 151.5t-151.5 62.5t-151 -62.5t-62.5 -151.5v-89h-35q-37 0 -63 -26t-26 -63v-338
-q0 -37 26 -63t63 -26h498q37 0 63 26t26 63v338q0 37 -26 63t-63 26v0zM511 712q74 0 126 -52t52 -126v-89h-356v89v0q0 74 52 126t126 52v0zM814 18q0 -22 -16 -37.5t-38 -15.5h-498q-22 0 -38 15.5t-16 37.5v338q0 23 16 38.5t38 15.5h498q22 0 38 -15.5t16 -38.5v-338v0z
-M814 18z" />
-    <glyph glyph-name="shoucang" unicode="&#xe60b;" 
-d="M752 -127q-16 0 -30 7l-208 103l-209 -103q-15 -8 -34 -6.5t-34 11.5q-15 11 -22 28.5t-4 35.5l43 225l-164 153q-30 29 -17 68q6 18 20 30t32 15l229 42l102 208q18 37 58 37q19 0 35 -10t24 -27l102 -208l229 -41q18 -3 32 -15t20 -30q6 -17 1.5 -35.5t-17.5 -31.5
-l-166 -155l42 -224q3 -19 -4 -36.5t-22 -28.5q-17 -12 -38 -12v0zM514 35l228 -114q12 -6 21.5 1.5t7.5 19.5l-46 248l183 173q8 8 5 19q-4 12 -16 14l-252 44l-113 230q-5 10 -17.5 10t-17.5 -10l-113 -229l-251 -47q-13 -2 -17 -13q-4 -12 5 -20l183 -171l-48 -249
-q-2 -11 8 -18q10 -8 20 -2l230 114v0zM514 35z" />
-    <glyph glyph-name="zhengque" unicode="&#xe60e;" 
-d="M512 -125q-116 0 -213.5 57t-154.5 154.5t-57 213.5t57 213.5t154.5 154.5t213.5 57t213.5 -57t154.5 -154.5t57 -213.5t-57 -213.5t-154.5 -154.5t-213.5 -57zM512 672q-101 0 -186.5 -50t-135.5 -135.5t-50 -186.5t50 -186.5t135.5 -135.5t186.5 -50t186.5 50
-t135.5 135.5t50 186.5t-50 186.5t-135.5 135.5t-186.5 50zM682 448q5 9 2.5 20t-12 16.5t-20.5 2.5t-16 -13l-170 -294l-95 88q-8 8 -19 8.5t-19 -7t-8 -18.5t7 -20l122 -112q7 -8 18 -8t19 7q2 2 49.5 84t94.5 164z" />
-    <glyph glyph-name="tuichu" unicode="&#xe7c8;" horiz-adv-x="1274" 
-d="M851 -212h-716q-57 0 -94 38q-41 40 -41 90v768q0 50 41 91q37 37 94 37h716q50 0 88 -37q34 -35 34 -91v-77q0 -10 -7.5 -17.5t-18 -7.5t-18 7.5t-7.5 17.5v77q0 35 -20 54q-22 23 -51 23h-716q-35 0 -58 -23q-26 -25 -26 -54v-768q0 -29 26 -54q23 -23 58 -23h716
-q29 0 51 23q20 19 20 54v77q0 10 7.5 17.5t18 7.5t18 -7.5t7.5 -17.5v-77q0 -56 -34 -91q-38 -37 -88 -37v0zM1203 274h-640q-10 0 -17.5 7.5t-7.5 18.5t7.5 18.5t17.5 7.5h640q11 0 18.5 -7.5t7.5 -18.5t-7.5 -18.5t-18.5 -7.5v0zM1031 57q-11 0 -18.5 7.5t-7.5 18t8 18.5
-l199 199l-199 199q-8 8 -8 18.5t7.5 18t18 7.5t18.5 -8l217 -217q7 -7 7 -18t-7 -18l-217 -217q-8 -8 -18 -8v0zM1031 57z" />
-    <glyph glyph-name="wodedingdan30" unicode="&#xe638;" 
-d="M179 148l204 -213l500 522l-203 212l-501 -521v0zM16 -196l321 78l-207 215l-114 -293v0zM939 725q-26 26 -44 41t-40 25t-43.5 3.5t-42.5 -28.5l-39 -45l207 -216l43 42q21 22 26.5 44t-4 45.5t-24 43t-39.5 45.5v0z" />
-    <glyph glyph-name="chenggong" unicode="&#xe62a;" 
-d="M511 -147q-91 0 -174 35.5t-143 95t-95.5 142.5t-35.5 174t35.5 174t95.5 143t143 95.5t174 35.5t174 -35.5t142.5 -95.5t95 -143t35.5 -174t-35.5 -174t-95 -142.5t-142.5 -95t-174 -35.5zM784 458l-14 14q-6 6 -14.5 6t-14.5 -6l-298 -292l-110 115q-6 6 -21 -8
-l-14 -15q-15 -14 -8 -21l146 -153q7 -6 21 8l14 15q4 3 6 7l307 301q6 6 6 14.5t-6 14.5z" />
-    <glyph glyph-name="time" unicode="&#xe62f;" 
-d="M512 736q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5zM512 -96q-104 0 -192.5 51.5t-140 140t-51.5 192.5t51.5 192.5t140 140t192.5 51.5t192.5 -51.5t140 -140t51.5 -192.5t-51.5 -192.5
-t-140 -140t-192.5 -51.5zM672 288h-160v224q0 13 -9.5 22.5t-22.5 9.5t-22.5 -9.5t-9.5 -22.5v-256q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5t-9.5 22.5t-22.5 9.5z" />
-    <glyph glyph-name="jingshu" unicode="&#xe611;" 
-d="M270 606v40q0 9 -6 14.5t-14 5.5t-14 -5.5t-6 -14.5v-399q0 -2 1 -5v-97h-14q-22 0 -38 -15t-18 -37v-4v-1v-1q1 -22 17 -37.5t39 -15.5h14v-39h-17h-3q-37 2 -63 29.5t-26 65.5v1.5v1.5q-1 64 0 551v2q0 40 28 67.5t67 27.5h31h477h5q8 0 14 -5.5t6 -13.5v-76h-385
-q-56 0 -95 -40zM883.5 -29q-8.5 0 -14 -6t-5.5 -14v-54h-494q-22 0 -38 15.5t-17 37.5v0.5v0.5v4q1 22 17 37.5t38 15.5h509h4h1q8 0 13.5 6t5.5 14v556q0 8 -5.5 14t-13.5 6h-5h-477h-32q-39 0 -67 -28t-28 -67v-2v-551v-2v-2q0 -37 26 -64.5t63 -29.5q2 -1 3 -1h517
-q8 0 13.5 6t5.5 14v74q0 8 -5.5 14t-14 6zM766 154q-10 -1 -21 -2.5t-31.5 -2t-22.5 -0.5h-26q-23 0 -41 -1.5t-35 -5.5q-2 -1 -7 -1q-7 0 -14 5t-7 11t8 11q2 2 9 10q11 12 19 10q4 -4 10.5 -5.5t11.5 -1.5q3 0 10 0.5t10 0.5h7q3 3 4.5 9.5t1.5 12.5q0 4 -1 13v13v8l-5 7
-q-9 0 -20.5 -1.5t-28.5 -5.5q-1 3 -1.5 5.5t-0.5 5.5q0 15 12 23.5t28 8.5q10 0 16 -3l101 -4q3 -6 3 -13q0 -16 -13 -16h-44q-2 -7 -2 -11q-2 -13 -2 -26q0 -4 0.5 -9t0.5 -7l3 -4q88 -10 90 -10q0 -19 -22 -24zM591 437q7 8 14 10l5 5q8 5 15 5q6 0 13 -4h2q4 0 8 1
-q10 0 19 -1.5t20 -5.5q10 9 24 9q12 0 14 -12q6 -10 6 -18q0 -15 -19 -29q-8 -7 -17 -13v-2q1 -5 6 -8q23 -11 40 -16q50 -18 93 -24q-6 -15 -12 -23q-19 -24 -42 -24q-6 0 -8 1q-13 4 -29 16q-43 32 -45 33q-1 1 -16 14q-9 8 -17 6q-6 -6 -14.5 -13.5t-17 -16t-14.5 -13.5
-q-29 -23 -55 -23q-10 5 -14 9q-8 6 -8 14q44 18 69 35q34 23 57 58q1 8 -3 10.5t-11 2.5h-8q-10 0 -16 -1q-21 -4 -36 -12q-10 4 -10 14q0 8 7 16zM422 350q5 4 16 14q14 15 23 26q26 33 43 63q3 4 6.5 5t6.5 1q9 0 16 -9.5t7 -20.5q0 -15 -12 -22q-13 -10 -21 -17
-q-25 -21 -47 -43q2 -5 6.5 -7.5t9.5 -2.5q10 1 14 1t6 -1q5 5 9 8q22 21 37 45q8 3 15 -3.5t12 -12.5q0 -14 -12 -26q-10 -8 -20 -17q-25 -26 -29 -31q-16 -18 -23 -36q9 0 37 12q13 6 22 6q4 -1 6 -1l8 -17q-16 -14 -42.5 -23t-49.5 -16q-13 -2 -19 11q-3 7 -3 16
-q0 21 13 29l4 4q8 12 13 23l-49 -4l-11 23q-2 13 8 23zM389 178q6 12 21 15q15 2 28 5l123 33q2 1 5 1q8 0 8 -11q0 -8 -4.5 -15.5t-11.5 -7.5q-8 -4 -20 -9q-30 -12 -53 -20q-38 -13 -69 -21q-5 -6 -11 -6q-7 0 -12 8.5t-5 19.5q0 6 1 8z" />
-    <glyph glyph-name="huiyuan1" unicode="&#xe610;" 
-d="M614 -212h-204q-63 0 -94 0.5t-80 3t-73 9t-51 17t-38 28.5t-11 42v20q0 93 46.5 171.5t126.5 124.5t174 46h204q94 0 174 -46t126.5 -124.5t46.5 -171.5v-20q0 -18 -6.5 -32.5t-22.5 -25t-31 -18t-44.5 -12t-50 -7t-60.5 -4t-63 -1.5h-69v0v0zM408 193
-q-120 0 -205.5 -84t-85.5 -202v-21q0 -14 25 -23t77 -12.5t88.5 -4t100.5 -0.5h208q56 0 91.5 0.5t89.5 4t82 12.5t28 23v21q0 118 -85.5 202t-205.5 84h-208v0zM502 270q-114 0 -194.5 79.5t-80.5 191.5t80.5 191.5t194.5 79.5t194.5 -79.5t80.5 -191.5t-80.5 -191.5
-t-194.5 -79.5v0v0v0zM283 542q0 -89 64 -152t154.5 -63t154.5 63t64 151.5t-64 151.5t-154.5 63t-154.5 -63t-64 -151v0v0v0z" />
-    <glyph glyph-name="xiazai" unicode="&#xe6d2;" 
-d="M356 296v-1v-1v-2v0v-0.5v-0.5q0 -1 1 -2v-1l0.5 -0.5l0.5 -0.5l140 -157l0.5 -0.5l0.5 -0.5h0.5h0.5v-0.5v-0.5q1 0 2 -1h0.5h0.5q4 -1 7 1l1 2v0v0l147 157l1 1v1q0 1 1 2v0.5v0.5v0v1q0 8 -8 8h-93v102q0 7 -5 12t-12 5h-68q-7 0 -12 -5t-5 -12v-102v0l-93 -1
-q-6 0 -8 -4zM849 446q-9 24 -34 24q-15 0 -25.5 -10.5t-10.5 -26.5q0 -8 3 -15v0q0 -1 5.5 -15t6.5 -17.5t5.5 -15.5t6 -18.5t4 -16.5t3.5 -18t1 -16q0 -127 -89.5 -216.5t-216 -89.5t-216 89.5t-89.5 216t89.5 216t215.5 89.5q43 0 120 -30v0q8 -5 18 -5q15 0 25.5 10.5
-t10.5 25.5q0 21 -17 32v0v0q-3 1 -6 3q-68 32 -151 32q-101 0 -187 -50t-136 -136t-50 -187.5t50 -187.5t136 -136t187.5 -50t187.5 50t136 136t50 188q0 74 -33 145zM474 437h68q7 0 12 5t5 12v17q0 7 -5 12t-12 5h-68q-7 0 -12 -5t-5 -12v-17q0 -7 5 -12t12 -5z" />
-    <glyph glyph-name="zhengque1" unicode="&#xe6e0;" 
-d="M449 100q-15 0 -25 11l-257 257q-11 10 -11 25t10.5 25.5t25.5 10.5t25 -11l232 -231l392 392q10 10 25 10t25.5 -10.5t10.5 -25t-10 -25.5l-418 -417q-10 -11 -25 -11z" />
-    <glyph glyph-name="richeng" unicode="&#xe641;" 
-d="M874 -110h-750q-28 0 -48 19.5t-20 48.5v750q0 28 20 48t48 20h68v-34q0 -42 30 -72t72.5 -30t72.5 30t30 72v34h205v-34q0 -42 29.5 -72t72 -30t72.5 30t30 72v34h68q29 0 49 -20t20 -48v-750q0 -28 -20 -48t-49 -20v0zM879 592h-759v-638h759v638v0zM295 398h-103v102
-h103v-102v0zM295 227h-103v103h103v-103v0zM295 57h-103v102h103v-102v0zM465 398h-102v102h102v-102v0zM465 227h-102v103h102v-103v0zM465 57h-102v102h102v-102v0zM636 398h-103v102h103v-102v0zM636 227h-103v103h103v-103v0zM636 57h-103v102h103v-102v0zM806 398h-102
-v102h102v-102v0zM806 227h-102v103h102v-103v0zM806 57h-102v102h102v-102v0zM703 674q-28 0 -47.5 19.5t-19.5 47.5v70q0 28 19.5 47.5t47.5 19.5t47.5 -19.5t19.5 -47.5v-70q0 -28 -19.5 -47.5t-47.5 -19.5v0zM294 674q-28 0 -48 19.5t-20 47.5v70q0 28 20 47.5t47.5 19.5
-t47.5 -19.5t20 -47.5v-70q0 -28 -20 -47.5t-47 -19.5v0zM294 674z" />
-    <glyph glyph-name="fo" unicode="&#xe606;" 
-d="M844 385q0 13 -8 24t-20 16q13 13 13 31t-12.5 30.5t-30.5 12.5h-4q3 8 3 18q0 17 -12.5 30t-30.5 13q-2 0 -4 -1q2 7 2 14q0 18 -12.5 30.5t-30.5 12.5h-4q2 7 2 15q0 18 -12.5 30.5t-30.5 12.5h-3q2 7 2 15q0 17 -12.5 30t-30.5 13q-2 0 -5 -1q1 5 1 10q0 16 -10 28
-t-25 15v3q0 18 -12.5 30.5t-30.5 12.5t-30.5 -12.5t-12.5 -30.5v-4q-15 -3 -24 -14.5t-9 -27.5q0 -5 1 -10q-3 1 -5 1q-18 0 -30.5 -13t-12.5 -30q0 -8 2 -15h-3q-18 0 -30.5 -12.5t-12.5 -30.5q0 -8 2 -15h-4q-18 0 -30.5 -12.5t-12.5 -30.5q0 -7 2 -14q-2 1 -4 1
-q-18 0 -31 -13t-13 -30q0 -10 4 -18h-4q-18 0 -30.5 -12.5t-12.5 -30.5t13 -31q-12 -5 -20 -16t-8 -24q0 -16 11 -28q-1 -20 13 -47q22 -41 34 -105.5t5 -118.5q-2 -11 -5.5 -29t-6 -30.5t-2.5 -15.5q0 -17 12 -28.5t29 -11.5q15 0 26.5 9.5t13.5 24.5h1q4 -5 9 -10t22 -16
-t36 -19t51 -15t68 -7t68 7t51.5 15t36 19t21.5 16t9 10h1q2 -15 13.5 -24.5t26.5 -9.5q17 0 29 11.5t12 28.5q0 3 -2.5 15.5t-6 30.5t-5.5 29q-7 54 5 118.5t34 105.5q15 27 14 47q10 12 10 28zM767 380v-21q-9 -68 -17 -98q-6 -23 -18 -129q-10 -81 -70.5 -129t-138.5 -52
-q-77 4 -136.5 52t-69.5 129q-13 106 -18 129q-4 14 -8 38l-7 42l-2 18v8q-1 0 -2 12.5t1 30t9 34t26 26.5t47 7q113 -14 172 -14t148 14q24 3 41 -3t25.5 -17t13 -26.5t5 -27t-0.5 -23.5zM689 323h-99q29 -22 65.5 -18.5t79.5 38.5q-25 -15 -46 -20zM576 150q12 18 -6 39
-q-10 11 -18 33.5t-9 50.5t6.5 54t33.5 46t69 25q27 3 52.5 -7t36.5 -22l12 -11q-1 2 -2.5 6t-9.5 14.5t-18 18.5t-28.5 14.5t-40.5 6.5q-64 0 -100 -54.5t-14 -142.5q2 -5 5.5 -17t5 -18t2 -15t-2 -13.5t-9 -8.5t-18.5 -4v0q41 -13 53 5zM509 408.5q0 6.5 4.5 10.5t11 4
-t10.5 -4t4 -10.5t-4 -11t-10.5 -4.5t-11 4.5t-4.5 11zM524 408zM472 150q-12 18 7 39q9 11 16.5 33.5t8.5 51t-6.5 54.5t-33.5 46t-67 24q-27 3 -52.5 -7t-37.5 -22l-12 -11l3 6t9.5 14.5t17.5 18.5t28.5 14.5t41.5 6.5q63 0 99 -54.5t14 -142.5q-2 -5 -5.5 -17t-5 -18
-t-2 -15t2 -13.5t9.5 -8.5t18 -4v0q-5 -2 -12 -3.5t-21.5 -0.5t-19.5 9zM359 323h99q-29 -22 -65.5 -18.5t-79.5 38.5q25 -15 46 -20zM450 68q74 -76 147 0q-36 -5 -73 -5t-55 2zM592 76l6 1q-9 9 -19 16q-13 10 -26 10q-8 1 -15.5 -2.5t-10.5 -7.5l-4 -3q-1 1 -4 3.5
-t-10.5 6.5t-14.5 3q-14 0 -26 -10q-9 -7 -19 -16v0v0v0l2 -1q70 -10 141 0zM737 8q0 8 6 14t14 6t13.5 -6t5.5 -14t-5.5 -13.5t-13.5 -5.5t-14 5.5t-6 13.5zM281 8q0 8 5.5 14t13.5 6t14 -6t6 -14t-6 -13.5t-14 -5.5t-13.5 5.5t-5.5 13.5z" />
-    <glyph glyph-name="fo3" unicode="&#xe60c;" 
-d="M483 826q-5 -13 -12 -36.5t-11 -32.5q-7 -21 -12 -29q-2 -4 -5.5 -7t-9 -6.5t-7.5 -5.5q-18 -14 -20 -30q-1 -11 4 -23q-9 -4 -10.5 -6.5t-0.5 -11.5q1 -6 12.5 -38.5t6.5 -51.5q7 0 10 5t4 13.5t3 11.5q9 -6 12 -23q4 -14 -10 -22q-10 -5 -30.5 -11t-24.5 -7
-q-13 -5 -22.5 -14t-14.5 -16.5t-8 -23t-4 -21.5t-2 -24q-5 -49 -8 -63q0 -2 -1 -7.5t-1.5 -7t-1.5 -6t-0.5 -6.5t0.5 -6t1 -7t2 -6.5t3 -7.5q1 -1 2 -3q6 -12 7.5 -17t-3.5 -18q-27 -3 -54 -14q-29 -13 -41 -29q-3 -4 -4.5 -9t-1.5 -8.5t1.5 -9.5t2.5 -8.5t4.5 -9.5t3.5 -8
-q2 -4 0 -7.5t-6.5 -7.5t-5.5 -7q-5 -10 -3 -25q0 -7 5 -29q-16 -10 -28 -19q-21 -18 -30 -40q-5 -12 -7 -27q-1 -7 -1 -15q7 -4 15 -7q45 -19 115 -29q122 -17 284 -3q55 4 133 17q4 0 10 1q28 5 43.5 8t38 11.5t37.5 20.5q18 15 -9 50q-18 23 -50 39q-7 3 -13 5
-q-3 1 -4 2.5t-1 3t0.5 4.5t0.5 4q1 18 2 38q0 1 -13 14q5 8 7 15q6 16 2 29q-5 18 -30 33q-10 5 -25 11q-5 2 -12 7t-10 6t-6 1.5t-4 1.5t-1 5q0 8 2 16q0 2 10 27q8 20 5 46q-9 84 -43 134q-6 7 -23 13.5t-34.5 10.5t-33.5 10.5t-19.5 15.5t7.5 26q5 6 7 -2q1 -3 1 -4
-q4 -11 13 -14q8 -3 9 0.5t-2 8.5q-1 3 -1 5q-3 11 -1 24q2 6 6 20t5 22q2 17 -5 22q-3 2 -5 4t-2.5 4t-0.5 5v7q-1 17 -16 31q-7 6 -19 13q-4 3 -5.5 10t-2.5 9q-2 3 -6.5 7.5t-5.5 6.5q-4 6 -4 23q-9 23 -12 31q-1 1 -3 5.5t-2 6.5q-3 6 -8 6h-4v0z" />
-    <glyph glyph-name="muyu2" unicode="&#xe612;" 
-d="M752 409q17 -7 47 -17t47 -16.5t39.5 -24t34.5 -41t20.5 -66t8.5 -100.5q0 -34 -2 -61.5t-5.5 -48t-9 -36t-13 -26t-17 -17t-21 -10t-24.5 -5t-28 -2t-31 -0.5q-15 1 -22 1h-347q-43 0 -71 27t-37 67t-2 85q9 63 65.5 79t114.5 -24q13 -9 29 -21t22.5 -16t17.5 -9.5
-t21 -6t25 0.5q47 3 71.5 36t24.5 83q0 27 -4.5 51.5t-15 49.5t-31.5 40t-50 15q-24 0 -45.5 -11t-36.5 -24t-41.5 -24t-58.5 -11q-31 0 -53 27t-27.5 65.5t-1 77t27 65.5t56.5 27q36 0 69 -16.5t59.5 -40t79.5 -59t115 -63.5zM460.5 821q-31.5 16 -69 -1t-58.5 -57
-q-19 -37 -14 -73.5t30 -56.5q-257 -493 -275 -536q-12 -28 7 -45q22 -20 48 8q13 14 24 39q28 67 225 519q30 -5 60 13t48 52q21 41 13.5 81.5t-39 56.5z" />
-    <glyph glyph-name="xiaoxizhongxin" unicode="&#xe605;" 
-d="M48 669v-395q0 -57 40.5 -98t98.5 -41h208l7 -175l205 175h234q58 0 98.5 41t40.5 98v395q0 58 -40.5 98.5t-98.5 40.5h-654q-58 0 -98.5 -40.5t-40.5 -98.5v0zM647 449.5q0 27.5 19.5 47t46.5 19.5t46.5 -19.5t19.5 -47t-19.5 -46.5t-46.5 -19t-46.5 19t-19.5 46.5z
-M446 449.5q0 27.5 19.5 47t46.5 19.5t46.5 -19.5t19.5 -47t-19.5 -46.5t-46.5 -19t-46.5 19t-19.5 46.5zM249 449.5q0 27.5 19 47t46.5 19.5t46.5 -19.5t19 -47t-19 -46.5t-46.5 -19t-46.5 19t-19 46.5z" />
-    <glyph glyph-name="shouqi" unicode="&#xe677;" 
-d="M833 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5zM545 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5zM256 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11
-v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5z" />
-    <glyph glyph-name="mima1" unicode="&#xe654;" 
-d="M847 -128h-675q-44 0 -75 29t-31 71v424q0 41 30.5 70.5t75.5 29.5h26v98q0 128 90.5 215t220.5 87t221 -87t91 -215v-99h26q44 0 75 -29t31 -71v-424q0 -41 -31 -70t-75 -29zM465 187v-111q0 -18 13 -30t31.5 -12t31.5 12t13 30v111q20 11 32.5 30.5t12.5 42.5
-q0 35 -26.5 59.5t-63 24.5t-63 -24.5t-26.5 -59.5q0 -23 12.5 -42.5t32.5 -30.5zM732 598q0 87 -65 148.5t-157.5 61.5t-157.5 -61.5t-65 -148.5v-102h445v102z" />
-    <glyph glyph-name="xiangshangjiantou" unicode="&#xe65d;" 
-d="M966 227l-435 432q-7 7 -17.5 7t-17.5 -7l-442 -432q-7 -7 -7 -17.5t7.5 -17.5t17.5 -7t18 7l425 416l416 -416q7 -7 17.5 -7t18 7t7.5 17.5t-8 17.5z" />
-    <glyph glyph-name="xiangxiajiantou" unicode="&#xe65e;" 
-d="M966 573q-7 7 -17.5 7t-17.5 -7l-416 -416l-425 416q-8 7 -18 7t-17.5 -7t-7.5 -17.5t7 -17.5l442 -432q7 -8 17.5 -8t17.5 8l435 432q15 20 0 35z" />
-    <glyph glyph-name="xiangyoujiantou" unicode="&#xe65f;" 
-d="M762 406l-432 436q-8 7 -18 7t-17.5 -7.5t-7.5 -17.5t7 -18l416 -416l-416 -425q-7 -7 -7 -17.5t7.5 -18t17.5 -7.5t18 8l432 441q7 7 7 17.5t-7 17.5z" />
-    <glyph glyph-name="xiangzuojiantou" unicode="&#xe660;" 
-d="M730 -35l-416 425l416 416q7 8 7 18t-7.5 17.5t-17.5 7.5t-18 -7l-432 -436q-7 -7 -7 -17.5t7 -17.5l432 -441q8 -8 18 -8t17.5 7.5t7.5 18t-7 17.5z" />
-    <glyph glyph-name="zhankai1" unicode="&#xe69c;" 
-d="M928 704h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5zM928 416h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5z
-M928 127h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5z" />
-    <glyph glyph-name="location" unicode="&#xe6c2;" 
-d="M513 -94h-1q-26 0 -44 19q-89 92 -172 205q-166 223 -166 350q0 104 51 192t139 139t192 51t192 -51t139 -139t51 -192q0 -77 -58 -186q-57 -105 -168 -241l-1 -1l-109 -126q-18 -20 -45 -20v0zM512 805q-88 0 -163 -43.5t-118.5 -118.5t-43.5 -163q0 -108 155 -316
-q81 -110 168 -200q1 -1 2 -1h1q1 0 2 1l109 125q107 132 161 232q52 97 52 159q0 88 -43.5 163t-118.5 118.5t-163 43.5zM512 302q-74 0 -126.5 52t-52.5 126t52.5 126.5t126.5 52.5t126.5 -52.5t52.5 -126.5t-52.5 -126t-126.5 -52zM512 602q-50 0 -85.5 -35.5t-35.5 -86
-t35.5 -86t85.5 -35.5t85.5 35.5t35.5 86t-35.5 86t-85.5 35.5z" />
-    <glyph glyph-name="suoxiaotuichuquanpingshouhui" unicode="&#xe794;" 
-d="M410 382h-312q-14 0 -23 -9t-9 -22.5t9 -23t23 -9.5h242l-267 -267q-9 -9 -9 -21.5t9 -21.5t21.5 -9t21.5 8l270 270v-247q0 -13 9 -22.5t22.5 -9.5t23 9.5t9.5 22.5v320q0 32 -40 32zM553 446h313q13 0 22.5 9.5t9.5 23t-9.5 22.5t-22.5 9h-243l267 268q9 9 9 21.5
-t-9 21.5t-21.5 9t-21.5 -9l-269 -269v246q0 14 -9.5 23t-23 9t-22.5 -9t-9 -23v-320q0 -15 10.5 -23.5t28.5 -8.5z" />
-    <glyph glyph-name="xitong1" unicode="&#xe61b;" 
-d="M512.5 208q-72.5 0 -124 51.5t-51.5 124t51.5 123.5t124 51t124 -51t51.5 -123.5t-51.5 -124t-124 -51.5zM923 461v0l-82 19l-2 6q-8 26 -22 52l-3 6l44 74q12 18 13 36t-11 33l-42 42q-12 13 -33 13t-37 -12h-1l-72 -46l-6 3q-25 14 -52 22l-6 2l-19 84v0
-q-3 19 -17.5 34t-33.5 15h-59q-17 0 -30 -15t-17 -35l-21 -82l-6 -2q-29 -9 -56 -24l-6 -3l-74 47v0q-16 12 -37 12t-33 -13l-42 -42q-12 -14 -11 -32.5t12 -36.5l47 -77l-3 -6q-13 -26 -20 -49l-2 -6l-83 -19v0q-19 -3 -34 -17.5t-15 -33.5v-59q0 -17 15 -30t35 -18l83 -20
-l2 -6q8 -23 19 -46l3 -6l-47 -77q-11 -18 -12 -36t11 -33l42 -42q12 -13 33 -13t37 12v0l75 47l5 -3q28 -15 56 -24l6 -2l21 -82q5 -20 17.5 -35t30.5 -15h59q18 0 32.5 15t18.5 34v0l18 84l7 2q26 9 51 22l6 3l72 -46h1q16 -12 37 -12t33 13l42 42q12 15 11 33t-13 36
-l-44 74l3 6q12 24 20 49l2 6l83 20q21 5 35.5 18t14.5 30v59q0 19 -15 33.5t-34 17.5v0z" />
-    <glyph glyph-name="ai-edit" unicode="&#xe613;" horiz-adv-x="1025" 
-d="M202 771q-41 0 -70.5 -29t-29.5 -70v-598q0 -41 29.5 -70t70.5 -29h598q41 0 70 29t29 70v393l103 99v-529q0 -68 -50 -116.5t-119 -48.5h-668q-68 0 -116.5 48.5t-48.5 116.5v661q0 70 49 123t116 53h529l-99 -103h-393zM568 285l-222 -63l63 221zM590 307l-159 158
-l349 346l159 -157zM1010 725l-47 -47l-159 157l48 47q13 13 31 14t30 -12l99 -98q13 -12 12 -30t-14 -31v0zM1010 725z" />
-    <glyph glyph-name="sanjiao" unicode="&#xe6a2;" 
-d="M290 818l651 -440l-651 -441v881z" />
-    <glyph glyph-name="error-circle" unicode="&#xe615;" 
-d="M511 -61q-89 0 -170.5 34t-144.5 97t-97 144t-34 170.5t34 171t97 144.5t144.5 96.5t170.5 33.5t170.5 -33.5t144.5 -96.5t96.5 -144.5t33.5 -171t-33.5 -170.5t-96.5 -144t-144.5 -97t-170.5 -34zM511 779q-79 0 -151 -30t-128 -85.5t-85.5 -127.5t-29.5 -151t29.5 -151
-t85.5 -128t128 -86t151 -30t151 30t128 86t85.5 128t29.5 151t-29.5 151t-85.5 127.5t-128 85.5t-151 30zM362.5 212q-10.5 0 -18 7.5t-7.5 18t8 18.5l296 297q8 7 18.5 7t18 -7.5t7.5 -18t-8 -18.5l-296 -296q-8 -8 -18.5 -8zM659.5 212q-10.5 0 -18.5 8l-296 296
-q-8 8 -8 18.5t7.5 18t18 7.5t18.5 -7l296 -297q8 -8 8 -18.5t-7.5 -18t-18 -7.5z" />
-    <glyph glyph-name="shouqi1" unicode="&#xe65b;" 
-d="M510 768l419 -419q14 -14 32.5 -14t32.5 14t14 32.5t-14 32.5l-482 482l-482 -482q-14 -14 -14 -32.5t14 -32.5t32.5 -14t32.5 14l415 419v0zM512 305l419 -419q14 -14 32.5 -14t32.5 14t14 32.5t-14 32.5l-484 482l-482 -482q-14 -14 -14 -32.5t14 -32.5t32.5 -14
-t32.5 14l417 419v0zM512 305z" />
-    <glyph glyph-name="jian" unicode="&#xe648;" 
-d="M797 516h-91v139q0 47 -33 80t-79 33h-352q-47 0 -80 -33t-33 -80v-351q0 -47 33 -80t80 -33h143v-87q0 -42 29.5 -71.5t70.5 -29.5h312q42 0 71.5 29.5t29.5 71.5v312q0 41 -29.5 70.5t-71.5 29.5zM242 255q-20 0 -34.5 14.5t-14.5 34.5v351q0 21 14.5 35t34.5 14h352
-q20 0 34.5 -14t14.5 -35v-139h-158q-41 0 -70.5 -29.5t-29.5 -70.5v-161h-143zM643 452v-148q0 -20 -14.5 -34.5t-34.5 -14.5h-145v161q0 15 10.5 25.5t25.5 10.5h158zM834 104q0 -15 -10.5 -26t-26.5 -11h-312q-15 0 -25.5 11t-10.5 26v87h145q46 0 79 33t33 80v148h91
-q16 0 26.5 -10.5t10.5 -25.5v-312z" />
-    <glyph glyph-name="daiban1" unicode="&#xe679;" 
-d="M511 831q-91 0 -173.5 -35.5t-142 -95t-94.5 -142t-35 -173t35 -173t94.5 -142t142 -95t173 -35.5t173 35.5t142.5 95t95 142t35 173t-35 173t-95 142t-142.5 95t-172.5 35.5v0zM495 728q5 1 5 2h20q22 -10 24 -12q27 -22 18 -55q-10 -34 -45 -38q-21 -2 -37.5 10
-t-20.5 32t6.5 37.5t29.5 23.5v0zM273 633q51 -35 153 -114q60 -47 116 -91q27 -21 21 -52q-7 -34 -40 -42q-34 -7 -55 20q-138 178 -179 234q-21 29 -31 46q-2 5 -3 8q7 -1 18 -9v0zM856 372q-1 0 -1 -4q0 -2 1 -3v-8q-1 -5 -2 -15.5t-2 -16.5q-13 -74 -56 -137
-q-45 -64 -112 -103q-60 -34 -125 -43q-3 0 -11 -0.5t-12 -0.5h-5h-3h-4h-27h-3h-3h-8q-5 0 -15.5 1t-16.5 2q-93 17 -165 78q-64 54 -96 133q-17 40 -22 83q-1 3 -1 9.5t-1 9.5v8q0 1 1 3l-1 4v27q1 0 1 2.5v2.5l-1 3v6q0 1 4 22q6 44 24 86q4 11 15 16t22 1
-q16 -5 22.5 -18.5t0.5 -28.5q-10 -28 -15 -49q-15 -74 8 -144q21 -61 66 -106q39 -41 92 -63q56 -23 116 -21q83 4 150 51q64 45 95 117q30 69 20 143q-15 116 -109 189q-6 4 -12.5 8t-14.5 9t-12 7q-9 7 -14 15q-14 22 6 42q14 15 37 4q106 -56 157 -163q25 -53 30 -113
-q1 -4 2 -4v-6q-1 0 -1 -2.5v-2.5v-4l1 -4v-22v0zM856 372z" />
-    <glyph glyph-name="laba" unicode="&#xe647;" 
-d="M867 611q-9 10 -22 10t-22.5 -9.5t-9.5 -22.5t9 -23q74 -73 74 -182q0 -104 -74 -182q-9 -10 -9 -23t9.5 -22.5t22.5 -9.5t22 10q93 93 93 227t-93 227zM774 518q-9 10 -22 10t-22.5 -9.5t-9.5 -22.5t10 -22q38 -39 38 -90q0 -56 -38 -90q-10 -9 -10 -22t9.5 -22.5
-t22.5 -9.5t22 10q58 57 58 134q0 38 -15.5 74t-42.5 60zM557 752l-237 -144v-448l237 -144q33 -21 58 -7.5t25 52.5v643q0 40 -25 54t-58 -6zM64 512v-256q0 -41 27.5 -68.5t68.5 -27.5h96v448h-96q-41 0 -68.5 -27.5t-27.5 -68.5z" />
-    <glyph glyph-name="shenfenxinxi" unicode="&#xe810;" 
-d="M511 707h324q24 0 37 -2q87 -11 87 -98q1 -228 0 -438q0 -48 -29 -77.5t-77 -29.5q-361 -1 -684 0q-48 0 -76 28t-28 75q-1 220 0 436q1 105 106 106h340v0v0zM413 210v82q-2 25 -19 44t-41 21q-63 5 -128 0q-22 -1 -37.5 -15t-19.5 -36q-2 -14 -3 -29.5t-1.5 -36
-t-0.5 -30.5h250v0v0zM365 486q0 31 -22 52.5t-54 22.5q-32 0 -54 -22t-22 -54t22 -54t54 -22t54 22.5t22 54.5v0v0zM661 308h118q33 0 34 26q2 30 -32 30q-123 1 -239 0q-33 0 -32 -31q1 -25 34 -25h117v0v0zM661 205v0h118q34 1 34 26q0 13 -8.5 21t-23.5 8q-107 1 -240 0
-q-16 0 -22 -9q-12 -17 -6 -27q11 -17 28 -18t120 -1v0v0zM704 409h75q16 0 25 7.5t9 19.5q-1 25 -32 26q-79 1 -157 0q-15 -1 -23.5 -9t-7.5 -19q4 -25 34 -25h77v0v0zM704 409z" />
-    <glyph glyph-name="zhankai" unicode="&#xe63c;" 
-d="M204 391l326 -289l288 288l41 -42l-327 -327l-367 326zM204 747l326 -290l288 289l41 -42l-327 -327l-367 326z" />
-    <glyph glyph-name="icon-yxj-record" unicode="&#xe639;" 
-d="M774 476h-520q-9 0 -16 7t-7 16.5t7 16t16 6.5h520q9 0 16 -6.5t7 -16t-7 -16.5t-16 -7zM623 297h-369q-9 0 -16 8t-7 17.5t7 17.5t16 8h369q9 0 16 -8t7 -17.5t-7 -17.5t-16 -8zM689 118h-435q-9 0 -16 8t-7 17.5t7 17.5t16 8h435q9 0 16 -8t7 -17.5t-7 -17.5t-16 -8z
-M660 660h-296q-38 0 -64 25.5t-26 62.5q0 30 19 53.5t50 29.5q7 29 31 47t56 18h164q32 0 56 -18t31 -47q31 -6 50 -29.5t19 -54.5q0 -36 -26 -61.5t-64 -25.5zM430 850q-19 0 -31 -11.5t-12 -28.5q0 -9 -7 -16t-16 -7q-19 0 -31 -10.5t-12 -27.5t12 -27t31 -10h296
-q19 0 31 10.5t12 27t-12 27.5t-31 11q-9 0 -16 6.5t-7 16.5q0 17 -12 28t-31 11h-164zM842 -127h-660q-49 0 -83.5 34.5t-34.5 83.5v660q0 49 34.5 83.5t83.5 34.5h115q10 0 17 -7t7 -16.5t-7 -16.5t-17 -7h-115q-29 0 -50 -21t-21 -50v-660q0 -29 21 -50t50 -21h660
-q29 0 50 21t21 50v660q0 29 -21 50t-50 21h-115q-10 0 -17 7t-7 16.5t7 16.5t17 7h115q49 0 83.5 -34.5t34.5 -83.5v-660q0 -49 -34.5 -83.5t-83.5 -34.5z" />
-    <glyph glyph-name="huiyuan" unicode="&#xe62c;" 
-d="M573 462q-40 -17 -73.5 -44.5t-58 -63.5t-38 -78t-13.5 -89q0 -41 10.5 -79t29.5 -71h-21q-23 0 -53.5 1.5t-63.5 4.5l-64 6q-32 4 -58.5 8t-44.5 8t-23 8q-8 6 -12.5 39t3.5 84q3 20 13 32.5t24 22t31.5 15t36 10.5t35.5 11t31 15q16 10 25.5 20t13.5 19.5t4 19.5t-1 23
-q-2 18 -13 29t-24 22q-7 5 -12 15t-9 20q-4 12 -8 25q-6 1 -11 5t-10.5 11.5t-9.5 21t-3 24.5t5 19q3 9 10 17q0 30 3 60q3 26 11 55t25 52q16 22 34 36t38 22t39 10.5t38 2.5q23 0 45.5 -5t42 -13.5t35 -19.5t24.5 -22q21 -26 30.5 -56.5t13.5 -58.5q4 -31 4 -64
-q5 -4 8 -10t5 -14.5t1 -21.5q-2 -17 -7 -27t-11 -15q-8 -7 -15 -9l-4 -10l-4 -11q-1 -6 -4 -12v0v0zM687 436q51 0 96.5 -19.5t79.5 -53.5t53.5 -79.5t19.5 -97t-19.5 -97.5t-53.5 -80t-79.5 -53t-96.5 -19q-53 0 -98.5 19t-79 53t-53.5 80t-20 97t20 97t53.5 80t79 53.5
-t98.5 19.5v0v0zM832 235q5 16 -4 29t-24 18.5t-30 1t-22 -24.5q-4 -14 -8 -25q-4 -12 -7 -24q-4 -13 -9 -27.5t-13 -33.5q-8 -21 -22.5 -19.5t-22.5 16.5q-9 16 -16 34q-7 17 -15 36q-7 17 -12 32q-6 14 -10 23q-6 12 -21 14t-28.5 -4t-23 -19t-2.5 -28q5 -16 12 -35.5
-t15 -40.5q8 -20 15.5 -40t12.5 -34q12 -30 36 -45t50.5 -16t51 11.5t35.5 38.5q9 21 18 43t17.5 44t15.5 41q7 20 11 34v0v0zM832 235z" />
-    <glyph glyph-name="renshiguanli" unicode="&#xe60d;" horiz-adv-x="1029" 
-d="M839 82v4.5v4.5l-16 -9h16zM701 103l15 85q0 5 -3 9l-61 60q-23 22 -14 48q1 5 3 8q-14 7 -34 15q-6 1 -18 4.5t-18 4.5q-12 9 -36 59q-8 1 -23 3q1 14 11 26.5t12 19.5t3 26.5t6 28.5q3 6 13 11t13 9q8 11 12 34q8 42 -2 63q-2 4 -4.5 8.5t-4 7.5t-1.5 9q-1 10 2 44
-t3 35q1 51 -7 84q-9 26 -22 34l-27 4l-17 15q-24 15 -49.5 20t-51.5 0t-40.5 -9.5t-35.5 -13.5q-44 -14 -63.5 -71t-2.5 -140q3 -11 -3.5 -23t-6.5 -16q0 -2 1 -17t2.5 -23t4 -21t7 -21t10.5 -12q1 0 5.5 -1.5t8.5 -2.5t4 0l6 -69q3 -5 12 -15.5t11 -22.5l-17 -4
-q-24 -50 -36 -59q-6 -2 -18 -5t-18 -5q-24 -9 -69.5 -29t-61.5 -26q-8 -3 -29.5 -11t-31.5 -12.5t-22.5 -15.5t-17.5 -25v-126h419h283q-2 11 -1 21zM762 349q5 1 8 6l1 1q-18 8 -33 14q-23 6 -35 9q-12 8 -34 56l-22 4q0 13 9.5 24.5t12 18.5t3.5 25.5t5 27.5q3 5 12.5 10
-t12.5 9q8 10 12 32q7 41 -3 61q-1 3 -3.5 7.5t-4 7.5t-1.5 9q-1 9 2 41.5t3 33.5q1 49 -7 80q-9 25 -21 32l-26 5l-16 14q-49 31 -118 12q1 0 1 -1l3 -1l12 -11l23 -4l5 -3q25 -14 38 -53v-1l1 -1q9 -38 8 -93q0 -4 -2 -24q-4 -44 -3 -51v-1q0 -1 1 -2q4 -7 5 -10
-q16 -32 6 -85q-6 -31 -18 -48q-8 -11 -25 -20q0 -3 -1 -13q-1 -21 -4 -33q-3 -7 -7 -13l5 -10q0 -1 1 -2.5t1 -2.5q13 -28 20 -37q5 -1 14 -3.5t13 -3.5l2 -1l3 -1q18 -7 56 -24l1 1zM701 103l15 85q0 5 -3 9l-61 60q-23 22 -14 48q1 5 3 8q-14 7 -34 15q-6 1 -18 4.5
-t-18 4.5q-12 9 -36 59q-8 1 -23 3q1 14 11 26.5t12 19.5t3 26.5t6 28.5q3 6 13 11t13 9q8 11 12 34q8 42 -2 63q-2 4 -4.5 8.5t-4 7.5t-1.5 9q-1 10 2 44t3 35q1 51 -7 84q-9 26 -22 34l-27 4l-17 15q-24 15 -49.5 20t-51.5 0t-40.5 -9.5t-35.5 -13.5q-44 -14 -63.5 -71
-t-2.5 -140q3 -11 -3.5 -23t-6.5 -16q0 -2 1 -17t2.5 -23t4 -21t7 -21t10.5 -12q1 0 5.5 -1.5t8.5 -2.5t4 0l6 -69q3 -5 12 -15.5t11 -22.5l-17 -4q-24 -50 -36 -59q-6 -2 -18 -5t-18 -5q-24 -9 -69.5 -29t-61.5 -26q-8 -3 -29.5 -11t-31.5 -12.5t-22.5 -15.5t-17.5 -25v-126
-h419h283q-2 11 -1 21zM839 82v4.5v4.5l-16 -9h16zM1023 282q7 7 5.5 12.5t-11.5 7.5l-85 12q-9 2 -19 9t-15 16l-38 77q-4 9 -10 9t-11 -9l-38 -77q-4 -9 -14 -16t-20 -9l-85 -12q-9 -2 -11 -7.5t5 -12.5l61 -60q7 -7 11 -18.5t2 -21.5l-14 -85q-3 -15 8 -15q4 0 9 3l76 40
-q8 4 20.5 4t21.5 -4l75 -40q5 -3 9 -3q11 0 8 15l-14 85q-2 9 2 21t11 19zM1023 282q7 7 5.5 12.5t-11.5 7.5l-85 12q-9 2 -19 9t-15 16l-38 77q-4 9 -10 9t-11 -9l-38 -77q-4 -9 -14 -16t-20 -9l-85 -12q-9 -2 -11 -7.5t5 -12.5l61 -60q7 -7 11 -18.5t2 -21.5l-14 -85
-q-3 -15 8 -15q4 0 9 3l76 40q8 4 20.5 4t21.5 -4l75 -40q5 -3 9 -3q11 0 8 15l-14 85q-2 9 2 21t11 19z" />
-    <glyph glyph-name="xinzenghuiyuan" unicode="&#xe61f;" 
-d="M729 4q-84 0 -143.5 59.5t-59.5 143.5q0 60 31.5 109t82.5 74q4 5 7 10q5 12 9 23q6 17 9 27q8 3 16 10q7 6 12 17q6 11 7 29q2 14 0 24q-2 9 -6 15q-3 7 -9 12q0 35 -4 70q-4 29 -14 64q-11 34 -33 62q-9 12 -25.5 24t-37.5 22q-21 9 -45 15q-24 5 -48 5q-20 0 -40 -3
-q-21 -3 -41.5 -11.5t-40.5 -23.5t-36 -40q-18 -25 -27 -57q-8 -32 -12 -60q-4 -33 -3 -67q-8 -8 -11 -18q-4 -9 -5 -21t4 -27q4 -14 10 -22t11 -12q6 -5 12 -7q5 -16 8 -28q4 -10 10 -22q4 -10 11 -17q15 -12 26.5 -23.5t13.5 -31.5q1 -13 1 -25t-4 -22q-5 -11 -14 -21
-q-9 -11 -27 -22q-22 -14 -52 -22t-57 -18q-28 -10 -48 -27q-21 -17 -25 -49q-8 -57 -3.5 -92.5t12.5 -42.5q5 -5 25 -9t47 -9q28 -4 62 -8t69 -7q32 -3 67 -5q33 -2 57 -2q23 0 58 2t69 5q38 3 72 7q37 5 65 10q30 6 49 12q20 6 24 12q6 10 9 28q0 2 1 5q-45 -24 -96 -24z
-M726 383q-74 0 -126 -52t-52 -126t52 -126t126 -52t126.5 52t52.5 126t-52.5 126t-126.5 52v0zM826 207v-5v0q-1 -9 -7.5 -15.5t-15.5 -6.5h-52v-74h-28v0q-9 0 -15.5 6.5t-6.5 15.5v52h-74v28v0q0 9 6.5 15.5t15.5 6.5h52v52v23h29v0q9 -1 15 -7.5t6 -15.5v-52h75v-23v0z
-M826 207z" />
-    <glyph glyph-name="fozhu" unicode="&#xe601;" 
-d="M96 410v-22t1 -24q-33 -15 -48 -47.5t-5 -67.5q9 -31 34.5 -50t57.5 -19q7 0 15 2q11 -21 25 -39q-20 -30 -15 -66t32 -59q27 -24 63 -24t64 24q20 -10 42 -19q0 -36 23 -63.5t59 -32.5q7 -1 14 -1q32 0 57.5 19.5t34.5 50.5q24 2 46 7q28 -45 81 -45q21 0 40 9
-q33 15 47.5 48t4.5 67q18 14 35 30q19 -9 40 -9q53 0 81 44q20 31 14.5 66.5t-32.5 58.5q7 22 13 45q35 5 59 32t24 63v1v1q0 36 -24 63t-60 32q-5 23 -13 44q27 24 32.5 59t-14.5 66t-54.5 40.5t-66.5 -5.5q-17 16 -36 30q11 34 -4 67t-48 48t-67.5 4.5t-53.5 -40.5
-q-22 4 -46 6q-10 34 -40 54t-65.5 14.5t-59 -33t-23.5 -63.5q-22 -8 -42 -19q-27 23 -63 23.5t-63 -23.5t-32 -60t15 -65q-14 -19 -25 -39q-36 5 -66.5 -14t-40.5 -54t5.5 -67.5t47.5 -47.5zM144 403q29 3 52 21t31.5 47t-1 57t-32.5 46q8 13 17 26q21 -11 44 -11
-q36 0 63 23q23 20 30 49t-3 56q14 7 28 13q13 -22 35 -35.5t48 -13.5q7 0 14 1q30 5 51.5 25t28.5 49q14 -2 30 -5q-2 -29 13.5 -54t42.5 -38q19 -8 40 -8q38 0 66 27l24 -20q-17 -24 -18 -53t15 -55v0q29 -44 81 -44q8 0 19 2q5 -15 9 -29q-28 -11 -44.5 -35.5t-16.5 -54.5
-v0v-1q0 -30 17 -54.5t44 -34.5q-4 -15 -9 -30q-28 6 -55.5 -5t-43.5 -37q-17 -26 -15.5 -55t18.5 -53q-12 -10 -23 -20q-21 20 -50 25.5t-57 -7.5q-27 -12 -42 -37.5t-14 -54.5q-16 -3 -30 -5q-7 29 -28.5 49t-51.5 24.5t-56 -9t-41 -38.5q-14 5 -27 12q9 27 2 56t-30 48.5
-t-52.5 23t-55.5 -10.5l-16 26q23 18 32 46t0.5 56.5t-31.5 47t-52 21.5v16v15z" />
-    <glyph glyph-name="iconfontquanping" unicode="&#xe60a;" 
-d="M144 -16h304q13 0 22 9.5t9 22t-9 22t-22 9.5h-236l260 260q9 9 9 21t-9 21t-21 9t-21 -9l-262 -262v240q0 13 -9 22t-22 9t-22 -9t-9 -22v-311q0 -32 38 -32v0zM880 794h-304q-13 0 -22 -9t-9 -22t9 -22t22 -9h236l-260 -261q-9 -8 -9 -20.5t9 -21.5t21 -9t21 9l262 262
-v-240q0 -12 9 -21.5t22 -9.5t22 9.5t9 21.5v312q0 15 -10.5 23t-27.5 8v0z" />
-    <glyph glyph-name="iconfontshuangjiantou" unicode="&#xe608;" 
-d="M535 52l335 341q10 11 10 26.5t-10.5 26t-25.5 10.5t-26 -11l-311 -317l-312 317q-11 11 -26 11t-25.5 -10.5t-10.5 -26t11 -26.5l335 -341q11 -12 28 -10q16 -2 28 10v0v0v0v0zM507 309q16 -1 28 10l335 341q10 11 10 26.5t-10.5 26t-25.5 10.5t-26 -10l-311 -318
-l-312 318q-11 10 -26 10t-25.5 -10.5t-10.5 -26t11 -26.5l335 -341q11 -11 28 -10v0v0v0z" />
-    <glyph glyph-name="temple" unicode="&#xe607;" 
-d="M626 749h-240q15 16 42.5 41t47 45t29.5 39q0 16 3 22q-7 -21 12 -44.5t55 -53.5t51 -49zM715 727v-23q67 -38 74 -38q16 0 28 16q-1 -2 -3 -7t-4.5 -9.5t-4.5 -8.5q-5 -8 -17 -15.5t-19 -7.5h-529q-14 0 -31 19t-14 29q12 -16 29 -16q6 0 36.5 19.5t36.5 25.5v16h418z
-M291 593h431v13h-431v-13zM310 513h392v57h-392v-57zM769 459q77 -51 96 -51q8 0 18 6.5t17 15.5q-1 -9 -11.5 -25t-10.5 -26q0 -3 -10 -13h-727l6 7q-3 5 -17 19.5t-18 27.5v10q5 -9 15 -15.5t20 -6.5q9 0 30 11.5t41.5 25t21.5 14.5q3 6 3 28h526v-28zM220 328h610v13
-h-610v-13zM763 302v-54h-514q0 7 1.5 21.5t1.5 16.5q0 6 -4.5 10t-4.5 6h520zM843 219v-38q1 0 26 -15t53.5 -30.5t38.5 -15.5q28 0 45 29q7 -14 -21 -47t-50 -33h-861q-24 8 -35 20q-12 8 -22 23.5t-10 20.5v16q12 -29 44 -29q13 0 36.5 13t48.5 29.5t30 18.5q3 0 3 10v28
-h674zM157 25h699v16h-699v-16zM189 -52h635v58h-635v-58zM96 -119h820v35h-820v-35z" />
-    <glyph glyph-name="huiyuan2" unicode="&#xe631;" 
-d="M516 821q-88 0 -169 -34t-140.5 -91.5t-95 -137.5t-36.5 -168q-2 -120 56 -221.5t158.5 -161t220.5 -61.5q87 -1 167.5 33t139.5 92t95 138t37 167q1 89 -33 171t-92 141.5t-138.5 95.5t-169.5 37zM809 134q-75 94 -187 130q140 177 10 289q-55 47 -128 44t-123 -55
-q-23 -24 -36 -56t-15 -68.5t17 -77.5t59 -76q-117 -38 -190 -131q-60 66 -82.5 158t3 190.5t97.5 172.5q71 74 169.5 102t198 6t172.5 -90q80 -74 110 -174.5t9 -196.5t-84 -167zM249 99q6 -8 8 -9q63 -62 157 -84.5t188.5 -1.5t160.5 80q9 11 8.5 16.5t-8.5 14.5
-q-140 156 -340 105q-106 -28 -174 -121zM513 281q54 0 94 39t41 94t-39.5 96t-95.5 41q-55 1 -95.5 -39.5t-40.5 -95.5q-1 -56 39 -95.5t97 -39.5z" />
-    <glyph glyph-name="shangchuan1" unicode="&#xe672;" 
-d="M512 896q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM559 128h-56q-12 0 -23 10.5t-11 23.5t11 23.5t23 10.5h56q13 0 23.5 -10.5t10.5 -23.5t-10.5 -23.5t-23.5 -10.5zM687 401h-94v-107
-q0 -12 -8.5 -20.5t-21.5 -8.5h-60q-12 0 -20.5 8.5t-8.5 20.5v107h-103q-12 0 -21 8t-9 18q0 30 13 38l145 162q13 13 30 13t30 -13l145 -162q13 -13 13 -38q-4 -10 -12.5 -18t-17.5 -8z" />
-    <glyph glyph-name="sousuo-sousuo" unicode="&#xe603;" 
-d="M691.5 646.5q-91.5 91.5 -221 91.5t-221 -91.5t-91.5 -221t91.5 -221.5t221 -92t221 92t91.5 221.5t-91.5 221zM181.5 136q-56.5 57 -88 131.5t-31.5 157.5q0 111 54.5 205.5t149 149t205.5 54.5t205 -54.5t149 -149t55 -205.5q0 -83 -31.5 -157.5t-88.5 -131.5
-t-131.5 -88.5t-157.5 -31.5t-158 31.5t-131.5 88.5zM946 -50q-17 -16 -40 -16t-39 16l-79 79q-17 17 -17 40t16.5 39.5t39.5 16.5t40 -17l79 -79q16 -16 16 -39t-16 -40v0z" />
-    <glyph glyph-name="shangchuan" unicode="&#xe63a;" 
-d="M542 144h-60q-12 0 -21 -9t-9 -21.5t9 -21t21 -8.5h60q12 0 21 8.5t9 21t-9 21.5t-21 9zM512 865q-98 0 -187 -38.5t-153.5 -102.5t-102.5 -153t-38 -187t38 -187t102.5 -153t153.5 -102.5t187 -38.5t187 38.5t153 102.5t102.5 153t38.5 187t-38.5 187t-102.5 153
-t-153 102.5t-187 38.5zM512 -55q-89 0 -170.5 35t-140 93.5t-93.5 140t-35 170.5t35 170.5t93.5 140t140 93.5t170.5 35t170.5 -35t140 -93.5t93.5 -140t35 -170.5t-35 -170.5t-93.5 -140t-140 -93.5t-170.5 -35zM541 610q-12 13 -28.5 13t-27.5 -13l-140 -162
-q-14 -16 -12 -38q2 -11 10 -18.5t20 -7.5h89v-150q0 -13 9 -21.5t21 -8.5h60q12 0 21 8.5t9 21.5v150h91q11 0 19.5 7.5t9.5 18.5q3 22 -11 38z" />
-    <glyph glyph-name="shoukuan" unicode="&#xe6fd;" 
-d="M986 269q-20 11 -72.5 -9.5t-105.5 -52t-103.5 -58.5t-64.5 -27q-3 -1 -9.5 -2.5t-27 -2t-42.5 2.5t-54.5 15t-64.5 31q-52 29 -101.5 61t-73.5 50l-24 17q-3 2 -8.5 5t-24 7.5t-37 5t-45 -6.5t-51.5 -23q-17 -12 -36.5 -23t-30 -16.5l-10.5 -5.5v-327q3 4 8.5 9.5
-t22.5 20t35.5 25.5t46 20t53.5 9q43 0 121 -26t137 -51.5t56 -25.5q3 -1 9 -3.5t24 -7t35 -6t39 2t40 14.5l378 282q13 6 18 24t-4.5 39t-32.5 33zM582 211q92 0 170 46t124 124t46 169.5t-46 169.5t-124 124t-170 46q-91 0 -169 -44.5t-124 -121t-46 -167.5
-q0 -92 46 -171.5t124 -127t169 -47.5zM474 749l115 -154l115 154h64l-141 -192h103q2 0 4 -1.5t2 -3.5v-2v-19q0 -3 -1.5 -4.5t-3.5 -1.5h-1h-122v-45h115q3 0 4.5 -1.5t1.5 -3.5l1 -1v-26q0 -3 -2 -4.5t-3 -1.5h-2h-115v-71q0 -6 -13 -6h-25q-3 0 -6.5 1.5t-4.5 3.5l-2 1
-v71h-109q-5 0 -5.5 0.5t-0.5 5.5v19q0 3 1.5 4.5t2.5 1.5l2 1h115v51h-115q-3 0 -4.5 1.5t-1.5 3.5v1v19q0 3 1.5 4.5l2.5 2.5h2h102l-140 192h64z" />
-    <glyph glyph-name="men" unicode="&#xe6cf;" 
-d="M501 422q-19 0 -32.5 -11t-13.5 -27t13.5 -27t32.5 -11t32.5 11t13.5 27t-13.5 27t-32.5 11zM760 784h-497q-32 0 -53.5 -16.5t-24.5 -44.5v0v-672q0 -30 22 -48.5t56 -18.5h497q33 0 56 18t23 44v676q0 26 -23 44t-56 18zM578 57q31 5 51.5 25t20.5 45v514
-q0 25 -20.5 45t-51.5 25l-243 33h425q20 0 33 -13q8 -8 8 -20v-654q0 -12 -8 -20q-13 -13 -33 -13h-425zM613 125q0 -5 -11.5 -17t-20.5 -14l-353 -51v680l353 -49q9 -2 20.5 -14t11.5 -17v-518z" />
-  </font>
-</defs></svg>

src/views/group/holidaySetting/theme/public.css

@@ -1,411 +0,0 @@
-@charset "UTF-8";
-@font-face {
-  font-family: 'iconfont';
-  src: url('font/iconfont/iconfont.eot?t=1492242939353'); /* IE9*/
-  src: url('font/iconfont/iconfont.eot?t=1492242939353#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('font/iconfont/element-icons.woff?t=1492242939353') format('woff'), /* chrome, firefox */
-  url('font/iconfont/element-icons.ttf?t=1492242939353') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-  url('font/iconfont/iconfont.svg?t=1492242939353#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
-  font-family:"iconfont" !important;
-  font-size:16px;
-  font-style:normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-time:before { content: "\e62f"; }
-.icon-richeng:before { content: "\e641"; }
-.icon-guanbi:before { content: "\e617"; }
-
-.icon-xiangzuojiantou:before { content: "\e660"; }
-.icon-xiangyoujiantou:before { content: "\e65f"; }
-
-
-body {
-  margin: 0px;
-  padding: 0px;
-  /*background: url(assets/bg1.jpg) center !important;
-  background-size: cover;*/
-  background: #ffffff;
-  font-size: 12px;
-  -webkit-font-smoothing: antialiased;
-}
-body, button, input, select, textarea {
-  font: 400 1em/1.5 PingFang SC,/*Lantinghei SC,Helvetica Neue,*/Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans;
-}
-ul,li,dl,dt,dd{ margin:0; padding:0; list-style:none;}
-em,i{ font-style:normal; margin:0; padding:0;}
-h1,h2,h3,h4,h5,p{ margin:0; padding:0;}
-a{ cursor: pointer;}
-
-
-.full-jcalendar{
-  position: relative;
-  font-size: 14px;
-  display: inline-block;
-}
-.full-jcalendar .input-icon{
-  position: absolute;
-  width: 28px;
-  height: 100%;
-  right: 0;
-  top: 5px;
-  text-align: center;
-  color: #e8a400;
-  transition: all .3s;
-}
-.full-jcalendar .input-icon .iconfont{
-  font-size: 18px;
-}
-.full-jcalendar .input-icon .iconfont.is-clear{
-  color:#999;
-  font-weight: bolder;
-}
-.full-jcalendar .input-icon__tip{
-  position: absolute;
-  right:28px;
-  top:10px;
-  width:16px;
-  cursor: default;
-  text-align: center;
-}
-.full-jcalendar .input-icon__tip i{
-  display: block;
-  margin:0;
-  padding:0;
-  width:16px;
-  height:16px;
-  background-color: #ff5a00;
-  border-radius: 8px;
-  font-size: 12px;
-  color:#fff;
-  line-height: 16px;
-  text-align: center;
-  overflow: hidden;
-}
-
-.full-jcalendar .input__inner{
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background-color: #fff;
-  background-image: none;
-  border-radius: 5px;
-  border: 1px solid #bfcbd9;
-  box-sizing: border-box;
-  color: #1f2d3d;
-  display: inline-block;
-  font-size: inherit;
-  height: 36px;
-  line-height: 1;
-  outline: none;
-  padding: 3px 10px;
-  transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-  min-width:193px;
-  width: 100%;
-}
-.full-jcalendar .input__inner:focus{
-  outline: none;
-  border-color:#20a0ff;
-}
-.full-jcalendar .input__inner:hover{
-  border-color:#8391a5;
-}
-.input-icon+.input__inner{
-  padding-right:28px;
-}
-.input-icon__tip+.input__inner{
-  padding-right:35px;
-}
-.full-jcalendar input.input__inner::placeholder, .full-jcalendar input.input__inner:-moz-placeholder{
-  color:#97A8BE;
-}
-.full-jcalendar input.is-disabled{
-  background-color: #eef1f6;
-  border-color: #d1dbe5;
-  color: #bbb;
-  cursor: not-allowed;
-}
-.full-jcalendar .is-disabled i{
-   color: #bbb;
- }
-.full-jcalendar .is-disabled *{
-  cursor: not-allowed;
-}
-
-.full-jcalendar__main{
-  cursor: pointer;
-  position: absolute;
-  z-index: 1670;
-  left:2px;
-  top:38px;
-  width:296px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  -moz-box-shadow:2px 2px 5px #C9C9C9;
-  -webkit-box-shadow:2px 2px 5px #C9C9C9;
-  box-shadow:2px 2px 5px #C9C9C9;
-  overflow: hidden;
-}
-.full-jcalendar__main.is-daterange{
-  width:593px;
-}
-.full-jcalendar__main .date-range__month{
-  float: left;
-  width:296px;
-  overflow: hidden;
-}
-.full-jcalendar__main .date-range__month.leftMonth{
-  border-right:1px solid #F8F8F8;
-}
-.full-jcalendar-header{
-  position: relative;
-  width:100%;
-  padding:5px 0;
-  height:24px;
-  font-size: 14px;
-  text-align: center;
-  line-height: 24px;
-  color:#333;
-}
-.full-jcalendar-header span{ display: inline-block;}
-.full-jcalendar-header .title-year:hover,.full-jcalendar-header .title-month:hover{
-  color:#50bfff;
-}
-.date-range__month .full-jcalendar-header .title-year:hover,.date-range__month .full-jcalendar-header .title-month:hover{
-  color:#333;
-}
-.full-jcalendar-header .prev-month,.full-jcalendar-header .next-month {
-  cursor: pointer;
-  line-height: 20px;
-  text-align: center;
-  color: #E1CEB7;
-  font-size: 20px;
-}
-.full-jcalendar-header p.prev-month{
-  position: absolute;
-  z-index: 1676;
-  left:5px;
-  top:5px;
-}
-.full-jcalendar-header p.next-month {
-  position: absolute;
-  z-index: 1676;
-  right: 5px;
-  top: 5px;
-}
-
-.date-range__month .full-jcalendar-header .prev-year{
-  position: absolute;
-  z-index: 1676;
-  left: 5px;
-  top: 5px;
-}
-
-.date-range__month .full-jcalendar-header .prev-month{
-  left:35px;
-}
-.date-range__month .full-jcalendar-header .next-year{
-  position: absolute;
-  z-index: 1676;
-  right: 5px;
-  top: 5px;
-}
-.date-range__month .full-jcalendar-header .next-month{
-  right:35px;
-}
-
-.full-jcalendar__body {
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 280px;
-  position: relative;
-}
-.full-jcalendar__body ul,.full-jcalendar__body p {
-  margin: 0;
-  padding: 0;
-}
-.full-jcalendar__body .weeks {
-  width: 100%;
-  height: 30px;
-  display: flex;
-  border-top: 1px solid #F8F8F8;
-}
-.full-jcalendar__body .weeks .week {
-  flex: 1;
-  text-align: center;
-  font-size: 14px;
-  color: #8391A5;
-  line-height: 30px;
-  border: none;
-}
-.full-jcalendar__body .weeks .week strong {
-  font-weight: normal;
-}
-.full-jcalendar__body .week-row {
-  display: flex;
-  width:100%;
-}
-.full-jcalendar__body .week-row .day-cell {
-  position: relative;
-  flex: 1;
-  padding: 2px;
-  border: 1px solid #F8F8F8;
-  margin-right: -1px;
-  margin-bottom: -1px;
-  text-align: center;
-}
-.full-jcalendar__body .day-cell .day-number .lunar {
-  font-size: 12px;
-  color: #ACACAC;
-}
-.full-jcalendar__body .day-cell .day-number .solar {
-  font-size: 12px;
-  color: #483a32;
-  /*text-shadow: 1px 1px 1px #ddd;*/
-}
-/*.full-jcalendar__body .day-cell.not-cur-month .solar {*/
-  /*text-shadow: none;*/
-/*}*/
-.full-jcalendar__body .day-cell .day-number .solar .is-leap {
-  display: inline-block;
-  width:14px;
-  height:14px;
-  border-radius: 7px;
-  background-color: #f00;
-  font-size: 12px;
-  color: #fff;
-  text-align: center;
-  line-height: 14px;
-}
-.full-jcalendar__body .day-cell .day-number .term {
-  font－size:12px;
-  color: #FFC200;
-}
-.full-jcalendar__body .day-cell .day-number .festival {
-  font－size:12px;
-  color: #ff8610;
-}
-.full-jcalendar__body .day-cell .day-number .is-today {
-  font-size: 12px;
-  color: #20a0ff;
-}
-.full-jcalendar__body .day-cell .day-number .is-empty {
-  line-height: 34px;
-}
-.full-jcalendar__body .day-cell.today {
-  background-color: #FBF9F6;
-}
-.full-jcalendar__body .day-cell.today:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 0;
-  height: 0;
-  border-top: .5em solid #20a0ff;
-  border-left: .5em solid transparent;
-}
-.full-jcalendar__body .day-cell.choose {
-  background-color: #d2ecff;
-}
-.full-jcalendar__body .day-cell.select {
-  background-color: #009bfe;
-}
-.full-jcalendar__body .day-cell.select .lunar,
-.full-jcalendar__body .day-cell.select .solar,
-.full-jcalendar__body .day-cell.select .term ,
-.full-jcalendar__body .day-cell.select .festival ,
-.full-jcalendar__body .day-cell.select .is-today{
-  color: #fff;
-}
-.full-jcalendar__body .day-cell.select .solar .is-leap {
-  background: none;
-}
-.full-jcalendar__body .day-cell.not-cur-month .lunar
-,.full-jcalendar__body .day-cell.not-cur-month .solar
-,.full-jcalendar__body .day-cell.not-cur-month .term
-,.full-jcalendar__body .day-cell.not-cur-month .festival{
-  color: #ddd;
-}
-.full-jcalendar__body .day-cell:hover {
-  background-color: #ECF1F4;
-}
-.full-jcalendar__body .day-cell.choose:hover {
-  background-color: #009bfe;
-}
-.full-jcalendar__body .day-cell.choose:hover .lunar,
-.full-jcalendar__body .day-cell.choose:hover .solar,
-.full-jcalendar__body .day-cell.choose:hover .term ,
-.full-jcalendar__body .day-cell.choose:hover .festival ,
-.full-jcalendar__body .day-cell.choose:hover .is-today{
-  color: #fff;
-}
-.full-jcalendar__body .select:hover{
-  background-color: #009bfe;
-}
-.full-jcalendar__body .day-cell.not-optional{
-  background-color: #ECF1F4;
-}
-.full-jcalendar__month,.full-jcalendar__year{
-  position: absolute;
-  z-index: 1677;
-  top:0;
-  left:0;
-  width:100%;
-  height:100%;
-  background-color: #fff;
-}
-.full-jcalendar__body .close{
-  position: absolute;
-  bottom:10px;
-  right:10px;
-  padding:3px 5px;
-  font-size:12px;
-  background-color: #FBF8FF;
-  border:1px solid #F8F8F8;
-  border-radius: 3px;
-}
-.full-jcalendar__body .data-list{
-  list-style: none;
-  margin:auto;
-  padding:20px 0 0 0;
-  width:85%;
-}
-.full-jcalendar__body .data-list li{
-  position: relative;
-  list-style: none;
-  line-height: normal;
-  float: left;
-  width:25%;
-  text-align: center;
-  padding:5px 0;
-  margin:10px 0;
-  font-size:14px;
-  color:#333;
-}
-.full-jcalendar__body .data-list li:hover ,.full-jcalendar__body .data-list li.select-year {
-  background-color: #50bfff;
-  color: #fff;
-}
-.full-jcalendar__body .data-list li.curr-year:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 0;
-  height: 0;
-  border-top: .5em solid #20a0ff;
-  border-left: .5em solid transparent;
-}
-.full-jcalendar__body .clearfix{
-  float: none;
-  width:100%;
-  clear: both;
-  height:0px;
-  line-height: 0px;
-}