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

Reviewed-on: #470

.env.dev

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

package.json

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

src/api/areavisual/lane.js

@@ -0,0 +1,49 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 13:53:22
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得巷道分页
+export function getLanePage(query) {
+  return request({
+    url: '/wms/lane/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得巷道
+export function getLane(id) {
+  return request({
+    url: '/wms/lane/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除巷道
+export function deleteLane(id) {
+  return request({
+    url: '/wms/lane/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateLane(data) {
+  return request({
+    url: '/wms/lane/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createLane(data) {
+  return request({
+    url: '/wms/lane/create',
+    method: 'post',
+    data: data
+  })
+}

src/api/areavisual/lineEdgeLibrary.js

@@ -0,0 +1,66 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 14:26:15
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得线边库分页
+export function getLineEdgeLibraryPage(query) {
+  return request({
+    url: '/wms/line-edge-library/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得线边库
+export function getLineEdgeLibrary(id) {
+  return request({
+    url: '/wms/line-edge-library/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除线边库
+export function deleteLineEdgeLibrary(id) {
+  return request({
+    url: '/wms/line-edge-library/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 更新线边库实时pc --清空操作
+export function QKLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/update/pc',
+    method: 'put',
+    data: data
+  })
+}
+// 创建
+export function createLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得设备分页
+export function getEquipmentPage(query) {
+  return request({
+    url: '/wms/equipment/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/areavisual/overview.js

@@ -0,0 +1,79 @@
+/*
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 15:02:04
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获取区域列表
+export function getAreaList(params) {
+    return request({
+        url: '/wms/region/page',
+        method: 'get',
+        params
+    })
+}
+
+// 获取区域空满数量
+export function postAllAreaInfo(data) {
+    return request({
+        url: '/wms/region/lsit/count',
+        method: 'post',
+        data
+    })
+}
+
+// 获取指定库区库位信息
+export function postAreaInfo(params) {
+    return request({
+        url: '/wms/line-edge-library/list/region',
+        method: 'get',
+        params
+    })
+}
+
+// 获取区域总览
+export function postAllAreaOverview(data) {
+    return request({
+        url: '/wms/line-edge-library/line/count',
+        method: 'post',
+        data
+    })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/areavisual/record.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 获取出入库历史任务分页
+export function getRecordPage(params) {
+  return request({
+    url: '/wms/job-main-task-history/page',
+    method: 'get',
+    params
+  })
+}
+
+// 获取巷道列表
+export function getLaneList(params) {
+  return request({
+    url: '/wms/lane/page',
+    method: 'get',
+    params
+  })
+}
+
+// 更新能源实时数据库plc相关
+export function updateEnergyPlc(data) {
+  return request({
+    url: '/base/energy-plc/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/areavisual/region.js

@@ -0,0 +1,49 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 13:35:11
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得区域分页
+export function getRegionPage(query) {
+  return request({
+    url: '/wms/region/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得区域
+export function getRegion(id) {
+  return request({
+    url: '/wms/region/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除区域
+export function deleteRegion(id) {
+  return request({
+    url: '/wms/region/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateRegion(data) {
+  return request({
+    url: '/wms/region/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createRegion(data) {
+  return request({
+    url: '/wms/region/create',
+    method: 'post',
+    data: data
+  })
+}

src/api/group/Schedule.js

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

src/api/group/groupSetting.js

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

src/api/group/holidaySetting.js

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

src/api/ssdl/product&recipe.js

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

src/api/ssdl/taskList.js

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

src/api/visualization/visualization.js

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

src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,12 @@
 				v-if="collapse"
 				key="collapse"
 				class="sidebar-logo-link"
-				to="/">
+				:to="{
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				}">
 				<img v-if="logo" :src="logo" class="sidebar-logo" />
 				<h1
 					v-else
@@ -28,7 +33,16 @@
 					{{ title }}
 				</h1>
 			</router-link>
-			<router-link v-else key="expand" class="sidebar-logo-link" to="/">
+			<router-link
+				v-else
+				key="expand"
+				class="sidebar-logo-link"
+				:to="{
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				}">
 				<img v-if="logo" :src="logo" class="sidebar-logo" />
 				<h1
 					class="sidebar-title"

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:52:23
+ * @Description:
+-->
 <template>
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">

src/mixins/basic-page.js

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

src/permission.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:54:44
+ * @Description:
+ */
 import router from './router'
 import store from './store'
 import { Message } from 'element-ui'
@@ -9,7 +16,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login', 'screenbg', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -17,7 +24,12 @@ router.beforeEach((to, from, next) => {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
     if (to.path === '/login') {
-      next({ path: '/' })
+      next({
+        path: '/',
+        query: {
+          keyword: 'home',
+        },
+      })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
@@ -25,9 +37,9 @@ router.beforeEach((to, from, next) => {
         // 获取字典数据 add by 芋艿
         store.dispatch('dict/loadDictDatas')
         // 判断当前用户是否已拉取完 user_info 信息
-        store.dispatch('GetInfo').then(() => {
+        store.dispatch('GetInfo').then(userInfo => {
           isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
+          store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => {
             // 根据 roles 权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
@@ -35,7 +47,12 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
             Message.error(err)
-            next({ path: '/' })
+            next({
+              path: '/',
+              query: {
+                keyword: 'home',
+              },
+            })
           })
         })
       } else {

src/router/index.js

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

src/store/modules/permission.js

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

src/utils/request.js

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

src/views/areavisual/lane/add-or-updata.vue

@@ -0,0 +1,81 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 14:38:31
+ * @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/areavisual/lane/changeStatus.vue

@@ -0,0 +1,62 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-11 14:41:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 14:15:47
+ * @Description:
+-->
+<template>
+	<el-switch
+		@change="changeStatus"
+		size="small"
+		v-model="injectData.laneState"
+		:active-value="1"
+		:inactive-value="2"></el-switch>
+</template>
+
+<script>
+import { updateLane } from '@/api/areavisual/lane';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {
+		changeStatus(val) {
+			const pdata = { ...this.injectData, laneState: val };
+			this.$confirm(
+				`是否确认修改${'巷道  [ ' + this.injectData.laneName + ' ]  '}的状态?`,
+				'更新状态',
+				{
+					confirmButtonText: '确认修改',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					updateLane(pdata).then((res) => {
+						if (res.code === 0 || res.code === 200) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('emitData');
+						} else {
+							this.$modal.msg(res.msg);
+						}
+					});
+				})
+				.catch((res) => {
+					this.$emit('emitData');
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
+	},
+};
+</script>

src/views/areavisual/lane/index.vue

@@ -0,0 +1,191 @@
+<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">
+		</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 { deleteLane, getLanePage } from '@/api/areavisual/lane';
+import changeStatus from './changeStatus.vue';
+
+const lane = [
+	{
+		id: '1',
+		name: 'A巷道',
+	},
+	{
+		id: '2',
+		name: 'B巷道',
+	},
+	{
+		id: '3',
+		name: 'C巷道',
+	},
+	{
+		id: '4',
+		name: 'D巷道',
+	},
+	{
+		id: '5',
+		name: 'E巷道',
+	},
+	{
+		id: '6',
+		name: 'F巷道',
+	},
+];
+const tableProps = [
+	{
+		prop: 'laneCode',
+		label: '巷道编码',
+	},
+	{
+		prop: 'laneName',
+		label: '巷道名称',
+	},
+	{
+		prop: 'lane',
+		label: '巷道',
+		filter: (val) => {
+			return lane.find((i) => i.id == val)
+				? lane.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'laneSort',
+		label: '巷道排序',
+    width:90,
+	},
+	{
+		prop: 'laneState',
+		label: '巷道状态',
+    width:90,
+		subcomponent: changeStatus,
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		width: 150,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLanePage,
+				deleteURL: deleteLane,
+			},
+			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: 'select',
+					label: '巷道',
+					selectOptions: lane,
+					placeholder: '请选择巷道',
+					param: 'lane',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.laneName = val.name;
+					this.listQuery.laneCode = val.code;
+					this.listQuery.lane = val.lane;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/areavisual/lineEdgeLibrary/add-or-updata.vue

@@ -0,0 +1,324 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:16:36
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<div class="stat-card">
+			<div class="stat-icon">
+				<i class="el-icon-s-grid" style="color: #fff"></i>
+			</div>
+			<div class="stat-title">库位信息</div>
+			<div class="stat-content">
+				<div class="stat-value">{{ lineInfo.lineEdgeLibraryCode }}</div>
+				<div class="stat-label">{{ lineInfo.lineEdgeLibraryName }}</div>
+			</div>
+		</div>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item label="物料" prop="materialId">
+					<el-select
+						style="width: 100%"
+						v-model="dataForm.materialId"
+						filterable
+						@change="setMaterial"
+						placeholder="请选择物料">
+						<el-option
+							v-for="item in productArr"
+							:key="item.id"
+							:label="
+								item.materialCode +
+								'-' +
+								item.materialName +
+								'-' +
+								item.material
+							"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="本盘长度" prop="cableLength">
+					<el-input-number
+						v-model="dataForm.cableLength"
+						:min="0"
+						:precision="2"></el-input-number>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="设备" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						@change="setEquipment"
+						placeholder="请选择绞体">
+						<el-option
+							v-for="item in options1"
+							:key="item.id"
+							:label="item.equipmentName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="应用套号" prop="suite">
+					<el-select v-model="dataForm.suite" placeholder="请选择应用套号">
+						<el-option
+							v-for="item in options2"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<span v-if="dataForm.suite == 2">
+				<el-col :span="8">
+					<el-form-item label="选择套号" prop="time">
+						<el-date-picker
+							v-model="dataForm.time"
+							value-format="yyyy-MM-dd"
+							type="date"></el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="productionLine">
+						<el-select v-model="dataForm.productionLine">
+							<el-option
+								v-for="item in options3"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="numb">
+						<el-select v-model="dataForm.numb">
+							<el-option
+								v-for="item in options4"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</span>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { getAllProductPage } from '@/api/ssdl/product&recipe';
+import {
+	QKLineEdgeLibrary,
+	getEquipmentPage,
+} from '@/api/areavisual/lineEdgeLibrary';
+import { parseTime } from '@/filter/code-filter';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: QKLineEdgeLibrary,
+			},
+			dataForm: {
+				id: undefined,
+				materialId: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+				material: undefined,
+				cableLength: undefined,
+				equipmentId: undefined,
+				equipmentName: undefined,
+				suite: undefined, //是否成套
+				suiteCode: undefined, //套号
+				time: this.parseTime(new Date(), '{y}-{m}-{d}'),
+				productionLine: undefined,
+				numb: undefined,
+			},
+			lineInfo: {},
+			productArr: [],
+			options1: [],
+			options2: [
+				{
+					value: 2,
+					label: '是',
+				},
+				{
+					value: 1,
+					label: '否',
+				},
+			],
+			options3: [
+				{
+					value: '6#',
+					label: '6#',
+				},
+				{
+					value: '7#',
+					label: '7#',
+				},
+				{
+					value: '8#',
+					label: '8#',
+				},
+			],
+			options4: [
+				{
+					value: 0,
+					label: '0',
+				},
+				{
+					value: 1,
+					label: '1',
+				},
+				{
+					value: 2,
+					label: '2',
+				},
+				{
+					value: 3,
+					label: '3',
+				},
+				{
+					value: 4,
+					label: '4',
+				},
+				{
+					value: 5,
+					label: '5',
+				},
+				{
+					value: 6,
+					label: '6',
+				},
+			],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'change' },
+				],
+				time: [{ required: true, message: '不能为空', trigger: 'change' }],
+				productionLine: [
+					{ required: true, message: '不能为空', trigger: 'change' },
+				],
+				numb: [{ required: true, message: '不能为空', trigger: 'change' }],
+			},
+		};
+	},
+	methods: {
+		showLine(val) {
+			getAllProductPage().then((res) => {
+				this.productArr = res.data;
+			});
+			getEquipmentPage({ pageNo: 1, pageSize: 100, equipmentType: 2 }).then(
+				(res) => {
+					this.options1 = res.data.list;
+				}
+			);
+			this.lineInfo = { ...val };
+		},
+		setMaterial() {
+			const data = this.productArr.find(
+				(i) => i.id === this.dataForm.materialId
+			);
+			this.dataForm.materialName = data.materialName;
+			this.dataForm.material = data.material;
+			this.dataForm.materialCode = data.materialCode;
+		},
+		setEquipment() {
+			const data = this.options1.find(
+				(i) => i.id === this.dataForm.equipmentId
+			);
+			this.dataForm.equipmentName = data.equipmentName;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (this.dataForm.suite == 2) {
+					this.dataForm.suiteCode =
+						this.dataForm.time +
+						'-' +
+						this.dataForm.productionLine +
+						'-' +
+						this.dataForm.numb;
+				}
+				QKLineEdgeLibrary({
+					...this.lineInfo,
+					...this.dataForm,
+					lineEdgeLibraryState: 1,
+					id: this.lineInfo.id,
+				}).then((response) => {
+					this.$modal.msgSuccess('操作成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+				return;
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.stat-card {
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>

src/views/areavisual/lineEdgeLibrary/index.vue

@@ -0,0 +1,318 @@
+<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="110"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+      destroy-on-close
+			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 {
+	deleteLineEdgeLibrary,
+	getLineEdgeLibraryPage,
+	QKLineEdgeLibrary,
+} from '@/api/areavisual/lineEdgeLibrary';
+
+const laneRow = [
+	{
+		id: '1',
+		name: '第一排',
+	},
+	{
+		id: '2',
+		name: '第二排',
+	},
+	{
+		id: '3',
+		name: '第三排',
+	},
+	{
+		id: '4',
+		name: '第四排',
+	},
+	{
+		id: '5',
+		name: '第五排',
+	},
+	{
+		id: '6',
+		name: '第六排',
+	},
+];
+const tableProps = [
+	{
+		prop: 'lineEdgeLibraryCode',
+		label: '线边库编码',
+	},
+	{
+		prop: 'lineEdgeLibraryName',
+		label: '线边库名称',
+	},
+	{
+		prop: 'agvGroundCode',
+		label: 'agv码',
+	},
+	{
+		prop: 'lineEdgeLibraryState',
+		label: '线边库状态',
+		width: 90,
+		filter: (val) => {
+			return val ? '满位' : '空闲';
+		},
+	},
+	{
+		prop: 'usableState',
+		label: '是否可用',
+		width: 90,
+		filter: (val) => {
+			return ['', '可用', '不可用', '锁定'][val];
+		},
+	},
+	{
+		prop: 'trayType',
+		label: '托盘类型',
+		width: 90,
+		filter: (val) => {
+			return val ? '笼式' : '盘式';
+		},
+	},
+	{
+		prop: 'productionLine',
+		label: '产线',
+	},
+	{
+		prop: 'equipmentName',
+		label: '设备',
+	},
+	{
+		prop: 'suiteCode',
+		label: '套号',
+	},
+	{
+		prop: 'laneRow',
+		label: '巷道排',
+		filter: (val) => {
+			return laneRow.find((i) => i.id == val)
+				? laneRow.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'materialCode',
+		label: '物料',
+	},
+	{
+		prop: 'batch',
+		label: '批次',
+	},
+	{
+		prop: 'cableLength',
+		label: '线缆长度',
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		width: 150,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineEdgeLibraryPage,
+				deleteURL: deleteLineEdgeLibrary,
+			},
+			tableProps,
+			tableData: [],
+			tableBtn: [
+				{
+					type: 'clear',
+					btnName: '清空',
+				},
+				{
+					type: 'add',
+					btnName: '添加',
+				},
+			].filter((v) => v),
+			formConfig: [
+				{
+					type: 'input',
+					label: '线边库名称',
+					placeholder: '线边库名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '线边库编码',
+					placeholder: '线边库编码',
+					param: 'code',
+				},
+				{
+					type: 'select',
+					label: '巷道排',
+					selectOptions: laneRow,
+					placeholder: '请选择巷道排',
+					param: 'laneRow',
+				},
+				{
+					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.lineEdgeLibraryName = val.name;
+					this.listQuery.lineEdgeLibraryCode = val.code;
+					this.listQuery.laneRow = val.laneRow;
+					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) {
+			if (val.type == 'clear') {
+				if (val.data.usableState == 3) {
+					this.$confirm(
+						`当前库位为锁定状态，代表该库位有未完成的任务关联，是否确认清空${
+							'线边库名称为  ' + val.data.lineEdgeLibraryName + '  '
+						}的数据项?`,
+						'锁定库位清空提示',
+						{
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning',
+						}
+					)
+						.then(() => {
+							QKLineEdgeLibrary({...val.data,lineEdgeLibraryState:0,usableState:1 }).then(({ data }) => {
+								this.$message({
+									message: data,
+									type: 'success',
+									duration: 1500,
+									onClose: () => {
+										this.getDataList();
+									},
+								});
+							});
+						})
+						.catch(() => {});
+				} else {
+					QKLineEdgeLibrary({...val.data,lineEdgeLibraryState:0,usableState:1 }).then(({ data }) => {
+						this.$message({
+							message: data,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				}
+			} else if (val.type === 'add') {
+				this.addOrEditTitle = '添加货物';
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init();
+					this.$refs.addOrUpdate.showLine(val.data);
+				});
+			}
+		},
+	},
+};
+</script>

src/views/areavisual/overview/components/add-or-updata.vue

@@ -0,0 +1,324 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:16:36
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<div class="stat-card">
+			<div class="stat-icon">
+				<i class="el-icon-s-grid" style="color: #fff"></i>
+			</div>
+			<div class="stat-title">库位信息</div>
+			<div class="stat-content">
+				<div class="stat-value">{{ lineInfo.lineEdgeLibraryCode }}</div>
+				<div class="stat-label">{{ lineInfo.lineEdgeLibraryName }}</div>
+			</div>
+		</div>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item label="物料" prop="materialId">
+					<el-select
+						style="width: 100%"
+						v-model="dataForm.materialId"
+						filterable
+						@change="setMaterial"
+						placeholder="请选择物料">
+						<el-option
+							v-for="item in productArr"
+							:key="item.id"
+							:label="
+								item.materialCode +
+								'-' +
+								item.materialName +
+								'-' +
+								item.material
+							"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="本盘长度" prop="cableLength">
+					<el-input-number
+						v-model="dataForm.cableLength"
+						:min="0"
+						:precision="2"></el-input-number>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="设备" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						@change="setEquipment"
+						placeholder="请选择绞体">
+						<el-option
+							v-for="item in options1"
+							:key="item.id"
+							:label="item.equipmentName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="应用套号" prop="suite">
+					<el-select v-model="dataForm.suite" placeholder="请选择应用套号">
+						<el-option
+							v-for="item in options2"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<span v-if="dataForm.suite == 2">
+				<el-col :span="8">
+					<el-form-item label="选择套号" prop="time">
+						<el-date-picker
+							v-model="dataForm.time"
+							value-format="yyyy-MM-dd"
+							type="date"></el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="productionLine">
+						<el-select v-model="dataForm.productionLine">
+							<el-option
+								v-for="item in options3"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="numb">
+						<el-select v-model="dataForm.numb">
+							<el-option
+								v-for="item in options4"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</span>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { getAllProductPage } from '@/api/ssdl/product&recipe';
+import {
+	QKLineEdgeLibrary,
+	getEquipmentPage,
+} from '@/api/areavisual/lineEdgeLibrary';
+import { parseTime } from '@/filter/code-filter';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: QKLineEdgeLibrary,
+			},
+			dataForm: {
+				id: undefined,
+				materialId: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+				material: undefined,
+				cableLength: undefined,
+				equipmentId: undefined,
+				equipmentName: undefined,
+				suite: undefined, //是否成套
+				suiteCode: undefined, //套号
+				time: this.parseTime(new Date(), '{y}-{m}-{d}'),
+				productionLine: undefined,
+				numb: undefined,
+			},
+			lineInfo: {},
+			productArr: [],
+			options1: [],
+			options2: [
+				{
+					value: 2,
+					label: '是',
+				},
+				{
+					value: 1,
+					label: '否',
+				},
+			],
+			options3: [
+				{
+					value: '6#',
+					label: '6#',
+				},
+				{
+					value: '7#',
+					label: '7#',
+				},
+				{
+					value: '8#',
+					label: '8#',
+				},
+			],
+			options4: [
+				{
+					value: 0,
+					label: '0',
+				},
+				{
+					value: 1,
+					label: '1',
+				},
+				{
+					value: 2,
+					label: '2',
+				},
+				{
+					value: 3,
+					label: '3',
+				},
+				{
+					value: 4,
+					label: '4',
+				},
+				{
+					value: 5,
+					label: '5',
+				},
+				{
+					value: 6,
+					label: '6',
+				},
+			],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'change' },
+				],
+				time: [{ required: true, message: '不能为空', trigger: 'change' }],
+				productionLine: [
+					{ required: true, message: '不能为空', trigger: 'change' },
+				],
+				numb: [{ required: true, message: '不能为空', trigger: 'change' }],
+			},
+		};
+	},
+	methods: {
+		showLine(val) {
+			getAllProductPage().then((res) => {
+				this.productArr = res.data;
+			});
+			getEquipmentPage({ pageNo: 1, pageSize: 100, equipmentType: 2 }).then(
+				(res) => {
+					this.options1 = res.data.list;
+				}
+			);
+			this.lineInfo = { ...val };
+		},
+		setMaterial() {
+			const data = this.productArr.find(
+				(i) => i.id === this.dataForm.materialId
+			);
+			this.dataForm.materialName = data.materialName;
+			this.dataForm.material = data.material;
+			this.dataForm.materialCode = data.materialCode;
+		},
+		setEquipment() {
+			const data = this.options1.find(
+				(i) => i.id === this.dataForm.equipmentId
+			);
+			this.dataForm.equipmentName = data.equipmentName;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (this.dataForm.suite == 2) {
+					this.dataForm.suiteCode =
+						this.dataForm.time +
+						'-' +
+						this.dataForm.productionLine +
+						'-' +
+						this.dataForm.numb;
+				}
+				QKLineEdgeLibrary({
+					...this.lineInfo,
+					...this.dataForm,
+					lineEdgeLibraryState: 1,
+					id: this.lineInfo.id,
+				}).then((response) => {
+					this.$modal.msgSuccess('操作成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+				return;
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.stat-card {
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>

src/views/areavisual/overview/components/ringChart.vue

@@ -0,0 +1,125 @@
+<template>
+	<div
+		:class="className"
+		:style="{ height: height, width: width, marginLeft: '10px' }" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from '@/utils/chartMixins/resize';
+
+const animationDuration = 1000;
+export default {
+	mixins: [resize],
+	props: {
+		className: {
+			type: String,
+			default: 'chart',
+		},
+		title: {
+			type: String,
+			default: '',
+		},
+		width: {
+			type: String,
+			default: '100%',
+		},
+		height: {
+			type: String,
+			default: '300px',
+		},
+		ringData: {
+			type: Object,
+			default: () => {},
+		},
+	},
+	data() {
+		return {
+			chart: null,
+			targetId: '',
+		};
+	},
+	beforeDestroy() {
+		if (!this.chart) {
+			return;
+		}
+		this.chart.dispose();
+		this.chart = null;
+	},
+	methods: {
+		initChart() {
+			this.chart = echarts.init(this.$el, 'macarons');
+			const _this = this;
+			this.chart.setOption({
+				title: {
+					text: this.title
+						? '{space|}{tip|}{space|}{value|' + this.title + '}'
+						: '',
+					textStyle: {
+						rich: {
+							tip: {
+								width: 6,
+								height: 6,
+								borderRadius: 50,
+								backgroundColor: '#288AFF',
+							},
+							space: {
+								width: 8,
+							},
+							value: {
+								fontSize: 14,
+								color: 'black',
+							},
+						},
+					},
+				},
+				color: ['#33B36B', '#3A8DFF', '#F59A23'],
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'cross',
+						crossStyle: {
+							color: '#999',
+						},
+					},
+				},
+				legend: {
+					data: ['当前满位', '当前空位', '在途'],
+				},
+				grid: {
+					containLabel: true,
+				},
+				series: [
+					{
+						// name: '投入',
+						type: 'pie',
+						radius: '50%',
+						data: [
+							{
+								name: '当前满位',
+								value: this.ringData.occupiedQuantity
+							},
+							{
+								name: '当前空位',
+								value: this.ringData.idleQuantity
+							},
+							{
+								name: '在途',
+								value: this.ringData.transitQuantity
+							},
+						],
+						emphasis: {
+							itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+							}
+						}
+					}
+				],
+			});
+		},
+	},
+};
+</script>

src/views/areavisual/overview/index.vue

@@ -0,0 +1,665 @@
+<template>
+	<div class="app-container">
+		<el-row class="overview-container">
+			<el-col :span="4" class="overview-container-left">
+				<el-row style="font-size: 18px; font-weight: bold; line-height: 36px">
+					库区选择
+				</el-row>
+				<el-input
+					v-model="areaSearchForm.regionName"
+					placeholder="库区名称"
+					@blur="getArea"
+					clearable />
+				<el-tree
+					:data="areaList"
+					:node-key="'id'"
+					:props="{ label: 'regionName' }"
+					@node-click="nodeClick" />
+			</el-col>
+			<el-col
+				:span="16"
+				v-if="changeType === 0"
+				class="overview-container-main">
+				<el-row>
+					<el-col
+						:span="8"
+						class="allarea-box"
+						v-for="item in allAreaList"
+						:key="item.id">
+						<div class="areainfo-box">
+							<div class="areainfo-box-header">
+								{{ item.regionName }}
+							</div>
+							<div class="areainfo-box-line">
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.occupiedQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#33B36B',
+									}"></div>
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.idleQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#3A8DFF',
+									}"></div>
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.transitQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#F59A23',
+									}"></div>
+							</div>
+							<el-row class="areainfo-box-info">
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p class="areainfo-box-info-item-count">
+										{{ item.totalInventory }}
+									</p>
+									<p class="areainfo-box-info-item-title">库位总数</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #33b36b">
+										{{ item.occupiedQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">占</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #3a8dff">
+										{{ item.idleQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">空</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #f59a23">
+										{{ item.transitQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">在途</p>
+								</el-col>
+							</el-row>
+						</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col
+				:span="4"
+				v-if="changeType === 0"
+				class="overview-container-right">
+				<el-tabs v-model="activeName" @tab-click="handleClickRight">
+					<el-tab-pane label="概览" name="first">
+						<el-row class="overview-container-right-alloverview">
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.totalInventory }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									库位总数
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.occupiedQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									当前满位
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.idleQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									当前空位
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.transitQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									在途
+								</p>
+							</el-col>
+						</el-row>
+						<ringChart :ring-data="allAreaInfo" ref="ringChart" />
+					</el-tab-pane>
+					<el-tab-pane label="在途任务" name="second">在途任务</el-tab-pane>
+				</el-tabs>
+			</el-col>
+			<el-col
+				:span="20"
+				v-if="changeType === 1"
+				class="overview-container-main">
+					<div class="stat-card">
+						<div class="stat-icon">
+							<i class="el-icon-s-grid" style="color: #fff"></i>
+						</div>
+						<div class="stat-title">库区信息</div>
+						<div class="stat-content">
+							<div class="stat-value">{{ getAreaInfoInfo.regionName }}</div>
+							<div class="stat-label">{{ getAreaInfoInfo.regionCode }}</div>
+						</div>
+					</div>
+				<div class="area-body">
+					<div v-for="item in Object.keys(areaInfo)" :key="item">
+						<div class="potTitle">{{ item }}</div>
+						<div class="potList">
+							<div v-for="sitem in areaInfo[item]" :key="sitem.id">
+								<div v-if="sitem.empty" class="area-div-empty" />
+								<div v-else class="area-div" :title="sitem.lineEdgeLibraryName">
+									<el-popover
+										placement="top-start"
+										:title="sitem.lineEdgeLibraryCode"
+										width="200"
+										trigger="hover">
+										<div class="point" />
+										<span style="font-weight: 600">名称:</span>
+										{{ sitem.lineEdgeLibraryName }}
+										<br />
+										<div class="point" />
+										<span style="font-weight: 600">状态:</span>
+										{{
+											sitem.usableState == 3
+												? '锁定'
+												: sitem.usableState == 2
+												? '不可用'
+												: sitem.lineEdgeLibraryState == 1
+												? '满位'
+												: '空闲'
+										}}
+										<br />
+										<span
+											v-if="
+												sitem.usableState == 1 &&
+												sitem.lineEdgeLibraryState == 1
+											">
+											<span style="font-weight: 600">物料:</span>
+											{{ sitem.materialCode || '' }}
+											<br />
+											<span style="font-weight: 600">设备:</span>
+											{{ sitem.equipmentName || '' }}
+											<br />
+											<span style="font-weight: 600">套号:</span>
+											{{ sitem.suiteCode || '' }}
+											<br />
+										</span>
+										<el-button type="text" @click="clearLine(sitem)">
+											清空
+										</el-button>
+										<el-button type="text" @click="addLine(sitem)">
+											添加
+										</el-button>
+										<div
+											class="area-icon"
+											:style="{
+												backgroundColor:
+													sitem.usableState == 3
+														? '#E6A23C'
+														: sitem.usableState == 2
+														? 'gray'
+														: sitem.lineEdgeLibraryState == 1
+														? '#67C23A'
+														: '',
+											}"
+											slot="reference">
+											<i
+												:class="
+													sitem.usableState == 3
+														? 'el-icon-lock'
+														: 'el-icon-s-grid'
+												"
+												style="color: #fff"></i>
+										</div>
+									</el-popover>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</el-col>
+		</el-row>
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			destroy-on-close
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+// import basicPage from '@/mixins/basic-page';
+import ringChart from './components/ringChart.vue';
+import AddOrUpdate from './components/add-or-updata';
+import basicPage from '@/mixins/basic-page';
+import {
+	getAreaList,
+	postAllAreaInfo,
+	postAllAreaOverview,
+	postAreaInfo,
+} from '@/api/areavisual/overview';
+import { QKLineEdgeLibrary } from '@/api/areavisual/lineEdgeLibrary';
+
+export default {
+	name: 'overview',
+	mixins: [basicPage],
+	data() {
+		return {
+			areaList: [
+				{
+					id: 0,
+					regionName: '全部库区',
+				},
+			],
+			areaSearchForm: {
+				pageNo: 1,
+				pageSize: 100,
+				regionName: '',
+			},
+			changeType: 0,
+			allAreaList: [],
+			allAreaInfo: {
+				totalInventory: 0,
+				occupiedQuantity: 0,
+				idleQuantity: 0,
+				transitQuantity: 0,
+			},
+			areaInfo: {},
+			activeName: 'first',
+			getAreaInfoInfo: {},
+		};
+	},
+	components: {
+		ringChart,
+		AddOrUpdate,
+	},
+	async created() {
+		this.getArea();
+		this.getAllAreaInfo();
+		this.getAllAreaOverview();
+	},
+	watch: {
+		activeName: (val) => {
+			if (val === 'first') {
+				this.getAllAreaOverview();
+			} else if (val === 'second') {
+				this.getNowTaskList();
+			}
+		},
+	},
+	methods: {
+		// 获取库区列表
+		async getArea() {
+			const res = await getAreaList(this.areaSearchForm);
+			if (res.code === 0 && res.data) {
+				(this.areaList = [
+					{
+						id: 0,
+						regionName: '全部库区',
+					},
+				]),
+					this.areaList.push(...res.data.list);
+			}
+		},
+		// 库区选择
+		nodeClick(data, node, components) {
+			if (data.id === 0) {
+				this.changeType = 0;
+				this.activeName = 'first';
+				this.getAllAreaInfo();
+			} else {
+				this.getAreaInfoInfo = data; //把库区存下，方便刷新
+				this.changeType = 1;
+				this.getAreaInfo(data.id);
+			}
+		},
+		// 获取全部库区概览信息
+		async getAllAreaInfo() {
+			const res = await postAllAreaInfo([]);
+			console.log(res);
+			if (res.code === 0 && res.data) {
+				this.allAreaList = res.data;
+			}
+		},
+		// 获取库区概览
+		async getAllAreaOverview() {
+			const res = await postAllAreaOverview([]);
+			console.log(res);
+			if (res.code === 0 && res.data) {
+				this.allAreaInfo = res.data;
+				this.$refs.ringChart.initChart();
+			}
+		},
+		// 获取在途任务
+		async getNowTaskList() {},
+		// 获取单库区信息
+		async getAreaInfo(id) {
+			const res = await postAreaInfo({ id });
+			if (res.code === 0 && res.data) {
+				// 按巷道号分组
+				this.areaInfo = res.data.reduce((result, item) => {
+					// 提取巷道号
+					const laneNumber = item.lineEdgeLibraryCode.substring(3, 5) + ' 巷道';
+
+					// 如果该巷道还没有分组，创建一个空数组
+					if (!result[laneNumber]) {
+						result[laneNumber] = [];
+					}
+
+					// 将当前项添加到对应巷道的数组中
+					result[laneNumber].push(item);
+
+					return result;
+				}, {});
+				Object.keys(this.areaInfo).forEach((key) => {
+					const arr = this.areaInfo[key];
+					let emptyNum = 0;
+					let insetEmpty = [];
+					arr.forEach((item, index) => {
+						if (
+							!item.empty &&
+							item.lineEdgeLibraryCode.substring(5, 7) !=
+								Math.floor(index / 2) + 1 + emptyNum &&
+							item.lineEdgeLibraryCode[item.lineEdgeLibraryCode.length - 1] ==
+								'L'
+						) {
+							let num =
+								Number(item.lineEdgeLibraryCode.substring(5, 7)) -
+								(Math.floor(index / 2) + 1 + emptyNum);
+							insetEmpty.push({
+								index,
+								num,
+							});
+							emptyNum += num;
+						}
+					});
+					insetEmpty.forEach((item) => {
+						const arrEmpty = Array.from({ length: item.num * 2 }, () => ({
+							empty: true,
+						}));
+						arr.splice(item.index, 0, ...arrEmpty);
+					});
+				});
+			}
+		},
+		getDataList() {},
+		// 全部库区右侧分页点击
+		handleClickRight(tab, event) {
+			console.log(tab, event);
+		},
+		clearLine(val) {
+			if (val.usableState == 3) {
+				this.$confirm(
+					`当前库位为锁定状态，代表该库位有未完成的任务关联，是否确认清空${
+						'线边库名称为  ' + val.lineEdgeLibraryName + '  '
+					}的数据项?`,
+					'锁定库位清空提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						QKLineEdgeLibrary({
+							...val,
+							lineEdgeLibraryState: 0,
+							usableState: 1,
+						}).then(({ data }) => {
+							this.$message({
+								message: data,
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getAreaInfo(this.getAreaInfoInfo.id);
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				QKLineEdgeLibrary({
+					...val,
+					lineEdgeLibraryState: 0,
+					usableState: 1,
+				}).then(({ data }) => {
+					this.$message({
+						message: data,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAreaInfo(this.getAreaInfoInfo.id);
+						},
+					});
+				});
+			}
+		},
+		addLine(val) {
+			this.addOrEditTitle = '添加货物';
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+				this.$refs.addOrUpdate.showLine(val);
+			});
+		},
+		// dialog的父组件方法this.$emit("refreshDataList");
+		successSubmit() {
+			this.handleCancel();
+			this.getAreaInfo(this.getAreaInfoInfo.id);
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.overview-container {
+	max-height: calc(100vh - 120px - 8px);
+	overflow: scroll;
+	.overview-container-left {
+		padding-right: 12px;
+	}
+	.overview-container-main {
+		.allarea-box {
+			padding: 10px;
+			.areainfo-box {
+				border: 1px solid #bbb;
+				border-radius: 5px;
+				padding: 10px;
+				.areainfo-box-header {
+					font-size: 16px;
+					font-weight: bold;
+					white-space: nowrap; /* 禁止换行 */
+					overflow: hidden; /* 隐藏溢出内容 */
+					text-overflow: ellipsis; /* 溢出部分显示省略号 */
+				}
+				.areainfo-box-line {
+					width: 100%;
+					.areainfo-box-line-item {
+						height: 5px;
+						display: inline-block;
+					}
+				}
+				.areainfo-box-info {
+					.areainfo-box-info-item {
+						text-align: center;
+						font-size: 12px;
+						.areainfo-box-info-item-count {
+							font-weight: bold;
+							font-size: 14px;
+						}
+					}
+				}
+			}
+		}
+	}
+	.overview-container-right {
+		.overview-container-right-alloverview {
+			.overview-container-right-alloverview-item {
+				text-align: center;
+				.overview-container-right-alloverview-item-count {
+					font-size: 14px;
+					font-weight: bold;
+				}
+			}
+		}
+	}
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+	height: 40px;
+	line-height: 40px;
+}
+.el-tree-node__label {
+	display: block;
+	width: calc(100% - 24px);
+	text-align: center;
+	white-space: nowrap; /* 禁止换行 */
+	overflow: hidden; /* 隐藏溢出内容 */
+	text-overflow: ellipsis; /* 溢出部分显示省略号 */
+}
+</style>
+
+<style scoped>
+.area-body {
+	margin-top: 10px;
+	margin-left: 10px;
+	overflow-x: auto;
+	display: flex;
+}
+.potTitle {
+	width: 190px;
+	background-color: rgb(169, 235, 249);
+	border-radius: 3px;
+	margin-right: 5px;
+	text-align: center;
+	color: #000000;
+	letter-spacing: 1px;
+	margin-bottom: 10px;
+	font-size: 16px;
+}
+.potList {
+	width: 190px;
+	display: grid;
+	grid-template-columns: 90px 90px;
+	gap: 8px;
+}
+.area-div {
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border: 4px solid #1a56db;
+	margin-bottom: 30px;
+}
+.area-div-empty {
+	background: white;
+	width: 90px;
+	height: 88px;
+	margin-bottom: 30px;
+}
+.point {
+	width: 5px;
+	height: 5px;
+	border-radius: 50%;
+	background-color: #409eff;
+	float: left;
+	margin-top: 7px;
+	margin-right: 5px;
+}
+.area-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: auto;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+}
+</style>
+
+<style scoped>
+.stat-card {
+	margin-top: 10px;
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>

src/views/areavisual/record/components/RecordDrawer.vue

@@ -0,0 +1,519 @@
+<!--
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description:
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<!-- <EquipmentInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							:disabled="mode.includes('detail')"
+							:sync-filelist="syncFileListFlag"
+							v-model="form" /> -->
+					</div>
+
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							:add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr"
+							@emitFun="handleEmitFun">
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+	</el-drawer>
+</template>
+
+<script>
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle },
+	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						// this.form = {
+						// 	code: 'gj',
+						// 	name: '下片机',
+						// 	enName: 'unload',
+						// 	abbr: '',
+						// 	equipmentTypeId: 21084,
+						// 	remark: '备注',
+						// 	id: '1712367395052384257',
+						// 	createTime: 1697095176000,
+						// 	enterTime: 0,
+						// 	productionTime: 0,
+						// 	files: [
+						// 		{
+						// 			fileName: '测试.xlsx',
+						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0108%2F0f0c6f30j00r5cle9000sc000hs00gtc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试2.xlsx',
+						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0415%2F2cd23619j00racb96000kc000hs00hsc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试3.xlsx',
+						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F1fea91a0-d088-409e-b145-e0e61254b28b%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=2e0fe7d1de7f54adff3007efe133d67c',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试4.xlsx',
+						// 			fileUrl: 'https://pics5.baidu.com/feed/b7003af33a87e950cdfb4b4546eed044faf2b40d.jpeg?token=1d7484cfe4b014dd201f8c8725cab945',
+						// 			fileType: 2
+						// 		},
+						// 		{
+						// 			fileName: '测试5.xlsx',
+						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2Fe3500876-9c46-4b70-8d37-4799520cdd13%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=4abc1df930e62730e5361a7d3765e0f2',
+						// 			fileType: 2
+						// 		},
+						// 	],
+						// 	tvalue: 0,
+						// 	processingTime: 0,
+						// 	manufacturer: '',
+						// 	spec: '',
+						// 	description: '描述',
+						// };
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+          this.$emit('refreshDataList');
+				}
+
+				this.btnLoading = false;
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.warning('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/areavisual/record/index.vue

@@ -0,0 +1,277 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+            isFold
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 设备 详情 - 编辑 -->
+		<RecordDrawer
+			v-if="open"
+			ref="drawer"
+			:mode="editMode"
+			@update-mode="editMode = $event"
+			:data-id="form.id"
+			@refreshDataList="getList"
+			@cancel="cancelEdit"
+			@destroy="cancelEdit" />
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import RecordDrawer from './components/RecordDrawer';
+import { getRecordPage, getLaneList } from '@/api/areavisual/record';
+
+export default {
+	name: 'Equipment',
+	components: {
+		RecordDrawer,
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name', 'code'],
+            // this.$auth.hasPermi(`base:equipment:update`)
+			tableBtn: [
+				{
+                    type: 'detail',
+                    btnName: '详情'
+				}
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'recordCode',
+					label: '出/入库单编号',
+					fixed: true,
+					width: 180,
+					// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+					// showOverflowtooltip: true,
+				},
+				{
+					prop: 'type',
+					label: '业务类型',
+					filter: (val) => val === 1 ? '出库' : '入库',
+				},
+				{
+                    width: 180,
+                    prop: 'recordTime',
+                    label: '出/入库时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss')
+                },
+				{ prop: 'recordArea', label: '出/入库库区' },
+				{ prop: 'recordLane', label: '出/入库巷道' },
+				{ prop: 'recordRegion', label: '出/入库库位号' },
+				{ prop: 'target', label: '搬运对象' },
+				{ prop: 'productName', label: '产品名称' },
+				{ prop: 'specification', label: '型号规格' },
+				{ prop: 'recordMan', label: '出/入库人' },
+				{ prop: 'remark', label: '备注' }
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '请输入出/入库编码、产品名称、规格型号、库位号',
+					param: 'query',
+                    width: 350
+				},
+				{
+					type: 'select',
+					label: '业务类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'出库'
+                        },
+                        {
+                            id: '2',
+                            name:'入库'
+                        },
+                    ],
+					placeholder: '请选择业务类型',
+					param: 'type',
+				},
+				{
+					type: 'select',
+					label: '出/入库巷道',
+					selectOptions: [],
+					placeholder: '请选择出/入库巷道',
+					param: 'recordLane',
+				},
+				{
+					type: 'select',
+					label: '来源',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'WMS'
+                        },
+                        {
+                            id: '2',
+                            name:'MES'
+                        },
+                    ],
+					placeholder: '请选择来源',
+					param: 'source',
+				},
+				{
+					type: 'select',
+					label: '出/入库人',
+					selectOptions: [],
+					placeholder: '请选择出/入库人',
+					param: 'recordMan',
+				},
+				{
+					type: 'datePicker',
+					label: '出/入库时间',
+					placeholder: '请选择出/入库时间',
+					param: 'recordTime',
+                    dateType: 'datetimerange',
+                    rangeSeparator: '至'
+				},
+				{
+					type: 'select',
+					label: '载具类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'AGV'
+                        },
+                        {
+                            id: '2',
+                            name:'人工叉车'
+                        },
+                    ],
+					placeholder: '请选择载具类型',
+					param: 'vehicleType',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
+					color: 'info',
+				}
+			],
+			editVisible: false,
+			editMode: 'detail', // 'edit', 'detail'
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 20,
+                query: '',
+				type: '',
+                source: '',
+				recordLane: '',
+                recordMan: '',
+                recordTime: '',
+                vehicleType: ''
+			},
+            form: {}
+		};
+	},
+	created() {
+        this.getLane()
+		this.getList();
+	},
+	computed: {},
+	methods: {
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getRecordPage(this.queryParams).then((response) => {
+                console.log(response)
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+        async getLane() {
+            const res = await getLaneList({
+                pageNo: 1,
+                pageSize: 100
+            })
+            if (res.code === 0 && res.data) {
+                console.log(res.data)
+                this.searchBarFormConfig[2].selectOptions = res.data.list.map(item => {
+                    return { id: item.id, name: item.lane }
+                })
+                console.log(this.searchBarFormConfig)
+            }
+        },
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+		},
+		// /** 导出按钮操作 */
+		// handleExport() {
+		// 	// 处理查询参数
+		// 	let params = { ...this.queryParams };
+		// 	params.pageNo = undefined;
+		// 	params.pageSize = undefined;
+		// 	this.$modal
+		// 		.confirm('是否确认导出所有设备数据项?')
+		// 		.then(() => {
+		// 			this.exportLoading = true;
+		// 			return exportEquipmentExcel(params);
+		// 		})
+		// 		.then((response) => {
+		// 			this.$download.excel(response, '设备.xls');
+		// 			this.exportLoading = false;
+		// 		})
+		// 		.catch(() => {});
+		// },
+        handleTableBtnClick ({data, type}) {
+            switch (type) {
+                case 'detail':
+                    this.viewDetail(data.id)
+            }
+        },
+		// 查看详情
+		viewDetail(id) {
+			this.editMode = 'detail';
+			this.open = true;
+			this.form.id = id;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+	},
+};
+</script>

src/views/areavisual/region/add-or-updata.vue

@@ -0,0 +1,81 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 14:38:31
+ * @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/areavisual/region/changeStatus.vue

@@ -0,0 +1,62 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-11 14:41:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 14:13:14
+ * @Description:
+-->
+<template>
+	<el-switch
+		@change="changeStatus"
+		size="small"
+		v-model="injectData.regionState"
+		:active-value="1"
+		:inactive-value="2"></el-switch>
+</template>
+
+<script>
+import { updateRegion } from '@/api/areavisual/region';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {
+		changeStatus(val) {
+			const pdata = { ...this.injectData, regionState: val };
+			this.$confirm(
+				`是否确认修改${'区域  [ ' + this.injectData.regionName + ' ]  '}的状态?`,
+				'更新状态',
+				{
+					confirmButtonText: '确认修改',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					updateRegion(pdata).then((res) => {
+						if (res.code === 0 || res.code === 200) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('emitData');
+						} else {
+							this.$modal.msg(res.msg);
+						}
+					});
+				})
+				.catch((res) => {
+					this.$emit('emitData');
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
+	},
+};
+</script>

src/views/areavisual/region/index.vue

@@ -0,0 +1,221 @@
+<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">
+		</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 { deleteRegion, getRegionPage } from '@/api/areavisual/region';
+import changeStatus from './changeStatus.vue';
+
+const region = [
+	{
+		id: '1',
+		name: 'A区域',
+	},
+	{
+		id: '2',
+		name: 'B区域',
+	},
+	{
+		id: '3',
+		name: 'C区域',
+	},
+	{
+		id: '4',
+		name: 'D区域',
+	},
+	{
+		id: '5',
+		name: 'E区域',
+	},
+	{
+		id: '6',
+		name: 'F区域',
+	},
+	{
+		id: '7',
+		name: 'G区域',
+	},
+	{
+		id: '8',
+		name: 'H区域',
+	},
+];
+const regionType = [
+	{
+		id: '1',
+		name: '拉丝缓存区',
+	},
+	{
+		id: '2',
+		name: '满盘存储区',
+	},
+	{
+		id: '3',
+		name: '空盘存储区',
+	},
+	{
+		id: '4',
+		name: '复绕区',
+	},
+];
+const tableProps = [
+	{
+		prop: 'regionCode',
+		label: '区域编码',
+	},
+	{
+		prop: 'regionName',
+		label: '区域名称',
+	},
+	{
+		prop: 'region',
+		label: '区域',
+		filter: (val) => {
+			return region.find((i) => i.id == val)
+				? region.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'regionType',
+		label: '区域类型',
+		filter: (val) => {
+			return regionType.find((i) => i.id == val)
+				? regionType.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'rowNum',
+		label: '行数',
+    width:90,
+	},
+	{
+		prop: 'columnNum',
+		label: '列数',
+    width:90,
+	},
+	{
+		prop: 'regionState',
+		label: '区域状态',
+    width:90,
+		subcomponent: changeStatus,
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		width: 150,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getRegionPage,
+				deleteURL: deleteRegion,
+			},
+			tableProps,
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '编码',
+					placeholder: '编码',
+					param: 'code',
+				},
+				{
+					type: 'select',
+					label: '区域',
+					selectOptions: region,
+					placeholder: '请选择区域',
+					param: 'region',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.regionName = val.name;
+					this.listQuery.regionCode = val.code;
+					this.listQuery.region = val.region;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/cost/components/SmallTitle.vue

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

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

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

src/views/cost/components/detailDrawer.vue

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

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

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

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

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

@@ -0,0 +1,32 @@
+<!--
+ * @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/typeRule.vue

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

src/views/cost/index.vue

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

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

@@ -0,0 +1,35 @@
+<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/error/401.vue

@@ -1,88 +1,93 @@
 <template>
-  <div class="errPage-container">
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
-    <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          401错误!
-        </h1>
-        <h2>您没有访问权限！</h2>
-        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
-        <ul class="list-unstyled">
-          <li class="link-type">
-            <router-link to="/">
-              回首页
-            </router-link>
-          </li>
-        </ul>
-      </el-col>
-      <el-col :span="12">
-        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
-      </el-col>
-    </el-row>
-  </div>
+	<div class="errPage-container">
+		<el-button icon="arrow-left" class="pan-back-btn" @click="back">
+			返回
+		</el-button>
+		<el-row>
+			<el-col :span="12">
+				<h1 class="text-jumbo text-ginormous">401错误!</h1>
+				<h2>您没有访问权限！</h2>
+				<h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
+				<ul class="list-unstyled">
+					<li class="link-type">
+						<router-link to="/">回首页</router-link>
+					</li>
+				</ul>
+			</el-col>
+			<el-col :span="12">
+				<img
+					:src="errGif"
+					width="313"
+					height="428"
+					alt="Girl has dropped her ice cream." />
+			</el-col>
+		</el-row>
+	</div>
 </template>
 
 <script>
-import errGif from '@/assets/401_images/401.gif'
+import errGif from '@/assets/401_images/401.gif';
 
 export default {
-  name: 'Page401',
-  data() {
-    return {
-      errGif: errGif + '?' + +new Date()
-    }
-  },
-  methods: {
-    back() {
-      if (this.$route.query.noGoBack) {
-        this.$router.push({ path: '/' })
-      } else {
-        this.$router.go(-1)
-      }
-    }
-  }
-}
+	name: 'Page401',
+	data() {
+		return {
+			errGif: errGif + '?' + +new Date(),
+		};
+	},
+	methods: {
+		back() {
+			if (this.$route.query.noGoBack) {
+				this.$router.push({
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				});
+			} else {
+				this.$router.go(-1);
+			}
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-  .errPage-container {
-    width: 800px;
-    max-width: 100%;
-    margin: 100px auto;
-    .pan-back-btn {
-      background: #008489;
-      color: #fff;
-      border: none!important;
-    }
-    .pan-gif {
-      margin: 0 auto;
-      display: block;
-    }
-    .pan-img {
-      display: block;
-      margin: 0 auto;
-      width: 100%;
-    }
-    .text-jumbo {
-      font-size: 60px;
-      font-weight: 700;
-      color: #484848;
-    }
-    .list-unstyled {
-      font-size: 14px;
-      li {
-        padding-bottom: 5px;
-      }
-      a {
-        color: #008489;
-        text-decoration: none;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
+.errPage-container {
+	width: 800px;
+	max-width: 100%;
+	margin: 100px auto;
+	.pan-back-btn {
+		background: #008489;
+		color: #fff;
+		border: none !important;
+	}
+	.pan-gif {
+		margin: 0 auto;
+		display: block;
+	}
+	.pan-img {
+		display: block;
+		margin: 0 auto;
+		width: 100%;
+	}
+	.text-jumbo {
+		font-size: 60px;
+		font-weight: 700;
+		color: #484848;
+	}
+	.list-unstyled {
+		font-size: 14px;
+		li {
+			padding-bottom: 5px;
+		}
+		a {
+			color: #008489;
+			text-decoration: none;
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
+}
 </style>

src/views/group/Calendar/holidayLog.vue

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2025-10-23 13:43:55
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 21:13:10
+ * @LastEditTime: 2025-10-23 16:50:43
  * @Description:
 -->
 <template>
-	<div class="app-container" style="padding-top: 0">
+	<div class="app-container">
 		<div v-for="item in groupClassArr" :key="item.planId">
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				{{ item.deptName + ' - ' + item.planName }}
+				{{item.planName}}
 			</small-title>
 			<base-table
 				:table-props="tableProps"
@@ -59,14 +59,13 @@ export default {
 	},
 	created() {},
 	methods: {
-		init(det, detSort) {
+		init(det) {
 			this.tableData = det;
 			//返回计划名和id
 			const arr = det.map((item) => {
 				const obj = {
 					planName: item.schedulingPlanName,
 					planId: item.schedulingPlanId,
-					deptName: item.belongDeptName,
 				};
 				return obj;
 			});
@@ -77,19 +76,7 @@ export default {
 					map.set(item.planId, item);
 				}
 			});
-			const newArr = Array.from(map.values());
-			// 创建B数组中id的顺序映射
-			const orderMap = new Map();
-			detSort.forEach((item, index) => {
-				orderMap.set(item, index);
-			});
-
-			// 根据B的顺序对A进行排序
-			this.groupClassArr = [...newArr].sort((a, b) => {
-				const orderA = orderMap.get(a.planId);
-				const orderB = orderMap.get(b.planId);
-				return orderA - orderB;
-			});
+			this.groupClassArr = Array.from(map.values());
 		},
 	},
 };

src/views/group/Calendar/index.vue

@@ -2,221 +2,212 @@
  * @Author: zwq
  * @Date: 2025-10-23 13:43:55
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-25 09:39:43
+ * @LastEditTime: 2025-10-24 11:14:55
  * @Description:
 -->
 <template>
-	<div
-		class="app-container"
-		style="
-			background-color: #f2f4f9;
-			padding: 0;
-			display: grid;
-			grid-template-columns: 1fr 5fr;
-			gap: 10px;
-		">
-		<div class="head-container">
-			<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
-				<el-tab-pane label="部门" name="first"></el-tab-pane>
-				<el-tab-pane label="班组" name="second"></el-tab-pane>
-			</el-tabs>
-			<div v-if="activeName == 'first'">
-				<el-input
-					v-model="deptName"
-					placeholder="请输入部门名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="deptOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree"
-					node-key="id"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick" />
+	<el-row :gutter="10" style="background-color: #f2f4f9">
+		<!--部门数据-->
+		<el-col :span="4">
+			<div class="head-container">
+				<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
+					<el-tab-pane label="部门" name="first"></el-tab-pane>
+					<el-tab-pane label="班组" name="second"></el-tab-pane>
+				</el-tabs>
+				<div v-if="activeName == 'first'">
+					<el-input
+						v-model="deptName"
+						placeholder="请输入部门名称"
+						clearable
+						size="small"
+						prefix-icon="el-icon-search"
+						style="margin-bottom: 20px" />
+					<el-tree
+						:data="deptOptions"
+						:props="defaultProps"
+						:expand-on-click-node="false"
+						:filter-node-method="filterNode"
+						ref="tree"
+						default-expand-all
+						highlight-current
+						@node-click="handleNodeClick" />
+				</div>
+				<div v-else>
+					<el-input
+						v-model="groupName"
+						placeholder="请输入班组名称"
+						clearable
+						size="small"
+						prefix-icon="el-icon-search"
+						style="margin-bottom: 20px" />
+					<el-tree
+						:data="groupOptions"
+						:props="defaultProps"
+						:expand-on-click-node="false"
+						:filter-node-method="filterNode"
+						ref="tree1"
+						default-expand-all
+						highlight-current
+						@node-click="handleNodeClick1" />
+				</div>
 			</div>
-			<div v-else>
-				<el-input
-					v-model="groupName"
-					placeholder="请输入班组名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="groupOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree1"
-					node-key="id"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick1" />
-			</div>
-		</div>
-		<div class="groupTeamScheduling">
-			<div class="operationArea">
-				<el-form :inline="true" class="demo-form-inline">
-					<span class="blue-block"></span>
-					<el-form-item label="月份选择">
-						<el-date-picker
-							v-model="startDay"
-							type="month"
-							placeholder="选择月"
-							size="small"
-							@change="selectMonth"
-							:clearable="false"
-							style="width: 120px"></el-date-picker>
-						<span
-							style="color: #909399; font-size: 12px"
-							v-if="activeName == 'first'">
-							提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
-						</span>
-						<span v-else style="margin-left: 10px">
-							组长:
-							<span style="font-weight: 600; margin: 0 10px">
-								{{ showTeamName?.leaderName || '-' }}
+		</el-col>
+		<el-col :span="20">
+			<div class="groupTeamScheduling">
+				<div class="operationArea">
+					<el-form :inline="true" class="demo-form-inline">
+						<span class="blue-block"></span>
+						<el-form-item label="月份选择">
+							<el-date-picker
+								v-model="startDay"
+								type="month"
+								placeholder="选择月"
+								size="small"
+								@change="selectMonth"
+								:clearable="false"
+								style="width: 120px"></el-date-picker>
+							<span
+								style="color: #909399; font-size: 12px"
+								v-if="activeName == 'first'">
+								提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
 							</span>
-							组长电话:
-							<span style="font-weight: 600; margin: 0 10px">
-								{{ showTeamName?.leaderPhone || '-' }}
+							<span v-else>
+								组长:{{ showTeamName?.leaderName || '-' }} 组长电话:{{
+									showTeamName?.leaderPhone || '-'
+								}}
 							</span>
-						</span>
-					</el-form-item>
-					<el-form-item style="float: right">
-						<el-button
-							size="small"
-							type="primary"
-							@click="(startDay = new Date()), getHolidayPage()">
-							跳转到今天
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-			<!-- 日历区域 -->
-			<div class="calenderArea">
-				<el-calendar v-model="startDay">
-					<template slot="dateCell" slot-scope="{ data }">
-						<div v-if="data.type === 'current-month'">
-							<!-- 日期 -->
-							<div class="dateStyle">
-								<el-row :gutter="20">
-									<!-- 公历和农历 -->
-									<el-col :span="18">
-										{{ Number(data.day.split('-')[2]) }}
-										<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-									</el-col>
-									<!-- 显示假或班 -->
-									<el-col :span="6">
-										<div
-											class="work-tip"
-											:style="{
-												backgroundColor: HolidayList[
-													Number(data.day.split('-')[2]) - 1
-												]?.isHoliday
-													? '#67C23A'
-													: '#409EFF',
-											}">
-											{{
-												HolidayList[Number(data.day.split('-')[2]) - 1]
-													?.isHoliday
-													? '假'
-													: '班'
-											}}
-											<!-- //变更节假日未更新排班计划的角标 -->
+						</el-form-item>
+						<el-form-item style="float: right">
+							<el-button
+								size="small"
+								type="primary"
+								@click="(startDay = new Date()), getHolidayPage()">
+								跳转到今天
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+				<!-- 日历区域 -->
+				<div class="calenderArea">
+					<el-calendar v-model="startDay">
+						<template slot="dateCell" slot-scope="{ data }">
+							<div v-if="data.type === 'current-month'">
+								<!-- 日期 -->
+								<div class="dateStyle">
+									<el-row :gutter="20">
+										<!-- 公历和农历 -->
+										<el-col :span="18">
+											{{ Number(data.day.split('-')[2]) }}
+											<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
+										</el-col>
+										<!-- 显示假或班 -->
+										<el-col :span="6">
 											<div
-												class="subIcon"
-												v-if="
+												class="work-tip"
+												:style="{
+													backgroundColor: HolidayList[
+														Number(data.day.split('-')[2]) - 1
+													]?.isHoliday
+														? '#67C23A'
+														: '#409EFF',
+												}">
+												{{
 													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.isUpdate
-												">
+														?.isHoliday
+														? '假'
+														: '班'
+												}}
+                        <!-- //变更节假日未更新排班计划的角标 -->
+												<div
+													class="subIcon"
+													v-if="
+														HolidayList[Number(data.day.split('-')[2]) - 1]
+															?.isUpdate
+													">
+													<el-tooltip
+														effect="dark"
+														content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
+														placement="top">
+														<i
+															class="el-icon-warning"
+															style="color: #f56c6c"></i>
+													</el-tooltip>
+												</div>
+											</div>
+										</el-col>
+										<!-- 显示排班 -->
+										<div
+											v-if="
+												HolidayList[Number(data.day.split('-')[2]) - 1]?.det
+													.length > 0
+											">
+											<el-col
+												:span="24"
+												v-for="(item, index) in HolidayList[
+													Number(data.day.split('-')[2]) - 1
+												]?.det.filter(
+													(item) =>
+														item.schedulingPlanId ==
+														HolidayList[Number(data.day.split('-')[2]) - 1]
+															?.schedulingPlanId
+												)"
+												:key="index">
 												<el-tooltip
 													effect="dark"
-													content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
-													placement="top">
-													<i class="el-icon-warning" style="color: #f56c6c"></i>
+													content="点击展示全部排班计划"
+													placement="top-start">
+													<div
+														class="holiday-div"
+														:style="{
+															backgroundColor:
+																holidayDivColor[item?.classesCode],
+														}"
+														@click="
+															holidayLog(
+																HolidayList[Number(data.day.split('-')[2]) - 1]
+																	?.det,
+																HolidayList[Number(data.day.split('-')[2]) - 1]
+																	?.date
+															)
+														"
+														:title="
+															item.classesName +
+															' | ' +
+															item.teamName +
+															' | ' +
+															item.workTime
+														">
+														{{
+															item.classesName +
+															' | ' +
+															item.teamName +
+															' | ' +
+															item.workTime
+														}}
+													</div>
 												</el-tooltip>
-											</div>
+											</el-col>
 										</div>
+									</el-row>
+								</div>
+							</div>
+							<div
+								v-else
+								style="font-size: 20px; font-weight: 500; text-align: left">
+								<el-row :gutter="20">
+									<el-col :span="24">
+										{{ Number(data.day.split('-')[2]) }}
+										<span style="font-size: 12px">
+											{{ getLunarDate(data.day) }}
+										</span>
 									</el-col>
-									<!-- 显示排班 -->
-									<div
-										v-if="
-											HolidayList[Number(data.day.split('-')[2]) - 1]?.det
-												.length > 0
-										">
-										<el-col
-											:span="24"
-											v-for="(item, index) in HolidayList[
-												Number(data.day.split('-')[2]) - 1
-											]?.det.filter(
-												(item) =>
-													item.schedulingPlanId ==
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.schedulingPlanId
-											)"
-											:key="index">
-											<el-tooltip
-												effect="dark"
-												content="点击展示全部排班计划"
-												placement="top-start">
-												<div
-													class="holiday-div"
-													:style="{
-														backgroundColor: holidayDivColor[item?.classesCode],
-													}"
-													@click="
-														holidayLog(
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.det,
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.date,
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																?.detSort
-														)
-													"
-													:title="
-														item.classesName +
-														' | ' +
-														item.teamName +
-														' | ' +
-														item.workTime
-													">
-													{{
-														item.classesName +
-														' | ' +
-														item.teamName +
-														' | ' +
-														item.workTime
-													}}
-												</div>
-											</el-tooltip>
-										</el-col>
-									</div>
 								</el-row>
 							</div>
-						</div>
-						<div
-							v-else
-							style="font-size: 20px; font-weight: 500; text-align: left">
-							<el-row :gutter="20">
-								<el-col :span="24">
-									{{ Number(data.day.split('-')[2]) }}
-									<span style="font-size: 12px">
-										{{ getLunarDate(data.day) }}
-									</span>
-								</el-col>
-							</el-row>
-						</div>
-					</template>
-				</el-calendar>
+						</template>
+					</el-calendar>
+				</div>
 			</div>
-		</div>
+		</el-col>
 		<base-dialog
 			:dialogTitle="dialogTitle"
 			:dialogVisible="logVisible"
@@ -237,7 +228,7 @@
 				</slot>
 			</template>
 		</base-dialog>
-	</div>
+	</el-row>
 </template>
 
 <script>
@@ -348,43 +339,13 @@ export default {
 			getEnableData().then((response) => {
 				// 处理 deptOptions 参数
 				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree1(response.data, 'id'));
-				this.$nextTick(() => {
-					this.$refs.tree.setCurrentKey(this.deptId);
-				});
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
 			});
 			listByDeptId(this.topDept.id).then((response) => {
 				this.groupOptions = [];
 				this.groupOptions.push(...response.data);
 			});
 		},
-		//大整数精度丢失
-		handleTree1(data, fid) {
-			const id = fid || 'id';
-			const parentId = 'parentId';
-			const children = 'children';
-			const rootId =
-				data
-					.map((item) => item[parentId].toString())
-					.reduce((min, current) => {
-						if (current.length < min.length) return current;
-						if (current.length > min.length) return min;
-						return current < min ? current : min;
-					}) || 0;
-			//对源数据深度克隆
-			const cloneData = JSON.parse(JSON.stringify(data));
-			//循环所有项
-			const treeData = cloneData.filter((father) => {
-				let branchArr = cloneData.filter((child) => {
-					//返回每一项的子级数组
-					return father[id] == child[parentId];
-				});
-				branchArr.length > 0 ? (father.children = branchArr) : '';
-				//返回第一层
-				return father[parentId] == rootId;
-			});
-			return treeData !== '' ? treeData : data;
-		},
 		// 筛选节点
 		filterNode(value, data) {
 			if (!value) return true;
@@ -397,14 +358,8 @@ export default {
 					leaderName: this.groupOptions[0].leaderName || '-',
 					leaderPhone: this.groupOptions[0].leaderPhone || '-',
 				};
-				this.$nextTick(() => {
-					this.$refs.tree1.setCurrentKey(this.teamId);
-				});
 			} else if (this.activeName == 'first') {
 				this.deptId = this.topDept.id;
-				this.$nextTick(() => {
-					this.$refs.tree.setCurrentKey(this.deptId);
-				});
 			}
 			this.getHolidayPage();
 		},
@@ -486,11 +441,11 @@ export default {
 				return '';
 			}
 		},
-		holidayLog(det, date, detSort) {
+		holidayLog(det, date) {
 			this.dialogTitle = this.showDeptName + '-' + date + '-排班详情';
 			this.logVisible = true;
 			this.$nextTick(() => {
-				this.$refs.holidayLogRef.init(det, detSort);
+				this.$refs.holidayLogRef.init(det);
 			});
 		},
 		cancelLog() {
@@ -504,8 +459,8 @@ export default {
 .head-container {
 	padding: 20px 10px 0;
 	background-color: #fff;
+	min-height: calc(100vh - 120px - 8px);
 	border-radius: 8px;
-	height: 100%;
 }
 .groupTeamScheduling {
 	.operationArea {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 22:00:10
+ * @LastEditTime: 2025-10-29 17:12:04
  * @Description:
 -->
 <template>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { getGroupPage } from '@/api/group/groupSetting';
+import { listByDeptId } from '@/api/group/Schedule';
 
 const tableProps = [
 	{
@@ -39,7 +39,7 @@ const tableProps = [
 		width: 100,
 	},
 	{
-		prop: 'deptName',
+		prop: 'deptId',
 		label: '所属部门',
 	},
 	{
@@ -57,7 +57,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getGroupPage,
+				getDataListURL: listByDeptId,
 			},
 			tableProps,
 			tableData: [],
@@ -86,16 +86,16 @@ export default {
 				pageSize: 100,
 				code: '',
 				name: '',
-				deptId: undefined,
 			},
 			selectedList: [],
 			selectedArr: [], //已选的班组，从父组件传过来的
+			deptId: undefined,
 		};
 	},
 	created() {},
 	methods: {
 		init(id, tableData) {
-			this.formInline.deptId = id;
+			this.deptId = id;
 			this.selectedArr = tableData || [];
 			this.$nextTick(() => {
 				this.getDataList();
@@ -103,9 +103,8 @@ export default {
 		},
 		// 获取数据列表
 		getDataList() {
-			this.urlOptions.getDataListURL(this.formInline).then((response) => {
-				this.tableData = response.data.list.filter(item=>item.enabled===1);
-        this.tableData.forEach(item=>item.teamId= item.id)
+			this.urlOptions.getDataListURL(this.deptId).then((response) => {
+				this.tableData = response.data;
 				this.$nextTick(() => {
 					if (this.selectedArr.length > 0) {
 						this.setSelectedRows();
@@ -120,12 +119,12 @@ export default {
 			table.clearSelection();
 
 			this.selectedArr.forEach((item) => {
-				const rowInTable = this.tableData.find((i) => i.teamId === item.teamId);
+				const rowInTable = this.tableData.find((i) => i.id === item.id);
 				if (rowInTable) {
 					//这里一定要用table.tableData，这样才是指向同一个数组
 					this.$set(table.store.states, 'selection', [
 						...table.store.states.selection,
-						table.tableData.find((i) => i.teamId === item.teamId),
+						table.tableData.find((i) => i.id === item.id),
 					]);
 				}
 			});
@@ -150,19 +149,22 @@ export default {
 		selectChange(val) {
 			this.selectedList = val;
 		},
-		// 判断两个数组是否有重复的 id,去重
+		// 判断两个数组是否有重复的 id
 		hasDuplicateIds(arr1, arr2) {
-			return arr2.filter(
-				(item2) => !arr1.some((item1) => item1.teamId === item2.teamId)
-			);
+			const idSet = new Set(arr1.map((item) => item.id));
+			return arr2.some((item) => idSet.has(item.id));
 		},
 
 		dataFormSubmit() {
 			if (this.selectedList && this.selectedList.length > 0) {
-				this.selectedList = this.hasDuplicateIds(
+				const haveData = 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-12-03 15:48:26
+ * @LastEditTime: 2025-10-29 15:28:52
  * @Description:
 -->
 <template>
@@ -54,11 +54,10 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="部门" prop="deptId">
+						<el-form-item label="部门">
 							<dept-select
 								style="width: 100%"
 								ref="deptSelect"
-								v-model="dataForm.deptId"
 								@DeptId="setDeptId"></dept-select>
 						</el-form-item>
 					</el-col>
@@ -112,7 +111,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"
@@ -135,18 +134,6 @@
 		<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">不能重叠</span>
-					，且 在24小时。
-				</el-tag>
-				<el-tag type="warning" style="color: black" v-if="!covers24Hours">
-					<i class="el-icon-warning" style="color: #ffbd02"></i>
-					两班倒和三班倒的班次设置时间,班次时间
-					<span style="color: red">必须连续</span>
-					在24小时。
-				</el-tag>
 			</small-title>
 			<base-table
 				:table-props="tableProps1"
@@ -163,12 +150,6 @@
 			</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"
@@ -176,7 +157,6 @@
 				:limit="10"
 				:table-data="tableData2"
 				:add-button-show="'新增'"
-				@emitFun="handleSort"
 				@emitButtonClick="addNewGroup">
 				<method-btn
 					v-if="tableBtn2.length"
@@ -194,7 +174,8 @@
 				:no-padding="true">
 				排班计划预览
 				<span style="font-size: 14px; color: #ff1c15">
-					系统将根据
+					系统将根据以下设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
+
 					<el-popover
 						placement="right"
 						title="比如三班两倒，同班次连排2天，不休周末排班如下"
@@ -211,10 +192,9 @@
 						</el-table>
 						<i
 							slot="reference"
-							class="el-icon-chat-dot-square"
-							style="color: #409eff; font-size: 18px"></i>
+							class="el-icon-warning-outline"
+							style="color: #ff1c15"></i>
 					</el-popover>
-					设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
 				</span>
 			</small-title>
 			<el-tag>
@@ -247,7 +227,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>
@@ -355,7 +335,6 @@ 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,
@@ -395,17 +374,10 @@ const tableProps1 = [
 ];
 
 const tableProps2 = [
-	{
-		prop: 'shunxu',
-		label: '顺序',
-		width: 70,
-		subcomponent: sortSet,
-	},
 	{
 		prop: 'code',
 		label: '班组编号',
 		width: 140,
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'name',
@@ -450,7 +422,6 @@ export default {
 				},
 			],
 			stepNum: 1, // 当前第几步
-			isEdit: false, //是否是编辑状态，编辑的时候，让前端上一步和取消都不用接口
 			shiftTypeEdit: undefined, //该值为编辑时获取的shiftType，到第二步，判断dataForm.shiftType是否改变，同时改变班次信息
 			//第一步参数
 			dataForm: {
@@ -505,7 +476,6 @@ export default {
 				name: [
 					{ required: true, message: '计划名称不能为空', trigger: 'blur' },
 				],
-				deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
 				startDay: [
 					{ required: true, message: '开始时间不能为空', trigger: 'change' },
 				],
@@ -538,8 +508,6 @@ export default {
 					btnName: '编辑',
 				},
 			].filter((v) => v),
-			isClassTimePass: true, //修改班次时间后，需要判断时间是否有重叠，且是否在24小时内 true是没问题的
-			covers24Hours: true, //修改班次时间后，需要判断时间是否覆盖24小时连续的时间 true是没问题的
 			tableData1: [],
 			tableProps2,
 			tableBtn2: [
@@ -629,9 +597,8 @@ export default {
 		};
 	},
 	methods: {
-		init(id, isEdit) {
+		init(id) {
 			this.dataForm.id = id || undefined;
-			this.isEdit = isEdit || false;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
@@ -642,18 +609,14 @@ export default {
 						this.tableData1 = res.data?.stepTwo.groupPlanClassesBaseVOList;
 						this.tableData2 = res.data?.stepTwo.groupPlanTeamBaseVOList;
 						this.tableData2.forEach((item, index) => {
-							let lineName = [];
-							if (item.isProduction) {
-								lineName = this.setLineName(item.bindLineTree);
-								this.$set(
-									this.tableData2[index],
-									'lineName',
-									lineName.join(';')
-								);
-							}
+							let lineName = '';
+							lineName = this.setLineName(item.bindLineTree, lineName);
+							this.$set(
+								this.tableData2[index],
+								'lineName',
+								lineName.slice(0, -1)
+							);
 						});
-						this.stepNum = 3;
-						this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
 					});
 				} else {
 					getCode().then((res) => {
@@ -665,33 +628,18 @@ export default {
 		//上一步
 		upSubmit() {
 			if (this.stepNum == 2) {
-				if (!this.isEdit) {
-					//编辑的时候，让前端上一步和取消都不用接口，
-					returnStepOne(this.dataForm.id).then((res) => {
-						this.stepNum -= 1;
-						this.$emit('setSN', this.stepNum);
-						this.$nextTick(() => {
-							this.setDataForm();
-						});
-					});
-				} else {
+				returnStepOne(this.dataForm.id).then((res) => {
 					this.stepNum -= 1;
 					this.$emit('setSN', this.stepNum);
 					this.$nextTick(() => {
 						this.setDataForm();
 					});
-				}
+				});
 			} else if (this.stepNum == 3) {
-				if (!this.dataForm.id) {
-					//编辑的时候，让前端上一步和取消都不用接口，
-					returnStepTwo(this.dataForm.id).then((res) => {
-						this.stepNum -= 1;
-						this.$emit('setSN', this.stepNum);
-					});
-				} else {
+				returnStepTwo(this.dataForm.id).then((res) => {
 					this.stepNum -= 1;
 					this.$emit('setSN', this.stepNum);
-				}
+				});
 			}
 		},
 		//下一步
@@ -706,12 +654,9 @@ 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;
 					}
@@ -732,7 +677,6 @@ export default {
 				return;
 			}
 			if (this.stepNum == 2) {
-				//班组验证
 				if (!this.tableData2 || this.tableData2.length == 0) {
 					this.$message('班组不能为空');
 					return;
@@ -740,10 +684,7 @@ export default {
 
 				let isbindLine = false;
 				this.tableData2.forEach((item) => {
-					if (
-						item.isProduction &&
-						(!item.bindLineTree || item.bindLineTree.length == 0)
-					) {
+					if (!item.bindLineTree || item.bindLineTree.length == 0) {
 						isbindLine = true;
 					}
 				});
@@ -770,11 +711,6 @@ export default {
 					return;
 				}
 
-				//班次验证
-				if (!this.isClassTimePass || !this.covers24Hours) {
-					this.$message('班次内时间有误，请重新填写!');
-					return;
-				}
 				let data = {};
 				data.planId = this.dataForm.id;
 				data.groupPlanClassesBaseVOList = []; //排班-班次信息list
@@ -786,30 +722,24 @@ export default {
 						startTime: item.startTime,
 						endTime: item.endTime,
 						daySpan: item.daySpan,
-						code: item.code,
 					};
 					data.groupPlanClassesBaseVOList.push(obj);
 				});
 				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
-				this.tableData2.forEach((item, index) => {
+				this.tableData2.forEach((item) => {
 					const obj = {
-						sort: index + 1,
-						teamId: item.teamId || item.id,
+						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);
 				});
 				createStepTwo(data).then((res) => {
-					if (res.code === 200 || res.code === 0) {
-						this.stepNum += 1;
-						this.$emit('setSN', this.stepNum);
-						this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
-					} else {
-						this.$message(res.msg);
-					}
+					this.stepNum += 1;
+					this.$emit('setSN', this.stepNum);
+					this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
 				});
 				return;
 			}
@@ -818,7 +748,7 @@ export default {
 				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
 				this.tableData2.forEach((item) => {
 					const obj = {
-						teamId: item.teamId || item.id,
+						teamId: item.id,
 						name: item.name,
 						bindData: JSON.stringify(item.bindLineTree),
 					};
@@ -826,14 +756,10 @@ export default {
 				});
 				checkPlan(data).then((RES) => {
 					createStepFour(this.dataForm.id).then((res) => {
-						if (res.code === 200 || res.code === 0) {
-							this.$modal.msgSuccess('创建计划成功');
-							this.stepNum = 1;
-							this.$emit('setSN', this.stepNum);
-							this.$emit('refreshDataList');
-						} else {
-							this.$message(res.msg);
-						}
+						this.$modal.msgSuccess('创建计划成功');
+						this.stepNum = 1;
+						this.$emit('setSN', this.stepNum);
+						this.$emit('refreshDataList');
 					});
 				});
 				return;
@@ -848,7 +774,7 @@ export default {
 		setDataForm() {
 			this.$refs.deptSelect.setID(this.dataForm.deptId);
 		},
-		//比较时间，开始时间在结束时间前
+    //比较时间，开始时间在结束时间前
 		compareDates(date1, date2) {
 			const d1 = date1;
 			const d2 = date2;
@@ -867,156 +793,54 @@ 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;
-			}
-		},
-		/**
-		 * 检查多个班次是否连续覆盖24小时
-		 * @param {Array} shifts - 班次数组，每个班次包含startTime和endTime
-		 * @returns {boolean} 是否连续覆盖24小时
-		 */
-		isCover24Hours(shifts) {
-			if (!shifts || shifts.length === 0) return false;
-
-			const totalMinutes = 24 * 60;
-
-			// 将班次转换为时间段对象
-			const intervals = shifts.map((shift) => ({
-				start: this.timeToMinutes(shift.startTime),
-				end: this.timeToMinutes(shift.endTime),
-			}));
-
-			// 处理跨天情况：如果结束时间小于开始时间，加上24小时
-			const normalizedIntervals = intervals.map((interval) => {
-				let { start, end } = interval;
-				if (end < start) {
-					end += totalMinutes;
-				}
-				return { start, end, originalEnd: interval.end };
-			});
-
-			// 按开始时间排序
-			normalizedIntervals.sort((a, b) => a.start - b.start);
-
-			// 检查是否连续覆盖
-			let coveredUntil = normalizedIntervals[0].end;
-			let hasGap = false;
-
-			for (let i = 1; i < normalizedIntervals.length; i++) {
-				const current = normalizedIntervals[i];
-
-				// 如果当前班次的开始时间大于已覆盖的结束时间，说明有间隔
-				if (current.start > coveredUntil) {
-					hasGap = true;
-					break;
-				}
-
-				// 更新已覆盖的结束时间
-				coveredUntil = Math.max(coveredUntil, current.end);
-			}
-
-			// 检查是否覆盖完整的24小时
-			const firstStart = normalizedIntervals[0].start;
-
-			// 判断条件：没有间隔且覆盖时间达到24小时
-			return !hasGap && coveredUntil - firstStart >= totalMinutes;
-		},
 		//编辑班次
 		handleClick1(val) {
 			this.addOrUpdateVisible1 = true;
@@ -1035,37 +859,11 @@ 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() {
@@ -1088,58 +886,6 @@ 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);
-			}
-			//修改班次时间后，两班倒和三班倒需要判断时间是否连续覆盖24小时内
-			if (this.dataForm.shiftType > 1) {
-				this.covers24Hours = this.isCover24Hours(this.tableData1);
-				console.log(1111, this.covers24Hours);
-			}
 			this.cancel1();
 		},
 		refreshTableData2(val) {
@@ -1148,45 +894,23 @@ export default {
 		},
 		refreshTableData3(index, val) {
 			this.tableData2[index].bindLineTree = val;
-			let lineName = this.setLineName(val);
+			let lineName = '';
+			lineName = this.setLineName(val, lineName);
 			if (lineName) {
-				this.$set(this.tableData2[index], 'lineName', lineName.join(';'));
+				this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
 			}
 			this.cancel3();
 		},
 		//提取绑定的产线工段名展示出来
-		setLineName(data) {
-			const paths = [];
-
-			const processNode = (node, currentPath = []) => {
-				const newPath = [...currentPath, node.name];
-
-				if (node.children && node.children.length > 0) {
-					// 检查子节点是否都是叶子节点
-					const allChildrenAreLeaves = node.children.every(
-						(child) => !child.children || child.children.length === 0
-					);
-
-					if (allChildrenAreLeaves && node.children.length > 1) {
-						// 如果所有子节点都是叶子节点且多于1个，用括号合并显示
-						const leafNames = node.children
-							.map((child) => child.name)
-							.join(' 、 ');
-						paths.push(`${newPath.join('/')}/(${leafNames})`);
-					} else if (allChildrenAreLeaves && node.children.length === 1) {
-						// 只有一个叶子子节点，用括号显示
-						paths.push(`${newPath.join('/')}/（${node.children[0].name}）`);
-					} else {
-						// 继续处理子节点
-						node.children.forEach((child) => processNode(child, newPath));
-					}
-				} else {
-					// 没有子节点的节点（如原片产线1），用括号显示
-					paths.push(`${currentPath.join('/')}/（${node.name}）`);
+		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;
 				}
-			};
-			data.forEach((node) => processNode(node));
-			return paths;
+			});
+			return lineName;
 		},
 		//第三步
 		// 进来加载预览排班
@@ -1195,7 +919,6 @@ export default {
 				id: this.dataForm.id,
 				count: day,
 			};
-			this.period = day;
 			this.tableProps3 = [];
 			this.tableData3 = [];
 			getPerView(data).then((res) => {
@@ -1223,7 +946,6 @@ export default {
 					label: item.day,
 					work: item.work,
 					subcomponent: propSpan,
-					showOverflowtooltip: true,
 				};
 				this.tableProps3.push(obj);
 				item.det.forEach((sItem, sIndex) => {
@@ -1248,8 +970,7 @@ export default {
 			});
 		},
 		cancelStep() {
-			if (this.stepNum > 1 && !this.isEdit) {
-				//编辑的时候，让前端上一步和取消都不用接口，
+			if (this.stepNum > 1) {
 				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-11-25 15:49:17
+ * @LastEditTime: 2025-10-30 10:47:09
  * @Description:
 -->
 <template>
@@ -13,12 +13,8 @@
 			:to_data="toData"
 			@add-btn="add"
 			@remove-btn="remove"
-			pid="fid"
-			:node_key="'uniqueId'"
-			:defaultProps="{
-				label: 'name',
-				children: 'children',
-			}"
+			pid="pid"
+			:defaultProps="{ label: 'name' }"
 			height="450px"
 			style="padding-bottom: 20px"
 			:mode="mode"
@@ -47,34 +43,16 @@ export default {
 			this.fromData = [];
 			this.toData = [];
 			getGroupPlanTree().then((res) => {
-				res.data.forEach((item) => {
+				this.fromData = res.data;
+				this.fromData.forEach((item) => {
 					item.productionLineId = 0;
 				});
-				this.fromData = this.generateUniqueData(res.data);
 				this.$nextTick(() => {
 					this.toData = val.bindLineTree || [];
 					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
 				});
 			});
 		},
-		generateUniqueData(data) {
-			return data.map((node) => this.processNode(node));
-		},
-		processNode(node) {
-			// 创建唯一ID：类型-原始ID
-			const uniqueId = node.type+'L'+node.id;
-			if (node.type > 0) {
-				node.fid = (node.type - 1)+'L'+node.pid;
-			}
-
-			return {
-				...node,
-				uniqueId,
-				children: node.children
-					? node.children.map((child) => this.processNode(child))
-					: [],
-			};
-		},
 		// 监听穿梭框组件添加
 		add(fromData, toData, obj) {
 			console.log('fromData:', fromData);

src/views/group/Schedule/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-21 14:27:23
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-25 15:14:53
+ * @LastEditTime: 2025-10-21 15:02:27
  * @Description:
 -->
 <template>
@@ -46,7 +46,7 @@
 			</div>
 			<div>
 				<span class="title">创建人:</span>
-				{{ infoData.creatorName }}
+				{{ infoData.creator }}
 			</div>
 			<div>
 				<span class="title">创建时间:</span>
@@ -73,7 +73,7 @@
 				:limit="10"
 				:table-data="tableData1"></base-table>
 			<base-table
-				v-else
+      v-else
 				:table-props="tableProps2"
 				:page="1"
 				:limit="10"
@@ -150,45 +150,26 @@ export default {
 			this.infoData = {};
 			getPlan(id).then((res) => {
 				this.infoData = res.data || {};
-				this.tableData1 = res.data?.groupPlanClassesBaseVOList.sort(
-					(a, b) => a.sort - b.sort
-				);
+				console.log(res);
+				this.tableData1 = res.data?.groupPlanClassesBaseVOList;
 				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
 				this.tableData2.forEach((item, index) => {
 					let lineName = '';
-					if (item.isProduction) {
-						lineName = this.setLineName(item.bindLineTree);
-					}
-					this.$set(this.tableData2[index], 'lineName', lineName);
+					lineName = this.setLineName(item.bindLineTree, lineName);
+					this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
 				});
 			});
 		},
 		//提取绑定的产线工段名展示出来
-		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}`;
+		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;
 				}
-			}
-
-			return currentDisplay;
+			});
+			return 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-11-04 14:08:47
+ * @LastEditTime: 2025-10-20 10:23:52
  * @Description:
 -->
 <template>
@@ -15,10 +15,9 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="排序" prop="sort">
+				<el-form-item label="序号" prop="index">
 					<el-input-number
-						style="width: 100%"
-						v-model="dataForm.sort"
+						v-model="dataForm.index"
 						:step="1"
 						:min="1"
 						step-strictly />
@@ -39,8 +38,7 @@
 						format="H:mm"
 						value-format="HH:mm:ss"
 						v-model="dataForm.startTime"
-            @change="timeFun('start')"
-						placeholder="选择时间"></el-time-picker>
+						placeholder="选择日期时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -50,19 +48,7 @@
 						format="H:mm"
 						value-format="HH:mm:ss"
 						v-model="dataForm.endTime"
-            @change="timeFun('end')"
-						placeholder="选择时间"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否跨天" prop="daySpan">
-					<el-switch
-						v-model="dataForm.daySpan"
-            disabled
-						:active-value="1"
-						:inactive-value="0"
-						active-text="隔天"
-						inactive-text="当天"></el-switch>
+						placeholder="选择日期时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -84,17 +70,15 @@ export default {
 		return {
 			dataForm: {
 				id: undefined,
-				sort: undefined,
+				index: undefined,
 				name: undefined,
 				startTime: undefined,
 				endTime: undefined,
-				daySpan: 0,
-				code: 1,
 				remark: undefined,
 			},
 			_pageIndex: 1,
 			dataRule: {
-				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+				index: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
 				name: [
 					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
 				],
@@ -109,31 +93,13 @@ export default {
 	},
 	methods: {
 		init(val) {
-			this._pageIndex = val._pageIndex - 1;
-			this.dataForm.sort = val._pageIndex || 1;
+			this._pageIndex = val._pageIndex-1;
+			this.dataForm.index = 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-13 15:07:24
+ * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-28 09:56:09
+ * @LastEditTime: 2025-10-29 14:50:16
  * @Description:
 -->
 <template>
@@ -31,17 +31,13 @@
 				<el-form-item label="开始时间" prop="startDay">
 					<el-date-picker
 						v-model="formInline.startDay"
-						size="small"
 						type="datetime"
-						value-format="yyyy-MM-dd HH:mm:ss"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束时间" prop="endDay">
 					<el-date-picker
 						v-model="formInline.endDay"
-						size="small"
 						type="datetime"
-						value-format="yyyy-MM-dd HH:mm:ss"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="部门" prop="deptId">
@@ -50,12 +46,8 @@
 						ref="deptSelect"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
-				<el-form-item label="状态" prop="status">
-					<el-select
-						v-model="formInline.status"
-						size="small"
-						clearable
-						placeholder="请选择状态">
+				<el-form-item label="状态" prop="leaderName">
+					<el-select v-model="formInline.status" placeholder="请选择状态">
 						<el-option
 							v-for="item in options"
 							:key="item.value"
@@ -73,8 +65,7 @@
 					</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>
@@ -83,8 +74,7 @@
 					</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>
@@ -97,17 +87,6 @@
 						新增
 					</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
@@ -222,7 +201,6 @@ import {
 	copyPlan,
 	disablePlan,
 	updateScheduleLater,
-	exportExcel,
 } from '@/api/group/Schedule';
 
 const tableProps = [
@@ -290,97 +268,91 @@ 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,
-									},
-									{
-										type: 'equal',
-										name: 'updateFlag',
-										value: true,
-									},
-								],
+						],
+					},
+				}: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-scheduling-plan:create')
-					? {
-							type: 'copy',
-							btnName: '复制',
-					  }
-					: undefined,
+							{
+								type: 'equal',
+								name: 'updateFlag',
+								value: true,
+							},
+						],
+					},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:create')?
+				{
+					type: 'copy',
+					btnName: '复制',
+				}:undefined,
 			].filter((v) => v),
 			tableData: [],
 			options: [
@@ -398,52 +370,50 @@ export default {
 				},
 			],
 			formInline: {
-				code: null,
-				name: null,
-				startDay: null,
-				endDay: null,
-				deptId: null,
-				status: null,
+				code: '',
+				name: '',
+				startDay: '',
+				endDay: '',
+				deptId: '',
+				status: '',
 			},
 			stepNum: 1, // 新增编辑时当前第几步
 			detailVisible: false,
-			// 导出遮罩层
-			exportLoading: false,
 		};
 	},
 	components: {
 		AddOrUpdate,
 		deptSelect,
-		detail,
+    detail
 	},
 	created() {},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-					if (this.formInline.startDay > this.formInline.endDay) {
+					const date1 = new Date(this.formInline.startDay).getTime();
+					const date2 = new Date(this.formInline.endDay).getTime();
+
+					if (date1 > date2) {
 						this.$message('开始时间不得晚于结束时间');
 						return;
 					}
 					this.listQuery = {
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 						total: 1,
 						...this.formInline,
 					};
 					this.getDataList();
 					break;
 				case 'reset':
-					this.$refs.searchBarForm.resetFields();
 					this.formInline.name = null;
 					this.formInline.code = null;
 					this.formInline.deptId = null;
 					this.$refs.deptSelect.clear();
-					this.formInline.status = null;
-					this.formInline.startDay = null;
-					this.formInline.endDay = null;
+					this.formInline.leaderName = null;
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};
@@ -492,8 +462,7 @@ export default {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '编辑';
 				this.$nextTick(() => {
-					this.stepNum = 3;
-					this.$refs.addOrUpdate.init(val.data.id, true);
+					this.$refs.addOrUpdate.init(val.data.id);
 				});
 			} else if (val.type === 'delete') {
 				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
@@ -505,62 +474,23 @@ 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') {
-				this.$confirm(
-					'当前节假日包含尚未同步的节假日变更，是否立即将上述节假日同步更新到排班计划？',
-					'同步节假日',
-					{
-						confirmButtonText: '确认同步',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						updateScheduleLater({
-							planId: val.data.id,
-							logId: val.data.updateLogId,
-						}).then((res) => {
-							this.$modal.msgSuccess('同步节假日成功');
-							this.getDataList();
-						});
-					})
-					.catch((res) => {
-						this.getDataList();
-						this.$message({
-							type: 'info',
-							message: '已取消',
-						});
-					});
+				updateScheduleLater({ planId: val.data.id }).then((res) => {
+					this.$modal.msgSuccess('同步节假日成功');
+          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

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

src/views/group/Schedule/subSpan.vue

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

src/views/group/deptSelect.vue

@@ -48,6 +48,7 @@ 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-11-27 14:49:34
+ * @LastEditTime: 2025-10-29 14:47:33
  * @Description:
 -->
 <template>
@@ -25,18 +25,16 @@
 			<el-col :span="8">
 				<el-form-item label="班组名称" prop="name">
 					<el-input
-						:disabled="nameDisable"
 						v-model="dataForm.name"
 						clearable
 						placeholder="请输入班组名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="部门" prop="deptId">
+				<el-form-item label="部门">
 					<dept-select
 						style="width: 100%"
 						ref="deptSelect"
-						v-model="dataForm.deptId"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
 			</el-col>
@@ -46,7 +44,7 @@
 						style="width: 100%"
 						v-model="dataForm.leaderId"
 						@change="setLeaderName"
-						filterable
+            filterable
 						placeholder="请选择组长">
 						<el-option
 							v-for="item in leaderArr"
@@ -61,7 +59,7 @@
 					<el-input
 						v-model="dataForm.leaderPhone"
 						clearable
-						maxlength="11"
+             maxlength="11"
 						placeholder="请输入组长电话" />
 				</el-form-item>
 			</el-col>
@@ -79,7 +77,6 @@
 				<el-form-item label="生产班组" prop="isProduction">
 					<el-select
 						style="width: 100%"
-						@change="setIsProduction"
 						v-model="dataForm.isProduction"
 						placeholder="请选择是否为生产班组">
 						<el-option
@@ -111,7 +108,6 @@ import {
 	updateGroup,
 	getGroup,
 	getCode,
-	updateIsProduction,
 } from '@/api/group/groupSetting';
 
 export default {
@@ -141,8 +137,7 @@ export default {
 				num: undefined,
 				remark: undefined,
 			},
-			setData: true,
-			nameDisable: false, //班组被使用时，班组名称不能修改
+      setData: true,
 			leaderArr: [],
 			options: [
 				{
@@ -161,21 +156,19 @@ 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"
+          }
+        ]
 			},
 		};
 	},
@@ -191,43 +184,9 @@ export default {
 				})
 				.catch(() => {});
 		},
-		setDataForm() {
-			this.$refs.deptSelect.setID(this.dataForm.deptId);
-			this.nameDisable = false;
-			updateIsProduction(this.dataForm.id).then(({ data }) => {
-				if (data) {
-					this.$notify({
-						title: '警告',
-						message: '当前班组仍参与排班计划或正在执行工单。班组名称不能修改',
-						type: 'warning',
-					});
-					this.nameDisable = true;
-				}
-			});
-		},
-		setIsProduction() {
-			// 修改的提交
-			if (this.dataForm.id && this.nameDisable) {
-				this.$confirm(
-					'当前班组仍参与排班计划或正在执行工单。<br/>修改<strong> 是否是生产班组 </strong>不会自动更新排班内容，可能导致排班信息与班组属性不一致，请注意核查！<br/>是否确认修改是否是生产班组？',
-					'修改是否是生产班组',
-					{
-						dangerouslyUseHTMLString: true,
-						confirmButtonText: '确认修改',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {})
-					.catch((res) => {
-						this.$message({
-							type: 'info',
-							message: '已取消',
-						});
-						this.dataForm.isProduction = !this.dataForm.isProduction;
-					});
-			}
-		},
+    setDataForm(){
+      this.$refs.deptSelect.setID(this.dataForm.deptId)
+    },
 		setLeaderName(val) {
 			this.leaderArr.map((item) => {
 				if (val === item.id) {
@@ -235,33 +194,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/groupSetting/changeStatus.vue

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

src/views/group/groupSetting/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-14 21:50:40
+ * @LastEditTime: 2025-10-29 14:44:41
  * @Description:
 -->
 <template>
@@ -212,7 +212,7 @@ export default {
 				case 'search':
 					this.listQuery = {
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 						total: 1,
 						...this.formInline,
 					};
@@ -225,7 +225,7 @@ export default {
 					this.$refs.deptSelect.clear();
 					this.formInline.leaderName = null;
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

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-12-11 10:47:50
+ * @LastEditTime: 2025-10-23 13:29:58
  * @Description:
 -->
 <template>
@@ -18,7 +18,6 @@
 				<el-col :span="12">
 					<el-form-item label="节假日名称" prop="name">
 						<el-input
-							ref="inputWidth"
 							v-model="dataForm.name"
 							clearable
 							:disabled="detail"
@@ -55,7 +54,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item
-						v-if="dataForm.dateType == 1 && dataForm.calendarType == 1"
+						v-if="dataForm.dateType == 1"
 						label="日期"
 						prop="dateDay">
 						<el-date-picker
@@ -66,14 +65,10 @@
 							type="date"
 							placeholder="选择日期"
 							format="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
-							@blur="$forceUpdate()"
+							value-format="--MM-dd"
 							:picker-options="pickerOptions"></el-date-picker>
 					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 1"
-						label="日期"
-						prop="dateDayArr">
+					<el-form-item v-else label="日期" prop="dateDayArr">
 						<el-date-picker
 							:disabled="detail"
 							style="width: 100%"
@@ -81,57 +76,12 @@
 							v-model="dataForm.dateDayArr"
 							type="daterange"
 							format="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
+							value-format="--MM-dd"
 							range-separator="至"
 							start-placeholder="开始日期"
 							end-placeholder="结束日期"
-							@blur="$forceUpdate()"
 							:picker-options="pickerOptions"></el-date-picker>
 					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 1 && dataForm.calendarType == 2"
-						label="日期"
-						prop="dateDayChinese">
-						<j-date-picker
-							ref="JDatePicker1"
-							style="line-height: 18px"
-							v-model="dataForm.dateDayChinese"
-							id="value1"
-							:width="width1"
-							:placeholder="placeholder"
-							:picker-options="pickerOptions"
-							:rangeSeparator="rangeSeparator"
-							@change="onDateChange"
-							:disabled="detail"
-							:showLunarClass="showLunarClass"
-							:showLunarControl="showLunarControl"
-							type="DATE"
-							:showBackYears="showBackYears"
-							:showLunarIcon="showLunarIcon"
-							:format="format"></j-date-picker>
-					</el-form-item>
-					<el-form-item
-						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 2"
-						label="日期"
-						prop="dateDayArrChinese">
-						<j-date-picker
-							style="line-height: 18px"
-							ref="JDatePicker2"
-							v-model="dataForm.dateDayArrChinese"
-							id="value2"
-							:width="width1"
-							:placeholder="placeholder"
-							:picker-options="pickerOptions"
-							:rangeSeparator="rangeSeparator"
-							@change="onDateChange"
-							:disabled="detail"
-							:showLunarClass="showLunarClass"
-							:showLunarControl="showLunarControl"
-							type="DATERANGE"
-							:showBackYears="showBackYears"
-							:showLunarIcon="showLunarIcon"
-							:format="format"></j-date-picker>
-					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="是否每年重复" prop="repeat">
@@ -181,7 +131,6 @@
 </template>
 
 <script>
-import JDatePicker from './components/JDatePicker.vue';
 import {
 	createHoliday,
 	updateHoliday,
@@ -192,9 +141,7 @@ import {
 } from '@/api/group/holidaySetting';
 
 export default {
-	components: {
-		JDatePicker,
-	},
+	components: {},
 	data() {
 		return {
 			dataForm: {
@@ -204,16 +151,11 @@ export default {
 				dateType: 1,
 				dateDay: undefined,
 				dateDayArr: [],
-				dateDayChinese: undefined,
-				dateDayArrChinese: [],
-				noRepeatYear: undefined,
-				noRepeatYearChinese: undefined,
 				repeat: true,
 				inherited: true, //	是否为继承
 				deptId: undefined,
 			},
 			detail: false,
-			inherited: true,
 			options1: [
 				{
 					value: 1,
@@ -260,12 +202,6 @@ export default {
 				dateDayArr: [
 					{ required: true, message: '日期不能为空', trigger: 'change' },
 				],
-				dateDayChinese: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				dateDayArrChinese: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
 				repeat: [
 					{
 						required: true,
@@ -280,131 +216,49 @@ 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, val, detail, inherited) {
+		init(deptId, id, detail) {
 			this.dataForm.deptId = deptId || undefined;
-			this.dataForm.id = val.holidayId || undefined;
-			this.dataForm.inherited = val.isInherit || false;
+			this.dataForm.id = id || undefined;
 			this.detail = detail || false;
-			this.inherited = inherited; //编辑的时候，该部门如果是自定义的，但这个val数据是继承的，修改之后，则变成自定义的inherited
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
 					getHoliday(this.dataForm.id).then((res) => {
-						//设置年份，不重复的直接用返回的年份，重复的直接用当年年份
-						let year = new Date().getFullYear();
-						if (res.data.calendarType == 1 && !res.data.repeat) {
-							year = res.data.noRepeatYear;
-						} else if (res.data.calendarType == 2 && !res.data.repeat) {
-							year = res.data.noRepeatYearChinese;
-						}
-
 						this.dataForm = res.data;
 						if (
 							this.dataForm.dateType == 1 &&
 							this.dataForm.calendarType == 1
 						) {
-							this.dataForm.dateDay =
-								year + '-' + this.dataForm.oneDay.slice(-5);
+							this.dataForm.dateDay = this.dataForm.oneDay;
 						} else if (
 							this.dataForm.dateType == 2 &&
 							this.dataForm.calendarType == 1
 						) {
-							let num = this.compareMonthDay(
-								this.dataForm.startDay.slice(-5),
-								this.dataForm.endDay.slice(-5)
-							);
 							this.dataForm.dateDayArr = [
-								year + '-' + this.dataForm.startDay.slice(-5),
-								(num > 0 ? year : year + 1) +
-									'-' +
-									this.dataForm.endDay.slice(-5),
+								this.dataForm.startDay,
+								this.dataForm.endDay,
 							];
 						} else if (
 							this.dataForm.dateType == 1 &&
 							this.dataForm.calendarType == 2
 						) {
-							this.dataForm.dateDayChinese =
-								'L' + year + this.dataForm.oneDayChinese.slice(-6);
+							this.dataForm.dateDay = this.dataForm.oneDayChinese;
 						} else if (
 							this.dataForm.dateType == 2 &&
 							this.dataForm.calendarType == 2
 						) {
-							let num = this.compareMonthDay(
-								this.dataForm.startDayChinese.slice(-6),
-								this.dataForm.endDayChinese.slice(-6)
-							);
-							this.dataForm.dateDayArrChinese = [
-								'L' + year + this.dataForm.startDayChinese.slice(-6),
-								'L' +
-									(num > 0 ? year : year + 1) +
-									+this.dataForm.endDayChinese.slice(-6),
+							this.dataForm.dateDayArr = [
+								this.dataForm.startDayChinese,
+								this.dataForm.endDayChinese,
 							];
 						}
 					});
 				}
 			});
 		},
-		//用于比较日期大小，判断年份是否要加1
-		compareMonthDay(dateStr1, dateStr2) {
-			const [month1, day1] = dateStr1.split('-').map(Number);
-			const [month2, day2] = dateStr2.split('-').map(Number);
-
-			if (month1 !== month2) {
-				return month2 - month1;
-			}
-			return day2 - day1;
-		},
 		editHoliday() {
 			this.detail = false;
 		},
@@ -453,13 +307,10 @@ 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) => {
@@ -467,133 +318,61 @@ export default {
 					return false;
 				}
 				if (this.dataForm.dateType == 1 && this.dataForm.calendarType == 1) {
-					const [year, month, day] = this.dataForm.dateDay.split('-');
-					this.dataForm.oneDay = `--${month}-${day}`;
+					this.dataForm.oneDay = this.dataForm.dateDay;
 				} else if (
 					this.dataForm.dateType == 2 &&
 					this.dataForm.calendarType == 1
 				) {
-					const [year, month, day] = this.dataForm.dateDayArr[0].split('-');
-					this.dataForm.startDay = `--${month}-${day}`;
-					const [year1, month1, day1] = this.dataForm.dateDayArr[1].split('-');
-					this.dataForm.endDay = `--${month1}-${day1}`;
+					this.dataForm.startDay = this.dataForm.dateDayArr[0];
+					this.dataForm.endDay = this.dataForm.dateDayArr[1];
 				} else if (
 					this.dataForm.dateType == 1 &&
 					this.dataForm.calendarType == 2
 				) {
-					this.dataForm.oneDayChinese =
-						'--' + this.dataForm.dateDayChinese.slice(-5);
+					this.dataForm.oneDayChinese = this.dataForm.dateDay;
 				} else if (
 					this.dataForm.dateType == 2 &&
 					this.dataForm.calendarType == 2
 				) {
-					this.dataForm.startDayChinese =
-						'--' + this.dataForm.dateDayArrChinese[0].slice(-5);
-					this.dataForm.endDayChinese =
-						'--' + this.dataForm.dateDayArrChinese[1].slice(-5);
-				}
-				//是否每年重复，不重复的话需要传  年份
-				if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 1 &&
-					!this.dataForm.repeat
-				) {
-					const [year, month, day] = this.dataForm.dateDay.split('-');
-					this.dataForm.noRepeatYear = year;
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 1 &&
-					!this.dataForm.repeat
-				) {
-					const [year, month, day] = this.dataForm.dateDayArr[0].split('-');
-					this.dataForm.noRepeatYear = year;
-				} else if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 2 &&
-					!this.dataForm.repeat
-				) {
-					this.dataForm.noRepeatYearChinese =
-						this.dataForm.dateDayChinese.slice(1, 5);
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 2 &&
-					!this.dataForm.repeat
-				) {
-					this.dataForm.noRepeatYearChinese =
-						this.dataForm.dateDayArrChinese[0].slice(1, 5);
+					this.dataForm.startDayChinese = this.dataForm.dateDayArr[0];
+					this.dataForm.endDayChinese = this.dataForm.dateDayArr[1];
 				}
 				// 修改的提交
 				if (this.dataForm.id) {
-					if (!this.inherited) {
-						this.dataForm.inherited = false;
-					}
-					updateHoliday(this.dataForm).then((res) => {
-						if (res.code === 0 || res.code === 200) {
-							if (!res.data.updateFlag) {
-								this.$modal.msgSuccess('修改成功');
-								this.$emit('refreshPage');
-							} else {
-								this.$confirm(
-									'新增节假日影响已有排班计划，是否立即更新？',
-									'更新排班',
-									{
-										confirmButtonText: '立即更新',
-										cancelButtonText: '暂不更新',
-										type: 'warning',
-									}
-								)
-									.then(() => {
-										updateSchedule({ logId: res.data.logId }).then((res1) => {
-											this.$modal.msgSuccess('更新成功');
-										});
-										this.$emit('refreshPage');
-									})
-									.catch(() => {
-										this.$message({
-											type: 'info',
-											message: '已取消',
-										});
-										this.$emit('refreshPage');
-									});
-							}
-						} else {
-							this.$modal.msg(res.msg);
-						}
+					updateHoliday(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.$emit('refreshPage');
 					});
 					return;
 				}
 				// 添加的提交
 				createHoliday(this.dataForm).then((res) => {
-					if (res.code === 0 || res.code === 200) {
-						if (!res.data.updateFlag) {
-							this.$modal.msgSuccess('新增成功');
-							this.$emit('refreshPage');
-						} else {
-							this.$confirm(
-								'新增节假日影响已有排班计划，是否立即更新？',
-								'更新排班',
-								{
-									confirmButtonText: '立即更新',
-									cancelButtonText: '暂不更新',
-									type: 'warning',
-								}
-							)
-								.then(() => {
-									updateSchedule({ logId: res.data.logId }).then((res1) => {
-										this.$modal.msgSuccess('更新成功');
-									});
-									this.$emit('refreshPage');
-								})
-								.catch(() => {
-									this.$message({
-										type: 'info',
-										message: '已取消',
-									});
+					updateSchedule;
+					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');
 								});
-						}
-					} else {
-						this.$modal.msg(res.msg);
+							})
+							.catch(() => {
+								this.$message({
+									type: 'info',
+									message: '已取消',
+								});
+							});
 					}
 				});
 			});

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

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

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

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

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

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