Merge pull request '班组bug' (#448) from projects/line-new-zwq into projects/line-new

Reviewed-on: #448

.env.dev

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

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
     "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",

src/api/group/Schedule.js

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

src/api/group/holidaySetting.js

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

src/api/ssdl/product&recipe.js

@@ -1,139 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2025-11-17 09:25:12
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-19 13:11:54
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得原料分页
-export function getProductPage(query) {
-  return request({
-    url: '/wms/material/page',
-    method: 'get',
-    params: query
-  })
-}
-// 获得原料
-export function getProduct(id) {
-  return request({
-    url: '/wms/material/get?id=' + id,
-    method: 'get'
-  })
-}
-// 删除原料
-export function deleteProduct(id) {
-  return request({
-    url: '/wms/material/delete?id=' + id,
-    method: 'delete'
-  })
-}
-// 更新
-export function updateProduct(data) {
-  return request({
-    url: '/wms/material/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 创建
-export function createProduct(data) {
-  return request({
-    url: '/wms/material/create',
-    method: 'post',
-    data: data
-  })
-}
-
-
-// 获得工艺分页
-export function getProcessPage(query) {
-  return request({
-    url: '/wms/process/page',
-    method: 'get',
-    params: query
-  })
-}
-// 删除工艺
-export function deleteProcess(id) {
-  return request({
-    url: '/wms/process/delete?id=' + id,
-    method: 'delete'
-  })
-}
-// 更新
-export function updateProcess(data) {
-  return request({
-    url: '/wms/process/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 创建
-export function createProcess(data) {
-  return request({
-    url: '/wms/process/create',
-    method: 'post',
-    data: data
-  })
-}
-// 获得工艺
-export function getProcess(id) {
-  return request({
-    url: '/wms/process/get?id=' + id,
-    method: 'get'
-  })
-}
-// 工艺设备原料分页
-export function getProcessMaterialPage(query) {
-  return request({
-    url: '/wms/process-equipment-material/page',
-    method: 'get',
-    params: query
-  })
-}
-// 删除工艺设备原料
-export function deleteProcessMaterial(id) {
-  return request({
-    url: '/wms/process-equipment-material/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 更新
-export function updateProcessMaterial(data) {
-  return request({
-    url: '/wms/process-equipment-material/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 创建
-export function createProcessMaterial(data) {
-  return request({
-    url: '/wms/process-equipment-material/create',
-    method: 'post',
-    data: data
-  })
-}
-// 获得工艺
-export function getProcessMaterial(id) {
-  return request({
-    url: '/wms/process-equipment-material/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得设备分页
-export function getEquipmentPage(query) {
-  return request({
-    url: '/wms/equipment/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/ssdl/taskList.js

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

src/api/visualization/visualization.js

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

src/mixins/basic-page.js

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

src/permission.js

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

src/router/index.js

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

src/store/modules/permission.js

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

src/views/cost/components/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/cost/components/add-or-updata.vue

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

src/views/cost/components/detailDrawer.vue

@@ -1,273 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-11-07 17:01:51
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-07 22:31:17
- * @Description:
--->
-<template>
-	<el-drawer
-		:visible.sync="visible"
-		:with-header="false"
-		size="50%"
-		@close="closeD"
-		:show-close="false">
-		<div class="bgDiv1">
-			<el-row :gutter="20" style="margin-bottom: 15px">
-				<el-col :span="8" style="font-size: 20px; font-weight: 600">
-					TSK202510230001
-				</el-col>
-				<el-col :span="8">满盘搬运（自动）</el-col>
-				<el-col :span="8">
-					上次刷新：{{ parseTime(Date.now()) }}
-					<el-button type="text" @click="refresh">刷新</el-button>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">任务状态</el-col>
-				<el-col :span="8">优先级</el-col>
-				<el-col :span="8">执行车辆</el-col>
-			</el-row>
-			<el-row :gutter="20" style="margin-bottom: 15px">
-				<el-col :span="8">
-					<span
-						:style="{ backgroundColor: statusColor[1].color }"
-						class="taskStatus">
-						{{ statusColor[1].label }}
-					</span>
-				</el-col>
-				<el-col :span="8">中</el-col>
-				<el-col :span="8">--</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">执行时长</el-col>
-				<el-col :span="8">创建人</el-col>
-				<el-col :span="8">创建时间</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">--</el-col>
-				<el-col :span="8">系统/张三</el-col>
-				<el-col :span="8">{{ parseTime(Date.now()) }}</el-col>
-			</el-row>
-		</div>
-		<div class="bgDiv2">
-			<el-steps
-				:active="stepNum"
-				finish-status="success"
-				:process-status="stepStatus"
-				align-center>
-				<el-step title="待下发"></el-step>
-				<el-step title="待执行"></el-step>
-				<el-step title="执行中"></el-step>
-				<el-step title="已完成"></el-step>
-			</el-steps>
-			<div class="abnormal">任务异常：无效路径</div>
-		</div>
-		<div class="bgDiv3">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				搬运对象
-			</small-title>
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<div class="pan-info">
-						<div class="pan-title">L盘</div>
-					</div>
-				</el-col>
-				<el-col :span="12">
-					<div class="pan-info">
-						<div class="pan-title">R盘</div>
-					</div>
-				</el-col>
-			</el-row>
-		</div>
-		<div class="bgDiv4">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				回收信息
-			</small-title>
-			<el-descriptions :column="2" size="medium" border>
-				<el-descriptions-item label="回收方式">他车回收</el-descriptions-item>
-				<el-descriptions-item label="回收任务编号">
-					18100000000
-				</el-descriptions-item>
-				<el-descriptions-item label="回收库位">
-					CK-01-A05-L / R
-				</el-descriptions-item>
-				<el-descriptions-item label="执行车辆">AGV-06</el-descriptions-item>
-			</el-descriptions>
-		</div>
-		<div class="bgDiv5">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				任务明细
-			</small-title>
-			<el-descriptions :column="2" size="medium" border>
-				<el-descriptions-item label="起点库位(L/R)">
-					CK-01-A05-L / R
-				</el-descriptions-item>
-				<el-descriptions-item label="终点库位(L/R)">
-					CC-02-B03-L/R (候选 )
-				</el-descriptions-item>
-				<el-descriptions-item label="起点策略">--</el-descriptions-item>
-				<el-descriptions-item label="终点策略">入库策略</el-descriptions-item>
-				<el-descriptions-item label="FMS任务号">--</el-descriptions-item>
-				<el-descriptions-item label="车辆位置">--</el-descriptions-item>
-				<el-descriptions-item label="电量">--</el-descriptions-item>
-				<el-descriptions-item label="是否载货">--</el-descriptions-item>
-				<el-descriptions-item label="创建方式">自动/人工</el-descriptions-item>
-				<el-descriptions-item label="任务来源">
-					PDA/PC/系统
-				</el-descriptions-item>
-				<el-descriptions-item label="关联叫料单">--</el-descriptions-item>
-				<el-descriptions-item label=""></el-descriptions-item>
-			</el-descriptions>
-		</div>
-		<div class="bgDiv6">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				任务日志
-			</small-title>
-			<el-timeline style="padding: 0">
-				<el-timeline-item
-					v-for="(activity, index) in activities"
-					:key="index"
-					:type="activity.type"
-					:color="activity.color"
-					size="large"
-					hide-timestamp>
-					<span>{{ activity.content }}</span>
-					<span style="float: right">{{ activity.timestamp }}</span>
-				</el-timeline-item>
-			</el-timeline>
-		</div>
-						<el-divider></el-divider>
-
-      <!-- 底部按钮 -->
-			<div class="drawer-body__footer">
-        <el-button @click="closeD">返 回</el-button>
-      </div>
-	</el-drawer>
-</template>
-<script>
-import SmallTitle from './SmallTitle';
-
-export default {
-	name: '',
-	data() {
-		return {
-			visible: false,
-			title: '',
-			statusColor: [
-				//bgDiv1的任务状态
-				{ label: '待下发', color: '#fa8c16' },
-				{ label: '待执行', color: '#1890ff' },
-				{ label: '执行中', color: '#1890ff' },
-				{ label: '已完成', color: '#52c41a' },
-				{ label: '暂停中', color: '#8c8c8c' },
-				{ label: '已终止', color: '#faad14' },
-				{ label: '异常', color: '#ff4d4f' },
-				{ label: '禁用', color: '#d9d9d9' },
-			],
-			//bgDiv2的步骤条
-			stepNum: 2,
-			stepStatus: 'finish',
-			//bgDiv6的时间线
-
-			activities: [
-				{
-					content: 'FMS | 卸货完成，任务完成',
-					timestamp: '2018-04-12 20:46',
-					type: 'primary',
-				},
-				{
-					content: 'FMS | 取货完成',
-					timestamp: '2018-04-03 20:46',
-				},
-				{
-					content: 'FMS | 派车AGV-03，前往起点取货',
-					timestamp: '2018-04-03 20:46',
-				},
-				{
-					content: '张三 | 任务扫码配对完成，进入待下发',
-					timestamp: '2018-04-03 20:46',
-				},
-			],
-		};
-	},
-	components: {
-		SmallTitle,
-	},
-	created() {},
-	methods: {
-		init(val) {
-			this.visible = true;
-		},
-		//刷新
-		refresh() {},
-		closeD() {
-      this.visible = false
-			this.$emit('closeDrawer');
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-.bgDiv1 {
-	background-color: rgba(242, 242, 242, 0.5);
-	padding: 20px;
-	line-height: 25px;
-	font-size: 15px;
-	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-	.taskStatus {
-		text-align: center;
-		border-radius: 3px;
-		padding: 2px 5px;
-		color: #fff;
-	}
-}
-.bgDiv2 {
-	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-	padding: 18px 0;
-	.abnormal {
-		width: 80%;
-		margin: auto;
-		border-radius: 5px;
-		height: 40px;
-		font-size: 22px;
-		line-height: 40px;
-		text-align: center;
-		background-color: rgba(217, 0, 27, 0.1);
-		color: rgba(217, 0, 27, 1);
-		border: 1px solid rgba(217, 0, 27, 1);
-	}
-}
-.bgDiv3 {
-	padding: 20px 20px 0;
-	.pan-info {
-		height: 350px;
-		border: 1px solid rgba(121, 121, 121, 0.8);
-		border-radius: 5px;
-		.pan-title {
-			background-color: rgba(242, 242, 242, 0.5);
-			height: 35px;
-			font-size: 20px;
-			line-height: 35px;
-			padding: 0 20px;
-			border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-			letter-spacing: 2px;
-		}
-	}
-}
-.bgDiv4 {
-	padding: 20px 20px 0;
-}
-.bgDiv5 {
-	padding: 20px 20px 0;
-}
-.bgDiv6 {
-	padding: 20px 20px 0;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 0 18px 10px;
-}
-</style>

src/views/cost/components/stopInStock.vue

@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-11-08 17:44:05
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-08 18:13:25
- * @Description:
--->
-<template>
-	<div>
-		<div>请选择要执行的终止方式，系统会根据选择进行处理</div>
-		<el-radio-group v-model="radio" class="stockRadioDiv">
-			<el-radio :label="1" border style="margin: 10px 0">
-				仅终止，稍后回收
-				<div style="font-weight: 400">
-					任务立即终止，车辆保持暂停，稍后可在任务列表中手动回收
-				</div>
-			</el-radio>
-			<el-radio :label="2" border style="margin: 10px 0">
-				终止，并立即回收
-				<div style="font-weight: 400">
-					任务立即终止立即，选择货物回收方式生成任务或更新卸货点
-				</div>
-			</el-radio>
-		</el-radio-group>
-		<div>
-			终止原因：
-			<el-input
-				type="textarea"
-				:rows="3"
-         style="margin: 10px 0"
-				placeholder="请输入终止原因"
-				v-model="textarea" />
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			radio: 1,
-			textarea: '',
-		};
-	},
-	methods: {
-		init(val) {},
-		submit() {
-      if(this.textarea){
-
-      }else{
-        this.$message('请输入终止原因');
-      }
-    },
-	},
-};
-</script>
-
-<style scoped>
-.stockRadioDiv >>> .el-radio--medium.is-bordered {
-	display: flex;
-	align-items: center;
-	height: 70px;
-  line-height: 20px;
-}
-</style>

src/views/cost/components/subSpan1.vue

@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/cost/components/subSpan2.vue

@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:20:43
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val3
-				? ['待下发', '待执行', '执行中', '已完成', '暂停中', '已终止', '异常'][injectData.val3]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/cost/components/subSpan3.vue

@@ -1,57 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:37:02
- * @Description:
--->
-<template>
-	<div>
-		<div style="display: flex; align-items: center">
-			<div
-				style="
-					width: 16px;
-					height: 16px;
-					border-radius: 5px;
-					background-color: #e89b24;
-					color: #fff;
-          text-align:center;
-          line-height:16px
-				">
-				L
-			</div>
-			产品名称+产品规格
-		</div>
-		<div style="display: flex; align-items: center">
-			<div
-				style="
-					width: 16px;
-					height: 16px;
-					border-radius: 5px;
-					background-color: #6a96ec;
-					color: #fff;
-          text-align:center;
-          line-height:16px
-				">
-				R
-			</div>
-			产品名称+产品规格
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

src/views/cost/components/subSpan4.vue

@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>

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

@@ -1,35 +0,0 @@
-<template>
-	<el-switch
-		@change="changeStatus"
-		size="small"
-		v-model="list.enabled"
-		:active-value="1"
-		:inactive-value="0"></el-switch>
-</template>
-
-<script>
-import { updateGroup } from '@/api/group/groupSetting';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-		};
-	},
-	created() {},
-	methods: {
-		changeStatus(val) {
-			const data = { ...this.injectData, enabled: val };
-			updateGroup(data).then((res) => {
-				this.$modal.msgSuccess('修改成功');
-					this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>

src/views/group/Calendar/holidayLog.vue

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2025-10-23 13:43:55
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 16:50:43
+ * @LastEditTime: 2025-11-10 10:39:33
  * @Description:
 -->
 <template>
-	<div class="app-container">
+	<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.planName}}
+				{{item.deptName + ' - ' +item.planName}}
 			</small-title>
 			<base-table
 				:table-props="tableProps"
@@ -66,6 +66,7 @@ export default {
 				const obj = {
 					planName: item.schedulingPlanName,
 					planId: item.schedulingPlanId,
+					deptName: item.belongDeptName,
 				};
 				return obj;
 			});

src/views/group/Calendar/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-23 13:43:55
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-24 11:14:55
+ * @LastEditTime: 2025-11-10 10:40:13
  * @Description:
 -->
 <template>
@@ -167,7 +167,7 @@
 																HolidayList[Number(data.day.split('-')[2]) - 1]
 																	?.det,
 																HolidayList[Number(data.day.split('-')[2]) - 1]
-																	?.date
+																	?.date,
 															)
 														"
 														:title="

src/views/group/Schedule/add-group.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 17:12:04
+ * @LastEditTime: 2025-11-10 16:20:13
  * @Description:
 -->
 <template>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { listByDeptId } from '@/api/group/Schedule';
+import { getGroupPage } from '@/api/group/groupSetting';
 
 const tableProps = [
 	{
@@ -39,7 +39,7 @@ const tableProps = [
 		width: 100,
 	},
 	{
-		prop: 'deptId',
+		prop: 'deptName',
 		label: '所属部门',
 	},
 	{
@@ -57,7 +57,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: listByDeptId,
+				getDataListURL: getGroupPage,
 			},
 			tableProps,
 			tableData: [],
@@ -86,16 +86,16 @@ export default {
 				pageSize: 100,
 				code: '',
 				name: '',
+				deptId: undefined,
 			},
 			selectedList: [],
 			selectedArr: [], //已选的班组，从父组件传过来的
-			deptId: undefined,
 		};
 	},
 	created() {},
 	methods: {
 		init(id, tableData) {
-			this.deptId = id;
+			this.formInline.deptId = id;
 			this.selectedArr = tableData || [];
 			this.$nextTick(() => {
 				this.getDataList();
@@ -103,8 +103,9 @@ export default {
 		},
 		// 获取数据列表
 		getDataList() {
-			this.urlOptions.getDataListURL(this.deptId).then((response) => {
-				this.tableData = response.data;
+			this.urlOptions.getDataListURL(this.formInline).then((response) => {
+				this.tableData = response.data.list;
+        this.tableData.forEach(item=>item.teamId= item.id)
 				this.$nextTick(() => {
 					if (this.selectedArr.length > 0) {
 						this.setSelectedRows();
@@ -119,12 +120,12 @@ export default {
 			table.clearSelection();
 
 			this.selectedArr.forEach((item) => {
-				const rowInTable = this.tableData.find((i) => i.id === item.id);
+				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.id === item.id),
+						table.tableData.find((i) => i.teamId === item.teamId),
 					]);
 				}
 			});
@@ -149,22 +150,19 @@ export default {
 		selectChange(val) {
 			this.selectedList = val;
 		},
-		// 判断两个数组是否有重复的 id
+		// 判断两个数组是否有重复的 id,去重
 		hasDuplicateIds(arr1, arr2) {
-			const idSet = new Set(arr1.map((item) => item.id));
-			return arr2.some((item) => idSet.has(item.id));
+			return arr2.filter(
+				(item2) => !arr1.some((item1) => item1.teamId === item2.teamId)
+			);
 		},
 
 		dataFormSubmit() {
 			if (this.selectedList && this.selectedList.length > 0) {
-				const haveData = this.hasDuplicateIds(
+				this.selectedList = this.hasDuplicateIds(
 					this.selectedArr,
 					this.selectedList
 				);
-				if (haveData) {
-					this.$message('请不要重复添加数组');
-					return;
-				}
 				this.$emit('refreshTableData', this.selectedList);
 			} else if (this.selectedArr.length > 0) {
 				this.$message('请不要重复添加数组');

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 15:28:52
+ * @LastEditTime: 2025-11-11 15:32:04
  * @Description:
 -->
 <template>
@@ -54,10 +54,11 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="部门">
+						<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>
@@ -111,7 +112,7 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6" v-if="dataForm.shiftType>1">
+					<el-col :span="6" v-if="dataForm.shiftType > 1">
 						<el-form-item label="同班次连排" prop="shiftSustainedNum">
 							<el-input
 								v-model="dataForm.shiftSustainedNum"
@@ -134,6 +135,11 @@
 		<div v-if="stepNum == 2">
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				班次
+				<el-tag type="warning" style="color: black" v-if="!isClassTimePass">
+					<i class="el-icon-warning" style="color: #ffbd02"></i>
+					两班倒和三班倒的班次设置时间
+					<span style="color: red">不能重叠，且必须连续覆盖24小时。</span>
+				</el-tag>
 			</small-title>
 			<base-table
 				:table-props="tableProps1"
@@ -150,6 +156,12 @@
 			</base-table>
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				班组
+				<el-tag type="warning" style="color: black">
+					<i class="el-icon-warning" style="color: #ffbd02"></i>
+					排班从计划开始时间对应的第一个班次开始，按
+					<span style="color: red">班组列表顺序</span>
+					依次循环执行
+				</el-tag>
 			</small-title>
 			<base-table
 				:table-props="tableProps2"
@@ -157,6 +169,7 @@
 				:limit="10"
 				:table-data="tableData2"
 				:add-button-show="'新增'"
+				@emitFun="handleSort"
 				@emitButtonClick="addNewGroup">
 				<method-btn
 					v-if="tableBtn2.length"
@@ -174,8 +187,7 @@
 				:no-padding="true">
 				排班计划预览
 				<span style="font-size: 14px; color: #ff1c15">
-					系统将根据以下设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
-
+					系统将根据
 					<el-popover
 						placement="right"
 						title="比如三班两倒，同班次连排2天，不休周末排班如下"
@@ -192,9 +204,10 @@
 						</el-table>
 						<i
 							slot="reference"
-							class="el-icon-warning-outline"
-							style="color: #ff1c15"></i>
+							class="el-icon-chat-dot-square"
+							style="color: #409eff; font-size: 18px"></i>
 					</el-popover>
+					设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
 				</span>
 			</small-title>
 			<el-tag>
@@ -227,7 +240,7 @@
 						<div style="color: rgba(0, 0, 0, 0.6)">同班次连排</div>
 						<div style="color: #000000">
 							{{
-								dataForm.shiftSustainedNum +
+								(dataForm.shiftSustainedNum ? dataForm.shiftSustainedNum : '') +
 								['日', '周', '月', '季'][dataForm.shiftSustainedType - 1]
 							}}
 						</div>
@@ -335,6 +348,7 @@ import { parseTime } from '@/filter/code-filter';
 import editClass from './edit-class.vue';
 import addGroup from './add-group.vue';
 import bindLine from './bind-line.vue';
+import sortSet from './sortSet.vue';
 import {
 	getCode,
 	createStepOne,
@@ -374,10 +388,17 @@ const tableProps1 = [
 ];
 
 const tableProps2 = [
+	{
+		prop: 'shunxu',
+		label: '顺序',
+		width: 70,
+		subcomponent: sortSet,
+	},
 	{
 		prop: 'code',
 		label: '班组编号',
 		width: 140,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'name',
@@ -422,6 +443,7 @@ export default {
 				},
 			],
 			stepNum: 1, // 当前第几步
+      isEdit: false, //是否是编辑状态，编辑的时候，让前端上一步和取消都不用接口
 			shiftTypeEdit: undefined, //该值为编辑时获取的shiftType，到第二步，判断dataForm.shiftType是否改变，同时改变班次信息
 			//第一步参数
 			dataForm: {
@@ -476,6 +498,7 @@ export default {
 				name: [
 					{ required: true, message: '计划名称不能为空', trigger: 'blur' },
 				],
+				deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
 				startDay: [
 					{ required: true, message: '开始时间不能为空', trigger: 'change' },
 				],
@@ -508,6 +531,7 @@ export default {
 					btnName: '编辑',
 				},
 			].filter((v) => v),
+			isClassTimePass: true, //修改班次时间后，需要判断时间是否有覆盖，且是否覆盖24小时
 			tableData1: [],
 			tableProps2,
 			tableBtn2: [
@@ -597,8 +621,9 @@ export default {
 		};
 	},
 	methods: {
-		init(id) {
+		init(id,isEdit) {
 			this.dataForm.id = id || undefined;
+      this.isEdit = isEdit || false
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
@@ -610,12 +635,10 @@ export default {
 						this.tableData2 = res.data?.stepTwo.groupPlanTeamBaseVOList;
 						this.tableData2.forEach((item, index) => {
 							let lineName = '';
-							lineName = this.setLineName(item.bindLineTree, lineName);
-							this.$set(
-								this.tableData2[index],
-								'lineName',
-								lineName.slice(0, -1)
-							);
+							if (item.isProduction) {
+								lineName = this.setLineName(item.bindLineTree);
+							}
+							this.$set(this.tableData2[index], 'lineName', lineName);
 						});
 					});
 				} else {
@@ -628,18 +651,33 @@ export default {
 		//上一步
 		upSubmit() {
 			if (this.stepNum == 2) {
-				returnStepOne(this.dataForm.id).then((res) => {
+				if (!this.isEdit) {
+					//编辑的时候，让前端上一步和取消都不用接口，
+					returnStepOne(this.dataForm.id).then((res) => {
+						this.stepNum -= 1;
+						this.$emit('setSN', this.stepNum);
+						this.$nextTick(() => {
+							this.setDataForm();
+						});
+					});
+				} else {
 					this.stepNum -= 1;
 					this.$emit('setSN', this.stepNum);
 					this.$nextTick(() => {
 						this.setDataForm();
 					});
-				});
+				}
 			} else if (this.stepNum == 3) {
-				returnStepTwo(this.dataForm.id).then((res) => {
+				if (!this.dataForm.id) {
+					//编辑的时候，让前端上一步和取消都不用接口，
+					returnStepTwo(this.dataForm.id).then((res) => {
+						this.stepNum -= 1;
+						this.$emit('setSN', this.stepNum);
+					});
+				} else {
 					this.stepNum -= 1;
 					this.$emit('setSN', this.stepNum);
-				});
+				}
 			}
 		},
 		//下一步
@@ -654,9 +692,12 @@ export default {
 						this.$message('部门不能为空');
 						return;
 					}
-          const compareDate = this.compareDates(this.dataForm.startDay,this.dataForm.endDay)
+					const compareDate = this.compareDates(
+						this.dataForm.startDay,
+						this.dataForm.endDay
+					);
 
-					if (compareDate > 0 ) {
+					if (compareDate > 0) {
 						this.$message('开始时间不能大于结束时间');
 						return;
 					}
@@ -677,6 +718,7 @@ export default {
 				return;
 			}
 			if (this.stepNum == 2) {
+				//班组验证
 				if (!this.tableData2 || this.tableData2.length == 0) {
 					this.$message('班组不能为空');
 					return;
@@ -684,7 +726,10 @@ export default {
 
 				let isbindLine = false;
 				this.tableData2.forEach((item) => {
-					if (!item.bindLineTree || item.bindLineTree.length == 0) {
+					if (
+						item.isProduction &&
+						(!item.bindLineTree || item.bindLineTree.length == 0)
+					) {
 						isbindLine = true;
 					}
 				});
@@ -711,6 +756,11 @@ export default {
 					return;
 				}
 
+				//班次验证
+				if (!this.isClassTimePass) {
+					this.$message('班次内时间有误，请重新填写!');
+					return;
+				}
 				let data = {};
 				data.planId = this.dataForm.id;
 				data.groupPlanClassesBaseVOList = []; //排班-班次信息list
@@ -722,6 +772,7 @@ export default {
 						startTime: item.startTime,
 						endTime: item.endTime,
 						daySpan: item.daySpan,
+						code: item.code,
 					};
 					data.groupPlanClassesBaseVOList.push(obj);
 				});
@@ -730,8 +781,8 @@ export default {
 					const obj = {
 						teamId: item.id,
 						name: item.name,
-            leaderName: item.leaderName,
-            leaderPhone:item.leaderPhone,
+						leaderName: item.leaderName,
+						leaderPhone: item.leaderPhone,
 						bindData: JSON.stringify(item.bindLineTree),
 					};
 					data.groupPlanTeamBaseVOList.push(obj);
@@ -774,7 +825,7 @@ export default {
 		setDataForm() {
 			this.$refs.deptSelect.setID(this.dataForm.deptId);
 		},
-    //比较时间，开始时间在结束时间前
+		//比较时间，开始时间在结束时间前
 		compareDates(date1, date2) {
 			const d1 = date1;
 			const d2 = date2;
@@ -793,54 +844,105 @@ export default {
 			this.tableData1 = [];
 			if (this.dataForm.shiftType == 1) {
 				const obj = {
+					sort: 1,
 					name: '长白班',
 					startTime: '08:00:00',
 					endTime: '17:00:00',
 					daySpan: 0, //是否跨天
-          code: 1, //排版日历页面，根据这个字段显示颜色
+					code: 1, //排版日历页面，根据这个字段显示颜色
 				};
 				this.tableData1.push(obj);
 			} else if (this.dataForm.shiftType == 2) {
 				const obj1 = {
+					sort: 1,
 					name: '白班',
 					startTime: '08:00:00',
 					endTime: '20:00:00',
 					daySpan: 0,
-          code: 1,
+					code: 1,
 				};
 				const obj2 = {
+					sort: 2,
 					name: '夜班',
 					startTime: '20:00:00',
 					endTime: '08:00:00',
 					daySpan: 1,
-          code: 3,
+					code: 3,
 				};
 				this.tableData1.push(obj1, obj2);
 			} else if (this.dataForm.shiftType == 3) {
 				const obj1 = {
+					sort: 1,
 					name: '早班',
 					startTime: '08:00:00',
 					endTime: '16:00:00',
 					daySpan: 0,
-          code: 1,
+					code: 1,
 				};
 				const obj2 = {
+					sort: 2,
 					name: '中班',
 					startTime: '16:00:00',
 					endTime: '00:00:00',
 					daySpan: 1,
-          code: 2,
+					code: 2,
 				};
 				const obj3 = {
+					sort: 3,
 					name: '夜班',
 					startTime: '00:00:00',
 					endTime: '08:00:00',
 					daySpan: 0,
-          code: 3,
+					code: 3,
 				};
 				this.tableData1.push(obj1, obj2, obj3);
 			}
 		},
+
+		/**
+		 * 将时间字符串转换为分钟数
+		 * @param {string} timeStr - 时间字符串，如 "08:00:00"
+		 * @returns {number} 分钟数
+		 */
+		timeToMinutes(timeStr) {
+			const [hours, minutes, s] = timeStr.split(':').map(Number);
+			return hours * 60 + minutes;
+		},
+		/**
+		 * 修改班次时间后，需要判断时间是否有覆盖，且是否覆盖24小时
+		 * @param {string} start1 - 开始时间1
+		 * @param {string} end1 - 结束时间1
+		 * @param {string} start2 - 开始时间2
+		 * @param {string} end2 - 结束时间2
+		 * @returns {boolean} 是否重叠 true则重叠，false则可以使用
+		 */
+		isTimeOverlap(start1, end1, start2, end2) {
+			const start1Min = this.timeToMinutes(start1);
+			const end1Min = this.timeToMinutes(end1);
+			const start2Min = this.timeToMinutes(start2);
+			const end2Min = this.timeToMinutes(end2);
+
+			// 处理跨天情况
+			const totalMinutes = 24 * 60;
+
+			// 如果结束时间小于开始时间，说明跨天
+			const isEnd1NextDay = end1Min < start1Min;
+			const isEnd2NextDay = end2Min < start2Min;
+
+			if (isEnd1NextDay && isEnd2NextDay) {
+				// 两个时间段都跨天，直接比较
+				return true;
+			} else if (isEnd1NextDay) {
+				// 第一个时间段跨天
+				return start2Min < end1Min || end2Min > start1Min;
+			} else if (isEnd2NextDay) {
+				// 第二个时间段跨天
+				return start1Min < end2Min || end1Min > start2Min;
+			} else {
+				// 都不跨天，正常比较
+				return start1Min < end2Min && end1Min > start2Min;
+			}
+		},
 		//编辑班次
 		handleClick1(val) {
 			this.addOrUpdateVisible1 = true;
@@ -859,11 +961,37 @@ export default {
 				this.tableData2.splice(val.data._pageIndex - 1, 1);
 			}
 		},
+		//班组改变顺序
+		handleSort(val) {
+			if (val.type == 'up') {
+				const temp = this.tableData2[val.index];
+				this.tableData2.splice(val.index, 1);
+				let i = 0;
+				//如果是数组第一个，再向上则放到最后
+				if (val.index == 0) {
+					i = this.tableData2.length;
+				} else {
+					i = val.index - 1;
+				}
+				this.tableData2.splice(i, 0, temp);
+			} else {
+				const temp = this.tableData2[val.index];
+				this.tableData2.splice(val.index, 1);
+				let i = 0;
+				//如果是数组最后一个，再向下则放到第一个(因为先splice(val.index, 1)所以这里length不用-1)
+				if (val.index == this.tableData2.length) {
+					i = 0;
+				} else {
+					i = val.index + 1;
+				}
+				this.tableData2.splice(i, 0, temp);
+			}
+		},
 		// 新增班组
 		addNewGroup() {
 			this.addOrUpdateVisible2 = true;
 			this.$nextTick(() => {
-				this.$refs.addGroupRef.init(this.dataForm.deptId,this.tableData2);
+				this.$refs.addGroupRef.init(this.dataForm.deptId, this.tableData2);
 			});
 		},
 		cancel1() {
@@ -886,6 +1014,53 @@ export default {
 		},
 		refreshTableData1(index, val) {
 			this.tableData1.splice(index, 1, val);
+			this.tableData1.sort((a, b) => {
+				if (a.sort === b.sort) {
+					return -1; // sort相等时，a排在b前面
+				}
+				return a.sort - b.sort;
+			});
+			this.tableData1.forEach((item, index) => {
+				item.sort = index + 1;
+			});
+			//修改班次时间后，需要判断时间是否有覆盖，且是否覆盖24小时,isTimeOverlap方法返回false才是校验通过
+			if (this.dataForm.shiftType == 2) {
+				const twoClass = this.tableData1.map(({ startTime, endTime }) => ({
+					startTime,
+					endTime,
+				}));
+
+				this.isClassTimePass = !this.isTimeOverlap(
+					twoClass[0].startTime,
+					twoClass[0].endTime,
+					twoClass[1].startTime,
+					twoClass[1].endTime
+				);
+			} else if (this.dataForm.shiftType == 3) {
+				const threeClass = this.tableData1.map(({ startTime, endTime }) => ({
+					startTime,
+					endTime,
+				}));
+				const result1 = this.isTimeOverlap(
+					threeClass[0].startTime,
+					threeClass[0].endTime,
+					threeClass[1].startTime,
+					threeClass[1].endTime
+				);
+				const result2 = this.isTimeOverlap(
+					threeClass[1].startTime,
+					threeClass[1].endTime,
+					threeClass[2].startTime,
+					threeClass[2].endTime
+				);
+				const result3 = this.isTimeOverlap(
+					threeClass[0].startTime,
+					threeClass[0].endTime,
+					threeClass[2].startTime,
+					threeClass[2].endTime
+				);
+				this.isClassTimePass = !(result1 || result2 || result3);
+			}
 			this.cancel1();
 		},
 		refreshTableData2(val) {
@@ -895,22 +1070,38 @@ export default {
 		refreshTableData3(index, val) {
 			this.tableData2[index].bindLineTree = val;
 			let lineName = '';
-			lineName = this.setLineName(val, lineName);
+			lineName = this.setLineName(val);
 			if (lineName) {
-				this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
+				this.$set(this.tableData2[index], 'lineName', lineName);
 			}
 			this.cancel3();
 		},
 		//提取绑定的产线工段名展示出来
-		setLineName(val, lineName) {
-			val.forEach((item) => {
-				lineName += item.name + '：';
-				if (item.children && item.children.length > 0) {
-					const childName = this.setLineName(item.children, lineName);
-					lineName = childName;
+		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 lineName;
+			}
+
+			return currentDisplay;
 		},
 		//第三步
 		// 进来加载预览排班
@@ -919,6 +1110,7 @@ export default {
 				id: this.dataForm.id,
 				count: day,
 			};
+			this.period = day;
 			this.tableProps3 = [];
 			this.tableData3 = [];
 			getPerView(data).then((res) => {
@@ -946,6 +1138,7 @@ export default {
 					label: item.day,
 					work: item.work,
 					subcomponent: propSpan,
+					showOverflowtooltip: true,
 				};
 				this.tableProps3.push(obj);
 				item.det.forEach((sItem, sIndex) => {
@@ -970,7 +1163,8 @@ export default {
 			});
 		},
 		cancelStep() {
-			if (this.stepNum > 1) {
+			if (this.stepNum > 1 && !this.isEdit) {
+				//编辑的时候，让前端上一步和取消都不用接口，
 				cancelStepThree(this.dataForm.id).then((res) => {
 					this.$message('已取消计划');
 					this.$emit('refreshDataList');

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-30 10:47:09
+ * @LastEditTime: 2025-11-10 16:07:01
  * @Description:
 -->
 <template>
@@ -13,8 +13,12 @@
 			:to_data="toData"
 			@add-btn="add"
 			@remove-btn="remove"
-			pid="pid"
-			:defaultProps="{ label: 'name' }"
+			pid="fid"
+			:node_key="'uniqueId'"
+			:defaultProps="{
+				label: 'name',
+				children: 'children',
+			}"
 			height="450px"
 			style="padding-bottom: 20px"
 			:mode="mode"
@@ -43,16 +47,34 @@ export default {
 			this.fromData = [];
 			this.toData = [];
 			getGroupPlanTree().then((res) => {
-				this.fromData = res.data;
-				this.fromData.forEach((item) => {
+				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.id + node.type;
+			if (node.type > 0) {
+				node.fid = node.pid + node.type - 1;
+			}
+
+			return {
+				...node,
+				uniqueId,
+				children: node.children
+					? node.children.map((child) => this.processNode(child))
+					: [],
+			};
+		},
 		// 监听穿梭框组件添加
 		add(fromData, toData, obj) {
 			console.log('fromData:', fromData);

src/views/group/Schedule/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-21 14:27:23
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-21 15:02:27
+ * @LastEditTime: 2025-11-10 17:07:54
  * @Description:
 -->
 <template>
@@ -46,7 +46,7 @@
 			</div>
 			<div>
 				<span class="title">创建人:</span>
-				{{ infoData.creator }}
+				{{ infoData.creatorName }}
 			</div>
 			<div>
 				<span class="title">创建时间:</span>
@@ -150,8 +150,7 @@ export default {
 			this.infoData = {};
 			getPlan(id).then((res) => {
 				this.infoData = res.data || {};
-				console.log(res);
-				this.tableData1 = res.data?.groupPlanClassesBaseVOList;
+				this.tableData1 = res.data?.groupPlanClassesBaseVOList.sort((a, b) => a.sort - b.sort);
 				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
 				this.tableData2.forEach((item, index) => {
 					let lineName = '';

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:23:52
+ * @LastEditTime: 2025-11-04 14:08:47
  * @Description:
 -->
 <template>
@@ -15,9 +15,10 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="序号" prop="index">
+				<el-form-item label="排序" prop="sort">
 					<el-input-number
-						v-model="dataForm.index"
+						style="width: 100%"
+						v-model="dataForm.sort"
 						:step="1"
 						:min="1"
 						step-strictly />
@@ -38,7 +39,8 @@
 						format="H:mm"
 						value-format="HH:mm:ss"
 						v-model="dataForm.startTime"
-						placeholder="选择日期时间"></el-time-picker>
+            @change="timeFun('start')"
+						placeholder="选择时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -48,7 +50,19 @@
 						format="H:mm"
 						value-format="HH:mm:ss"
 						v-model="dataForm.endTime"
-						placeholder="选择日期时间"></el-time-picker>
+            @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">
@@ -70,15 +84,17 @@ export default {
 		return {
 			dataForm: {
 				id: undefined,
-				index: undefined,
+				sort: undefined,
 				name: undefined,
 				startTime: undefined,
 				endTime: undefined,
+				daySpan: 0,
+				code: 1,
 				remark: undefined,
 			},
 			_pageIndex: 1,
 			dataRule: {
-				index: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
 				name: [
 					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
 				],
@@ -93,13 +109,31 @@ export default {
 	},
 	methods: {
 		init(val) {
-			this._pageIndex = val._pageIndex-1;
-			this.dataForm.index = val._pageIndex || 1;
+			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) => {

src/views/group/Schedule/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
- * @Date: 2025-10-11 14:27:37
+ * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 14:50:16
+ * @LastEditTime: 2025-11-05 08:51:13
  * @Description:
 -->
 <template>
@@ -31,12 +31,14 @@
 				<el-form-item label="开始时间" prop="startDay">
 					<el-date-picker
 						v-model="formInline.startDay"
+						size="small"
 						type="datetime"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束时间" prop="endDay">
 					<el-date-picker
 						v-model="formInline.endDay"
+						size="small"
 						type="datetime"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
@@ -46,8 +48,12 @@
 						ref="deptSelect"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
-				<el-form-item label="状态" prop="leaderName">
-					<el-select v-model="formInline.status" placeholder="请选择状态">
+				<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"
@@ -65,7 +71,8 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"
+					<span
+						class="separateStyle"
 						v-hasPermi="['base:group-scheduling-plan:query']"></span>
 				</el-form-item>
 				<el-form-item>
@@ -74,7 +81,8 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"
+					<span
+						class="separateStyle"
 						v-hasPermi="['base:group-scheduling-plan:create']"></span>
 				</el-form-item>
 				<el-form-item>
@@ -87,6 +95,17 @@
 						新增
 					</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
@@ -201,6 +220,7 @@ import {
 	copyPlan,
 	disablePlan,
 	updateScheduleLater,
+	exportExcel,
 } from '@/api/group/Schedule';
 
 const tableProps = [
@@ -268,91 +288,97 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-plan:update')?
-				{
-					type: 'edit',
-					btnName: '编辑',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
+				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: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: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-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,
+					  }
+					: 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,
+									},
+								],
 							},
-							{
-								type: 'equal',
-								name: 'updateFlag',
-								value: true,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:create')?
-				{
-					type: 'copy',
-					btnName: '复制',
-				}:undefined,
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:create')
+					? {
+							type: 'copy',
+							btnName: '复制',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableData: [],
 			options: [
@@ -379,12 +405,14 @@ export default {
 			},
 			stepNum: 1, // 新增编辑时当前第几步
 			detailVisible: false,
+			// 导出遮罩层
+			exportLoading: false,
 		};
 	},
 	components: {
 		AddOrUpdate,
 		deptSelect,
-    detail
+		detail,
 	},
 	created() {},
 	methods: {
@@ -411,7 +439,7 @@ export default {
 					this.formInline.code = null;
 					this.formInline.deptId = null;
 					this.$refs.deptSelect.clear();
-					this.formInline.leaderName = null;
+					this.formInline.status = null;
 					this.listQuery = {
 						pageSize: 10,
 						pageNo: 1,
@@ -462,7 +490,7 @@ export default {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '编辑';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
+					this.$refs.addOrUpdate.init(val.data.id,true);
 				});
 			} else if (val.type === 'delete') {
 				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
@@ -474,23 +502,44 @@ export default {
 			} else if (val.type === 'cancel') {
 				disablePlan(val.data.id).then((res) => {
 					this.$modal.msgSuccess('作废成功');
-          this.getDataList()
+					this.getDataList();
 				});
 			} else if (val.type === 'sync') {
-				updateScheduleLater({ planId: val.data.id }).then((res) => {
+				updateScheduleLater({
+					planId: val.data.id,
+					logId: val.data.updateLogId,
+				}).then((res) => {
 					this.$modal.msgSuccess('同步节假日成功');
-          this.getDataList()
+					this.getDataList();
 				});
 			} else if (val.type === 'copy') {
 				copyPlan(val.data.id).then((res) => {
 					this.$modal.msgSuccess('复制成功');
-          this.getDataList()
+					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>

src/views/group/Schedule/sortSet.vue

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

@@ -2,13 +2,13 @@
  * @Author: zwq
  * @Date: 2025-10-13 16:18:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:13:26
+ * @LastEditTime: 2025-11-04 10:54:19
  * @Description:
 -->
 <template>
 	<span>
 		{{
-			injectData.shiftSustainedNum +
+			(injectData.shiftSustainedNum?injectData.shiftSustainedNum:'') +
 			(injectData.shiftSustainedType
 				? ['', '日', '周', '月', '季'][injectData.shiftSustainedType]
 				: '')

src/views/group/deptSelect.vue

@@ -48,7 +48,6 @@ export default {
 			this.deptId = id;
 		},
 		clear() {
-			console.log(this.$refs.treeselect);
 			this.$refs.treeselect.clear();
 		},
 		// 格式化部门的下拉框

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 14:47:33
+ * @LastEditTime: 2025-10-31 15:47:16
  * @Description:
 -->
 <template>
@@ -31,10 +31,11 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="部门">
+				<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>
@@ -44,7 +45,7 @@
 						style="width: 100%"
 						v-model="dataForm.leaderId"
 						@change="setLeaderName"
-            filterable
+						filterable
 						placeholder="请选择组长">
 						<el-option
 							v-for="item in leaderArr"
@@ -59,7 +60,7 @@
 					<el-input
 						v-model="dataForm.leaderPhone"
 						clearable
-             maxlength="11"
+						maxlength="11"
 						placeholder="请输入组长电话" />
 				</el-form-item>
 			</el-col>
@@ -137,7 +138,7 @@ export default {
 				num: undefined,
 				remark: undefined,
 			},
-      setData: true,
+			setData: true,
 			leaderArr: [],
 			options: [
 				{
@@ -156,19 +157,23 @@ export default {
 				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"
-          }
-        ]
+				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',
+					},
+				],
 			},
 		};
 	},
@@ -184,9 +189,9 @@ export default {
 				})
 				.catch(() => {});
 		},
-    setDataForm(){
-      this.$refs.deptSelect.setID(this.dataForm.deptId)
-    },
+		setDataForm() {
+			this.$refs.deptSelect.setID(this.dataForm.deptId);
+		},
 		setLeaderName(val) {
 			this.leaderArr.map((item) => {
 				if (val === item.id) {
@@ -194,33 +199,33 @@ export default {
 				}
 			});
 		},
-    // 表单提交
-    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");
-        });
-      });
-    },
+		// 表单提交
+		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/holidaySetting/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 13:29:58
+ * @LastEditTime: 2025-11-11 10:29:18
  * @Description:
 -->
 <template>
@@ -18,6 +18,7 @@
 				<el-col :span="12">
 					<el-form-item label="节假日名称" prop="name">
 						<el-input
+							ref="inputWidth"
 							v-model="dataForm.name"
 							clearable
 							:disabled="detail"
@@ -54,7 +55,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item
-						v-if="dataForm.dateType == 1"
+						v-if="dataForm.dateType == 1 && dataForm.calendarType == 1"
 						label="日期"
 						prop="dateDay">
 						<el-date-picker
@@ -66,9 +67,13 @@
 							placeholder="选择日期"
 							format="yyyy-MM-dd"
 							value-format="--MM-dd"
+							@blur="$forceUpdate()"
 							:picker-options="pickerOptions"></el-date-picker>
 					</el-form-item>
-					<el-form-item v-else label="日期" prop="dateDayArr">
+					<el-form-item
+						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 1"
+						label="日期"
+						prop="dateDayArr">
 						<el-date-picker
 							:disabled="detail"
 							style="width: 100%"
@@ -80,8 +85,53 @@
 							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">
@@ -131,6 +181,7 @@
 </template>
 
 <script>
+import JDatePicker from './components/JDatePicker.vue';
 import {
 	createHoliday,
 	updateHoliday,
@@ -141,7 +192,9 @@ import {
 } from '@/api/group/holidaySetting';
 
 export default {
-	components: {},
+	components: {
+		JDatePicker,
+	},
 	data() {
 		return {
 			dataForm: {
@@ -151,6 +204,10 @@ export default {
 				dateType: 1,
 				dateDay: undefined,
 				dateDayArr: [],
+				dateDayChinese: undefined,
+				dateDayArrChinese: [],
+				noRepeatYear: undefined,
+				noRepeatYearChinese: undefined,
 				repeat: true,
 				inherited: true, //	是否为继承
 				deptId: undefined,
@@ -202,6 +259,12 @@ export default {
 				dateDayArr: [
 					{ required: true, message: '日期不能为空', trigger: 'change' },
 				],
+				dateDayChinese: [
+					{ required: true, message: '日期不能为空', trigger: 'change' },
+				],
+				dateDayArrChinese: [
+					{ required: true, message: '日期不能为空', trigger: 'change' },
+				],
 				repeat: [
 					{
 						required: true,
@@ -216,12 +279,61 @@ export default {
 				},
 			},
 			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, id, detail) {
+		init(deptId, val, detail) {
 			this.dataForm.deptId = deptId || undefined;
-			this.dataForm.id = id || undefined;
+			this.dataForm.id = val.holidayId || undefined;
+			this.dataForm.inherited = val.isInherit || false;
 			this.detail = detail || false;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
@@ -245,14 +357,21 @@ export default {
 							this.dataForm.dateType == 1 &&
 							this.dataForm.calendarType == 2
 						) {
-							this.dataForm.dateDay = this.dataForm.oneDayChinese;
+							this.dataForm.dateDayChinese =
+								'L' +
+								new Date().getFullYear() +
+								this.dataForm.oneDayChinese.slice(-6);
 						} else if (
 							this.dataForm.dateType == 2 &&
 							this.dataForm.calendarType == 2
 						) {
-							this.dataForm.dateDayArr = [
-								this.dataForm.startDayChinese,
-								this.dataForm.endDayChinese,
+							this.dataForm.dateDayArrChinese = [
+								'L' +
+									new Date().getFullYear() +
+									this.dataForm.startDayChinese.slice(-6),
+								'L' +
+									new Date().getFullYear() +
+									this.dataForm.endDayChinese.slice(-6),
 							];
 						}
 					});
@@ -307,10 +426,13 @@ export default {
 				this.$modal.msgSuccess('删除成功');
 				updateSchedule({ logId: res.data.logId }).then((res1) => {
 					this.$modal.msgSuccess('更新成功');
-					this.$emit('refreshPage');
 				});
+				this.$emit('refreshPage');
 			});
 		},
+		onDateChange(val) {
+			console.log(val);
+		},
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
@@ -329,25 +451,57 @@ export default {
 					this.dataForm.dateType == 1 &&
 					this.dataForm.calendarType == 2
 				) {
-					this.dataForm.oneDayChinese = this.dataForm.dateDay;
+					this.dataForm.oneDayChinese =
+						'--' + this.dataForm.dateDayChinese.slice(-5);
 				} else if (
 					this.dataForm.dateType == 2 &&
 					this.dataForm.calendarType == 2
 				) {
-					this.dataForm.startDayChinese = this.dataForm.dateDayArr[0];
-					this.dataForm.endDayChinese = this.dataForm.dateDayArr[1];
+					this.dataForm.startDayChinese =
+						'--' + this.dataForm.dateDayArrChinese[0].slice(-5);
+					this.dataForm.endDayChinese =
+						'--' + this.dataForm.dateDayArrChinese[1].slice(-5);
+				}
+				if (this.dataForm.calendarType == 1 && !this.dataForm.repeat) {
+					this.dataForm.noRepeatYear = new Date().getFullYear();
+				} else if (this.dataForm.calendarType == 2 && !this.dataForm.repeat) {
+					this.dataForm.noRepeatYearChinese = new Date().getFullYear();
 				}
 				// 修改的提交
 				if (this.dataForm.id) {
-					updateHoliday(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.$emit('refreshPage');
+					updateHoliday(this.dataForm).then((res) => {
+						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');
+								});
+						}
 					});
 					return;
 				}
 				// 添加的提交
 				createHoliday(this.dataForm).then((res) => {
-					updateSchedule;
 					if (!res.data.updateFlag) {
 						this.$modal.msgSuccess('新增成功');
 						this.$emit('refreshPage');
@@ -363,15 +517,16 @@ export default {
 						)
 							.then(() => {
 								updateSchedule({ logId: res.data.logId }).then((res1) => {
-									this.$modal.msgSuccess('新增成功');
-									this.$emit('refreshPage');
+									this.$modal.msgSuccess('更新成功');
 								});
+								this.$emit('refreshPage');
 							})
 							.catch(() => {
 								this.$message({
 									type: 'info',
 									message: '已取消',
 								});
+								this.$emit('refreshPage');
 							});
 					}
 				});

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

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

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

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

@@ -33,6 +33,10 @@ const tableProps = [
 		prop: 'opPeopleName',
 		label: '操作人'
 	},
+	{
+		prop: 'deptName',
+		label: '部门'
+	},
 	{
 		prop: 'opType',
 		label: '操作类型',

src/views/group/holidaySetting/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-27 10:18:54
+ * @LastEditTime: 2025-11-11 14:29:10
  * @Description:
 -->
 <template>
@@ -32,15 +32,24 @@
 			<div class="groupTeamScheduling">
 				<div class="operationArea">
 					<el-row>
-						<el-col :span="16">
+						<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="8">
+						<el-col :span="18" v-if="!ishasParent">
 							<div style="float: right">
 								<el-button
 									size="small"
@@ -58,6 +67,39 @@
 								</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">
@@ -73,6 +115,24 @@
 								: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"
@@ -82,16 +142,47 @@
 							</el-button>
 						</el-form-item>
 					</el-form>
-					<el-tag
-						v-if="topDeptId == deptId"
-						type="warning"
-						closable
-						style="margin-bottom: 10px; color: black">
-						<i class="el-icon-warning" style="color: #ffbd02"></i>
-						当前节假日设置为组织架构中最高层级配置，默认自动继承至下属部门。子部门可选择
-						<span style="color: red">解除继承</span>
-						设置后进行独立修改，复制后不再继承上级设置
-					</el-tag>
+					<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">
@@ -99,7 +190,18 @@
 						<template slot="dateCell" slot-scope="{ data }">
 							<div v-if="data.type === 'current-month'">
 								<!-- 日期 -->
-								<div class="dateStyle">
+								<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">
@@ -134,20 +236,25 @@
 											">
 											<div
 												class="holiday-div"
-												@click="
-													new Date(data.day).getTime() > Date.now() &&
-														showDetail(
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																.holidayId
-														)
-												">
+												: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="new Date(data.day).getTime() > Date.now()">
+													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>
@@ -179,6 +286,7 @@
 			@confirm="handleConfirm"
 			:before-close="cancel"
 			:destroy-on-close="true"
+			class="addDialog"
 			width="40%">
 			<add-or-updata
 				ref="addOrUpdataRef"
@@ -252,7 +360,14 @@ import moment from 'moment';
 import { solarToLunar } from 'chinese-lunar';
 
 import { getUserProfile } from '@/api/system/user';
-import { deptHolidayList, getEnableData } from '@/api/group/holidaySetting';
+import {
+	deptHolidayList,
+	getEnableData,
+	disExtends,
+	reExtends,
+	updateSchedule,
+	getSet,
+} from '@/api/group/holidaySetting';
 
 import addOrUpdata from './add-or-updata.vue';
 import holidayLog from './holidayLog';
@@ -274,7 +389,9 @@ export default {
 			// 选择的部门名称
 			showDeptName: undefined,
 			topDeptId: undefined, // 保存当前用户的部门id为最高级部门id
+			parentId: undefined, // 保存部门点击时对象的父id，用于解除和恢复继承
 			deptId: undefined,
+			ishasParent: false, // 判断是否有上级,false,则表示为最高级
 			defaultProps: {
 				children: 'children',
 				label: 'name',
@@ -283,6 +400,10 @@ export default {
 			addOrUpdateVisible: false,
 			detail: false,
 			logVisible: false,
+			inherited: true, //该部门是否为继承状态
+			showTag1: true, //tag标签是否显示的
+			showTag2: true,
+			showTag3: true,
 		};
 	},
 	watch: {
@@ -298,9 +419,9 @@ export default {
 			this.showDeptName = response.data.dept.name || '';
 			this.topDeptId = response.data.dept.id || ''; // 保存当前用户的部门id为最高级部门id
 			this.deptId = response.data.dept.id || '';
-			this.getHolidayPage();
+			this.getTreeselect();
+			this.getSet();
 		});
-		this.getTreeselect();
 	},
 	methods: {
 		getHolidayPage() {
@@ -329,11 +450,23 @@ export default {
 		/** 查询部门下拉树结构 */
 		getTreeselect() {
 			getEnableData().then((response) => {
+				// 遍历部门，判断当前帐号的部门是否有为最上级
+				const nowDept = response.data.filter((i) => i.id == this.topDeptId);
+				this.ishasParent = nowDept[0].hasParent;
+				this.parentId = nowDept.parentId;
+
 				// 处理 deptOptions 参数
 				this.deptOptions = [];
 				this.deptOptions.push(...this.handleTree(response.data, 'id'));
 			});
 		},
+		// 根据部门id查询该部门是否是继承
+		getSet() {
+			getSet({ id: this.deptId }).then((res) => {
+				this.inherited = res.data;
+			});
+			this.getHolidayPage();
+		},
 		// 筛选节点
 		filterNode(value, data) {
 			if (!value) return true;
@@ -343,6 +476,11 @@ export default {
 		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();
 		},
 		//获取农历
@@ -414,9 +552,108 @@ export default {
 			this.detail = false;
 			this.dialogTitle = '新增节假日';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId);
+				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: '已取消',
+									});
+								});
+						}
+					});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
 		holidayLog() {
 			this.logVisible = true;
 			this.$nextTick(() => {
@@ -434,12 +671,12 @@ export default {
 		handleConfirm() {
 			this.$refs.addOrUpdataRef.dataFormSubmit();
 		},
-		showDetail(id) {
+		showDetail(val) {
 			this.addOrUpdateVisible = true;
 			this.detail = true;
 			this.dialogTitle = '节假日详情';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId, id, true);
+				this.$refs.addOrUpdataRef.init(this.deptId, val, true);
 			});
 		},
 		editHoliday() {
@@ -456,6 +693,15 @@ export default {
 		cancelLog() {
 			this.logVisible = false;
 		},
+		handleClose(val) {
+			if (val == 1) {
+				this.showTag1 = false;
+			} else if (val == 2) {
+				this.showTag2 = false;
+			} else {
+				this.showTag3 = false;
+			}
+		},
 	},
 };
 </script>
@@ -561,4 +807,9 @@ export default {
 		}
 	}
 }
+.addDialog {
+	.el-dialog__body {
+		overflow: visible;
+	}
+}
 </style>

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

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

@@ -0,0 +1,411 @@
+@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;
+}

src/views/login.vue

@@ -44,7 +44,7 @@
 								border-radius: 100%;
 								background: #26b9de;
 							"></span>
-						上上电缆
+						智能监控分析系统
 					</p>
 				</div>
 				<video
@@ -103,7 +103,7 @@
 							line-height: 54px;
 							letter-spacing: 2px;
 						">
-						上上电缆
+						智能监控分析系统
 					</h3>
 				</h2>
 

src/views/product&recipe/product/add-or-updata.vue

@@ -1,81 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-18 15:01:42
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产品编码" prop="materialCode">
-					<el-input
-						v-model="dataForm.materialCode"
-						clearable
-						placeholder="请输入产品编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="产品名称" prop="materialName">
-					<el-input
-						v-model="dataForm.materialName"
-						clearable
-						placeholder="请输入产品名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产品规格" prop="material">
-					<el-input
-						v-model="dataForm.material"
-						clearable
-						placeholder="请输入产品规格" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { createProduct, updateProduct,getProduct } from '@/api/ssdl/product&recipe';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createProduct,
-				updateURL: updateProduct,
-				infoURL: getProduct,
-			},
-			dataForm: {
-				id: undefined,
-				material: undefined,
-				materialName: undefined,
-				materialCode: undefined,
-			},
-      typeArr: [],
-			dataRule: {
-				materialCode: [
-					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
-				],
-				materialName: [
-					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
-				],
-				material: [
-					{ required: true, message: '规格不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {},
-};
-</script>

src/views/product&recipe/product/index.vue

@@ -1,199 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="90"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
-import { deleteProduct, getProductPage } from '@/api/ssdl/product&recipe';
-
-const tableProps = [
-	{
-		prop: 'materialCode',
-		label: '产品编码',
-	},
-	{
-		prop: 'materialName',
-		label: '产品名称',
-	},
-	{
-		prop: 'material',
-		label: '规格型号',
-	},
-	{
-		prop: 'creator',
-		label: '创建人',
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getProductPage,
-				deleteURL: deleteProduct,
-			},
-			tableProps,
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '名称',
-					placeholder: '名称',
-					param: 'name',
-				},
-				{
-					type: 'input',
-					label: '编码',
-					placeholder: '编码',
-					param: 'code',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.materialName = val.name;
-					this.listQuery.materialCode = val.code;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-    // 删除
-    deleteHandle(id, name, index,data) {
-      this.$confirm(`是否确认删除${'产品名称为  ' + data.materialName + '  '}的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-	},
-};
-</script>

src/views/product&recipe/recipe/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/product&recipe/recipe/add-or-updata.vue

@@ -1,395 +0,0 @@
-<template>
-	<el-drawer
-		:visible.sync="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		size="60%">
-		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
-		</small-title>
-
-		<div class="content">
-			<div class="visual-part">
-				<el-form
-					ref="dataForm"
-					:model="dataForm"
-					:rules="dataRule"
-					label-width="100px"
-					label-position="top"
-					@keyup.enter.native="dataFormSubmit">
-					<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="配方编码" prop="processCode">
-								<el-input
-									v-model="dataForm.processCode"
-									clearable
-									:disabled="isdetail"
-									placeholder="请输入配方编码" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="配方名称" prop="processName">
-								<el-input
-									v-model="dataForm.processName"
-									clearable
-									:disabled="isdetail"
-									placeholder="请输入配方名称" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="产品" prop="materialId">
-								<el-select
-									style="width: 100%"
-									v-model="dataForm.materialId"
-									:disabled="isdetail"
-									@change="setMaterial"
-									placeholder="请选择产品">
-									<el-option
-										v-for="item in productArr"
-										:key="item.id"
-										:label="item.materialName"
-										:value="item.id"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="配方描述" prop="processDesc">
-								<el-input
-									v-model="dataForm.processDesc"
-									clearable
-									:disabled="isdetail"
-									placeholder="请输入配方描述" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-
-				<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true"
-					v-if="dataForm.id">
-					产品属性列表
-				</small-title>
-
-				<div class="attr-list" v-if="dataForm.id">
-					<base-table
-						:table-props="tableProps"
-						:page="listQuery.pageNo"
-						:limit="listQuery.pageSize"
-						:add-button-show="isdetail ? null : '添加属性'"
-						@emitButtonClick="addNew()"
-						:table-data="productAttributeList">
-						<method-btn
-							v-if="!isdetail"
-							slot="handleBtn"
-							:width="120"
-							label="操作"
-							:method-list="tableBtn"
-							@clickBtn="handleClick" />
-					</base-table>
-					<pagination
-						v-show="listQuery.total > 0"
-						:total="listQuery.total"
-						:page.sync="listQuery.pageNo"
-						:limit.sync="listQuery.pageSize"
-						:page-sizes="[5, 10, 15]"
-						@pagination="getList" />
-				</div>
-			</div>
-		</div>
-
-		<div class="drawer-body__footer">
-			<el-button style="" @click="goback()">取消</el-button>
-			<el-button v-if="isdetail" type="primary" @click="goEdit()">
-				编辑
-			</el-button>
-			<el-button v-else type="primary" @click="dataFormSubmit()">
-				确定
-			</el-button>
-		</div>
-
-		<product-attr-add
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:process-id="dataForm.id"
-			@refreshDataList="getList" />
-	</el-drawer>
-</template>
-
-<script>
-import {
-	updateProcess,
-	createProcess,
-	getProcess,
-	getProcessMaterialPage,
-	deleteProcessMaterial,
-	getProductPage,
-} from '@/api/ssdl/product&recipe';
-import productAttrAdd from './attr-add';
-import { parseTime } from '@/filter/code-filter';
-import SmallTitle from './SmallTitle';
-
-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'equipmentName',
-		label: '设备名称',
-	},
-	{
-		prop: 'materialName',
-		label: '原料名称',
-	},
-	{
-		prop: 'quantity',
-		label: '数量',
-	},
-];
-
-export default {
-	components: { productAttrAdd, SmallTitle },
-	data() {
-		return {
-			visible: false,
-			addOrUpdateVisible: false,
-			tableBtn,
-			tableProps,
-			productAttributeList: [],
-			dataForm: {
-				id: null,
-				processName: '', // 配方名称
-				processCode: '', // 配方编码
-				processDesc: '', // 配方描述
-				materialId: '', // 物料id
-				materialName: '', // 物料名称
-				materialCode: '', // 物料编码
-			},
-			productArr: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
-			},
-			dataRule: {
-				processCode: [
-					{
-						required: true,
-						message: '配方编码不能为空',
-						trigger: 'blur',
-					},
-				],
-				processName: [
-					{
-						required: true,
-						message: '配方名称不能为空',
-						trigger: 'blur',
-					},
-				],
-				materialId: [
-					{
-						required: true,
-						message: '物料不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-			isdetail: false,
-		};
-	},
-	methods: {
-		initData() {
-			this.productAttributeList.splice(0);
-			this.listQuery.total = 0;
-		},
-		init(id, isdetail) {
-			this.initData();
-			getProductPage({ pageNo: 1, pageSize: 100 }).then((res) => {
-				this.productArr = res.data.list;
-			});
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || null;
-			this.visible = true;
-
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-
-				if (this.dataForm.id) {
-					// 获取产品详情
-					getProcess(id).then((response) => {
-						this.dataForm = response.data;
-					});
-					// 获取产品的属性列表
-					this.getList();
-				}
-			});
-		},
-
-		setMaterial() {
-			const data = this.productArr.find(
-				(i) => i.id === this.dataForm.materialId
-			);
-			this.dataForm.materialName = data.materialName;
-			this.dataForm.materialCode = data.materialCode;
-		},
-		getList() {
-			// 获取产品的属性列表
-			getProcessMaterialPage({
-				...this.listQuery,
-				productId: this.dataForm.id,
-			}).then((response) => {
-				this.productAttributeList = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(
-					`确定对${
-						raw.data.name
-							? '[名称=' + raw.data.name + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
-					'提示',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						deleteProcessMaterial(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-						updateProcess(this.dataForm).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-					// 添加的提交
-					createProcess(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.$confirm(`是否新增产品属性?`, '系统提示', {
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning',
-						})
-							.then(() => {
-								this.dataForm.id = response.data;
-								this.addNew();
-							})
-							.catch(() => {
-								this.visible = false;
-								this.$emit('refreshDataList');
-							});
-					});
-				}
-			});
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		// 新增 / 修改
-		addNew(id) {
-			if (this.dataForm.id) {
-				this.addOrUpdateVisible = true;
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(id);
-				});
-			} else {
-				this.$message('请先创建配方!');
-			}
-		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-			this.initData();
-		},
-	},
-};
-</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/product&recipe/recipe/attr-add.vue

@@ -1,195 +0,0 @@
-<template>
-	<el-dialog
-		:visible.sync="visible"
-		:width="'35%'"
-		:append-to-body="true"
-		:close-on-click-modal="false"
-		class="dialog">
-		<template #title>
-			<slot name="title">
-				<div class="titleStyle">
-					{{ !dataForm.id ? '新增' : '编辑' }}
-				</div>
-			</slot>
-		</template>
-
-		<el-form
-			ref="dataForm"
-			:model="dataForm"
-			:rules="dataRule"
-			label-width="100px"
-			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="设备" prop="equipmentId">
-				<el-select
-					style="width: 100%"
-					v-model="dataForm.equipmentId"
-					@change="setEquipment"
-					placeholder="请选择设备">
-					<el-option
-						v-for="item in equipmentArr"
-						:key="item.id"
-						:label="item.equipmentName"
-						:value="item.id"></el-option>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="原料" prop="materialId">
-				<el-select
-					style="width: 100%"
-					v-model="dataForm.materialId"
-					@change="setMaterial"
-					placeholder="请选择原料">
-					<el-option
-						v-for="item in productArr"
-						:key="item.id"
-						:label="item.materialName"
-						:value="item.id"></el-option>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="数量" prop="quantity">
-				<el-input-number
-					v-model="dataForm.quantity"
-					:step="1"
-					step-strictly
-					:min="0"></el-input-number>
-			</el-form-item>
-		</el-form>
-
-		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-		</el-row>
-	</el-dialog>
-</template>
-
-<script>
-import {
-	getProductPage,
-	createProcessMaterial,
-	getProcessMaterial,
-	updateProcessMaterial,
-  getEquipmentPage
-} from '@/api/ssdl/product&recipe';
-
-export default {
-	props: {
-		processId: {
-			type: String,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			visible: false,
-			dataForm: {
-				id: 0,
-				equipmentId: '',
-				equipmentCode: '',
-				equipmentName: '',
-				materialId: '',
-				materialCode: '',
-				materialName: '',
-				quantity: '',
-			},
-			productArr: [],
-      equipmentArr: [],
-			dataRule: {
-				equipmentId: [
-					{ required: true, message: '设备不能为空', trigger: 'change' },
-				],
-				materialId: [
-					{ required: true, message: '原料不能为空', trigger: 'change' },
-				],
-				quantity: [
-					{ required: true, message: '数量不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			this.dataForm.id = id || '';
-			this.visible = true;
-			getProductPage({ pageNo: 1, pageSize: 100 }).then((res) => {
-				this.productArr = res.data.list;
-			});
-			getEquipmentPage({ pageNo: 1, pageSize: 100 }).then((res) => {
-				this.equipmentArr = res.data.list;
-			});
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					getProcessMaterial(this.dataForm.id).then((res) => {
-						this.dataForm = res.data;
-					});
-				}
-			});
-		},
-		setMaterial() {
-			const data = this.productArr.find(
-				(i) => i.id === this.dataForm.materialId
-			);
-			this.dataForm.materialName = data.materialName;
-			this.dataForm.materialCode = data.materialCode;
-		},
-		setEquipment() {
-			const data = this.equipmentArr.find(
-				(i) => i.id === this.dataForm.equipmentId
-			);
-			this.dataForm.equipmentName = data.equipmentName;
-			this.dataForm.equipmentCode = data.equipmentCode;
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-						updateProcessMaterial({
-							...this.dataForm,
-							processId: this.processId,
-						}).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-					// 添加的提交
-					createProcessMaterial({
-						...this.dataForm,
-						processId: this.processId,
-					}).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style scoped>
-.dialog >>> .el-dialog__body {
-	padding: 30px 24px;
-}
-.dialog >>> .el-dialog__header {
-	font-size: 16px;
-	color: rgba(0, 0, 0, 0.85);
-	font-weight: 500;
-	padding: 13px 24px;
-	border-bottom: 1px solid #e9e9e9;
-}
-.dialog >>> .el-dialog__header .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/product&recipe/recipe/index.vue

@@ -1,223 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 14:55:51
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-19 13:21:53
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			: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>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<add-or-update
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
-import { deleteProcess, getProcessPage } from '@/api/ssdl/product&recipe';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
-	},
-	{
-		prop: 'processName',
-		label: '配方名称'
-	},
-	{
-		prop: 'processCode',
-		label: '配方编码'
-	},
-	{
-		prop: 'materialName',
-		label: '产品名称'
-	},
-	{
-		prop: 'materialCode',
-		label: '产品编码'
-	},
-	{
-		prop: 'processDesc',
-		label: '配方描述'
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getProcessPage,
-				deleteURL: deleteProcess,
-			},
-			tableProps,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  },{
-							type: 'delete',
-							btnName: '删除',
-					  },{
-							type: 'detail',
-							btnName: '详情',
-					  },
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '配方编码',
-					placeholder: '配方编码',
-					param: 'code1',
-				},
-				{
-					type: 'input',
-					label: '配方名称',
-					placeholder: '配方名称',
-					param: 'name1',
-				},
-				{
-					type: 'input',
-					label: '产品编码',
-					placeholder: '产品编码',
-					param: 'code2',
-				},
-				{
-					type: 'input',
-					label: '产品名称',
-					placeholder: '产品名称',
-					param: 'name2',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: 'separate',
-				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:product:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.processName = val.name1 || null;
-					this.listQuery.processCode = val.code1 || null;
-					this.listQuery.materialName = val.name2 || null;
-					this.listQuery.materialCode = val.code2 || null;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		otherMethods(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '详情';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(val.data.id, true);
-			});
-		},
-    // 删除
-    deleteHandle(id, name, index,data) {
-      this.$confirm(`是否确认删除${'配方名称为  ' + data.processName + '  '}的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-	},
-};
-</script>

src/views/productionVisualization/equipmentBoard/components/EventLisener.js

@@ -1,38 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2022-06-14 14:28:55
- * @LastEditTime: 2023-08-15 15:48:39
- * @LastEditors: zhp
- * @Description:
- */
-const EventListener = {
-  /**
-   * Listen to DOM events during the bubble phase.
-   *
-   * @param {DOMEventTarget} target DOM element to register listener on.
-   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
-   * @param {function} callback Callback function.
-   * @return {object} Object with a `remove` method.
-   */
-  listen(target, eventType, callback) {
-    if (target.addEventListener) {
-      // console.log(1111)
-      target.addEventListener(eventType, callback, false)
-      return {
-        remove() {
-          target.removeEventListener(eventType, callback, false)
-        }
-      }
-    } else if (target.attachEvent) {
-      // console.log(222)
-      target.attachEvent('on' + eventType, callback)
-      return {
-        remove() {
-          target.detachEvent('on' + eventType, callback)
-        }
-      }
-    }
-  }
-}
-
-export default EventListener

src/views/productionVisualization/equipmentBoard/components/Header.vue

@@ -1,170 +0,0 @@
-<template>
-  <header class="report-header">
-    <!-- logo 放在最左侧 -->
-    <!-- <img style="width: 221px;height: 31px;" src="" alt="benmaLogo" class="logo"> -->
-    <!-- 标题居中显示 -->
-    <!-- <h1>{{ topTitle }}</h1> -->
-    <!-- 实时时间显示 -->
-    <div class="header-right">
-      <img style="width: 426px;height: 44px;" src="../../../../assets/img/ssdlLeftTitle.png" alt="">
-      <!-- <div class="current-time">
-        <div class="YMD">{{ YMD }}</div>
-        <div class="time">{{ time }}</div>
-      </div> -->
-    </div>
-    <div class="header-right">
-      <img style="width: 426px;height: 44px;" src="../../../../assets/img/ssdlTitle.png" alt="">
-      <div class="current-time">
-        <div class="YMD">{{ YMD }}</div>
-        <div class="time">{{ time }}</div>
-      </div>
-    </div>
-    <!-- 全屏按钮保持在右侧 -->
-    <el-button type="text" class="screen-btn" :title="isFullScreen ? '退出全屏' : '全屏'" @click="changeFullScreen">
-      <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
-      <svg-icon v-else icon-class="fullScreenView" />
-    </el-button>
-  </header>
-</template>
-
-<script>
-export default {
-  name: 'Header',
-  props: {
-    isFullScreen: {
-      type: Boolean,
-      default: false
-    },
-    topTitle: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      time: '',
-      YMD:'',
-      timeTimer: null // 用于存储定时器
-    }
-  },
-  methods: {
-    changeFullScreen() {
-      this.$emit('screenfullChange')
-    },
-    exportPDF() {
-      this.$emit('exportPDF')
-    },
-    // 更新当前时间
-    updateTime() {
-      const now = new Date()
-      const hours = this.padZero(now.getHours())
-      const minutes = this.padZero(now.getMinutes())
-      // 新增：获取并格式化秒数
-      const seconds = this.padZero(now.getSeconds())
-
-      const year = now.getFullYear()
-      const month = this.padZero(now.getMonth() + 1) // 补充月份补零，避免单数字月份（如3月显示为"3"）
-      const day = this.padZero(now.getDate()) // 补充日期补零
-
-      // 时间格式更新为：时:分:秒
-      this.time = `${hours}：${minutes}：${seconds}`
-      // 日期格式优化：月份和日期补零（如2025.3.5 → 2025.03.05）
-      this.YMD = `${year}.${month}.${day}`
-    },
-    // 补零函数保持不变（确保时分秒都是两位数）
-    padZero(num) {
-      return num < 10 ? '0' + num : num
-    }
-  },
-  mounted() {
-    // 初始化时间
-    this.updateTime()
-    // 设置定时器，每秒更新一次时间
-    this.timeTimer = setInterval(this.updateTime, 1000)
-  },
-  beforeDestroy() {
-    // 组件销毁前清除定时器，防止内存泄漏
-    if (this.timeTimer) {
-      clearInterval(this.timeTimer)
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.report-header {
-  width: 1920px;
-  height: 72px;
-  background: #FFFFFF;
-  box-shadow: 0px 1px 4px 0px rgba(0, 21, 41, 0.12);
-  display: flex;
-  justify-content:space-between;
-  align-items: center;
-  position: relative;
-  padding: 0 20px;
-
-  // .logo {
-  //   position: absolute;
-  //   left: 40px;
-  //   top: 15px;
-  //   height: auto;
-  //   object-fit: contain;
-  // }
-  .header-right{
-    display: flex;
-    gap: 15px;
-  }
-  h1 {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 48px;
-    color: #FFFFFF;
-    letter-spacing: 28px;
-    text-shadow: 1px 7px 2px #002144;
-    text-align: center;
-    margin: 0;
-  }
-
-  // 实时时间样式
-  .current-time {
-    // position: absolute;
-    // right: 100px; // 位于全屏按钮左侧
-    // top: 20px;
-    color: rgba(0, 0, 0, 0.85); // 假设使用白色文字，可根据实际设计调整
-    // font-size: 22px; // 可根据需要调整大小
-        font-weight: 600;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 16px;
-      line-height: 24px;
-      letter-spacing: 1px;
-      display: flex;
-      flex-direction: column;
-      .YMD{
-        font-weight: 600;
-      }
-      .time{
-      // width: 87px;
-      //   height: 14px;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 600;
-        font-size: 16px;
-        color:rgba(0, 0, 0, 0.85);;
-        // line-height: 14px;
-        letter-spacing: 1px;
-        text-align: left;
-        font-style: normal;
-      }
-  }
-
-  .screen-btn {
-    color: #00fff0;
-    font-size: 26px;
-    position: absolute;
-    right: 21px;
-    top: 85px;
-    transform: translateY(-50%);
-    padding: 0;
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/agvStatus.vue

@@ -1,299 +0,0 @@
-<template>
-  <div style="flex: 1">
-    <div class="agvStatusContent">
-      <div class="title">AGV状态</div>
-      <div class="agvDetailData">
-        <div class="item" v-for="(agv, index) in agvList" :key="agv.id">
-          <img class="car" src="../../../../assets/img/agvCar.png" alt="AGV小车">
-          <div class="eqInfo">
-            <div class="eqCode">
-              <div class="num">{{ index + 1 }}</div>
-              <div class="code">{{ agv.code }}</div>
-            </div>
-            <div class="eqStatusData">
-              <!-- 状态图标 -->
-              <img style="width: 16px; height: 16px; margin-right: 4px;" :src="require(`@/assets/img/${agv.statusImg}`)"
-                :alt="agv.status">
-              <!-- 状态文字（固定宽度） -->
-              <div class="runningState" :style="getStatusColor(agv.status)">
-                {{ agv.status }}
-              </div>
-              <!-- 动态栅格容器 -->
-              <div class="charge" :class="{
-                'charge--run': agv.status !== '充电中',  // 运行中/待命用run背景
-                'charge--charge': agv.status === '充电中'  // 充电中用charge背景
-              }">
-                <div class="grid-item" :style="{ backgroundColor: getGridColor(agv.status) }"
-                  v-for="(grid, idx) in generateGridArray(getGridCount(agv.progress))" :key="idx"
-                  ></div>
-              </div>
-            </div>
-          </div>
-          <div class="qty">
-            <div class="num">{{ agv.completed }}</div>
-            <div class="qtyTitle">今日完成</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AGVStatus',
-  components: {},
-  props: {
-    energyObj: {
-      type: Object,
-      default: () => ({
-        electricComu: 0,
-        steamComu: 0
-      })
-    }
-  },
-  data() {
-    return {
-      agvList: [
-        {
-          id: 1,
-          code: '设备编号1212121',
-          status: '运行中',
-          statusImg: 'runCircle.png',
-          completed: 47,
-          progress: 80 // 进度80% → 显示4个栅格
-        },
-        {
-          id: 2,
-          code: '设备编号3434343',
-          status: '待命',
-          statusImg: 'standbyCircle.png',
-          completed: 23,
-          progress: 40 // 进度40% → 显示2个栅格
-        },
-        {
-          id: 3,
-          code: '设备编号5656565',
-          status: '充电中',
-          statusImg: 'chargeCircle.png',
-          completed: 15,
-          progress: 100 // 进度100% → 显示5个栅格
-        },
-        {
-          id: 4,
-          code: '设备编号7878787',
-          status: '充电中',
-          statusImg: 'chargeCircle.png',
-          completed: 31,
-          progress: 60 // 进度60% → 显示3个栅格
-        }
-      ]
-    }
-  },
-  methods: {
-    // 获取状态文字颜色
-    getStatusColor(status) {
-      const baseStyle = {
-        color: '', // 默认颜色
-        letterSpacing: '0px' // 默认字间距
-      };
-
-      switch (status) {
-        case '运行中':
-          baseStyle.color = '#0A4BFF';
-          break;
-        case '待命':
-          baseStyle.color = 'rgba(245, 154, 36, 1)';
-          baseStyle.letterSpacing = '8px'; // 待命状态单独加字间距（可调整数值）
-          break;
-        case '充电中':
-          baseStyle.color = 'rgba(0, 225, 37, 1)';
-          break;
-        default:
-          baseStyle.color = '';
-      }
-
-      return baseStyle;
-    },
-    // 根据状态获取背景图
-    getBgImage(status) {
-      return status === '充电中' ? 'chargeBg.png' : 'run.png';
-    },
-    // 根据状态获取栅格颜色
-    getGridColor(status) {
-      return status === '充电中'
-        ? 'rgba(0, 225, 37, 1)'
-        : 'rgba(120, 138, 221, 1)';
-    },
-    getGridCount(progress) {
-      // 总栅格位置为5个，进度0%→0个，100%→5个，按比例取整
-      const totalGrids = 5;
-      return Math.ceil((progress / 100) * totalGrids);
-    },
-
-    // 生成栅格数组（用于v-for遍历）
-    generateGridArray(count) {
-      // 生成 [1,2,...,count] 的数组，长度为count
-      return Array.from({ length: count }, (_, i) => i + 1);
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.agvStatusContent {
-  width: 367px;
-  height: 512px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  padding: 16px 18px 26px;
-
-  .title {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 16px;
-    color: rgba(0, 0, 0, 0.85);
-    line-height: 16px;
-    letter-spacing: 1px;
-    text-align: left;
-    font-style: normal;
-    position: relative;
-    padding-left: 12px;
-
-    &::before {
-      content: '';
-      width: 4px;
-      height: 16px;
-      background: #0A4BFF;
-      border-radius: 1px;
-      position: absolute;
-      left: 0;
-      top: 2px;
-    }
-  }
-
-  .agvDetailData {
-    margin-top: 15px;
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-
-    .item {
-      width: 332px;
-      height: 101px;
-      padding: 22px 0 0 10px;
-      display: flex;
-      background: url('../../../../assets/img/agvItemBg.png') no-repeat;
-      background-size: cover;
-
-      .car {
-        width: 66px;
-        height: 57px;
-      }
-
-      .eqInfo {
-        margin-left: 6px;
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-
-        .eqCode {
-          display: flex;
-          align-items: center;
-
-          .num {
-            width: 21px;
-            height: 24px;
-            background: #0065FF;
-            backdrop-filter: blur(1.5px);
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            font-size: 16px;
-            color: #FFFFFF;
-            line-height: 18px;
-            text-align: center;
-          }
-
-          .code {
-            margin-left: 4px;
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            font-size: 16px;
-            color: #020203;
-            line-height: 18px;
-          }
-        }
-
-        .eqStatusData {
-          display: flex;
-          align-items: center;
-
-          // 状态文字固定宽度（确保三种状态宽度一致）
-          .runningState {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            font-size: 16px;
-            line-height: 20px;
-            width: 48px; // 固定宽度，适配三种状态文字
-            text-align: left; // 左对齐，避免空格填充
-          }
-
-          // 栅格容器样式
-          .charge {
-            width: 73px;
-            height: 27px;
-            margin-left: 5px;
-            background-size: 100% 100% !important;
-            background-repeat: no-repeat !important;
-            display: flex;
-            justify-content: flex-start;
-            gap: 1px;
-            padding: 5px 0px 4px 3px;
-
-            // 运行中/待命状态的背景图
-            &.charge--run {
-              background-image: url('../../../../assets/img/runBg.png');
-            }
-
-            // 充电中状态的背景图
-            &.charge--charge {
-              background-image: url('../../../../assets/img/chargeBg.png');
-            }
-
-            .grid-item {
-              width: 12px;
-              height: 18px;
-              border-radius: 2px;
-            }
-          }
-        }
-      }
-
-      .qty {
-        display: flex;
-        flex-direction: column;
-        margin-left: 24px;
-        gap: 12px;
-
-        .num {
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 400;
-          font-size: 31px;
-          color: #000000;
-          line-height: 18px;
-          text-align: center;
-        }
-
-        .qtyTitle {
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 400;
-          font-size: 14px;
-          color: rgba(2, 2, 3, 0.6);
-          line-height: 18px;
-          text-align: center;
-        }
-      }
-    }
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/alarm.vue

@@ -1,97 +0,0 @@
-<template>
-  <div style="flex: 1">
-    <div class="agvStatusContent">
-      <div class="title">异常报警</div>
-      <div class="alarm-item" style="margin-top: 13px;">
-        <div class="item">
-          9:05:21|FMS|AGV-03顶升失败，任务TSK25-1004中断
-        </div>
-        <div class="item">
-          9:05:21|FMS|AGV-03顶升失败，任务TSK25-1004中断
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-// import baseTable from './baseTable.vue'
-// import baseStatus from './baseStatus.vue'
-// import handingObject from './handingObject.vue'
-export default {
-  name: 'AGVStatus',
-  components: {},
-  props: {
-    // energyObj: {
-    //   type: Object,
-    //   default: () => ({
-    //     electricComu: 0,
-    //     steamComu: 0
-    //   })
-    // }
-  },
-  data() {
-    return {
-    }
-  },
-  methods: {
-  },
-
-}
-</script>
-
-<style lang='scss' scoped>
-.agvStatusContent {
-  width: 930px;
-  height: 92px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  padding: 16px 18px 0 18px;
-
-  .title {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 16px;
-    color: rgba(0, 0, 0, 0.85);
-    line-height: 16px;
-    letter-spacing: 1px;
-    text-align: left;
-    font-style: normal;
-    position: relative;
-    padding-left: 12px;
-
-    &::before {
-      content: '';
-      width: 4px;
-      height: 16px;
-      background: #0A4BFF;
-      border-radius: 1px;
-      position: absolute;
-      left: 0;
-      top: 2px;
-    }
-  }
-
-  .alarm-item {
-    display: flex;
-    gap: 10px;
-
-    .item {
-      width: 436px;
-      height: 32px;
-      border: 1px rgba(0, 0, 0, 0.3) dashed;
-      background: url('../../../../assets/img/alarmItemBg.png') no-repeat;
-      background-size: 100% 100%;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 14px;
-      padding: 0 16px;
-      color: #000000;
-      line-height: 32px;
-      letter-spacing: 1px;
-      text-align: left;
-      font-style: normal;
-    }
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/alarmTop.vue

@@ -1,232 +0,0 @@
-<template>
-  <div style="flex: 1">
-    <div class="agvStatusContent">
-      <div class="title">异常原因Top5</div>
-      <div class="alarm-item" style="margin-top: 14px;">
-        <div class="item top1">
-          <dov class="item-data">
-            <div class="data-unit">
-              单位/次
-            </div>
-            <div class="data-detail">
-              <div class="data-title">
-                放货有货
-              </div>
-              <div class="data-num">
-                261,938,984
-              </div>
-            </div>
-          </dov>
-        </div>
-        <div class="item top2">
-          <dov class="item-data">
-            <div class="data-unit">
-              单位/次
-            </div>
-            <div class="data-detail">
-              <div class="data-title">
-                车辆故障
-              </div>
-              <div class="data-num">
-                261,938,984
-              </div>
-            </div>
-          </dov>
-        </div>
-        <div class="item top3">
-          <dov class="item-data">
-            <div class="data-unit">
-              单位/次
-            </div>
-            <div class="data-detail">
-              <div class="data-title">
-                下发失败
-              </div>
-              <div class="data-num">
-                261,938,984
-              </div>
-            </div>
-          </dov>
-        </div>
-        <div class="item top4">
-          <dov class="item-data">
-            <div class="data-unit">
-              单位/次
-            </div>
-            <div class="data-detail">
-              <div class="data-title">
-                取货无货
-              </div>
-              <div class="data-num">
-                261,938,984
-              </div>
-            </div>
-          </dov>
-        </div>
-        <div class="item top5">
-          <dov class="item-data">
-            <div class="data-unit">
-              单位/次
-            </div>
-            <div class="data-detail">
-              <div class="data-title">
-                通信中断
-              </div>
-              <div class="data-num">
-                261,938,984
-              </div>
-            </div>
-          </dov>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-// import baseTable from './baseTable.vue'
-// import baseStatus from './baseStatus.vue'
-// import handingObject from './handingObject.vue'
-export default {
-  name: 'AGVStatus',
-  components: {},
-  props: {
-    // energyObj: {
-    //   type: Object,
-    //   default: () => ({
-    //     electricComu: 0,
-    //     steamComu: 0
-    //   })
-    // }
-  },
-  data() {
-    return {
-    }
-  },
-  methods: {
-  },
-
-}
-</script>
-
-<style lang='scss' scoped>
-.agvStatusContent {
-  width: 402px;
-  height: 442px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  padding: 16px 24px;
-
-  .title {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 16px;
-    color: rgba(0, 0, 0, 0.85);
-    line-height: 16px;
-    letter-spacing: 1px;
-    text-align: left;
-    font-style: normal;
-    position: relative;
-    padding-left: 12px;
-
-    &::before {
-      content: '';
-      width: 4px;
-      height: 16px;
-      background: #0A4BFF;
-      border-radius: 1px;
-      position: absolute;
-      left: 0;
-      top: 2px;
-    }
-  }
-
-  .alarm-item {
-    display: flex;
-    gap: 8px;
-    flex-direction: column;
-
-    .item {
-      width: 354px;
-      height: 70px;
-      background: url('../../../../assets/img/alarmItemBg.png') no-repeat;
-      background-size: 100% 100%;
-
-      .item-data {
-        margin-left: 95px;
-        margin-top: 14px;
-        display: flex;
-        gap: 2px;
-        flex-direction: column;
-
-        .data-unit {
-          // width: 58px;
-          //   height: 17px;
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 400;
-          font-size: 14px;
-          color:rgba(0, 0, 0, 0.7);
-          line-height: 17px;
-          letter-spacing: 2px;
-          text-align: left;
-          font-style: normal;
-        }
-
-        .data-detail {
-          display: flex;
-          gap: 12px;
-
-          .data-title {
-            // width: 80px;
-            // height: 17px;
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            font-size: 18px;
-              color: rgba(0, 0, 0, 0.7);
-            line-height: 17px;
-            letter-spacing: 1px;
-            text-align: left;
-            font-style: normal;
-          }
-          .data-num{
-            // width: 138px;
-            //   height: 17px;
-              font-family: PingFangSC, PingFang SC;
-              font-weight: 400;
-              font-size: 24px;
-              color: #000000;
-              line-height: 12px;
-              text-align: left;
-              font-style: normal;
-          }
-        }
-      }
-    }
-
-    .top1 {
-      background: url('../../../../assets/img/Top1.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .top2 {
-      background: url('../../../../assets/img/Top2.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .top3 {
-      background: url('../../../../assets/img/Top3.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .top4 {
-      background: url('../../../../assets/img/Top4.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .top5 {
-      background: url('../../../../assets/img/Top5.png') no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/baseContainer/eqIndex.vue

@@ -1,294 +0,0 @@
-<!--
- * @Author: gtz
- * @Date: 2022-01-19 15:58:17
- * @LastEditors: zhp
- * @LastEditTime: 2023-09-16 18:52:57
- * @Description: file content
- * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
--->
-<template>
-  <div
-    class="base-container"
-    :style="{ height: '100%', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px' }"
-    :class="{ 'no-padding': noPadding, 'border-none': !showLine }"
-  >
-    <!-- <div class="base-container" :style="{height: height * beilv + 'px', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px'}"> -->
-    <template v-if="showLine">
-      <div class="line" />
-      <div class="line line-vertical" />
-      <div class="line line-right" />
-      <div class="line line-right-vertical" />
-      <div class="line line-bottom" />
-      <div class="line line-bottom-vertical" />
-      <div class="line line-bottom-right" />
-      <div class="line line-bottom-right-vertical" />
-    </template>
-
-    <div class="bar-item">
-      <div v-if="title" class="bar-title">
-        <div class="line line-bottom" />
-        <div class="line line-bottom-vertical" />
-        <div class="line line-bottom-right" />
-        <div class="line line-bottom-right-vertical" />
-        <span class="title">
-          <!-- <svg-icon :icon-class="titleIcon" style="font-size: 1.5em; position: relative; top: .08em" /> -->
-          {{ title }}
-        </span>
-        <span class="colorBlock One" />
-        <span class="colorBlock Two" />
-        <span class="colorBlock Three" />
-        <span class="colorBlock Four" />
-
-      </div>
-      <div class="bar-content" :class="{ 'p-0': noContentPadding }">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'BaseContainer',
-  props: {
-    showLine: {
-      type: Boolean,
-      default: true
-    },
-    noPadding: {
-      type: Boolean,
-      default: false
-    },
-    noContentPadding: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    titleIcon: {
-      type: String,
-      default: ''
-    },
-    height: {
-      type: Number,
-      default: 200
-    },
-    baseSize: {
-      type: Number,
-      default: 12
-    },
-    beilv: {
-      type: Number,
-      default: 1
-    }
-  },
-  data() {
-    return {
-      curIndex: 0
-    }
-  },
-  mounted() { },
-  methods: {
-    changeTab(num) {
-      this.curIndex = num
-      this.$emit('tabSelect', num)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.base-container {
-  color: #fff;
-  width: 100%;
-  background-color: rgba($color: #061027, $alpha: 0.15);
-  position: relative;
-  // opacity: 0.65;
-  border-bottom: 2px solid;
-  border-image: linear-gradient(90deg, rgba(195, 255, 251, 0), rgba(0, 255, 236, 1), rgba(144, 255, 246, 0)) 2 2;
-  filter: blur(0px);
-  filter: blur(0px);
-
-  .line {
-    position: absolute;
-    border-top: 1px solid #52fff1;
-    width: .8em;
-    top: -0.1em;
-    left: -0.1em;
-    &-vertical {
-      // top: calc(-5em / 12);
-      left: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: left;
-    }
-
-    &-right {
-      top: -0.1em;
-      right: .01em;
-      left: inherit;
-    }
-
-    &-right-vertical {
-      top: calc(-2em / 12);
-      right: calc(-1em / 12);
-      left: inherit;
-      transform: rotate(-90deg);
-      transform-origin: right;
-    }
-
-    &-bottom {
-      top: inherit;
-      bottom: 0.01em;
-      left: -0.1em;
-    }
-
-    &-bottom-vertical {
-      top: inherit;
-      left: calc(-1em / 12);
-      bottom: calc(1em / 12);
-      transform: rotate(-90deg);
-      transform-origin: left;
-    }
-
-    &-bottom-right {
-      top: inherit;
-      left: inherit;
-      bottom: 0.01em;
-      right: 0.01em;
-    }
-
-    &-bottom-right-vertical {
-      top: inherit;
-      left: inherit;
-      right: calc(-1em / 12);
-      bottom: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: right;
-    }
-  }
-
-  .bar-item {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .bar-title {
-    width: 100%;
-    background: linear-gradient(90deg, rgba(75, 239, 255, 0.28) 0%, rgba(0, 169, 205, 0) 20%,), linear-gradient(180deg, rgba(75, 239, 255, 0.28) 0%,
-        rgba(0, 169, 205, 0) 20%);
-      backdrop-filter: blur(1.5px);
-    color: #52fff1;
-    .colorBlock{
-      display: inline-block;
-      width: 4px;
-      height: 16px;
-      background: #31A6AE;
-      opacity: 0.84;
-      backdrop-filter: blur(1.5px);
-      margin-left: 39em;
-      // margin-top: 1.2em;
-    }
-    .Two{
-      opacity: 0.55;
-      margin-left: 0.375em;
-    }
-    .Three {
-      opacity: 0.29;
-      margin-left: 0.375em;
-    }
-    .Four {
-      opacity: 0.16;
-      margin-left: 0.375em;
-    }
-    font-size: 1.5em;
-    height: 3em;
-    position: relative;
-      .line {
-          position: absolute;
-          border-top: 1px solid #52fff1;
-          width: .5em;
-          // top: -0.1em;
-          // left: -0.1em;
-
-          // &-vertical {
-          //   // top: calc(-5em / 12);
-          //   left: calc(-1em / 12);
-          //   transform: rotate(90deg);
-          //   transform-origin: left;
-          // }
-
-          // &-right {
-          //   top: -0.1em;
-          //   right: .01em;
-          //   left: inherit;
-          // }
-
-          // &-right-vertical {
-          //   top: calc(-2em / 12);
-          //   right: calc(-1em / 12);
-          //   left: inherit;
-          //   transform: rotate(-90deg);
-          //   transform-origin: right;
-          // }
-
-          &-bottom {
-            top: inherit;
-            bottom: 0.01em;
-            left: -0.1em;
-          }
-
-          &-bottom-vertical {
-            top: inherit;
-            left: calc(-1em / 12);
-            bottom: calc(1em / 12);
-            transform: rotate(-90deg);
-            transform-origin: left;
-          }
-
-          &-bottom-right {
-            top: inherit;
-            left: inherit;
-            bottom: 0.01em;
-            right: 0.01em;
-          }
-
-          &-bottom-right-vertical {
-            top: inherit;
-            left: inherit;
-            right: calc(-0.1em / 12);
-            bottom: calc(.1em / 12);
-            transform: rotate(90deg);
-            transform-origin: right;
-          }
-        }
-      .title{
-        margin-left: 1.75em;
-        margin-top: 1em;
-        width: 7em;
-        // height: 100%;
-        display: inline-block;
-        }
-    // padding: 0.67em;
-  }
-
-  .bar-content {
-    // padding: 1em;
-    flex: 1 auto;
-  }
-
-  .no-padding {
-    padding: 0;
-  }
-
-  .p-0 {
-    padding: 0;
-  }
-
-  &.border-none {
-    border: none;
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/baseContainer/index.vue

@@ -1,294 +0,0 @@
-<!--
- * @Author: gtz
- * @Date: 2022-01-19 15:58:17
- * @LastEditors: zhp
- * @LastEditTime: 2023-09-16 10:04:49
- * @Description: file content
- * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
--->
-<template>
-  <div
-    class="base-container"
-    :style="{ height: '100%', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px' }"
-    :class="{ 'no-padding': noPadding, 'border-none': !showLine }"
-  >
-    <!-- <div class="base-container" :style="{height: height * beilv + 'px', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px'}"> -->
-    <template v-if="showLine">
-      <div class="line" />
-      <div class="line line-vertical" />
-      <div class="line line-right" />
-      <div class="line line-right-vertical" />
-      <div class="line line-bottom" />
-      <div class="line line-bottom-vertical" />
-      <div class="line line-bottom-right" />
-      <div class="line line-bottom-right-vertical" />
-    </template>
-
-    <div class="bar-item">
-      <div v-if="title" class="bar-title">
-        <div class="line line-bottom" />
-        <div class="line line-bottom-vertical" />
-        <div class="line line-bottom-right" />
-        <div class="line line-bottom-right-vertical" />
-        <span class="title">
-          <!-- <svg-icon :icon-class="titleIcon" style="font-size: 1.5em; position: relative; top: .08em" /> -->
-          {{ title }}
-        </span>
-        <span class="colorBlock One" />
-        <span class="colorBlock Two" />
-        <span class="colorBlock Three" />
-        <span class="colorBlock Four" />
-
-      </div>
-      <div class="bar-content" :class="{ 'p-0': noContentPadding }">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'BaseContainer',
-  props: {
-    showLine: {
-      type: Boolean,
-      default: true
-    },
-    noPadding: {
-      type: Boolean,
-      default: false
-    },
-    noContentPadding: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    titleIcon: {
-      type: String,
-      default: ''
-    },
-    height: {
-      type: Number,
-      default: 200
-    },
-    baseSize: {
-      type: Number,
-      default: 12
-    },
-    beilv: {
-      type: Number,
-      default: 1
-    }
-  },
-  data() {
-    return {
-      curIndex: 0
-    }
-  },
-  mounted() { },
-  methods: {
-    changeTab(num) {
-      this.curIndex = num
-      this.$emit('tabSelect', num)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.base-container {
-  color: #fff;
-  width: 100%;
-  background-color: rgba($color: #061027, $alpha: 0.15);
-  position: relative;
-  // opacity: 0.65;
-  border-bottom: 2px solid;
-  border-image: linear-gradient(90deg, rgba(195, 255, 251, 0), rgba(0, 255, 236, 1), rgba(144, 255, 246, 0)) 2 2;
-  filter: blur(0px);
-  filter: blur(0px);
-
-  .line {
-    position: absolute;
-    border-top: 1px solid #52fff1;
-    width: .8em;
-    top: -0.1em;
-    left: -0.1em;
-    &-vertical {
-      // top: calc(-5em / 12);
-      left: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: left;
-    }
-
-    &-right {
-      top: -0.1em;
-      right: .01em;
-      left: inherit;
-    }
-
-    &-right-vertical {
-      top: calc(-2em / 12);
-      right: calc(-1em / 12);
-      left: inherit;
-      transform: rotate(-90deg);
-      transform-origin: right;
-    }
-
-    &-bottom {
-      top: inherit;
-      bottom: 0.01em;
-      left: -0.1em;
-    }
-
-    &-bottom-vertical {
-      top: inherit;
-      left: calc(-1em / 12);
-      bottom: calc(1em / 12);
-      transform: rotate(-90deg);
-      transform-origin: left;
-    }
-
-    &-bottom-right {
-      top: inherit;
-      left: inherit;
-      bottom: 0.01em;
-      right: 0.01em;
-    }
-
-    &-bottom-right-vertical {
-      top: inherit;
-      left: inherit;
-      right: calc(-1em / 12);
-      bottom: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: right;
-    }
-  }
-
-  .bar-item {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .bar-title {
-    width: 100%;
-    background: linear-gradient(90deg, rgba(75, 239, 255, 0.28) 0%, rgba(0, 169, 205, 0) 20%,), linear-gradient(180deg, rgba(75, 239, 255, 0.28) 0%,
-        rgba(0, 169, 205, 0) 20%);
-      backdrop-filter: blur(1.5px);
-    color: #52fff1;
-    .colorBlock{
-      display: inline-block;
-      width: 4px;
-      height: 16px;
-      background: #31A6AE;
-      opacity: 0.84;
-      backdrop-filter: blur(1.5px);
-      margin-left: 14em;
-      // margin-top: 1.2em;
-    }
-    .Two{
-      opacity: 0.55;
-      margin-left: 0.375em;
-    }
-    .Three {
-      opacity: 0.29;
-      margin-left: 0.375em;
-    }
-    .Four {
-      opacity: 0.16;
-      margin-left: 0.375em;
-    }
-    font-size: 1.5em;
-    height: 3em;
-    position: relative;
-      .line {
-          position: absolute;
-          border-top: 1px solid #52fff1;
-          width: .5em;
-          // top: -0.1em;
-          // left: -0.1em;
-
-          // &-vertical {
-          //   // top: calc(-5em / 12);
-          //   left: calc(-1em / 12);
-          //   transform: rotate(90deg);
-          //   transform-origin: left;
-          // }
-
-          // &-right {
-          //   top: -0.1em;
-          //   right: .01em;
-          //   left: inherit;
-          // }
-
-          // &-right-vertical {
-          //   top: calc(-2em / 12);
-          //   right: calc(-1em / 12);
-          //   left: inherit;
-          //   transform: rotate(-90deg);
-          //   transform-origin: right;
-          // }
-
-          &-bottom {
-            top: inherit;
-            bottom: 0.01em;
-            left: -0.1em;
-          }
-
-          &-bottom-vertical {
-            top: inherit;
-            left: calc(-1em / 12);
-            bottom: calc(1em / 12);
-            transform: rotate(-90deg);
-            transform-origin: left;
-          }
-
-          &-bottom-right {
-            top: inherit;
-            left: inherit;
-            bottom: 0.01em;
-            right: 0.01em;
-          }
-
-          &-bottom-right-vertical {
-            top: inherit;
-            left: inherit;
-            right: calc(-0.1em / 12);
-            bottom: calc(.1em / 12);
-            transform: rotate(90deg);
-            transform-origin: right;
-          }
-        }
-      .title{
-        margin-left: 1.75em;
-        margin-top: 1em;
-        width: 6em;
-        // height: 100%;
-        display: inline-block;
-        }
-    // padding: 0.67em;
-  }
-
-  .bar-content {
-    // padding: 1em;
-    flex: 1 auto;
-  }
-
-  .no-padding {
-    padding: 0;
-  }
-
-  .p-0 {
-    padding: 0;
-  }
-
-  &.border-none {
-    border: none;
-  }
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/baseContainer/powerIndex.vue

@@ -1,348 +0,0 @@
-<!--
- * @Author: gtz
- * @Date: 2022-01-19 15:58:17
- * @LastEditors: DY
- * @LastEditTime: 2023-12-12 14:37:29
- * @Description: file content
- * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
--->
-<template>
-  <div
-    class="base-container"
-    :style="{ height: '100%', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px' }"
-    :class="{ 'no-padding': noPadding, 'border-none': !showLine }"
-  >
-    <!-- <div class="base-container" :style="{height: height * beilv + 'px', fontSize: 12 * beilv + 'px', padding: 12 * beilv + 'px'}"> -->
-    <template v-if="showLine">
-      <div class="line" />
-      <div class="line line-vertical" />
-      <div class="line line-right" />
-      <div class="line line-right-vertical" />
-      <div class="line line-bottom" />
-      <div class="line line-bottom-vertical" />
-      <div class="line line-bottom-right" />
-      <div class="line line-bottom-right-vertical" />
-    </template>
-
-    <div class="bar-item">
-      <div v-if="title" class="bar-title">
-        <div class="line line-bottom" />
-        <div class="line line-bottom-vertical" />
-        <div class="line line-bottom-right" />
-        <div class="line line-bottom-right-vertical" />
-        <div>
-          <div class="title">
-            <!-- <svg-icon :icon-class="titleIcon" style="font-size: 1.5em; position: relative; top: .08em" /> -->
-            {{ title }}
-          </div>
-          <span :class="curIndex === 1 ? 'num' : 'numTwo'" @click="changeTab(1)">
-            芯片数量
-            <!-- <top-radio-group :data-type="0" @change-time-range="handleChangeOptions('产出数量图', $event)" /> -->
-          </span>
-          <span :class="curIndex === 2 ? 'num' : 'numTwo'" @click="changeTab(2)">
-            组件数量
-            <!-- <top-radio-group :data-type="0" @change-time-range="handleChangeOptions('产出数量图', $event)" /> -->
-          </span>
-        </div>
-
-      </div>
-      <div class="bar-content" :class="{ 'p-0': noContentPadding }">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-// import TopRadioGroup from '../topRadioGroup'
-export default {
-  name: 'BaseContainer',
-  // components: {
-  //   TopRadioGroup
-  // },
-  props: {
-    showLine: {
-      type: Boolean,
-      default: true
-    },
-    noPadding: {
-      type: Boolean,
-      default: false
-    },
-    noContentPadding: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    titleIcon: {
-      type: String,
-      default: ''
-    },
-    height: {
-      type: Number,
-      default: 200
-    },
-    baseSize: {
-      type: Number,
-      default: 12
-    },
-    beilv: {
-      type: Number,
-      default: 1
-    }
-  },
-  data() {
-    return {
-      curIndex: 1
-    }
-  },
-  mounted() { },
-  methods: {
-    changeTab(num) {
-      this.curIndex = num
-      this.$emit('tabSelect', num)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.base-container {
-  color: #fff;
-  width: 100%;
-  background-color: rgba($color: #061027, $alpha: 0.15);
-  position: relative;
-  // opacity: 0.65;
-  border-bottom: 2px solid;
-  border-image: linear-gradient(90deg, rgba(195, 255, 251, 0), rgba(0, 255, 236, 1), rgba(144, 255, 246, 0)) 2 2;
-  filter: blur(0px);
-  filter: blur(0px);
-
-  .line {
-    position: absolute;
-    border-top: 1px solid #52fff1;
-    width: .8em;
-    top: -0.1em;
-    left: -0.1em;
-    &-vertical {
-      // top: calc(-5em / 12);
-      left: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: left;
-    }
-
-    &-right {
-      top: -0.1em;
-      right: .01em;
-      left: inherit;
-    }
-
-    &-right-vertical {
-      top: calc(-2em / 12);
-      right: calc(-1em / 12);
-      left: inherit;
-      transform: rotate(-90deg);
-      transform-origin: right;
-    }
-
-    &-bottom {
-      top: inherit;
-      bottom: 0.01em;
-      left: -0.1em;
-    }
-
-    &-bottom-vertical {
-      top: inherit;
-      left: calc(-1em / 12);
-      bottom: calc(1em / 12);
-      transform: rotate(-90deg);
-      transform-origin: left;
-    }
-
-    &-bottom-right {
-      top: inherit;
-      left: inherit;
-      bottom: 0.01em;
-      right: 0.01em;
-    }
-
-    &-bottom-right-vertical {
-      top: inherit;
-      left: inherit;
-      right: calc(-1em / 12);
-      bottom: calc(-1em / 12);
-      transform: rotate(90deg);
-      transform-origin: right;
-    }
-  }
-
-  .bar-item {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .bar-title {
-    width: 100%;
-    background: linear-gradient(90deg, rgba(75, 239, 255, 0.28) 0%, rgba(0, 169, 205, 0) 20%,), linear-gradient(180deg, rgba(75, 239, 255, 0.28) 0%,
-        rgba(0, 169, 205, 0) 20%);
-      backdrop-filter: blur(1.5px);
-    color: #52fff1;
-    .colorBlock{
-      display: inline-block;
-      width: 4px;
-      height: 16px;
-      background: #31A6AE;
-      opacity: 0.84;
-      backdrop-filter: blur(1.5px);
-      margin-left: 14em;
-      // margin-top: 1.2em;
-    }
-    .Two{
-      opacity: 0.55;
-      margin-left: 0.375em;
-    }
-    .Three {
-      opacity: 0.29;
-      margin-left: 0.375em;
-    }
-    .Four {
-      opacity: 0.16;
-      margin-left: 0.375em;
-    }
-    font-size: 1.5em;
-    height: 3em;
-    position: relative;
-      .line {
-          position: absolute;
-          border-top: 1px solid #52fff1;
-          width: .5em;
-          // top: -0.1em;
-          // left: -0.1em;
-
-          // &-vertical {
-          //   // top: calc(-5em / 12);
-          //   left: calc(-1em / 12);
-          //   transform: rotate(90deg);
-          //   transform-origin: left;
-          // }
-
-          // &-right {
-          //   top: -0.1em;
-          //   right: .01em;
-          //   left: inherit;
-          // }
-
-          // &-right-vertical {
-          //   top: calc(-2em / 12);
-          //   right: calc(-1em / 12);
-          //   left: inherit;
-          //   transform: rotate(-90deg);
-          //   transform-origin: right;
-          // }
-
-          &-bottom {
-            top: inherit;
-            bottom: 0.01em;
-            left: -0.1em;
-          }
-
-          &-bottom-vertical {
-            top: inherit;
-            left: calc(-1em / 12);
-            bottom: calc(1em / 12);
-            transform: rotate(-90deg);
-            transform-origin: left;
-          }
-
-          &-bottom-right {
-            top: inherit;
-            left: inherit;
-            bottom: 0.01em;
-            right: 0.01em;
-          }
-
-          &-bottom-right-vertical {
-            top: inherit;
-            left: inherit;
-            right: calc(-0.1em / 12);
-            bottom: calc(.1em / 12);
-            transform: rotate(90deg);
-            transform-origin: right;
-          }
-        }
-      .title{
-        margin-left: 1.75em;
-        margin-top: 1em;
-        width: 6em;
-        float: left;
-        // height: 100%;
-        // display: inline-block;
-        }
-    // padding: 0.67em;
-  }
-
-  .bar-content {
-    // padding: 1em;
-    flex: 1 auto;
-  }
-
-  .no-padding {
-    padding: 0;
-  }
-
-  .p-0 {
-    padding: 0;
-  }
-
-  &.border-none {
-    border: none;
-  }
-}
-.num{
-  font-size: 12px;
-  display: inline-block;
-  margin-top: 14px;
-  margin-left: 0.5em;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #FFFFFF;
-  line-height: 18px;
-}
-.num:after {
-  content: '';
-  // bottom: 20%;
-  width: 100%;
-  height: 1px;
-  border-bottom: 1px solid #ccc;
-  display: inline-block;
-  // margin-left: 24px;
-  margin-bottom: 4px;
-  box-shadow: 0px 0px 2px 0px rgba(82, 255, 241, 0.34);
-    border: 1px solid;
-    border-image: linear-gradient(90deg, rgba(138, 255, 249, 0), rgba(112, 255, 245, 1), rgba(82, 255, 241, 0)) 2 2;
-}
-.numTwo{
-  font-size: 14px;
-  display: inline-block;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #FFFFFF;
-    line-height: 18px;
-    opacity: .39;
-  margin-left: .5em;
-}
-.numTwo:after {
-  content: '';
-  // bottom: 20%;
-  width: 100%;
-  // height: 1px;
-  // border-bottom: 1px solid #ccc;
-  display: inline-block;
-  // margin-left: 24px;
-  margin-bottom: 10px;
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/baseStatus.vue

@@ -1,111 +0,0 @@
-<template>
-  <div class="status-text" :class="getStatusClass()">
-    {{ injectData.status }}
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'StatusLabel',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({}),
-      required: true
-    }
-  },
-  methods: {
-    // 将中文状态转换为英文
-    getStatusText() {
-      const statusMap = {
-        '暂停中': 'Paused',
-        '已终止': 'Terminated',
-        '已终止-回收': 'Terminated-Recycled',
-        '已终止-待回收': 'Terminated-PendingRecycling',
-        '异常': 'Abnormal',
-        '执行中': 'InProgress',
-        '已完成': 'Done',
-        '未完成': 'Pending'
-      };
-      return statusMap[this.injectData.status] || this.injectData.status;
-    },
-    // 判断是否为含"已终止"的状态（用于绑定样式）
-    getStatusClass() {
-      const chineseStatus = this.injectData.status || '';
-      // 包含"已终止"的中文状态统一归类为terminated类
-      if (chineseStatus.includes('已终止')) {
-        return 'terminated';
-      }
-      // 其他状态直接返回英文类名
-      return this.getStatusText();
-    }
-  }
-};
-</script>
-
-<style scoped>
-.status-text {
-  font-size: 14px;
-  padding: 2px 8px 2px 24px;
-  border-radius: 4px;
-  display: inline-flex;
-  align-items: center;
-  position: relative;
-}
-
-/* 所有含"已终止"的状态共用样式 */
-.status-text.terminated::before {
-  content: '';
-    position: absolute;
-    left: 8px;
-    width: 14px;
-    height: 14px;
-    /* border-radius: 2px; */
-    background: url('../../../../assets/img/recycle.png') no-repeat;
-    background-size: cover;
-  /* 已终止系列统一色块 */
-}
-
-.status-text.terminated {
-  color: rgba(89, 89, 89, 1);
-  /* 已终止系列统一文字色 */
-}
-
-/* 暂停中样式 */
-.status-text.Paused::before {
-  content: '';
-  position: absolute;
-  left: 8px;
-  width: 14px;
-  height: 14px;
-  /* border-radius: 2px; */
-    background: url('../../../../assets/img/recycle.png') no-repeat;
-      background-size: cover;
-}
-
-.status-text.Paused {
-  color: rgba(245, 154, 36, 1);
-}
-
-/* 其他状态样式 */
-.status-text.Abnormal {
-  color: rgba(255, 0, 0, 1);
-  padding: 2px 8px;
-  /* 无左侧色块 */
-}
-
-.status-text.InProgress {
-  color: rgba(0, 101, 255, 1);
-  padding: 2px 8px;
-}
-
-.status-text.Done {
-  color: #4CAF50;
-  padding: 2px 8px;
-}
-
-.status-text.Pending {
-  color: #FF9800;
-  padding: 2px 8px;
-}
-</style>

src/views/productionVisualization/equipmentBoard/components/baseTable.vue

@@ -1,250 +0,0 @@
-<!--
- * @Date: 2020-12-14 09:07:03
- * @LastEditors: zhp
- * @LastEditTime: 2024-09-05 09:50:14
- * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue
- * @Description:
--->
-<template>
-  <div class="visual-base-table-container">
-    <el-table :max-height="maxHeight" ref="scroll_Table" @mouseenter.native="autoScroll(true)"
-      @mouseleave.native="autoScroll(false)" v-loading="isLoading"
-      :header-cell-style="{ background: 'rgba(250, 250, 250, 1)', color: 'rgba(0, 0, 0, 0.85)',padding:'3px 2px'}" :row-style="setRowStyle"
-      :data="renderData" border style="width: 100%; background: transparent">
-      <el-table-column v-if="page && limit && showIndex" prop="_pageIndex" label="序号" :width="70" align="center" />
-      <el-table-column v-for="item in renderTableHeadList" :key="item.prop" :show-overflow-tooltip="showOverflow"
-        v-bind="item">
-        <template slot-scope="scope">
-
-          <component :is="item.subcomponent" v-if="item.subcomponent" :inject-data="{...scope.row, ...item}"
-            @emitData="emitData" />
-          <span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span>
-
-        </template>
-      </el-table-column>
-      <slot name="content" />
-    </el-table>
-  </div>
-</template>
-<script>
-import { isObject, isString } from 'lodash'
-export default {
-  name: 'BaseTable',
-  filters: {
-    commonFilter: (source, filterType = a => a) => {
-      return filterType(source)
-    }
-  },
-  props: {
-    maxHeight: {
-      type: [Number, String],  // 支持数字（如300）或字符串（如'300px'）
-      required: false,
-      default: 280  // 原固定值，作为默认 fallback
-    },
-    tableData: {
-      type: Array,
-      required: true,
-      validator: val => val.filter(item => !isObject(item)).length === 0
-    },
-    tableConfig: {
-      type: Array,
-      required: true,
-      validator: val => val.filter(item => !isString(item.prop) || !isString(item.label)).length === 0
-    },
-    isLoading: {
-      type: Boolean,
-      required: false
-    },
-    page: {
-      type: Number,
-      required: false,
-      default: 1
-    },
-    limit: {
-      type: Number,
-      required: false,
-      default: 5
-    },
-    beilv: {
-      type: Number,
-      default: 1
-    },
-    showOverflow: {
-      type: Boolean,
-      default: true
-    },
-    showIndex: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      tableConfigBak: [],
-      selectedBox: new Array(100).fill(true)
-    }
-  },
-  computed: {
-    renderData() {
-      if (this.tableData.length && !this.tableData[0]._pageIndex) {
-        this.tableData.forEach((item, index) => {
-          item._pageIndex = (this.page - 1) * this.limit + index + 1
-        })
-      }
-      return this.tableData.slice((this.page - 1) * this.limit, this.page * this.limit)
-    },
-    renderTableHeadList() {
-      return this.tableConfig.filter((item, index) => {
-        return this.selectedBox[index]
-      })
-    }
-  },
-  beforeMount() {
-    this.selectedBox = new Array(100).fill(true)
-  },
-  mounted() {
-    this.autoScroll()
-  },
-  beforeDestroy() {
-    this.autoScroll(true)
-  },
-  methods: {
-    autoScroll(stop) {
-      const table = this.$refs.scroll_Table
-      if (!table) return; // 防止table未加载时出错
-
-      const divData = table.$refs.bodyWrapper
-      if (stop) {
-        window.clearInterval(this.scrolltimer)
-      } else {
-        // 先清除已有计时器，避免重复创建
-        if (this.scrolltimer) {
-          window.clearInterval(this.scrolltimer)
-        }
-
-        this.scrolltimer = window.setInterval(() => {
-          // 每次滚动1像素
-          divData.scrollTop += 1
-
-          // 关键修改：使用>=判断，允许微小像素偏差
-          if (divData.scrollTop + divData.clientHeight >= divData.scrollHeight - 1) {
-            // 滚动到底部后，重置到顶部（延迟一点更自然）
-            // setTimeout(() => {
-              divData.scrollTop = 0
-            // }, 2000); // 停顿500ms后再从头滚动
-          }
-        }, 200) // 滚动速度（数值越小越快）
-      }
-    },
-    emitData(val) {
-      this.$emit('emitFun', val)
-    },
-    setRowStyle(v) {
-      if (v.rowIndex % 2 === 0) {
-        return {
-          background: '#ffff',
-          color: 'rgba(89, 89, 89, 1)',
-          height: 33  + 'px',
-          lineHeight: 26 + 'px',
-          padding: 0,
-          fontSize: 12  + 'px'
-        }
-      } else {
-        return {
-          background: '#ffff',
-          color: 'rgba(89, 89, 89, 1)',
-          height: 33  + 'px',
-          lineHeight: 26  + 'px',
-          padding: 0,
-          fontSize: 12  + 'px'
-        }
-      }
-    },
-    setCellStyle() {
-      return {
-        // lineHeight: 23  + 'px'
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-// @import "./styles/index.scss";
-.visual-base-table-container {
-.el-table {
-    border: 0;
-
-    // 关键修改：隐藏滚动条但保留滚动功能
-    &::-webkit-scrollbar {
-      width: 0;
-      height: 0;
-      background: transparent;
-    }
-        // 隐藏表头的gutter
-        .el-table__header .el-table__cell.gutter {
-          display: none !important;
-        }
-    // 表格主体内容区滚动条处理
-    .el-table__body-wrapper {
-      &::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-      }
-
-      &::-webkit-scrollbar-thumb {
-        background: transparent;
-      }
-
-      &::-webkit-scrollbar-track {
-        background: transparent;
-      }
-
-      overflow-y: auto !important; // 确保垂直滚动可用
-      overflow-x: auto !important; // 确保水平滚动可用
-    }
-
-    // 固定列滚动条处理
-    .el-table__fixed,
-    .el-table__fixed-right {
-      .el-table__fixed-body-wrapper {
-        &::-webkit-scrollbar {
-          width: 0;
-          height: 0;
-        }
-
-        overflow-y: auto !important;
-        overflow-x: auto !important;
-      }
-    }
-  }
-  .el-table::before,.el-table--border::after {
-    background-color: transparent;
-  }
-  .el-table th,td{
-    border-color: rgba(232, 232, 232, 1) !important;
-    padding: 0;
-  }
-  .el-table tr {
-    background: transparent;
-  }
-  .el-table__row:hover > td {
-    background-color: rgba(79,114,136,0.29) !important;
-    }
-
-  .el-table__row--striped:hover > td {
-    background-color: rgba(79,114,136,0.29) !important;
-  }
-}
-// .setting {
-//   text-align: right;
-//   padding: 15px;
-//   .setting-box {
-//     width: 100px;
-//   }
-//   i {
-//     color: #aaa;
-//     @extend .pointer;
-//   }
-// }
-
-</style>