Merge branch 'projects/ssdl-test' into projects/ssdl-zhp

Reviewed-on: #450

.env.dev

@@ -12,8 +12,8 @@ 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://172.16.32.76:48080'
+# VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

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/permission.js

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

src/router/index.js

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

src/store/modules/permission.js

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

src/views/cost/costStatistics/index.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/views/cost/index.vue

@@ -0,0 +1,423 @@
+<template>
+	<div class="home-page">
+		<div class="date-tabs">
+			<!-- @tab-click="handleClick" -->
+			<el-tabs v-model="activeName" @tab-click="timedayChange" :stretch="true">
+				<el-tab-pane
+					:label="'\u2002\u2002日\u2002\u2002'"
+					name="日"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002周\u2002\u2002'"
+					name="周"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002月\u2002\u2002'"
+					name="月"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002年\u2002\u2002'"
+					name="年"></el-tab-pane>
+			</el-tabs>
+			<div class="detail">
+				<el-date-picker
+					v-model="timeday"
+					align="right"
+					type="date"
+					format="yyyy-MM-dd"
+					valueFormat="yyyy-MM-dd"
+					:clearable="false"
+					@change="timedayChange"
+					placeholder="选择日期"
+					:picker-options="pickerOptions"></el-date-picker>
+			</div>
+		</div>
+		<el-row class="main-top" :gutter="16">
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">生产总成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceS }}万元</div>
+						<div class="unit-style">总计成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceS }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceS }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceS }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<!-- <el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioS }}</div>
+						<div class="unit-style">综合良品率/%</div>
+					</el-col> -->
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceS }}元</div>
+						<div class="unit-style">综合每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">原片成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceO }}万元</div>
+						<div class="unit-style">原片总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceO }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceO }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceO }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioO }}</div>
+						<div class="unit-style">原片良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceO }}元</div>
+						<div class="unit-style">原片每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">深加工成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceD }}万元</div>
+						<div class="unit-style">深加工总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceD }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceD }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioD }}</div>
+						<div class="unit-style">深加工良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceD }}元</div>
+						<div class="unit-style">深加工每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+		</el-row>
+		<el-row class="main-bottom" :gutter="16" v-if="false">
+			<el-col :span="9">
+				<div class="chart-wrapper">
+					<line-chart :chart-data="lineChartData" />
+				</div>
+			</el-col>
+			<el-col :span="7">
+				<div class="chart-wrapper">
+					<pie-chart />
+				</div>
+			</el-col>
+			<el-col :span="8">
+				<div class="chart-wrapper">
+					<bar-chart />
+				</div>
+			</el-col>
+		</el-row>
+		<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 moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import LineChart from '../dashboard/LineChart';
+import PieChart from '../dashboard/PieChart';
+import BarChart from '../dashboard/BarChart';
+import PanelGroup from '../dashboard/PanelGroup';
+import { getData } from '@/api/cost/allCost';
+import { getUserProfile } from '@/api/system/user';
+
+const lineChartData = {
+	newVisitis: {
+		expectedData: [100, 120, 161, 134, 105, 160, 165],
+		actualData: [120, 82, 91, 154, 162, 140, 145],
+	},
+	messages: {
+		expectedData: [200, 192, 120, 144, 160, 130, 140],
+		actualData: [180, 160, 151, 106, 145, 150, 130],
+	},
+	purchases: {
+		expectedData: [80, 100, 121, 104, 105, 90, 100],
+		actualData: [120, 90, 100, 138, 142, 130, 130],
+	},
+	shoppings: {
+		expectedData: [130, 140, 141, 142, 145, 150, 160],
+		actualData: [120, 82, 91, 154, 162, 140, 130],
+	},
+};
+
+export default {
+	name: 'Home',
+	mixins: [tableHeightMixin],
+	components: {
+		LineChart,
+		PieChart,
+		PanelGroup,
+		BarChart,
+	},
+	computed: {
+		gradientBackground() {
+			return {
+				'background-image':
+					'linear-gradient(90deg, #f0f0f0 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, #f0f0f0 50%, #f0f0f0 75%, rgba(255, 255, 255, 0) 75%, rgba(255, 255, 255, 0))',
+				'background-size': '100px 100px', // 调整条纹的大小
+			};
+		},
+	},
+	data() {
+		return {
+			activeName: '日',
+			user: '',
+			lineChartData: lineChartData.newVisitis,
+			homeData: {},
+			timeday: moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'),
+			startTime:
+				moment(new Date()).subtract(0, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			endTime:
+				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+
+			pickerOptions: {
+				disabledDate(time) {
+					return time.getTime() + 3600 * 1000 * 24 > Date.now();
+				},
+				shortcuts: [
+					{
+						text: '今天',
+						onClick(picker) {
+							picker.$emit('pick', new Date());
+						},
+					},
+					{
+						text: '昨天',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24);
+							picker.$emit('pick', date);
+						},
+					},
+					{
+						text: '一周前',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', date);
+						},
+					},
+				],
+			},
+		};
+	},
+	created() {
+	},
+	beforeDestroy() {
+	},
+	methods: {
+		getData() {
+			let listQuery = {
+				//分页
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
+				startTime: this.timeday + ' 00:00:00',
+			};
+			getData(listQuery).then((response) => {
+				this.homeData = response.data;
+				for (let i in this.homeData) {
+					this.homeData[i] = Number(this.homeData[i]).toFixed(2);
+				}
+			});
+		},
+		timedayChange() {
+			let listQuery = {
+				//分页
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
+				startTime: this.timeday + ' 00:00:00',
+			};
+				getData(listQuery).then((response) => {
+					this.homeData = response.data;
+					for (let i in this.homeData) {
+						this.homeData[i] = Number(this.homeData[i]).toFixed(2);
+					}
+				});
+		},
+		goDetail() {
+			this.$router.push({ path: 'indexDetail' });
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.home-page::before {
+	background-image: url('~@/assets/img/home-bg.png');
+	background-size: cover;
+	background-repeat: no-repeat;
+	background-position: center;
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	transform: rotate(180deg);
+}
+.date-tabs {
+	padding-left: 40px;
+	padding-top: 20px;
+	position: relative;
+	margin-bottom: 20px;
+}
+:deep(.date-tabs) {
+	.el-tabs__header {
+		margin-bottom: 8px;
+		display: inline-block;
+		transform: translateY(-12px);
+	}
+
+	.el-tabs__content {
+		overflow: visible;
+	}
+
+	.el-tabs__item {
+		font-size: 18px;
+		color: #fff;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+		line-height: 36px !important;
+		height: 36px;
+	}
+	.el-tabs__item.is-active {
+		color: #0b58ff;
+	}
+}
+.detail {
+	display: inline-block;
+	position: absolute;
+	left: 260px;
+	top: 10px;
+}
+:deep(.detail) {
+	.el-input__inner {
+		background-color: transparent;
+		color: white;
+	}
+}
+// .current-date {
+// 	color: #fff;
+// 	font-size: 18px;
+// 	position: absolute;
+// 	left: 260px;
+// 	top: 14px;
+// }
+.current-time {
+	color: #fff;
+	font-size: 18px;
+	position: absolute;
+	right: 38px;
+	top: 14px;
+}
+.main-top {
+	width: 100%;
+	padding: 0 20px 0 40px;
+	.title {
+		position: absolute;
+		left: 34px;
+		top: 20px;
+		width: 180px;
+		font-size: 32px;
+		z-index: 10;
+		.title-inner {
+			position: absolute;
+			left: 42px;
+			top: 5px;
+			font-size: calc(100vw * 20 / 1920);
+		}
+	}
+	.box {
+		background-color: #fff;
+		border-radius: 24px;
+		height: 192px;
+		padding: 40px 24px 32px 24px;
+		margin-bottom: 20px;
+		box-shadow: 0 8px 8px 0 gray;
+		.num-box {
+			height: 120px;
+			padding-top: 26px;
+			text-align: center;
+			.num-style {
+				color: #000;
+				font-size: calc(100vw * 40 / 1920);
+			}
+			.unit-style {
+				color: rgba(0, 0, 0, 0.7);
+				font-size: calc(100vw * 18 / 1920);
+			}
+		}
+		.shadow {
+			background: linear-gradient(90deg, #ffffff 80%, #f2f4f9 100%);
+		}
+	}
+}
+.main-bottom {
+	width: 100%;
+	margin-top: 20px;
+	.chart-wrapper {
+		margin-left: 10px;
+		height: 425px;
+		background: #fff;
+		border-radius: 5px;
+		box-shadow: 0 3px 3px 0 gray;
+	}
+}
+</style>
+<style lang="scss">
+.home-page {
+	.el-progress-bar__inner {
+		background-image: url('~@/assets/img/home-progress-bg.png');
+		background-size: cover;
+	}
+}
+</style>

src/views/cost/indexDetail.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:47:28
+ * @LastEditTime: 2025-10-29 17:12:04
  * @Description:
 -->
 <template>
@@ -12,6 +12,9 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
+			ref="groupTableRef"
+			:id="'groupTableSelectRef'"
+			row-key="id"
 			:selectWidth="55"
 			@selection-change="selectChange"
 			:table-props="tableProps"
@@ -46,6 +49,7 @@ const tableProps = [
 	{
 		prop: 'remark',
 		label: '备注',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -84,22 +88,52 @@ export default {
 				name: '',
 			},
 			selectedList: [],
-      deptId: undefined
+			selectedArr: [], //已选的班组，从父组件传过来的
+			deptId: undefined,
 		};
 	},
 	created() {},
 	methods: {
-    init(id){
-      this.deptId = id
-      this.getDataList()
-    },
+		init(id, tableData) {
+			this.deptId = id;
+			this.selectedArr = tableData || [];
+			this.$nextTick(() => {
+				this.getDataList();
+			});
+		},
 		// 获取数据列表
 		getDataList() {
-			this.urlOptions
-				.getDataListURL(this.deptId)
-				.then((response) => {
-					this.tableData = response.data;
+			this.urlOptions.getDataListURL(this.deptId).then((response) => {
+				this.tableData = response.data;
+				this.$nextTick(() => {
+					if (this.selectedArr.length > 0) {
+						this.setSelectedRows();
+					}
 				});
+			});
+		},
+		setSelectedRows() {
+			const table = this.$refs.groupTableRef.$children[0];
+
+			// 先清空选择
+			table.clearSelection();
+
+			this.selectedArr.forEach((item) => {
+				const rowInTable = this.tableData.find((i) => i.id === item.id);
+				if (rowInTable) {
+					//这里一定要用table.tableData，这样才是指向同一个数组
+					this.$set(table.store.states, 'selection', [
+						...table.store.states.selection,
+						table.tableData.find((i) => i.id === item.id),
+					]);
+				}
+			});
+
+			// 强制更新视图
+			this.$nextTick(() => {
+				table.$forceUpdate();
+				this.$forceUpdate();
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -115,9 +149,25 @@ export default {
 		selectChange(val) {
 			this.selectedList = val;
 		},
+		// 判断两个数组是否有重复的 id
+		hasDuplicateIds(arr1, arr2) {
+			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) {
+				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-10-24 09:19:17
+ * @LastEditTime: 2025-10-29 15:28:52
  * @Description:
 -->
 <template>
@@ -111,7 +111,7 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="6" v-if="dataForm.shiftType>1">
 						<el-form-item label="同班次连排" prop="shiftSustainedNum">
 							<el-input
 								v-model="dataForm.shiftSustainedNum"
@@ -289,6 +289,7 @@
 			:dialogVisible="addOrUpdateVisible1"
 			@cancel="cancel1"
 			@confirm="handleConfirm1"
+			:before-close="cancel1"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -301,6 +302,7 @@
 			:dialogVisible="addOrUpdateVisible2"
 			@cancel="cancel2"
 			@confirm="handleConfirm2"
+			:before-close="cancel2"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -313,6 +315,7 @@
 			:dialogVisible="addOrUpdateVisible3"
 			@cancel="cancel3"
 			@confirm="handleConfirm3"
+			:before-close="cancel3"
 			:destroy-on-close="true"
 			append-to-body
 			width="50%">
@@ -391,6 +394,7 @@ const tableProps2 = [
 	{
 		prop: 'lineName',
 		label: '产线及工段',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -510,6 +514,16 @@ export default {
 				{
 					type: 'bind',
 					btnName: '绑定产线',
+					showParam: {
+						type: '&',
+						data: [
+							{
+								type: 'equal',
+								name: 'isProduction',
+								value: true,
+							},
+						],
+					},
 				},
 				{
 					type: 'delete',
@@ -640,6 +654,12 @@ export default {
 						this.$message('部门不能为空');
 						return;
 					}
+          const compareDate = this.compareDates(this.dataForm.startDay,this.dataForm.endDay)
+
+					if (compareDate > 0 ) {
+						this.$message('开始时间不能大于结束时间');
+						return;
+					}
 					createStepOne(this.dataForm).then((res) => {
 						if (!this.dataForm.id) {
 							this.dataForm.id = res.data;
@@ -754,6 +774,19 @@ export default {
 		setDataForm() {
 			this.$refs.deptSelect.setID(this.dataForm.deptId);
 		},
+    //比较时间，开始时间在结束时间前
+		compareDates(date1, date2) {
+			const d1 = date1;
+			const d2 = date2;
+
+			if (d1 === d2) {
+				return 0; // 日期相等
+			} else if (d1 < d2) {
+				return -1; // date1 在 date2 之前
+			} else {
+				return 1; // date1 在 date2 之后
+			}
+		},
 		//第二步
 		//设置第二部班次
 		setTWOclass() {
@@ -830,7 +863,7 @@ export default {
 		addNewGroup() {
 			this.addOrUpdateVisible2 = true;
 			this.$nextTick(() => {
-				this.$refs.addGroupRef.init(this.dataForm.deptId);
+				this.$refs.addGroupRef.init(this.dataForm.deptId,this.tableData2);
 			});
 		},
 		cancel1() {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-16 16:37:40
+ * @LastEditTime: 2025-10-30 10:47:09
  * @Description:
 -->
 <template>
@@ -16,7 +16,7 @@
 			pid="pid"
 			:defaultProps="{ label: 'name' }"
 			height="450px"
-      style="padding-bottom:20px"
+			style="padding-bottom: 20px"
 			:mode="mode"
 			filter
 			openAll></tree-transfer>
@@ -39,7 +39,7 @@ export default {
 	},
 	methods: {
 		init(val) {
-			this._pageIndex = val._pageIndex-1;
+			this._pageIndex = val._pageIndex - 1;
 			this.fromData = [];
 			this.toData = [];
 			getGroupPlanTree().then((res) => {
@@ -47,21 +47,41 @@ export default {
 				this.fromData.forEach((item) => {
 					item.productionLineId = 0;
 				});
+				this.$nextTick(() => {
+					this.toData = val.bindLineTree || [];
+					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
+				});
 			});
 		},
 		// 监听穿梭框组件添加
 		add(fromData, toData, obj) {
 			console.log('fromData:', fromData);
-			console.log('toData:', toData,obj);
+			console.log('toData:', toData, obj);
 		},
 		// 监听穿梭框组件移除
 		remove(fromData, toData, obj) {
 			console.log('fromData:', fromData);
 			console.log('toData:', toData);
 		},
+		/** 消除组件左边与右边选中数据相同项 */
+		// 处理过滤数据
+		getFilterLeftData(data, selData) {
+			for (let i = data.length - 1; i >= 0; i--) {
+				for (let j = selData.length - 1; j >= 0; j--) {
+					if (data[i] && data[i].id === selData[j].id) {
+						// 当id相等可以删除的情况 即：没有子级可以删除；
+						if (!data[i].children || data[i].children.length == 0) {
+							data.splice(i, 1);
+						} else {
+							this.getFilterLeftData(data[i].children, selData[j].children);
+						}
+					}
+				}
+			}
+		},
 		// 表单提交
 		dataFormSubmit() {
-			this.$emit('refreshTableData', this._pageIndex,this.toData);
+			this.$emit('refreshTableData', this._pageIndex, this.toData);
 		},
 	},
 };

src/views/group/Schedule/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 16:31:41
+ * @LastEditTime: 2025-10-29 14:50:16
  * @Description:
 -->
 <template>
@@ -59,12 +59,14 @@
 					<el-button
 						type="primary"
 						size="small"
+						v-hasPermi="['base:group-scheduling-plan:query']"
 						@click="buttonClick({ btnName: 'search' })">
 						查询
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:query']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
@@ -72,13 +74,15 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:create']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button
 						type="success"
 						size="small"
 						:plain="true"
+						v-hasPermi="['base:group-scheduling-plan:create']"
 						@click="buttonClick({ btnName: 'add' })">
 						新增
 					</el-button>
@@ -264,6 +268,7 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi('base:group-scheduling-plan:update')?
 				{
 					type: 'edit',
 					btnName: '编辑',
@@ -277,7 +282,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
 				{
 					type: 'delete',
 					btnName: '删除',
@@ -291,7 +297,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:query')?
 				{
 					type: 'detail',
 					btnName: '查看',
@@ -305,7 +312,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
 				{
 					type: 'cancel',
 					btnName: '作废',
@@ -319,7 +327,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-holiday:update')?
 				{
 					type: 'sync',
 					btnName: '同步节假日',
@@ -332,17 +341,18 @@ export default {
 								value: 2,
 							},
 							{
-								type: 'updateFlag',
-								name: 'status',
+								type: 'equal',
+								name: 'updateFlag',
 								value: true,
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:create')?
 				{
 					type: 'copy',
 					btnName: '复制',
-				},
+				}:undefined,
 			].filter((v) => v),
 			tableData: [],
 			options: [

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 15:44:18
+ * @LastEditTime: 2025-10-29 14:47:33
  * @Description:
 -->
 <template>
@@ -33,7 +33,7 @@
 			<el-col :span="8">
 				<el-form-item label="部门">
 					<dept-select
-						style="width: 200px"
+						style="width: 100%"
 						ref="deptSelect"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
@@ -41,8 +41,10 @@
 			<el-col :span="8">
 				<el-form-item label="组长" prop="leaderId">
 					<el-select
+						style="width: 100%"
 						v-model="dataForm.leaderId"
 						@change="setLeaderName"
+            filterable
 						placeholder="请选择组长">
 						<el-option
 							v-for="item in leaderArr"
@@ -57,12 +59,14 @@
 					<el-input
 						v-model="dataForm.leaderPhone"
 						clearable
+             maxlength="11"
 						placeholder="请输入组长电话" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="班组人数" prop="num">
 					<el-input-number
+						style="width: 100%"
 						v-model="dataForm.num"
 						:step="1"
 						:min="0"
@@ -72,6 +76,7 @@
 			<el-col :span="8">
 				<el-form-item label="生产班组" prop="isProduction">
 					<el-select
+						style="width: 100%"
 						v-model="dataForm.isProduction"
 						placeholder="请选择是否为生产班组">
 						<el-option
@@ -157,6 +162,13 @@ export default {
 				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"
+          }
+        ]
 			},
 		};
 	},

src/views/group/groupSetting/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-24 09:11:11
+ * @LastEditTime: 2025-10-29 14:44:41
  * @Description:
 -->
 <template>
@@ -25,7 +25,7 @@
 					<dept-select
 						style="width: 200px"
 						ref="deptSelect"
-            @DeptId="setDeptId"></dept-select>
+						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
 				<el-form-item label="班组名称" prop="name">
 					<el-input
@@ -45,12 +45,15 @@
 					<el-button
 						type="primary"
 						size="small"
+						v-hasPermi="['base:group-team:query']"
 						@click="buttonClick({ btnName: 'search' })">
 						查询
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-team:query']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
@@ -58,13 +61,16 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-team:create']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button
 						type="success"
 						size="small"
 						:plain="true"
+						v-hasPermi="['base:group-team:create']"
 						@click="buttonClick({ btnName: 'add' })">
 						新增
 					</el-button>
@@ -97,7 +103,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-      :destroy-on-close="true"
+			:destroy-on-close="true"
 			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
@@ -118,16 +124,16 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '班组编号',
-		width: 140,
+		width: 210,
 	},
 	{
 		prop: 'name',
 		label: '班组名称',
-		width: 100,
 	},
 	{
 		prop: 'deptName',
 		label: '所属部门',
+		width: 110,
 	},
 	{
 		prop: 'leaderName',
@@ -136,6 +142,7 @@ const tableProps = [
 	{
 		prop: 'leaderPhone',
 		label: '组长电话',
+		width: 110,
 	},
 	{
 		prop: 'num',
@@ -145,12 +152,15 @@ const tableProps = [
 	{
 		prop: 'isProduction',
 		label: '是否生产班组',
-    filter: val=>{return val?'是':'否'},
+		filter: (val) => {
+			return val ? '是' : '否';
+		},
 		width: 110,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'createTime',
@@ -175,10 +185,12 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
+				this.$auth.hasPermi('base:group-team:update')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableData: [],
 			formInline: {
@@ -231,9 +243,9 @@ export default {
 					console.log(val);
 			}
 		},
-    setDeptId(val){
-      this.formInline.deptId = val
-    }
+		setDeptId(val) {
+			this.formInline.deptId = val;
+		},
 	},
 };
 </script>

src/views/group/holidaySetting/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 13:52:52
+ * @LastEditTime: 2025-10-27 10:18:54
  * @Description:
 -->
 <template>
@@ -46,10 +46,14 @@
 									size="small"
 									type="primary"
 									style="margin-right: 10px"
+									v-hasPermi="['base:group-holiday:create']"
 									@click="addHoliday">
 									新增节假日
 								</el-button>
-								<el-button size="small" @click="holidayLog">
+								<el-button
+									size="small"
+									v-hasPermi="['base:group-holiday-log:query']"
+									@click="holidayLog">
 									节假日变更记录
 								</el-button>
 							</div>
@@ -73,7 +77,7 @@
 							<el-button
 								size="small"
 								type="primary"
-								@click="startDay = new Date(),getHolidayPage()">
+								@click="(startDay = new Date()), getHolidayPage()">
 								跳转到今天
 							</el-button>
 						</el-form-item>
@@ -203,6 +207,7 @@
 								size="small"
 								type="primary"
 								class="btnTextStyle"
+								v-hasPermi="['base:group-holiday:update']"
 								@click="editHoliday">
 								修改
 							</el-button>
@@ -210,6 +215,7 @@
 								v-if="detail"
 								class="btnTextStyle"
 								size="small"
+								v-hasPermi="['base:group-holiday:delete']"
 								@click="deleteHoliday">
 								删除
 							</el-button>

src/views/login.vue

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

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

@@ -0,0 +1,114 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-12 15:35:21
+ * @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="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入产品编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产品名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入产品名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="产品规格" prop="address">
+					<el-input
+						v-model="dataForm.address"
+						clearable
+						placeholder="请输入产品规格" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产品类型" prop="name">
+					<el-select
+						v-model="dataForm.name"
+						disabled
+						:style="{ width: '100%' }"
+						placeholder="请选择产品类型">
+						<el-option
+							v-for="item in typeArr"
+							:key="item.name"
+							:label="item.label"
+							:value="item.name"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="启用状态" prop="enabled">
+					<el-select
+						:style="{ width: '100%' }" v-model="dataForm.enabled" placeholder="请选择启用状态">
+						<el-option
+							v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import {
+	createFactory,
+	updateFactory,
+	getFactory,
+	getCode,
+} from '@/api/core/base/factory';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getCode,
+				createURL: createFactory,
+				updateURL: updateFactory,
+				infoURL: getFactory,
+			},
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				name: undefined,
+				address: undefined,
+        enabled:'1',
+				remark: undefined,
+			},
+      typeArr: [],
+			dataRule: {
+				code: [
+					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	methods: {},
+};
+</script>

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

@@ -0,0 +1,209 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData"
+			@emitFun="getDataList">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="90"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '@/mixins/basic-page';
+import changeStatus from './changeStatus.vue';
+import { parseTime } from '@/filter/code-filter';
+import {
+	deleteFactory,
+	getFactoryPage,
+	exportFactoryExcel,
+} from '@/api/core/base/factory';
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '产品编码',
+	},
+	{
+		prop: 'name',
+		label: '产品名称',
+	},
+	{
+		prop: 'address',
+		label: '规格型号',
+	},
+	{
+		prop: 'remark',
+		label: '产品分类',
+	},
+	{
+		prop: 'remark1',
+		label: '创建人',
+		width: 90,
+	},
+	{
+		prop: 'createTime',
+		label: '时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'enabled',
+		label: '状态',
+		subcomponent: changeStatus,
+		width: 80,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getFactoryPage,
+				deleteURL: deleteFactory,
+				exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:factory:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:factory:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '分类',
+					selectOptions: [],
+					param: 'val1',
+				},
+				{
+					type: 'select',
+					label: '状态',
+					selectOptions: [
+						{ id: 1, name: '正常' },
+						{ id: 2, name: '停用' },
+					],
+					param: 'val2',
+				},
+				{
+					type: 'input',
+					label: '产品编码',
+					placeholder: '产品编码',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:factory:create') ? '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 = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.val1 = val.val1;
+					this.listQuery.val2 = val.val2;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						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/product&recipe/recipe/add-or-updata.vue

@@ -0,0 +1,114 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-12 15:35:21
+ * @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="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入产品编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产品名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入产品名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="产品规格" prop="address">
+					<el-input
+						v-model="dataForm.address"
+						clearable
+						placeholder="请输入产品规格" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产品类型" prop="name">
+					<el-select
+						v-model="dataForm.name"
+						disabled
+						:style="{ width: '100%' }"
+						placeholder="请选择产品类型">
+						<el-option
+							v-for="item in typeArr"
+							:key="item.name"
+							:label="item.label"
+							:value="item.name"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="启用状态" prop="enabled">
+					<el-select
+						:style="{ width: '100%' }" v-model="dataForm.enabled" placeholder="请选择启用状态">
+						<el-option
+							v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import {
+	createFactory,
+	updateFactory,
+	getFactory,
+	getCode,
+} from '@/api/core/base/factory';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getCode,
+				createURL: createFactory,
+				updateURL: updateFactory,
+				infoURL: getFactory,
+			},
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				name: undefined,
+				address: undefined,
+        enabled:'1',
+				remark: undefined,
+			},
+      typeArr: [],
+			dataRule: {
+				code: [
+					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	methods: {},
+};
+</script>

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

@@ -0,0 +1,229 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData"
+			@emitFun="getDataList">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="90"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '@/mixins/basic-page';
+import changeStatus from './changeStatus.vue';
+import { parseTime } from '@/filter/code-filter';
+import {
+	deleteFactory,
+	getFactoryPage,
+	exportFactoryExcel,
+} from '@/api/core/base/factory';
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '产品编码',
+	},
+	{
+		prop: 'name',
+		label: '产品名称',
+	},
+	{
+		prop: 'address',
+		label: '规格型号',
+	},
+	{
+		prop: 'remark',
+		label: '产品分类',
+	},
+	{
+		prop: 'remark1',
+		label: '创建人',
+		width: 90,
+	},
+	{
+		prop: 'createTime',
+		label: '时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'enabled',
+		label: '状态',
+		subcomponent: changeStatus,
+		width: 80,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getFactoryPage,
+				deleteURL: deleteFactory,
+				exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:factory:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:factory:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '适用框绞线',
+					selectOptions: [],
+					param: 'val1',
+				},
+				{
+					type: 'select',
+					label: '修改人',
+					selectOptions: [],
+					param: 'val2',
+				},
+				{
+					type: 'select',
+					label: '状态',
+					selectOptions: [
+						{ id: 1, name: '正常' },
+						{ id: 2, name: '停用' },
+					],
+					param: 'val3',
+				},
+				{
+					type: 'datePicker',
+					label: '最后修改时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'input',
+					label: '产品编码',
+					placeholder: '产品编码',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.val1 = val.val1;
+					this.listQuery.val2 = val.val2;
+					this.listQuery.val3 = val.val3;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						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/productionVisualization/equipmentBoard/components/EventLisener.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,77 @@
+<template>
+  <div class="handling-object">
+    <!-- 左侧内容：L:名称+规格 -->
+    <div class="handling-item left">
+      <div class="table-icon left-icon"></div>
+      <span style="margin-left: 4px;">{{ leftContent }}</span>
+    </div>
+    <!-- 右侧内容：R:名称+规格 -->
+    <div class="handling-item right">
+      <div class="table-icon right-icon"></div>
+      <span style="margin-left: 4px;">{{ rightContent }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HandlingObjectLabel',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+      required: true
+    }
+  },
+  computed: {
+    // 拆分左侧内容（L:xxx）
+    leftContent() {
+      const handlingStr = this.injectData.handingObject || '';
+      const leftPart = handlingStr.split(',')[0] || ''; // 取第一个逗号前的部分
+      return leftPart.replace('L:', ''); // 移除前缀"L:"
+    },
+    // 拆分右侧内容（R:xxx）
+    rightContent() {
+      const handlingStr = this.injectData.handingObject || '';
+      const rightPart = handlingStr.split(',')[1] || ''; // 取第一个逗号后的部分
+      return rightPart.replace('R:', ''); // 移除前缀"R:"
+    }
+  }
+};
+</script>
+<style scoped>
+.handling-object {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  font-size: 14px;
+  padding: 4px 8px;
+}
+
+.handling-item {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  /* 防止子元素被压缩 */
+  flex-shrink: 0;
+}
+
+.table-icon {
+  width: 12px;
+  height: 12px;
+  background-size: cover;
+  background-repeat: no-repeat;
+  /* 固定图标尺寸，不被挤压 */
+  flex-shrink: 0;
+}
+
+/* 左侧图标 */
+.left-icon {
+  background-image: url('../../../../assets/img/leftTable.png');
+}
+
+/* 右侧图标 */
+.right-icon {
+  background-image: url('../../../../assets/img/rightTable.png');
+}
+</style>

src/views/productionVisualization/equipmentBoard/components/mixins/resize.js

@@ -0,0 +1,62 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-08-16 08:43:53
+ * @LastEditTime: 2023-09-15 16:12:57
+ * @LastEditors: zhp
+ * @Description:
+ */
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.$_resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  beforeDestroy() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  // to fixed bug when cached by keep-alive
+  // https://github.com/PanJiaChen/vue-element-admin/issues/2116
+  activated() {
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  deactivated() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_initResizeEvent() {
+      window.addEventListener('resize', this.$_resizeHandler)
+    },
+    $_destroyResizeEvent() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+    },
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    $_initSidebarResizeEvent() {
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    $_destroySidebarResizeEvent() {
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    }
+  }
+}

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

@@ -0,0 +1,273 @@
+<template>
+  <!-- 动态绑定 ref：使用 props 中的 chartRef，而非硬编码 -->
+  <div :ref="chartRef" id="coreLineChart" style="height: 170px; width: 100%;"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+  name: 'Container',
+  props: {
+    // 1. 重命名 props：ref → chartRef，避免关键字冲突，同时定义类型和默认值
+    chartRef: {
+      type: String,
+      required: true, // 强制父组件传值，避免获取不到 DOM
+      // validator: (value) => {
+      //   // 验证：ref 名不能为空，确保有效
+      //   return value.trim() !== '';
+      // }
+    }
+  },
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  mounted() {
+    this.$nextTick(() => {
+      this.initData();
+    });
+  },
+  methods: {
+    initData() {
+      // 2. 动态获取 DOM：通过 props 中的 chartRef 拿到对应的 ref 元素
+      const chartDom = this.$refs[this.chartRef];
+      if (!chartDom) {
+        console.error(`图表容器未找到！请确认父组件传递的 chartRef 为 "${this.chartRef}"`);
+        return;
+      }
+      const myChart = echarts.init(chartDom);
+
+      // 自定义颜色数组（与系列一一对应）
+      const customColors = [
+        'rgba(113, 100, 255, 1)',
+        'rgba(40, 138, 255, 1)',
+        'rgba(118, 218, 190, 1)',
+        'rgba(255, 206, 106, 1)',
+      ];
+
+      const option = {
+        // 标题配置（主标题+副标题）
+        // title: [
+        //   {
+        //     text: '月度',
+        //     left: 'center',
+        //     top: '35%',
+        //     textStyle: {
+        //       fontSize: 24,
+        //       letterSpacing: 5,
+        //       color: 'rgba(0, 0, 0, 0.85)',
+        //       fontFamily: 'PingFangSC, PingFang SC'
+        //     }
+        //   },
+        //   {
+        //     text: '单位:万m²',
+        //     left: 'center',
+        //     top: '50%',
+        //     textStyle: {
+        //       fontSize: 16,
+        //       color: 'rgba(0, 0, 0, 0.55)',
+        //       fontFamily: 'PingFangSC, PingFang SC'
+        //     }
+        //   }
+        // ],
+        series: [
+          {
+            // name: '销量',
+            type: 'pie',
+            radius: ['60%', '90%'],
+            center: ['50%', '50%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: true,
+              position: 'outside',
+              distance: 10,
+              formatter: '{c}万m²\n{b}',
+              textStyle: {
+                fontSize: 14,
+                color: 'rgba(0, 0, 0, 0.7)',
+                fontFamily: 'PingFangSC, PingFang SC',
+                lineHeight: 1.5
+              }
+            },
+            labelLine: {
+              show: true,
+              length: 0,
+              length2: 30,
+              lineStyle: {
+                color: (params) => customColors[params.dataIndex]
+              }
+            },
+            itemStyle: {
+              color: (params) => customColors[params.dataIndex]
+            },
+            data: [
+              {
+                value: 348, name: '临时搬运',
+                label: {
+                  normal: {
+                    align: 'left',
+                    distanceToLabelLine: 2,
+                    formatter: (params) => [
+                      `{b|${params.name.toLocaleString()}}`,
+                      `{c|${params.percent.toFixed(1)}% ${params.value}}`
+                    ].join('\n'),
+                    rich: {
+                      b: {
+                        color: 'rgba(140, 140, 140, 1)',
+                        fontSize: 14,
+                        padding: [0, 0, 0, 0]
+                      },
+                      c: {
+                        color: 'rgba(0, 0, 0, 0.65)',
+                        fontSize: 14,
+                        padding: [30, 0, 0, 0]
+                      }
+                    }
+                  }
+                },
+                labelLine: {
+                  lineStyle: { color: 'rgba(80, 181, 255, 1)' }
+                },
+                itemStyle: { color: 'rgba(80, 181, 255, 1)' }
+              },
+              {
+                value: 435, name: '满盘搬运',
+                label: {
+                  normal: {
+                    align: 'left',
+                    distanceToLabelLine: 2,
+                    formatter: (params) => [
+                      `{b|${params.name.toLocaleString()}}`,
+                      `{c|${params.percent.toFixed(1)}% ${params.value}}`
+                    ].join('\n'),
+                    rich: {
+                      b: {
+                        color: 'rgba(140, 140, 140, 1)',
+                        fontSize: 14,
+                        padding: [0, 0, 0, 0]
+                      },
+                      c: {
+                        color: 'rgba(0, 0, 0, 0.65)',
+                        fontSize: 14,
+                        padding: [30, 0, 0, 0]
+                      }
+                    }
+                  }
+                },
+                labelLine: {
+                  length: 10,
+                  length2: 20,
+                  lineStyle: { color: 'rgba(40, 138, 255, 1)' }
+                },
+                itemStyle: { color: 'rgba(40, 138, 255, 1)' }
+              },
+              {
+                value: 580, name: '备料搬运',
+                label: {
+                  normal: {
+                    align: 'left',
+                    distanceToLabelLine: 2,
+                    formatter: (params) => [
+                      `{b|${params.name.toLocaleString()}}`,
+                      `{c| ${params.value} ${params.percent.toFixed(1)}%}`
+                    ].join('\n'),
+                    rich: {
+                      b: {
+                        color: 'rgba(140, 140, 140, 1)',
+                        fontSize: 14,
+                        padding: [0, 0, 0, 0]
+                      },
+                      c: {
+                        color: 'rgba(0, 0, 0, 0.65)',
+                        fontSize: 14,
+                        padding: [30, 0, 0, 0]
+                      }
+                    }
+                  }
+                },
+                labelLine: {
+                  lineStyle: { color: 'rgba(143, 146, 255, 1)' }
+                },
+                itemStyle: { color: 'rgba(143, 146, 255, 1)' }
+              },
+              {
+                value: 484, name: '空盘搬运',
+                label: {
+                  normal: {
+                    align: 'left',
+                    distanceToLabelLine: 2,
+                    formatter: (params) => [
+                      `{b|${params.name.toLocaleString()}}`,
+                      `{c| ${params.value} ${params.percent.toFixed(1)}%}`
+                    ].join('\n'),
+                    rich: {
+                      b: {
+                        color: 'rgba(140, 140, 140, 1)',
+                        fontSize: 14,
+                        padding: [0, 0, 0, 0]
+                      },
+                      c: {
+                        color: 'rgba(0, 0, 0, 0.65)',
+                        fontSize: 14,
+                        padding: [30, 0, 0, 0]
+                      }
+                    }
+                  }
+                },
+                // label: {
+                //   normal: {
+                //     align: 'left',
+                //     distanceToLabelLine: 2,
+                //     formatter: (params) => [
+                //       `{b|${params.value.toLocaleString()}}`,
+                //       `{c|${params.name}}`
+                //     ].join('\n'),
+                //     rich: {
+                //       // hr: {
+                //       //   color: 'rgba(168, 233, 255, 1)',
+                //       //   fontSize: 20,
+                //       //   padding: [26, 8, 0, 0]
+                //       // },
+                //       b: {
+                //         color: 'rgba(0, 0, 0, 0.65)',
+                //         fontSize: 18,
+                //         padding: [0, 0, 0, 0]
+                //       },
+                //       c: {
+                //         color: 'rgba(0, 0, 0, 0.65)',
+                //         fontSize: 14,
+                //         padding: [30, 0, 0, -5]
+                //       }
+                //     }
+                //   }
+                // },
+                labelLine: {
+                  lineStyle: { color: 'rgba(168, 233, 255, 1)' }
+                },
+                itemStyle: { color: 'rgba(168, 233, 255, 1)' }
+              }
+            ]
+          }
+        ]
+      };
+
+      option && myChart.setOption(option);
+
+      // 窗口缩放监听
+      window.addEventListener('resize', () => {
+        myChart.resize();
+      });
+
+      // 组件销毁清理
+      this.$once('hook:destroyed', () => {
+        window.removeEventListener('resize', () => {
+          myChart.resize();
+        });
+        myChart.dispose();
+      });
+    }
+  },
+};
+</script>

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

@@ -0,0 +1,259 @@
+<template>
+  <!-- 外层容器：图表 + 自定义图例 -->
+  <div class="chart-legend-wrapper">
+    <!-- 图表容器 -->
+    <div :ref="chartRef" id="coreLineChart" class="chart-container"></div>
+    <!-- 自定义图例（三排三列 + 带数值） -->
+    <div class="custom-legend">
+      <div class="legend-item" v-for="(item, index) in chartData" :key="index"
+        >
+        <!-- 左侧：颜色块 + 名称（垂直居中对齐） -->
+        <div class="legend-left">
+          <div class="legend-color" :style="{ backgroundColor: customColors[index] }"></div>
+          <span class="legend-name">{{ item.name }}</span>
+        </div>
+        <!-- 右侧：数值（与左侧垂直居中对齐） -->
+        <span class="legend-value">{{ item.value }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+  name: 'Container',
+  props: {
+    chartRef: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      myChart: null,
+      selectedStatus: [],
+      customColors: [
+        'rgba(255, 235, 106, 1)',
+        'rgba(255, 206, 106, 1)',
+        'rgba(255, 151, 71, 1)',
+        'rgba(152, 92, 255, 1)',
+        'rgba(113, 100, 255, 1)',
+        'rgba(143, 146, 255, 1)',
+        'rgba(40, 138, 255, 1)',
+        'rgba(80, 181, 255, 1)',
+        'rgba(168, 233, 255, 1)',
+      ],
+      chartData: [
+        { value: 348, name: '暂停中' },
+        { value: 435, name: '已终止-回收' },
+        { value: 580, name: '已终止-待回收' },
+        { value: 484, name: '已终止' },
+        { value: 484, name: '已完成' },
+        { value: 484, name: '执行中' },
+        { value: 484, name: '异常' },
+        { value: 484, name: '待执行' },
+        { value: 484, name: '待下发' },
+
+      ]
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initData();
+    });
+  },
+  methods: {
+    initData() {
+      const chartDom = this.$refs[this.chartRef];
+      if (!chartDom) {
+        console.error(`图表容器未找到！请确认父组件传递的 chartRef 为 "${this.chartRef}"`);
+        return;
+      }
+      this.myChart = echarts.init(chartDom);
+      this.selectedStatus = this.chartData.map(() => true);
+      const total = this.chartData.reduce((sum, item) => sum + item.value, 0);
+
+      const option = {
+        legend: { show: false },
+        tooltip: {
+          show: true,
+          trigger: 'item',
+          backgroundColor: '#FFFFFF',
+          boxShadow: '0px 4px 8px 0px rgba(0, 0, 0, 0.16)',
+          borderRadius: '4px',
+          width: 153,
+          height: 42,
+          borderWidth: 0,
+          textStyle: {
+            color: 'rgba(0, 0, 0, 0.85)',
+            fontSize: 14,
+            lineHeight: 1.5
+          },
+          formatter: (params) => {
+            const color = this.customColors[params.dataIndex];
+            const percent = ((params.value / total) * 100).toFixed(1);
+            return `
+              <div style="display: flex; align-items: center; gap: 8px;">
+                <div style="width: 12px; height: 12px; background: ${color};"></div>
+                <div style="display: flex; align-items: center; gap: 20px;">
+                  <span>${params.name}</span>
+                  <span>${params.value}</span>
+                </div>
+              </div>
+            `;
+          }
+        },
+        title: [
+          {
+            text: total.toString(),
+            left: 'center',
+            top: '35%',
+            textStyle: {
+              fontSize: 23,
+              letterSpacing: 5,
+              color: 'rgba(0, 0, 0, 0.65)',
+              fontFamily: 'PingFangSC, PingFang SC'
+            }
+          },
+          {
+            text: '总数',
+            left: 'center',
+            top: '50%',
+            textStyle: {
+              fontSize: 16,
+              color: 'rgba(0, 0, 0, 0.65)',
+              fontFamily: 'PingFangSC, PingFang SC'
+            }
+          }
+        ],
+        series: [
+          {
+            type: 'pie',
+            radius: ['70%', '100%'],
+            center: ['50%', '50%'],
+            avoidLabelOverlap: false,
+            label: { show: false },
+            labelLine: { show: false },
+            itemStyle: {
+              color: (params) => this.customColors[params.dataIndex],
+              borderWidth: 2,
+              borderColor: '#fff'
+            },
+            data: this.chartData.map((item, index) => ({
+              ...item,
+              itemStyle: { color: this.customColors[index] }
+            })),
+            selected: this.selectedStatus.reduce((obj, selected, index) => {
+              obj[this.chartData[index].name] = selected;
+              return obj;
+            }, {})
+          }
+        ]
+      };
+
+      option && this.myChart.setOption(option);
+      window.addEventListener('resize', () => this.myChart?.resize());
+      this.$once('hook:destroyed', () => {
+        window.removeEventListener('resize', () => this.myChart?.resize());
+        this.myChart?.dispose();
+      });
+    },
+    handleLegendClick(index) {
+      this.selectedStatus[index] = !this.selectedStatus[index];
+      this.myChart.setOption({
+        series: [{
+          selected: this.selectedStatus.reduce((obj, selected, i) => {
+            obj[this.chartData[i].name] = selected;
+            return obj;
+          }, {})
+        }]
+      });
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+// 外层容器：横向排列，垂直居中
+.chart-legend-wrapper {
+  width: 100%;
+  height: 170px;
+  display: flex;
+  align-items: center; // 整体垂直居中
+}
+
+// 图表容器
+.chart-container {
+  height: 180px;
+  width: 30%;
+}
+
+// 图例容器：三列网格布局，垂直居中
+.custom-legend {
+  margin-left: 10px;
+  box-sizing: border-box;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr); // 三列
+  grid-template-rows: repeat(3, 1fr); // 两行（6个item刚好2行3列）
+  // gap: 15px 10px; // 行列间距
+  align-items: center; // 网格内垂直居中
+}
+
+// 单个图例项：横向排列，垂直居中
+.legend-item {
+  display: flex;
+  align-items: left; // 内部元素垂直居中
+  flex-direction: column;
+  width: 100%;
+  cursor: pointer;
+  // gap: 10px; // 左右两部分间距
+}
+
+// 左侧：颜色块 + 名称（垂直居中）
+.legend-left {
+  display: flex;
+  align-items: center; // 颜色块与名称垂直居中
+  gap: 8px; // 颜色块与名称间距
+  flex: 1; // 占满剩余空间，确保右侧数值靠右
+}
+
+// 颜色块
+.legend-color {
+  width: 8px;
+  height: 8px;
+  border-radius: 2px;
+  flex-shrink: 0; // 防止被压缩
+}
+
+// 名称
+.legend-name {
+  font-size: 14px;
+  color: rgba(140, 140, 140, 1);
+  font-family: 'PingFangSC, PingFang SC';
+  white-space: nowrap; // 防止换行
+}
+
+// 数值
+.legend-value {
+  font-size: 14px;
+  margin-left: 16px;
+  color: rgba(0, 0, 0, 0.65);
+  font-weight: 500;
+  white-space: nowrap; // 防止换行
+}
+
+// 未选中状态
+// .legend-item.unselected {
+
+//   .legend-name,
+//   .legend-value {
+//     color: rgba(0, 0, 0, 0.3);
+//   }
+
+//   .legend-color {
+//     opacity: 0.5;
+//   }
+// }
+</style>

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

@@ -0,0 +1,86 @@
+<template>
+  <div style="flex: 1">
+    <div class="agvStatusContent">
+      <div class="title">实时任务</div>
+      <base-table style="width: 100%;margin-top: 6px;height: 300px;" :page="1" :limit="10" :show-index="true" :beilv="1"
+        :tableConfig="tableProps" :table-data="maintenanceTasks" />
+    </div>
+  </div>
+</template>
+
+<script>
+import baseTable from './baseTable.vue'
+import baseStatus from './baseStatus.vue'
+import handingObject from './handingObject.vue'
+export default {
+  name: 'AGVStatus',
+  components: { baseTable },
+  props: {
+    // energyObj: {
+    //   type: Object,
+    //   default: () => ({
+    //     electricComu: 0,
+    //     steamComu: 0
+    //   })
+    // }
+  },
+  data() {
+    return {
+      maintenanceTasks: [
+        { id: 1, taskNum: 'ZD20250911000001', type: '空盘搬运', status: '暂停中', handingObject: 'L:名称+规格,R:名称+规格,', start: 'CK-01-A01-L/R', end: 'CK-01-A01-L/R', car: 'AGV-01',},
+        { id: 1, taskNum: 'ZD20250911000001', type: '空盘搬运', status: '已终止-待回收', handingObject: '1313,252', start: 'CK-01-A01-L/R', end: 'CK-01-A01-L/R', car: 'AGV-02', },
+        { id: 1, taskNum: 'ZD20250911000001', type: '满盘搬运', status: '异常', handingObject: '1313,252', start: 'CK-01-A01-L/R', end: 'CK-01-A01-L/R', car: 'AGV-03', },
+        { id: 1, taskNum: 'ZD20250911000001', type: '备料搬运', status: '执行中', handingObject: '1313,252', start: 'CK-01-A01-L/R', end: 'CK-01-A01-L/R', car: 'AGV-04', },
+        { id: 1, taskNum: 'ZD20250911000001', type: '满盘搬运', status: '执行中', handingObject: '1313,252', start: 'CK-01-A01-L/R', end: 'CK-01-A01-L/R', car: 'AGV-05', },
+      ],
+      tableProps: [
+        { prop: 'taskNum', label: '任务编号', align: 'left' },
+        { prop: 'type', label: '类型', align: 'left' },
+        { prop: 'status', label: '状态', align: 'left', subcomponent: baseStatus },
+        { prop: 'handingObject', label: '搬运对象', align: 'left', subcomponent: handingObject },
+        { prop: 'start', label: '起点', align: 'left' },
+        { prop: 'end', label: '终点', align: 'left' },
+        { prop: 'car', label: '执行车辆', align: 'left' },
+
+      ]
+    }
+  },
+  methods: {
+  },
+
+}
+</script>
+
+<style lang='scss' scoped>
+.agvStatusContent {
+  width: 930px;
+  height: 330px;
+  background: #FFFFFF;
+  border-radius: 8px;
+  padding: 16px 18px 26px;
+
+  .title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 16px;
+    color: rgba(0, 0, 0, 0.85);
+    line-height: 16px;
+    letter-spacing: 1px;
+    text-align: left;
+    font-style: normal;
+    position: relative;
+    padding-left: 12px;
+
+    &::before {
+      content: '';
+      width: 4px;
+      height: 16px;
+      background: #0A4BFF;
+      border-radius: 1px;
+      position: absolute;
+      left: 0;
+      top: 2px;
+    }
+  }
+}
+</style>

src/views/productionVisualization/equipmentBoard/components/styles/btn.scss

@@ -0,0 +1,99 @@
+@import './variables.scss';
+
+@mixin colorBtn($color) {
+  background: $color;
+
+  &:hover {
+    color: $color;
+
+    &:before,
+    &:after {
+      background: $color;
+    }
+  }
+}
+
+.blue-btn {
+  @include colorBtn($blue)
+}
+
+.light-blue-btn {
+  @include colorBtn($light-blue)
+}
+
+.red-btn {
+  @include colorBtn($red)
+}
+
+.pink-btn {
+  @include colorBtn($pink)
+}
+
+.green-btn {
+  @include colorBtn($green)
+}
+
+.tiffany-btn {
+  @include colorBtn($tiffany)
+}
+
+.yellow-btn {
+  @include colorBtn($yellow)
+}
+
+.pan-btn {
+  font-size: 14px;
+  color: #fff;
+  padding: 14px 36px;
+  border-radius: 8px;
+  border: none;
+  outline: none;
+  transition: 600ms ease all;
+  position: relative;
+  display: inline-block;
+
+  &:hover {
+    background: #fff;
+
+    &:before,
+    &:after {
+      width: 100%;
+      transition: 600ms ease all;
+    }
+  }
+
+  &:before,
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 2px;
+    width: 0;
+    transition: 400ms ease all;
+  }
+
+  &::after {
+    right: inherit;
+    top: inherit;
+    left: 0;
+    bottom: 0;
+  }
+}
+
+.custom-button {
+  display: inline-block;
+  line-height: 1;
+  white-space: nowrap;
+  cursor: pointer;
+  background: #fff;
+  color: #fff;
+  -webkit-appearance: none;
+  text-align: center;
+  box-sizing: border-box;
+  outline: 0;
+  margin: 0;
+  padding: 10px 15px;
+  font-size: 14px;
+  border-radius: 4px;
+}

src/views/productionVisualization/equipmentBoard/components/styles/element-ui.scss

@@ -0,0 +1,173 @@
+// cover some element-ui styles
+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+.cell {
+  .el-tag {
+    margin-right: 0px;
+  }
+}
+
+.visual-container {
+  .el-table {
+    .cell {
+      line-height: 1.2em !important;
+    }
+  }
+}
+.app-container {
+  .el-table th>.cell {
+    color: rgb(0, 0, 0,0.85);
+  }
+  .el-table__body tr.current-row>td {
+    background-color: #EAF1FC;
+  }
+    
+}
+.el-table--medium th, .el-table--medium td {
+  padding: 5px 0;
+}
+
+::v-deep .el-table__fixed-right {
+	right: 0 !important;
+	height: 100% !important;
+}
+.el-button--mini {
+  padding: 4px 0;
+}
+.small-padding {
+  .cell {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
+.fixed-width {
+  .el-button--mini {
+    padding: 7px 10px;
+    min-width: 60px;
+  }
+}
+
+.status-col {
+  .cell {
+    padding: 0 10px;
+    text-align: center;
+
+    .el-tag {
+      margin-right: 0px;
+    }
+  }
+}
+
+.el-button--primary {
+  background-color: #0B58FF !important;
+  border-color: #0B58FF !important;
+}
+// to fixed https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+  border-radius: 4px;
+}
+
+.el-dialog__header {
+  padding: 12px 24px 8px;
+  border-bottom: 1px solid #E9E9E9;
+  text-align: left;
+}
+
+.el-dialog__title {
+  font-size: 16px;
+  font-weight: 700;
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.el-form-item__label {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.65);
+  padding-right: 8px;
+}
+
+.el-dialog__headerbtn {
+  top: 16px;
+  right: 24px;
+}
+
+.el-form-item--medium .el-form-item__label {
+  line-height: 32px;
+}
+
+.el-button--medium {
+  padding: 8px 16px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.el-switch.is-checked .el-switch__core {
+  background-color: #0B58FF;
+  border-color: #0B58FF;
+}
+
+.el-radio__input.is-checked .el-radio__inner {
+  background-color: #0B58FF;
+  border-color: #0B58FF;
+}
+
+.el-button--text{
+  color:#0B58FF;
+}
+
+.el-tabs__item.is-active {
+  color: #0b58ff;
+}
+
+.el-tooltip__popper.is-dark {
+  max-width: 1100px;
+}
+// refine element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}
+
+// dropdown
+.el-dropdown-menu {
+  a {
+    display: block
+  }
+}
+
+// fix date-picker ui bug in filter-item
+.el-range-editor.el-input__inner {
+  display: inline-flex !important;
+}
+
+// to fix el-date-picker css style
+.el-range-separator {
+  box-sizing: content-box;
+}

src/views/productionVisualization/equipmentBoard/components/styles/element-variables.scss

@@ -0,0 +1,31 @@
+/**
+* I think element-ui's default theme color is too light for long-term use.
+* So I modified the default color and you can modify it to your liking.
+**/
+
+/* theme color */
+$--color-primary: #1890ff;
+$--color-success: #13ce66;
+$--color-warning: #ffba00;
+$--color-danger: #ff4949;
+// $--color-info: #1E1E1E;
+
+$--button-font-weight: 400;
+
+// $--color-text-regular: #1f2d3d;
+
+$--border-color-light: #dfe4ed;
+$--border-color-lighter: #e6ebf5;
+
+$--table-border: 1px solid #dfe6ec;
+
+/* icon font path, required */
+$--font-path: "~element-ui/lib/theme-chalk/fonts";
+
+@import "~element-ui/packages/theme-chalk/src/index";
+
+// the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+:export {
+  theme: $--color-primary;
+}

src/views/productionVisualization/equipmentBoard/components/styles/index.scss

@@ -0,0 +1,319 @@
+@import './variables.scss';
+@import './mixin.scss';
+@import './transition.scss';
+@import './element-ui.scss';
+@import './sidebar.scss';
+@import './btn.scss';
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+label {
+  font-weight: 700;
+}
+
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+#app {
+  height: 100%;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+.no-padding {
+  padding: 0px !important;
+}
+
+.padding-content {
+  padding: 4px 0;
+}
+
+a:focus,
+a:active {
+  outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+}
+
+div:focus {
+  outline: none;
+}
+
+.fr {
+  float: right;
+}
+
+.fl {
+  float: left;
+}
+
+.pr-5 {
+  padding-right: 5px;
+}
+
+.pl-5 {
+  padding-left: 5px;
+}
+
+.block {
+  display: block;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.inlineBlock {
+  display: block;
+}
+
+.clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    font-size: 0;
+    content: " ";
+    clear: both;
+    height: 0;
+  }
+}
+
+aside {
+  background: #eef1f6;
+  padding: 8px 24px;
+  margin-bottom: 20px;
+  border-radius: 2px;
+  display: block;
+  line-height: 32px;
+  font-size: 16px;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  color: #2c3e50;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  a {
+    color: #337ab7;
+    cursor: pointer;
+
+    &:hover {
+      color: rgb(32, 160, 255);
+    }
+  }
+}
+
+//main-container全局样式
+.app-container {
+  margin:0 16px 0;
+  background-color: #fff;
+  border-radius: 4px;
+  padding: 16px 16px 0;
+  height: calc(100vh - 134px);
+  overflow: auto;
+}
+
+.components-container {
+  margin: 30px 50px;
+  position: relative;
+}
+
+//  覆盖原有的分页样式-start
+
+.el-pagination {
+  position: relative;
+}
+ 
+.el-pagination.is-background .btn-prev,.el-pagination.is-background .btn-next,.el-pagination.is-background .el-pager li {
+  background-color: #fff;
+}
+
+.el-pagination__jump {
+  margin-left: 125px;
+}
+
+.el-pagination__sizes {
+  position: absolute;
+  right: 100px;
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #0B58FF;
+}
+.el-pagination .el-select .el-input .el-input__inner {
+  height: 22px;
+}
+.el-badge__content {
+  border: none;
+}
+//  覆盖原有的分页样式-end
+
+.text-center {
+  text-align: center
+}
+
+.sub-navbar {
+  height: 50px;
+  line-height: 50px;
+  position: relative;
+  width: 100%;
+  text-align: right;
+  padding-right: 20px;
+  transition: 600ms ease position;
+  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+  .subtitle {
+    font-size: 20px;
+    color: #fff;
+  }
+
+  &.draft {
+    background: #d0d0d0;
+  }
+
+  &.deleted {
+    background: #d0d0d0;
+  }
+}
+
+.link-type,
+.link-type:focus {
+  color: #337ab7;
+  cursor: pointer;
+
+  &:hover {
+    color: rgb(32, 160, 255);
+  }
+}
+
+.filter-container {
+  padding-bottom: 10px;
+
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+  }
+}
+
+//refine vue-multiselect plugin
+.multiselect {
+  line-height: 16px;
+}
+
+.multiselect--active {
+  z-index: 1000 !important;
+}
+
+// 业务代码中
+.content-row {
+  padding: 10px 0;
+}
+
+.el-dialog {
+  width: 1000px;
+}
+.el-dialog__body {
+  padding: 30px 40px;
+}
+
+.el-dialog__wrapper {
+  backdrop-filter: blur(5px);
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+  background-color: transparent;
+}
+
+::-webkit-scrollbar-track-piece {
+  background-color:rgba(144,147,153,0);
+}
+
+::-webkit-scrollbar-corner {
+  background-color:rgba(144,147,153,0);
+}
+
+::-webkit-scrollbar-track {
+  width: 6px;
+  background: rgba(144,147,153,0);
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: rgba(144,147,153,.5);
+  background-clip: padding-box;
+  min-height: 28px;
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+  transition: background-color .3s;
+  cursor: pointer;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(144,147,153,.3);
+}
+
+// 数据分析单选框样式覆盖
+
+.app-container{
+  .data-analysis-radio{
+    .el-radio-button__inner {
+      border: 0;
+      padding: 7px 0;
+      margin: 0 15px;
+    }
+    .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+      background-color: transparent;
+      color: #606266;
+      box-shadow: 0 0 0 0 transparent;
+      border-bottom: 2px solid #0B58FF;
+    }
+    .el-radio-button:first-child .el-radio-button__inner,
+    .el-radio-button:last-child .el-radio-button__inner {
+      border-radius: 0;
+    }
+  }
+}
+
+.el-table--group, .el-table--border {
+  border: none;
+}
+
+// 全局loading样式覆盖
+.el-loading-mask{
+  z-index: 99999;
+}
+
+
+input::-webkit-input-placeholder { 
+  /* WebKit browsers */ 
+  font-size:12px;
+} 
+input::-moz-placeholder { 
+  /* Mozilla Firefox 19+ */ 
+  font-size:12px;
+} 
+input:-ms-input-placeholder { 
+  font-size:12px;
+}

src/views/productionVisualization/equipmentBoard/components/styles/mixin.scss

@@ -0,0 +1,66 @@
+@mixin clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin scrollBar {
+  &::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #99a9bf;
+    border-radius: 20px;
+  }
+}
+
+@mixin relative {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+@mixin pct($pct) {
+  width: #{$pct};
+  position: relative;
+  margin: 0 auto;
+}
+
+@mixin triangle($width, $height, $color, $direction) {
+  $width: $width/2;
+  $color-border-style: $height solid $color;
+  $transparent-border-style: $width solid transparent;
+  height: 0;
+  width: 0;
+
+  @if $direction==up {
+    border-bottom: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==right {
+    border-left: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+
+  @else if $direction==down {
+    border-top: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==left {
+    border-right: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+}