.env.dev

@@ -9,7 +9,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'

.env.front

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'

.env.prod

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

.env.stage

@@ -1,7 +1,7 @@
 NODE_ENV = production
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 测试环境配置
 ENV = 'staging'

.env.static

@@ -4,7 +4,7 @@ NODE_ENV = development
 ENV = 'staging'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'

src/assets/icons/svg/downArrow.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收起箭头小备份 3</title>
-    <g id="能源管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="能源监控-同比分析" transform="translate(-848.000000, -392.000000)" fill-rule="nonzero">
-            <g id="收起箭头小备份-3" transform="translate(855.000000, 399.000000) scale(1, -1) translate(-855.000000, -399.000000) translate(848.000000, 392.000000)">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="14" height="14"></rect>
-                <path d="M6.60391666,1.57197282 L7.01633334,1.15897282 L12.70325,6.8441395 C12.9278333,7.06872283 12.93075,7.4408895 12.70325,7.6683895 C12.5941655,7.77825546 12.4457769,7.84009206 12.2909546,7.84020155 C12.1361323,7.84031104 11.9876564,7.77868438 11.8784167,7.66897282 L7.0175,2.8103895 L2.16066666,7.66955616 C2.05160439,7.77930978 1.90326864,7.84102718 1.74854166,7.84102718 C1.59381468,7.84102718 1.44547894,7.77930978 1.33641666,7.66955616 C1.10964988,7.4415567 1.1091291,7.07336285 1.33525,6.84472282 L6.58116666,1.59647282 L6.6045,1.57255616 L6.60391666,1.57197282 Z" id="路径" fill="#FFBD02"></path>
-                <path d="M6.60391666,6.57197282 L7.01633334,6.15897282 L12.70325,11.8441395 C12.9278333,12.0687228 12.93075,12.4408895 12.70325,12.6683895 C12.5941655,12.7782555 12.4457769,12.8400921 12.2909546,12.8402015 C12.1361323,12.840311 11.9876564,12.7786844 11.8784167,12.6689728 L7.0175,7.8103895 L2.16066666,12.6695562 C2.05160439,12.7793098 1.90326864,12.8410272 1.74854166,12.8410272 C1.59381468,12.8410272 1.44547894,12.7793098 1.33641666,12.6695562 C1.10964988,12.4415567 1.1091291,12.0733628 1.33525,11.8447228 L6.58116666,6.59647282 L6.6045,6.57255616 L6.60391666,6.57197282 Z" id="路径备份-2" fill="#FFBD02"></path>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/icons/svg/upArrow.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收起箭头小备份 11</title>
-    <g id="能源管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="能源监控-同比分析" transform="translate(-848.000000, -269.000000)" fill-rule="nonzero">
-            <g id="收起箭头小备份-11" transform="translate(848.000000, 269.000000)">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="14" height="14"></rect>
-                <path d="M6.60391666,1.57197282 L7.01633334,1.15897282 L12.70325,6.8441395 C12.9278333,7.06872283 12.93075,7.4408895 12.70325,7.6683895 C12.5941655,7.77825546 12.4457769,7.84009206 12.2909546,7.84020155 C12.1361323,7.84031104 11.9876564,7.77868438 11.8784167,7.66897282 L7.0175,2.8103895 L2.16066666,7.66955616 C2.05160439,7.77930978 1.90326864,7.84102718 1.74854166,7.84102718 C1.59381468,7.84102718 1.44547894,7.77930978 1.33641666,7.66955616 C1.10964988,7.4415567 1.1091291,7.07336285 1.33525,6.84472282 L6.58116666,1.59647282 L6.6045,1.57255616 L6.60391666,1.57197282 Z" id="路径" fill="#37D97F"></path>
-                <path d="M6.60391666,6.57197282 L7.01633334,6.15897282 L12.70325,11.8441395 C12.9278333,12.0687228 12.93075,12.4408895 12.70325,12.6683895 C12.5941655,12.7782555 12.4457769,12.8400921 12.2909546,12.8402015 C12.1361323,12.840311 11.9876564,12.7786844 11.8784167,12.6689728 L7.0175,7.8103895 L2.16066666,12.6695562 C2.05160439,12.7793098 1.90326864,12.8410272 1.74854166,12.8410272 C1.59381468,12.8410272 1.44547894,12.7793098 1.33641666,12.6695562 C1.10964988,12.4415567 1.1091291,12.0733628 1.33525,11.8447228 L6.58116666,6.59647282 L6.6045,6.57255616 L6.60391666,6.57197282 Z" id="路径备份-2" fill="#37D97F"></path>
-            </g>
-        </g>
-    </g>
-</svg>

src/layout/components/Navbar.vue

@@ -94,7 +94,7 @@ export default {
     async logout() {
       this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = getPath('/');
+          location.href = getPath('/index');
         })
       }).catch(() => {});
     }

src/router/index.js

@@ -65,17 +65,16 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/',
+    path: '',
     component: Layout,
-    redirect: 'core/base/factory',
-    // children: [{
-    //   path: 'index',
-    //   redirect: 'core/base/factory',
-    //   component: (resolve) => require(['@/views/index'], resolve),
-    //   name: '首页',
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
-    // }
-    // ]
+    redirect: 'index',
+    children: [{
+        path: 'index',
+        component: (resolve) => require(['@/views/index'], resolve),
+        name: '首页',
+        meta: {title: '首页', icon: 'dashboard', affix: true}
+      }
+    ]
   },
   {
     path: '/user',
@@ -83,15 +82,15 @@ export const constantRoutes = [
     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: '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' },
     }]
   },
   {
@@ -99,11 +98,11 @@ export const constantRoutes = [
     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: 'type/data/:dictId(\\d+)',
+        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        name: 'SystemDictData',
+        meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'}
+      }
     ]
   },
   {
@@ -111,22 +110,22 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     children: [{
-      path: 'log',
-      component: (resolve) => require(['@/views/infra/job/log'], resolve),
-      name: 'InfraJobLog',
-      meta: { title: '调度日志', activeMenu: '/infra/job' }
-    }
+        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: 'edit/:tableId(\\d+)',
+        component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
+        name: 'InfraCodegenEditTable',
+        meta: {title: '修改生成配置', activeMenu: '/infra/codegen'}
+      }
     ]
   },
   {
@@ -135,16 +134,16 @@ export const constantRoutes = [
     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: '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'}
+      }
     ]
   },
   {
@@ -152,31 +151,31 @@ export const constantRoutes = [
     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: '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'}
+      }
     ]
   },
   {
@@ -187,7 +186,7 @@ export const constantRoutes = [
       path: 'value/:propertyId(\\d+)',
       component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
       name: 'ProductPropertyValue',
-      meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
+      meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'}
     }
     ]
   },
@@ -199,14 +198,14 @@ export const constantRoutes = [
       path: 'edit/:spuId(\\d+)',
       component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
       name: 'ProductSpuUpdate',
-      meta: { title: '修改商品', activeMenu: '/product/spu' }
+      meta: {title: '修改商品', activeMenu: '/product/spu'}
     },
-    {
-      path: 'add',
-      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-      name: 'ProductSpuCreate',
-      meta: { title: '添加商品', activeMenu: '/product/spu' }
-    }
+      {
+        path: 'add',
+        component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
+        name: 'ProductSpuCreate',
+        meta: {title: '添加商品', activeMenu: '/product/spu'}
+      }
     ]
   },
   {
@@ -249,6 +248,6 @@ Router.prototype.push = function push(location) {
 export default new Router({
   base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
   mode: 'hash', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({y: 0}),
   routes: constantRoutes
 })

src/views/base/equipmentBindGroup/index.vue

@@ -303,7 +303,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该分组绑定?')
+				.confirm('是否确认删除设备与分组绑定编号为"' + id + '"的数据项?')
 				.then(function () {
 					return deleteEquipmentBindGroup(id);
 				})

src/views/base/equipmentBindSection/dialogForm.vue

@@ -20,7 +20,6 @@
 					<el-select
 						v-model="dataForm.productionLineId"
 						placeholder="请选择产线"
-						filterable
 						@change="handleProductlineChange">
 						<el-option
 							v-for="opt in productionLineList"
@@ -38,7 +37,6 @@
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.workshopSectionId"
-						filterable
 						placeholder="请选择工段"
 						@change="$emit('update', dataForm)">
 						<el-option
@@ -58,7 +56,6 @@
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.equipmentId"
-						filterable
 						placeholder="请选择设备"
 						@change="$emit('update', dataForm)">
 						<el-option
@@ -74,7 +71,6 @@
 				<el-form-item label="工段排序" prop="sort">
 					<el-input
 						v-model="dataForm.sort"
-						filterable
 						@change="$emit('update', dataForm)"
 						placeholder="请输入工段排序" />
 				</el-form-item>

src/views/base/equipmentPlc/index.vue

@@ -211,7 +211,6 @@ export default {
 						switch: true,
 						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
 						prop: 'collection',
-						value: 1,
 						bind: {
 							'active-value': 1,
 							'inactive-value': 0,

src/views/base/equipmentPlcConnect/index.vue

@@ -144,7 +144,7 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '编码',
+					label: 'PLC编码',
 					placeholder: '请选择编码',
 					param: 'plcId',
 					selectOptions: [],
@@ -184,9 +184,6 @@ export default {
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true
-						}
 					},
 				],
 				[
@@ -196,9 +193,6 @@ export default {
 						prop: 'equipmentId',
 						url: '/base/equipment/page?pageNo=1&pageSize=99',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true
-						}
 					},
 				],
 			],
@@ -357,7 +351,11 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除该配置?')
+				.confirm(
+					'是否确认删除设备与实时采集关系表（一对多）编号为"' +
+						id +
+						'"的数据项?'
+				)
 				.then(function () {
 					return deleteEquipmentPlcConnect(id);
 				})

src/views/base/equipmentPlcParam/index.vue

@@ -419,7 +419,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除"' + row.name + '"的参数绑定?')
+				.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?')
 				.then(function () {
 					return deleteEquipmentPlcParam(id);
 				})

src/views/core/analysis/LineChart.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-10-08 15:39:38
- * @LastEditors: DY
+ * @LastEditTime: 2023-09-13 10:33:20
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -61,12 +61,11 @@ export default {
   // },
   methods: {
     initChart(xData, yData,lineName) {
-      console.log( '打印结果', xData,yData, lineName);
+      console.log(xData,yData);
       this.chart = echarts.init(this.$el, 'macarons')
       this.setOptions(xData, yData, lineName)
     },
     setOptions(xData, yData, lineName) {
-      console.log('da', lineName)
       let seriesData = []
         lineName.forEach((item,index) => {
           seriesData.push({
@@ -87,7 +86,7 @@ export default {
           type: 'value'
         },
         series: seriesData
-      }, true)
+      })
     }
   }
 }

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

@@ -228,14 +228,7 @@ export default {
           this.listQuery.lineId = val.lineIds
           this.listQuery.startTime = val.time ? String(new Date(val.time[0]).getTime()) : undefined;
           this.listQuery.endTime = val.time ? String(new Date(val.time[1]).getTime()) : undefined;
-          if (val.time) {
-            this.getData()
-          } else {
-            this.$message({
-              message: '请选择时间',
-              type: 'warning'
-            });
-          }
+          this.getData()
           break;
         case 'reset':
           this.$refs.searchBarForm.resetForm();

src/views/core/analysis/balanceChart.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-10-08 16:36:37
+ * @LastEditTime: 2023-09-20 09:29:40
  * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div>
     <div style="margin: 20px">
-      <el-button v-for="(item, index) in buttonList" :key="index" :class="[item.actived ? 'activeButton': 'normalButton']" @click="changeChart(index)">{{ item.name }}</el-button>
+      <el-button v-for="(item, index) in dataArray" :key="index" @click="changeChart(index)">{{ item.name }}</el-button>
     </div>
     <div ref="chartDiv" :class="className" :style="{height:height,width:width}" />
   </div>
@@ -43,8 +43,7 @@ export default {
     return {
       chart: null,
       dataArray: [],
-      xDatas: [],
-      buttonList: []
+      xDatas: []
     }
   },
   mounted() {
@@ -52,34 +51,12 @@ export default {
   methods: {
     changeChart(index) {
       this.setOptions(this.xDatas, this.dataArray[index])
-      this.buttonList.forEach((item, s) => {
-        if (index === s) {
-          // item.actived = true
-          this.$nextTick(() =>{
-            // item.actived = true
-            this.$set(item, 'actived', true)
-          })
-        } else {
-          // item.actived = false
-          this.$nextTick(() =>{
-            // item.actived = false
-            this.$set(item, 'actived', false)
-          })
-          // this.$set(item, 'actived', false)
-        }
-      })
-      console.log('看一下数22222据', this.dataArray)
     },
     initChart(xData, yData, lineName) {
       this.dataArray = yData
-      this.buttonList = this.dataArray.map((item, index) => {
-        return {
-          'name': item.name,
-          'actived': index === 0 ? true : false
-        }
-      })
-      console.log('看一下数据', this.dataArray)
       this.xDatas = xData
+      console.log(xData,yData);
+      console.log('zale', yData[0].eqData)
       this.chart = echarts.init(this.$refs.chartDiv, 'macarons')
       this.setOptions(xData, yData[0], lineName)
     },
@@ -123,12 +100,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-.activeButton {
-  background-color: rgb(93,159,255);
-}
-.normalButton {
-  background-color: none;
-}
-</style>

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

@@ -57,7 +57,8 @@ export default {
         lineIds: [],
         time: ''
       },
-      dateLabelList: [],
+      xData: [],
+      yData:[],
       optionArrUrl: [getProductionLinePage ],
 			formConfig: [
 				{
@@ -112,101 +113,75 @@ export default {
         let arr = [
           	{
               prop: 'lineName',
-          		label: '产线'
+          		label: '产线',
+          		align: 'center',
           	},
             {
               prop: 'sum',
-              label: '合计'
+              label: '合计',
+              align: 'center',
             },
             {
-              prop: res.data ? res.data.nameData[0].name : undefined,
-              label: res.data ? res.data.nameData[0].name : undefined,
+              prop: res.data.nameData[0].name,
+              label: res.data.nameData[0].name,
               align: 'center',
               children:[
 
               ]
             }
         ]
-        // console.log(res.data.nameData.slice(1))
+        console.log(res.data.nameData.slice(1))
+        res.data.nameData.slice(1).forEach(item => {
+          const props = {
+            'prop': item.name,
+            'label': item.name,
+            'align': 'center'
+          }
+          arr[2].children.push(props)
+        })
+        let tableDataArr =[]
+        res.data.data.forEach(item => {
+          let obj = {}
+          obj.lineName= item.lineName,
+           obj.sum= item.sum,
+          item.data.forEach((ele, index) => {
+            // console.log(ele)
+            ele.children.forEach((e) => {
+              console.log(e.dynamicName)
+              obj['' + e.dynamicName + ''] = e.dynamicValue
+              console.log(obj['' + e.dynamicName + '']);
+            })
+          })
+          tableDataArr.push(obj)
+        });
+        this.tableData = tableDataArr
+        console.log(this.tableData)
+        console.log(arr)
+        this.tableProps = arr
         let xData = []
+
+        res.data.nameData.slice(1).forEach(item => {
+          xData.push(item.name)
+          // arr[2].children.push(props)
+        })
         let yAllData = []
         let lineName = []
-        if (res.data) {
-          let tempDateList = []
-          res.data.nameData.forEach(date => {
-            tempDateList.push(date.name)
-          })
-          this.dateLabelList = Array.from(new Set(tempDateList))
-
-          this.dateLabelList.forEach(item => {
-            if (item.indexOf('年') === -1) {
-              // 构造表头
-              const props = {
-                'prop': item,
-                'label': item
-              }
-              arr[2].children.push(props)
-
-              // 构造echarts横坐标
-              xData.push(item)
-            }
-          })
-          // res.data.nameData.slice(1).forEach(item => {
-          //   const props = {
-          //     'prop': item.name,
-          //     'label': item.name,
-          //     'align': 'center'
-          //   }
-          //   arr[2].children.push(props)
-          // })
-          let tableDataArr =[]
-          res.data.data.forEach(item => {
-            let obj = {}
-            obj.lineName= item.lineName,
-            obj.sum= item.sum,
-            item.data.forEach((ele, index) => {
+        res.data.data.forEach(item => {
+          let yData = []
+          lineName.push(item.lineName)
+          // let obj = {}
+          // obj.lineName = item.lineName,
+          //   obj.sum = item.sum,
+          item.data.forEach((ele, index) => {
               // console.log(ele)
-              ele.children.forEach((e) => {
-                console.log(e.dynamicName)
-                obj['' + e.dynamicName + ''] = e.dynamicValue
-                console.log(obj['' + e.dynamicName + '']);
+            ele.children.forEach((e) => {
+              // let yData = []
+              yData.push(e.dynamicValue)
               })
             })
-            tableDataArr.push(obj)
-          });
-          this.tableData = tableDataArr
-          this.tableProps = arr
-          
-          // let tempList = []
-          // res.data.nameData.slice(1).forEach(item => {
-          //   tempList.push(item.name)
-          //   // arr[2].children.push(props)
-          // })
-          // xData = Array.from(new Set(tempList))
-          
-          res.data.data.forEach(item => {
-            let yData = []
-            lineName.push(item.lineName)
-            // let obj = {}
-            // obj.lineName = item.lineName,
-            //   obj.sum = item.sum,
-            item.data.forEach((ele, index) => {
-                // console.log(ele)
-              ele.children.forEach((e) => {
-                // let yData = []
-                yData.push(e.dynamicValue)
-                })
-              })
-            yAllData.push(yData)
-          });
-          console.log(lineName)
-        } else {
-          this.tableProps = arr
-          this.tableData = []
-          xData = []
-          yAllData = []
-          lineName = []
-        }
+          yAllData.push(yData)
+        });
+        console.log(lineName)
         // res.data.data[0].data[0].children.forEach((item, index) => {
         //   // console.log(item)
         //   yData.push(item.dynamicValue)
@@ -228,14 +203,7 @@ export default {
           this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
 					// this.listQuery.pageNo = 1;
           // this.listQuery.pageSize = 10;
-          if (val.time) {
-            this.getData()
-          } else {
-            this.$message({
-              message: '请选择时间',
-              type: 'warning'
-            });
-          }
+          this.getData()
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();

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

@@ -50,24 +50,29 @@ import {
 const tableProps = [
 	{
 		prop: 'code',
-		label: '工厂编码'
+		label: '工厂编码',
+		align: 'center',
 	},
 	{
 		prop: 'name',
-		label: '工厂名称'
+		label: '工厂名称',
+		align: 'center',
 	},
 	{
 		prop: 'address',
-		label: '地址'
+		label: '地址',
+		align: 'center',
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		align: 'center',
 	},
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime
+		align: 'center',
+		filter: parseTime,
 	},
 ];
 
@@ -115,14 +120,14 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
+				},
 				{
 					type: 'separate',
 				},

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2023-09-27 16:19:56
+ * @LastEditTime: 2023-09-16 17:34:17
  * @LastEditors: DY
  * @Description: 
 -->
@@ -12,15 +12,21 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
-			class="right-aside"
 			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
 			:selectWidth="55"
-			:table-data="showData"
+			:table-data="tableData"
 			@selection-change="selectChange"
 			>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
 		</base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -37,6 +43,19 @@
 				:table-data="selectedList"
 			/>
 		</div> -->
+		<div ref="pdf" v-show="false">
+			<el-table :data="selectedList" stripe border style="width: 100%">
+				<el-table-column prop="reportType" label="报表类型" />
+				<el-table-column prop="reportStartTime" label="统计开始时间" />
+				<el-table-column prop="reportEndTime" label="统计结束时间" />
+				<el-table-column prop="proLineName" label="产线名称" />
+				<el-table-column prop="inputNum" label="投入数量/片" />
+				<el-table-column prop="outputNum" label="产出数量/片" />
+				<el-table-column prop="outputArea" label="产出面积/㎡" />
+				<el-table-column prop="lossArea" label="损耗面积/㎡" />
+				<el-table-column prop="lossRatio" label="损耗比例%" />
+			</el-table>
+		</div>
 		<el-dialog
 			title="提示"
 			:visible.sync="dialogVisible"
@@ -55,8 +74,8 @@
 <script>
 import { parseTime } from '../../mixins/code-filter';
 import { getPdlAutoReport, getPdList } from '@/api/core/monitoring/auto'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
+// import jsPDF from 'jspdf'
+// import html2canvas from 'html2canvas'
 // import codeFilter from '../../mixins/code-filter'
 import * as XLSX from 'xlsx'
 import FileSaver from 'file-saver'
@@ -64,45 +83,55 @@ import FileSaver from 'file-saver'
 const tableProps = [
 	{
 		prop: 'reportType',
-		label: '报表类型'
+		label: '报表类型',
+		align: 'center'
 	},
 	{
 		prop: 'reportStartTime',
 		label: '统计开始时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'reportEndTime',
 		label: '统计结束时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'proLineName',
-		label: '产线名称'
+		label: '产线名称',
+		align: 'center',
 	},
 	{
 		prop: 'inputNum',
-		label: '投入数量/片'
+		label: '投入数量/片',
+		align: 'center',
 	},
 	{
 		prop: 'outputNum',
-		label: '产出数量/片'
+		label: '产出数量/片',
+		align: 'center',
 	},
 	{
 		prop: 'outputArea',
-		label: '产出面积/㎡'
+		label: '产出面积/㎡',
+		align: 'center',
 	},
 	{
 		prop: 'lossNum',
-		label: '损耗数量/片'
+		label: '损耗数量/片',
+		align: 'center',
 	},
 	{
 		prop: 'lossArea',
-		label: '损耗面积/㎡'
+		label: '损耗面积/㎡',
+		align: 'center',
 	},
 	{
 		prop: 'lossRatio',
-		label: '损耗比例%'
+		label: '损耗比例%',
+		align: 'center',
 	}
 ];
 
@@ -124,7 +153,6 @@ export default {
       addOrUpdateVisible: false,
 			tableProps,
 			tableBtn: [],
-			showData: [],
 			selectedList: [],
 			// tableBtn: [
 			// 	this.$auth.hasPermi(`base:factory:update`)
@@ -204,60 +232,44 @@ export default {
 		this.getPdLineList()
 	},
 	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save('产线统计自动报表.pdf')
-				})
-			}, 300)
-		},
 		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-			
+			this.pdf()
+			this.dialogVisible = false
 		},
 		exportXlsx() {
-			this.exportECL()
+			this.down()
 			this.dialogVisible = false
-			this.showData = this.tableData
+		},
+		// imgDownload() {
+		// 	let that = this
+		// 	let img = this.$refs['pdf']
+		// 	// 图片高度
+		// 	var w = parseInt(window.getComputedStyle(img).width)
+		// 	// 图片宽度
+		// 	var h = parseInt(window.getComputedStyle(img).height)
+		// 	// 滚轮置顶，避免留白
+		// 	window.pageYOffset = 0
+		// 	html2canvas(img).then(function(canvas) {
+
+		// 	})
+		// },
+		pdf() {
+			// console.log('打印看看[df]')
+			// const pdf = new jsPDF()
+			// const content = this.$refs.pdf.innerHTML
+			// console.log('打印看看', content)
+			// pdf.text(content, 15, 15)
+			// // pdf.text('Hello world!', 10, 10)
+			// pdf.save('test.pdf')
+			// console.log('打印看看', pdf)
+			const printWindow = window.open('', '_blank')
+			const temp = this.$refs.pdf.innerHTML
+			console.log(temp)
+			printWindow.document.body.innerHTML = temp
+			printWindow.focus()
+			// printWindow.document.writeln(this.$refs.pdf.innerHTML)
+			printWindow.document.close()
+			printWindow.print()
 		},
 		handleClose(done) {
 			this.$confirm('确认关闭？')
@@ -266,30 +278,23 @@ export default {
 				})
 				.catch(_ => {});
 		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
+		down() {
+			//选中导出时可更改此处数组 选中的数组
+			//构建导出的表格数据
+			const exportData = [
+				{reportType: '报表类型', reportStartTime: '统计开始时间', reportEndTime: '统计结束时间', proLineName: '产线名称', inputNum: '投入数量/片', outputNum: '产出数量/片', outputArea: '产出面积/㎡', lossNum: '损耗数量/片', lossArea: '损耗面积/㎡', lossRatio: '损耗比例%' },
+				...this.selectedList
+			]
+			//注意表格上绑定id， 获取dom元素
+			const worksheet = XLSX.utils.json_to_sheet(exportData, { skipHeader: true })
+			const workbook = XLSX.utils.book_new()
+			XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1")
+			const workbookOutput = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' })
+			try {
+				FileSaver.saveAs(new Blob([workbookOutput], { type: 'application/octet-stream' }), '产线统计自动报表.xlsx')
+			} catch (e) {
+				console.log(e)
 			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), '产线统计自动报表.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
     },
 		selectChange(val) {
       console.log(val)
@@ -323,13 +328,12 @@ export default {
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list.map((item, index) => {
+        this.tableData = response.data.list.map(item => {
 					item.reportType = item.reportType === 1 ? '日' : item.reportType === 2 ? '周' : '月'
 					return item
 				});
         this.total = response.data.total;
         this.dataListLoading = false;
-				this.showData = this.tableData
       });
     },
     // 每页数
@@ -344,10 +348,15 @@ export default {
       this.getDataList();
     },
 		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
+			if (this.selectedList.length === 0) {
+				this.selectedList = this.tableData
 			}
 			this.dialogVisible = true
+      // this.$modal.confirm('是否确认导出所选数据项?').then(() => {
+      //   this.exportLoading = true;
+      //   // this.down()
+			// 	this.pdf()
+      // }).catch(() => { });
     }
 	},
 };

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2023-09-27 16:23:44
+ * @LastEditTime: 2023-09-20 10:55:23
  * @LastEditors: DY
  * @Description: 
 -->
@@ -12,13 +12,12 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
-			class="right-aside"
 			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
 			:selectWidth="55"
-			:table-data="showData"
+			:table-data="tableData"
 			@selection-change="selectChange"
 			>
 			<method-btn
@@ -34,6 +33,17 @@
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
 			@pagination="getDataList" />
+		<div ref="pdf" v-show="false">
+			<el-table :data="selectedList" stripe border style="width: 100%">
+				<el-table-column prop="proLineName" label="产线名称" />
+				<el-table-column prop="inputNum" label="投入数量/片" />
+				<el-table-column prop="outputNum" label="产出数量/片" />
+				<el-table-column prop="outputArea" label="产出面积/㎡" />
+				<el-table-column prop="lossNum" label="损耗数量/片" />
+				<el-table-column prop="lossArea" label="损耗面积/㎡" />
+				<el-table-column prop="lossRatio" label="损耗比例%" />
+			</el-table>
+		</div>
 		<el-dialog
 			title="提示"
 			:visible.sync="dialogVisible"
@@ -53,8 +63,6 @@
 import { getPdlDataSearch, getPdList } from '@/api/core/monitoring/data'
 import * as XLSX from 'xlsx'
 import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
 
 const tableProps = [
 	{
@@ -107,7 +115,6 @@ export default {
       addOrUpdateVisible: false,
 			tableProps,
 			tableBtn: [],
-			showData: [],
 			tableData: [],
 			selectedList: [],
 			formConfig: [
@@ -159,86 +166,40 @@ export default {
 		this.getPdLineList()
 	},
 	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save('产线统计数据查询报表.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), '产线统计数据查询报表.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
 		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-			
+			this.pdf()
+			this.dialogVisible = false
 		},
 		exportXlsx() {
-			this.exportECL()
+			this.down()
 			this.dialogVisible = false
-			this.showData = this.tableData
 		},
+		pdf() {
+			const printWindow = window.open('', '_blank')
+			const temp = this.$refs.pdf.innerHTML
+			console.log(temp)
+			printWindow.document.body.innerHTML = temp
+			printWindow.document.close()
+			printWindow.print()
+		},
+		down() {
+			//选中导出时可更改此处数组 选中的数组
+			//构建导出的表格数据
+			const exportData = [
+				{proLineName: '产线名称', inputNum: '投入数量/片', outputNum: '产出数量/片', outputArea: '产出面积/㎡', lossNum: '损耗数量/片', lossArea: '损耗面积/㎡', lossRatio: '损耗比例%' },
+				...this.selectedList
+			]
+			//注意表格上绑定id， 获取dom元素
+			const worksheet = XLSX.utils.json_to_sheet(exportData, { skipHeader: true })
+			const workbook = XLSX.utils.book_new()
+			XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1")
+			const workbookOutput = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' })
+			try {
+				FileSaver.saveAs(new Blob([workbookOutput], { type: 'application/octet-stream' }), '产线统计数据查询.xlsx')
+			} catch (e) {
+				console.log(e)
+			}
+    },
 		handleClose(done) {
 			this.$confirm('确认关闭？')
 				.then(_ => {
@@ -279,7 +240,6 @@ export default {
         this.tableData = response.data;
         this.total = response.data.total;
         this.dataListLoading = false;
-				this.showData = this.tableData
       });
     },
     // 每页数
@@ -294,10 +254,21 @@ export default {
       this.getDataList();
     },
 		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
+			if (this.selectedList.length === 0) {
+				this.selectedList = this.tableData
 			}
 			this.dialogVisible = true
+      // 处理查询参数
+      // let params = { ...this.queryParams };
+      // params.pageNo = undefined;
+      // params.pageSize = undefined;
+      // this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+      //   this.exportLoading = true;
+      //   return this.urlOptions.exportURL(params);
+      // }).then(response => {
+      //   this.$download.excel(response, '工厂.xls');
+      //   this.exportLoading = false;
+      // }).catch(() => { });
     }
 	},
 };

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2023-10-08 10:51:49
+ * @LastEditTime: 2023-09-22 15:13:48
  * @LastEditors: DY
  * @Description: 
 -->
@@ -13,13 +13,12 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
-			class="right-aside"
 			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
 			:selectWidth="55"
-			:table-data="showData"
+			:table-data="tableData"
 			@selection-change="selectChange"
 			>
 			<method-btn
@@ -35,6 +34,21 @@
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
 			@pagination="getDataList" />
+		<div ref="pdf" v-show="false">
+			<el-table :data="selectedList" stripe border style="width: 100%">
+				<el-table-column prop="reportType" label="报表类型" />
+				<el-table-column prop="reportStartTime" label="统计开始时间" />
+				<el-table-column prop="reportEndTime" label="统计结束时间" />
+				<el-table-column prop="proLineName" label="产线名称" />
+				<el-table-column prop="sectionName" label="工段名称" />
+				<el-table-column prop="inputNum" label="投入数量/片" />
+				<el-table-column prop="outputNum" label="产出数量/片" />
+				<el-table-column prop="outputArea" label="产出面积/㎡" />
+				<el-table-column prop="lossNum" label="损耗数量/片" />
+				<el-table-column prop="lossArea" label="损耗面积/㎡" />
+				<el-table-column prop="lossRatio" label="损耗比例%" />
+			</el-table>
+		</div>
 		<el-dialog
 			title="提示"
 			:visible.sync="dialogVisible"
@@ -55,8 +69,6 @@ import { parseTime } from '../../mixins/code-filter';
 import { getWorkshopSectionList, getPdList, getSectionAutoReport  } from '@/api/core/monitoring/sectionStatistics'
 import * as XLSX from 'xlsx'
 import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
 
 const tableProps = [
 	{
@@ -128,7 +140,6 @@ export default {
 			tableProps,
 			tableBtn: [],
 			tableData: [],
-			showData: [],
 			formConfig: [
 				{
 					type: 'select',
@@ -197,86 +208,40 @@ export default {
 		this.getPdLineList()
 	},
 	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save('工段统计自动报表.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), '工段统计自动报表.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
 		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-			
+			this.pdf()
+			this.dialogVisible = false
 		},
 		exportXlsx() {
-			this.exportECL()
+			this.down()
 			this.dialogVisible = false
-			this.showData = this.tableData
 		},
+		pdf() {
+			const printWindow = window.open('', '_blank')
+			const temp = this.$refs.pdf.innerHTML
+			console.log(temp)
+			printWindow.document.body.innerHTML = temp
+			printWindow.document.close()
+			printWindow.print()
+		},
+		down() {
+			//选中导出时可更改此处数组 选中的数组
+			//构建导出的表格数据
+			const exportData = [
+				{reportType: '产线类型', reportStartTime: '统计开始时间', reportEndTime: '统计结束时间', lineName: '产线名称', sectionName: '工段名称', inputNum: '投入数量/片', outputNum: '产出数量/片', outputArea: '产出面积/㎡', lossNum: '损耗数量/片', lossArea: '损耗面积/㎡', lossRatio: '损耗比例%' },
+				...this.selectedList
+			]
+			//注意表格上绑定id， 获取dom元素
+			const worksheet = XLSX.utils.json_to_sheet(exportData, { skipHeader: true })
+			const workbook = XLSX.utils.book_new()
+			XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1")
+			const workbookOutput = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' })
+			try {
+				FileSaver.saveAs(new Blob([workbookOutput], { type: 'application/octet-stream' }), '工段统计自动报表.xlsx')
+			} catch (e) {
+				console.log(e)
+			}
+    },
 		handleClose(done) {
 			this.$confirm('确认关闭？')
 				.then(_ => {
@@ -324,7 +289,6 @@ export default {
 					item.reportType = item.reportType === 1 ? '日' : item.reportType === 2 ? '周' : '月'
 					return item
 				});
-				this.showData = this.tableData
         this.total = response.data.total;
         this.dataListLoading = false;
       });
@@ -341,10 +305,21 @@ export default {
       this.getDataList();
     },
 		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
+			if (this.selectedList.length === 0) {
+				this.selectedList = this.tableData
 			}
 			this.dialogVisible = true
+      // 处理查询参数
+      // let params = { ...this.queryParams };
+      // params.pageNo = undefined;
+      // params.pageSize = undefined;
+      // this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+      //   this.exportLoading = true;
+      //   return this.urlOptions.exportURL(params);
+      // }).then(response => {
+      //   this.$download.excel(response, '工厂.xls');
+      //   this.exportLoading = false;
+      // }).catch(() => { });
     }
 	},
 };

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

@@ -5,42 +5,23 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
-			class="right-aside"
 			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:table-data="showData"
-			:selectWidth="55"
-			@selection-change="selectChange"
-		/>
-		<pagination
+			:table-data="tableData" />
+		<!-- <pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" />
-		<el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog>
+			@pagination="getDataList" /> -->
 	</div>
 </template>
 
 <script>
 // import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
 import { getSectionDataSearch } from '@/api/core/monitoring';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
 import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
 
 const tableProps = [
 	{
@@ -89,8 +70,6 @@ export default {
 			},
 			tableProps,
       tableData: [],
-			showData: [],
-			selectedList: [],
       listQuery: {
         proLineId:undefined,
         sectionId: undefined,
@@ -98,7 +77,6 @@ export default {
         endTime: undefined,
       },
 			dataListLoading: false,
-			dialogVisible: false,
       optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
 			formConfig: [
 				{
@@ -149,93 +127,6 @@ export default {
     this.getDataList()
 	},
 	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save('工段统计数据查询报表.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), '工段统计数据查询报表.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-			
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
 		getArr() {
 			const params = {
 				page: 1,
@@ -253,31 +144,9 @@ export default {
       // this.listQuery.endTime = '1693564257000'
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         this.tableData = res.data
-        this.listQuery.total = this.tableData.length;
+        // this.total = response.data.total;
         this.dataListLoading = false;
-				this.showData = this.tableData;
       });
-    },
-		// 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    },
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
     },
     buttonClick(val) {
       console.log(val)
@@ -302,9 +171,6 @@ export default {
 					};
 					this.getDataList();
 					break;
-				case 'export':
-					this.handleExport();
-					break;
 				default:
 					console.log(val);
 			}

src/views/energy/analysis/contrastAnalysis/components/barChart.vue

@@ -25,10 +25,6 @@ export default {
       default: () => {
         return []
       }
-    },
-    timeDim: {
-      type: String,
-      default: ''
     }
   },
   watch: {
@@ -62,58 +58,32 @@ export default {
         tempArr = this.chartData[0].trendRespVOList
       }
       for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
-        if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
-          let weak = tempArr[k].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = tempArr[k].time
-        }
-        xData.push(time)
+        xData.push(tempArr[k].time)
       }
       for (let i = 0; i < this.chartData.length; i++) {
         let obj = {
           name: this.chartData[i].objName + this.chartData[i].objCode,
           type: 'bar',
-          barMaxWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          },
           data: []
         }
         legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
         let temp = this.chartData[i].trendRespVOList
         for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
+          let num = temp[j].useNum ? temp[j].useNum : 0
           obj.data.push(num)
         }
         yData.push(obj)
       }
       var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
         tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
+          trigger: 'axis'
         },
         legend: {
           data: legendData
         },
         xAxis: {
           type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
+          data: xData
         },
         yAxis: {
           type: 'value'

src/views/energy/analysis/contrastAnalysis/components/lineChart.vue

@@ -25,10 +25,6 @@ export default {
       default: () => {
         return []
       }
-    },
-    timeDim: {
-      type: String,
-      default: ''
     }
   },
   watch: {
@@ -62,15 +58,7 @@ export default {
         tempArr = this.chartData[0].trendRespVOList
       }
       for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
-        if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
-          let weak = tempArr[k].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = tempArr[k].time
-        }
-        xData.push(time)
+        xData.push(tempArr[k].time)
       }
       for (let i = 0; i < this.chartData.length; i++) {
         let obj = {
@@ -82,35 +70,22 @@ export default {
         legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
         let temp = this.chartData[i].trendRespVOList
         for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
+          let num = temp[j].useNum ? temp[j].useNum : 0
           obj.data.push(num)
         }
         yData.push(obj)
       }
 
       var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
         tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
+          trigger: 'axis'
         },
         legend: {
           data: legendData
         },
         xAxis: {
           type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
+          data: xData
         },
         yAxis: {
           type: 'value'

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -135,7 +135,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="对象选择">
-        <el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small">
+        <el-select v-model="queryParams.objIds" placeholder="请选择" multiple collapse-tags style="width: 200px;" size="small">
           <el-option
             v-for="item in objectList"
             :key="item.id"

src/views/energy/analysis/contrastAnalysis/index.vue

@@ -1,17 +1,15 @@
 <template>
-  <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
+  <div class="app-container" id="contrastAnalysisBox">
     <!-- 搜索工作栏 -->
     <search-area  :isFold="isFold" @submit="getList"/>
-    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
+    <el-tabs v-model="activeName" @tab-click="switchChart">
       <el-tab-pane label="柱状图" name="bar">
-        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim" />
+        <bar-chart ref="analysisBarChart" :chartData="chartData" />
       </el-tab-pane>
       <el-tab-pane label="折线图" name="line">
-        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
+        <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </el-tab-pane>
     </el-tabs>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
   </div>
 </template>
 <script>
@@ -27,8 +25,7 @@ export default {
     return {
       isFold: false,
       activeName: 'bar',
-      chartData: [],
-      timeDim: ''
+      chartData: []
     }
   },
   mounted() {
@@ -41,7 +38,6 @@ export default {
   },
   methods: {
     getList(params) {
-      this.timeDim = params.timeDim
       getCompare({ ...params }).then((res) => {
         console.log(res)
         if (res.code === 0) {
@@ -64,33 +60,4 @@ export default {
     }
   }
 }
-</script>
-<style lang='scss'>
-.contrastAnalysisBox {
-  .el-tabs__nav::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-    /* z-index: 1; */
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
-  }
-}
-</style>
+</script>

src/views/energy/analysis/qoqAnalysis/components/lineChart.vue

@@ -57,22 +57,12 @@ export default {
         {
           name: '本期',
           type: 'bar',
-          data: [],
-          barWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          }
+          data: []
         },
         {
           name: '上期',
           type: 'bar',
-          data: [],
-          barWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          }
+          data: []
         }
       ]
       for (let j = 0; j < arr.length; j++) {
@@ -89,7 +79,6 @@ export default {
         // title: {
         //   text: 'World Population'
         // },
-        color:['#288AFF','#8EF0AB'],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -98,8 +87,8 @@ export default {
         },
         legend: {},
         grid: {
-          left: '1%',
-          right: '1%',
+          left: '3%',
+          right: '4%',
           bottom: '3%',
           containLabel: true
         },

src/views/energy/analysis/qoqAnalysis/index.vue

@@ -3,18 +3,14 @@
     <!-- 搜索工作栏 -->
     <search-area @submit="getList" @exportD="exportData"/>
     <!-- 表格 -->
-    <div v-show="chartData.length">
-      <base-table
-        :table-props="tableProps"
-        :table-data="list"
-        class="qoq-out-table"
-      />
-      <div style='width: 100%;height: 300px;padding-top: 30px;'>
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-      </div>
+    <base-table
+      :table-props="tableProps"
+      :table-data="list"
+      class="qoq-out-table"
+    />
+    <div style='width: 100%;height: 300px;padding-top: 30px;'>
+      <line-chart ref="analysisLineChart" :chartData="chartData"/>
     </div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
   </div>
 </template>
 <script>

src/views/energy/analysis/trendAnalysis/components/barChart.vue

@@ -25,10 +25,6 @@ export default {
       default: () => {
         return []
       }
-    },
-    timeDim: {
-      type: String,
-      default: ''
     }
   },
   watch: {
@@ -55,37 +51,13 @@ export default {
       let xData = []
       let yData = []
       for (let i = 0; i < this.chartData.length; i++) {
-        let time = ""
-        if (this.timeDim === '3') {
-          let year = this.chartData[i].time.slice(0,4)
-          let weak = this.chartData[i].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = this.chartData[i].time
-        }
-        xData.push(time)
+        xData.push(this.chartData[i].time)
         yData.push(this.chartData[i].useNum)
       }
       var option = {
-        color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
         xAxis: {
           type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
+          data: xData
         },
         yAxis: {
           type: 'value'
@@ -93,12 +65,7 @@ export default {
         series: [
           {
             data: yData,
-            type: 'bar',
-            barMaxWidth: 20,
-            label: {
-              show: true,
-              position: 'top'
-            }
+            type: 'bar'
           }
         ]
       };

src/views/energy/analysis/trendAnalysis/components/lineChart.vue

@@ -8,7 +8,6 @@
 <script>
 import * as echarts from 'echarts'
 import resize from '@/utils/chartMixins/resize'
-import moment from 'moment'
 export default {
   name: "LineChart",
   mixins: [resize],
@@ -26,10 +25,6 @@ export default {
       default: () => {
         return []
       }
-    },
-    timeDim: {
-      type: String,
-      default: ''
     }
   },
   watch: {
@@ -56,35 +51,14 @@ export default {
       let xData = []
       let yData = []
       for (let i = 0; i < this.chartData.length; i++) {
-        let time = ""
-        if (this.timeDim === '3') {
-          let year = this.chartData[i].time.slice(0,4)
-          let weak = this.chartData[i].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = this.chartData[i].time
-        }
-        xData.push(time)
+        xData.push(this.chartData[i].time)
         yData.push(this.chartData[i].useNum)
       }
 
       var option = {
-        color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis'
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
         xAxis: {
           type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
+          data: xData
         },
         yAxis: {
           type: 'value'

src/views/energy/analysis/trendAnalysis/index.vue

@@ -1,17 +1,15 @@
 <template>
-  <div class="app-container trendAnalysisBox" id="trendAnalysisBox">
+  <div class="app-container" id="trendAnalysisBox">
     <!-- 搜索工作栏 -->
     <search-area :isFold="isFold" @submit="getList"/>
-    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
+    <el-tabs v-model="activeName" @tab-click="switchChart">
       <el-tab-pane label="柱状图" name="bar">
-        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim"/>
+        <bar-chart ref="analysisBarChart" :chartData="chartData" />
       </el-tab-pane>
       <el-tab-pane label="折线图" name="line">
-        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
+        <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </el-tab-pane>
     </el-tabs>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
   </div>
 </template>
 <script>
@@ -27,8 +25,7 @@ export default {
     return {
       isFold: false,
       activeName: 'bar',
-      chartData: [],
-      timeDim: ''
+      chartData: []
     }
   },
   mounted() {
@@ -40,7 +37,6 @@ export default {
   },
   methods: {
     getList(params) {
-      this.timeDim = params.timeDim
       getEnergyTrend({ ...params }).then((res) => {
         if (res.code === 0) {
           this.chartData = res.data
@@ -62,33 +58,4 @@ export default {
     }
   }
 }
-</script>
-<style lang='scss'>
-.trendAnalysisBox {
-  .el-tabs__nav::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-    /* z-index: 1; */
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
-  }
-}
-</style>
+</script>

src/views/energy/analysis/yoyAnalysis/components/lineChart.vue

@@ -75,7 +75,6 @@ export default {
         }
       }
       var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
         legend: {
           data: keys
         },
@@ -83,8 +82,8 @@ export default {
           trigger: 'axis'
         },
         grid: {
-          left: '1%',
-          right: '1%',
+          left: '3%',
+          right: '4%',
           bottom: '3%',
           containLabel: true
         },

src/views/energy/analysis/yoyAnalysis/components/subRate.vue

@@ -1,18 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="upArrow" v-show='injectData[injectData.prop] > 0'/>
-    <svg-icon icon-class="downArrow"  v-show='injectData[injectData.prop] < 0'/>
-    <span style="margin-left: 5px;">{{ injectData[injectData.prop] }}</span>
-  </div>
-</template>
-<script>
-export default {
-  name: 'subRate',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  }
-}
-</script>

src/views/energy/analysis/yoyAnalysis/index.vue

@@ -2,25 +2,20 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <search-area @submit="getList" @exportD="exportData"/>
-    <div v-show='chartData.length'>
-      <div style='width: 100%;height: 400px;'>
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-      </div>
-      <!-- 表格 -->
-      <base-table
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-        class="yoy-out-table"
-      />
+    <div style='width: 100%;height: 300px;'>
+      <line-chart ref="analysisLineChart" :chartData="chartData"/>
     </div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
+    <!-- 表格 -->
+    <base-table
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+      class="yoy-out-table"
+    />
   </div>
 </template>
 <script>
 import { getYoy } from "@/api/analysis/energyAnalysis"
-import subRate from "./components/subRate.vue"
 import SearchArea from "./components/searchArea"
 import LineChart from "./components/lineChart"
 import FileSaver from "file-saver"
@@ -33,12 +28,12 @@ export default {
       chartData: [],
       tableProps: [],
       list: [],
-      tableH: this.tableHeight(600)
+      tableH: this.tableHeight(500)
     }
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(600)
+      this.tableH = this.tableHeight(500)
     })
   },
   methods: {
@@ -70,15 +65,11 @@ export default {
             let obj = {}
             obj.prop = tempX[j].prop + '_' + nameData[i].name
             obj.label = nameData[i].name
-            if (obj.label.indexOf('同比')!= -1) {
-              obj.subcomponent = subRate
-            }
             tempX[j].children.push(obj)
           }
         }
       }
       this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
-      console.log(this.tableProps)
       // 数据
       this.list = []
       for (let k = 0; k < data.length; k++) {

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -38,15 +38,15 @@ const tableProps = [
     label: '能源类型'
   },
   {
-    prop: 'startValue',
+    prop: 'startNum',
     label: '抄表数(起始)'
   },
   {
-    prop: 'endValue',
+    prop: 'endNum',
     label: '抄表数(结束)'
   },
   {
-    prop: 'diffValue',
+    prop: 'useNum',
     label: '消耗量'
   }
 ]

src/views/equipment/analysis/efficiency/index.vue

@@ -55,10 +55,7 @@
 							</div>
 							<div class="graph-grid">
 								<div class="bg-grid grid-line">
-									<div
-										class="grid-item"
-										v-for="item in list.length"
-										:key="item"></div>
+									<div class="grid-item" v-for="item in list.length" :key="item"></div>
 								</div>
 
 								<div class="bg-grid grid-charts">
@@ -118,12 +115,12 @@ export default {
 						{
 							width: 128,
 							prop: 'workTime',
-							label: '工作时长[h]',
+							label: '工作时长',
 						},
 						{
 							width: 128,
 							prop: 'workRate',
-							label: '百分比[%]',
+							label: '百分比',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
@@ -134,9 +131,9 @@ export default {
 						{
 							width: 128,
 							prop: 'stopTime',
-							label: '停机时长[h]',
+							label: '停机时长',
 						},
-						{ width: 128, prop: 'stopRate', label: '百分比[%]' },
+						{ width: 128, prop: 'stopRate', label: '百分比' },
 					],
 				},
 				{
@@ -145,10 +142,10 @@ export default {
 						{
 							width: 128,
 							prop: 'downTime',
-							label: '故障时长[h]',
+							label: '故障时长',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
-						{ width: 128, prop: 'downRate', label: '百分比[%]' },
+						{ width: 128, prop: 'downRate', label: '百分比' },
 						{
 							width: 128,
 							prop: 'timeEfficiency',
@@ -256,7 +253,7 @@ export default {
 							rangeSeparator: '-',
 							startPlaceholder: '开始时间',
 							endPlaceholder: '结束时间',
-							param: 'timerange',
+							param: 'recordTime',
 						},
 						{
 							parent: 'dateFilterType',
@@ -267,7 +264,7 @@ export default {
 							placeholder: '选择日期',
 							format: 'yyyy-MM-dd',
 							valueFormat: 'yyyy-MM-dd',
-							param: 'timeday',
+							param: 'recordTime',
 						},
 					],
 				},
@@ -386,18 +383,22 @@ export default {
 			if (btnName == 'search') {
 				this.queryParams.factoryId = payload.factoryId || null;
 				this.queryParams.lineId = payload.lineId || null;
-				if (0 == payload.dateFilterType) {
-					this.queryParams.recordTime = payload.timerange;
-				} else if (1 == payload.dateFilterType) {
-					this.queryParams.recordTime = [
-						`${payload.timeday} 00:00:00`,
-						`${payload.timeday} 23:59:59`,
-					];
+				if (payload.recordTime != null) {
+					if (typeof payload.recordTime == 'string') {
+						if (payload.recordTime.trim() !== '') {
+							this.queryParams.recordTime = [
+								`${payload.recordTime} 00:00:00`,
+								`${payload.recordTime} 23:59:59`,
+							];
+						}
+					} else {
+						this.queryParams.recordTime = payload.recordTime;
+					}
+				} else {
+					this.queryParams.recordTime = null;
 				}
-			} else {
-				this.queryParams.recordTime = null;
+				this.getList();
 			}
-			this.getList();
 		},
 
 		cancel() {

src/views/equipment/analysis/exception/index.vue

@@ -155,7 +155,7 @@ export default {
 		async getList() {
 			this.loading = true;
 			// 执行查询
-			const { code, data } = await this.$axios({
+			const { data } = await this.$axios({
 				url: '/analysis/equipment-analysis/efficiency',
 				method: 'get',
 				params: {
@@ -163,11 +163,6 @@ export default {
 					recordTime: this.queryParams.recordTime || null,
 				},
 			});
-			if (code === 0) {
-				this.list = data;
-			} else {
-				this.list.splice(0);
-			}
 		},
 
 		handleSearchBarBtnClick(btn) {

src/views/equipment/analysis/quality/components/lineChart.vue

@@ -37,14 +37,8 @@ export default {
 		option() {
 			const opt = [];
 			this.list.map((eq) => {
-				/** [设备名, ok数量, 不ok数量, 加工数量, 合格率] */
-				opt.push([
-					eq.equipmentName,
-					eq.okQuantity,
-					eq.nokQuantity,
-					eq.totalQuantity,
-					eq.passRate.toFixed(4),
-				]);
+				/** [设备名, ok数量, 不ok数量] */
+				opt.push([eq.equipmentName, eq.okQuantity, eq.nokQuantity]);
 			});
 			return {
 				color: ['#288AFF', '#8EF0AB'],
@@ -53,35 +47,11 @@ export default {
 					axisPointer: {
 						type: 'shadow',
 					},
-					formatter: (params) => {
-						const name = params[0].name;
-						const goodRate = opt.find((item) => item[0] == name)[4];
-						return `
-							<h1 style="font-size: 18px; letter-spacing: 1px;">${
-								params[0].axisValue
-							} <small>${goodRate}%</small></h1>
-							<ul style="margin: 0; padding: 0; min-width: 128px;">
-								${params
-									.map(
-										(item, index) => `
-											<li style="list-style: none; display: flex; justify-content: space-between; align-items: center;">
-												<div>
-													<span style="display: inline-block; width: 10px; height: 10px; border-radius: 50%; background-color: ${item.color}; margin-right: 5px;"></span>
-													${item.seriesName}
-												</div>
-												${item.value}
-											</li>
-								`
-									)
-									.join('')}
-							</ul>
-						`;
-					},
 				},
 				legend: {
 					itemWidth: 12,
 					itemHeight: 12,
-					right: 0,
+					right: 0
 				},
 				grid: {
 					left: '1%',
@@ -134,17 +104,6 @@ export default {
 						stack: 's',
 						data: opt.map((item) => item[2]),
 					},
-					// {
-					// 	name: '加工数量',
-					// 	type: 'bar',
-					// 	barWidth: 20,
-					// 	data: opt.map((item) => item[3]),
-					// },
-					// {
-					// 	name: '合格率',
-					// 	type: 'line',
-					// 	data: opt.map((item) => item[4]),
-					// },
 				],
 			};
 		},

src/views/equipment/analysis/quality/index.vue

@@ -31,8 +31,7 @@
 					<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
 						<div v-if="activeName == 'graph'" class="graph" style="height: 40vh; display: flex; flex-direction: column;">
 							<div class="blue-title">各设备加工数量</div>
-							<LineChart v-if="list && list.length" :list="list" />
-							<div v-else class="no-data-bg"></div>
+							<LineChart :list="list" />
 						</div>
 					</el-tab-pane>
 				</el-tabs>

src/views/equipment/timing-diagram/components/gantt.js

@@ -1,191 +0,0 @@
-
-// filename: gantt.vue
-// author: liubin
-// date: 2023 -09 - 25 14: 28: 12
-// description: 甘特图
-
-
-import * as echarts from 'echarts';
-
-/**
- * 
- * @param {*} params 
- * @param {*} api 
- * 
- * https://echarts.apache.org/zh/option.html#series-custom.renderItem.arguments.params
- */
-function renderItem(params, api) { }
-
-export default class Gantt {
-    constructor(el) {
-        this.chart = echarts.init(el);
-        let options = {
-            series: [
-                {
-                    type: 'custom',
-                    coordinateSystem: 'cartesian2d',
-                    renderItem: renderItem,
-                }
-            ]
-        }
-        this.chart.setOption(options);
-    }
-
-    update(options) {
-        this.chart.setOption(options);
-    }
-
-    resize() {
-        // todo
-    }
-
-    destroy() {
-        this.chart.dispose();
-    }
-}
-
-
-
-var data = [];
-var categories = ['设备1', '设备2', '设备3'];
-var types = [
-    { name: '运行', color: '#7b9ce1' },
-    { name: '故障', color: '#bd6d6c' },
-    { name: '停机', color: '#75d874' },
-];
-//   return new Date(new Date(timestamp).toLocaleDateString()).getTime()
-// })(1691568181000))
-function getStartTime(timestamp) {
-    return new Date(new Date(timestamp).toLocaleDateString()).getTime()
-}
-
-
-data.push({
-    name: 'running',
-    value: [0, 1691568181000, 1691568181000 + 60 * 60 * 1000, 60],
-    itemStyle: {
-        normal: {
-            color: types[0].color
-        }
-    }
-})
-
-
-
-function renderItem(params, api) {
-    var categoryIndex = api.value(0);
-    var start = api.coord([api.value(1), categoryIndex]);
-    var end = api.coord([api.value(2), categoryIndex]);
-    var height = api.size([0, 1])[1] * 0.8;
-    var rectShape = echarts.graphic.clipRectByRect(
-        {
-            x: start[0],
-            y: start[1] - height / 2,
-            width: end[0] - start[0],
-            height: height
-        },
-        {
-            x: params.coordSys.x,
-            y: params.coordSys.y,
-            width: params.coordSys.width,
-            height: params.coordSys.height
-        }
-    );
-    return (
-        rectShape && {
-            type: 'rect',
-            transition: ['shape'],
-            shape: rectShape,
-            style: api.style()
-        }
-    );
-}
-
-option = {
-    tooltip: {
-        // show: false,
-        formatter: function (params) {
-            return params.marker + params.name + ': ' + new Date(params.value[1]).toLocaleTimeString() + ' - ' + new Date(params.value[2]).toLocaleTimeString();
-        }
-    },
-    // title: {
-    //   text: 'Profile',
-    //   left: 'center'
-    // },
-    // dataZoom: [
-    //   {
-    //     type: 'slider',
-    //     filterMode: 'weakFilter',
-    //     showDataShadow: false,
-    //     top: 400,
-    //     labelFormatter: ''
-    //   },
-    //   {
-    //     type: 'inside',
-    //     filterMode: 'weakFilter'
-    //   }
-    // ],
-    grid: {
-        height: 300
-    },
-    xAxis: {
-        type: 'time',
-        min: getStartTime(1691568181000),
-        max: getStartTime(1691568181000 + 3600 * 24 * 1000),
-        splitNumber: 10,
-        // interval: 60*3600*1000,
-        // scale: true,
-        axisLabel: {
-            // rotate: -15,
-            formatter: function (val) {
-                return new Date(val).toLocaleTimeString()
-            }
-        },
-        axisTick: {
-            show: true
-        },
-        splitLine: {
-            show: false,
-        }
-    },
-    yAxis: [{
-        axisLine: {
-            // show: false,
-            lineStyle: {
-                color: ''
-            }
-        },
-        axisLabel: {
-            fontSize: 14,
-        },
-        axisTick: {
-            show: false,
-        },
-        splitLine: {
-            show: true
-        },
-        data: categories
-    }, {
-        axisLine: {
-            // show: false,
-            lineStyle: {
-                color: ''
-            }
-        },
-        data: []
-    }],
-    series: [
-        {
-            type: 'custom',
-            renderItem: renderItem,
-            itemStyle: {
-                opacity: 0.8
-            },
-            encode: {
-                x: [1, 2],
-                y: 0
-            },
-            data: data
-        }
-    ]
-};

src/views/equipment/timing-diagram/output/index.vue

@@ -8,7 +8,7 @@
 <template>
 	<div
 		class="production-timegraph-container"
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
+		style="background: #f2f4f9; flex: 1">
 		<el-row
 			class=""
 			style="
@@ -24,16 +24,12 @@
 				:formConfigs="searchBarFormConfig"
 				ref="search-bar"
 				:remove-blue="true"
-				@select-changed="handleSearchBarChanged"
 				@headBtnClick="handleSearchBarBtnClick" />
 		</el-row>
 
 		<el-row
 			class=""
 			style="
-				flex: 1;
-				display: flex;
-				flex-direction: column;
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 24px;
@@ -41,7 +37,7 @@
 			">
 			<div class="blue-title">设备产量时序图</div>
 
-			<div class="main-area" style="flex: 1">
+			<div class="main-area">
 				<div class="graphs" v-if="graphList.length">
 					<LineChart :config="templateConfig" />
 				</div>
@@ -74,7 +70,6 @@
 
 <script>
 import LineChart from './components/lineChart.vue';
-import response from './response.json';
 
 export default {
 	name: 'SGProduction',
@@ -82,7 +77,6 @@ export default {
 	props: {},
 	data() {
 		return {
-			startTime: null, // new Date(2023, 8, 26, 0, 0, 0, 0).getTime(),
 			accumulators: new Map(),
 			searchBarFormConfig: [
 				{
@@ -91,7 +85,6 @@ export default {
 					placeholder: '请选择产线',
 					selectOptions: [],
 					param: 'lineId',
-					onchange: true,
 				},
 				{
 					type: 'select',
@@ -115,7 +108,6 @@ export default {
 					// defaultTime: ['00:00:00', '23:59:59'],
 					placeholder: '选择日期',
 					param: 'recordTime',
-					required: true,
 				},
 				{
 					type: 'button',
@@ -144,18 +136,7 @@ export default {
 			eqList: [],
 			graphList: [],
 			templateConfig: {
-				color: [
-					'#283D68',
-					'#FFB61F',
-					'#4481FF',
-					'#5AD8A6',
-					'#E97466',
-					'#ccc', //<=== 需按情况更新
-					'#ccc',
-					'#ccc',
-					'#ccc',
-					'#ccc',
-				],
+				color: ['#283D68', '#FFB61F', '#4481FF', '#5AD8A6', '#E97466'],
 				grid: {
 					top: 48,
 					left: 48,
@@ -178,30 +159,25 @@ export default {
 				tooltip: {
 					show: true,
 					trigger: 'axis',
-					formatter: function (params) {
-						return `
-							<div style="margin-bottom: 8px;">${new Date(
-								+params[0].name
-							).toLocaleTimeString()}</div>
-							${params
-								.map(({ seriesName, color, data }) =>
-									data != null
-										? `
-								<div style="min-width: 160px; display: flex; justify-content: space-between; align-items: center;">
-									<span style="display: flex; align-items: center;">
-										<span style="display: inline-block; margin-right: 8px; width: 12px; height: 12px; background: ${color}"></span>
-										<span style="">${seriesName}</span>
-									</span>
-									<span style="color: #c7c7c7; text-align: right;">${data}</span>
-								</div>
-							`
-										: ''
-								)
-								.join('')}
-						`;
-					},
 				},
-				xAxis: null,
+				xAxis: {
+					type: 'category',
+					boundaryGap: true,
+					axisTick: {
+						// show: false,
+						alignWithLabel: true,
+						lineStyle: {
+							color: '#0003',
+						},
+					},
+					axisLabel: {
+						color: '#0007',
+					},
+					data: [],
+					// data: Array(24)
+					// 	.fill(1)
+					// 	.map((item, index) => `${index}:00`),
+				},
 				yAxis: {
 					type: 'value',
 					name: '产量',
@@ -210,12 +186,9 @@ export default {
 						fontSize: 14,
 						align: 'center',
 					},
-					axisLine: {
-						show: true,
-					},
+					nameGap: 26,
 					max: function (value) {
-						return value.max + Math.ceil(value.max / 4);
-						// return value.max + 50
+						return value.max + Math.floor(value.max / 5);
 					},
 				},
 				series: [
@@ -250,29 +223,16 @@ export default {
 			},
 		};
 	},
-	computed: {
-		timeArr() {
-			return Array(24)
-				.fill(this.startTime)
-				.map((time, index) => time + index * 3600000);
-		},
-	},
 	created() {
 		this.initProductline();
 		this.initWorksection();
 		this.initEquipment();
-		// this.getList();
+		this.getList();
 	},
 	methods: {
 		handleSearchBarBtnClick({ btnName, ...payload }) {
 			switch (btnName) {
 				case 'search':
-					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.error('请选择时间段');
-						return;
-					}
-					this.startTime = new Date(payload.recordTime).getTime();
-
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
 					this.queryParams.equipmentId = payload.equipmentId || null;
@@ -290,18 +250,6 @@ export default {
 			}
 		},
 
-		handleSearchBarChanged({ param, value }) {
-			if (!value) {
-				this.searchBarFormConfig[1].selectOptions = [];
-				return;
-			}
-			switch (param) {
-				case 'lineId':
-					this.getWorksectionById(value);
-					break;
-			}
-		},
-
 		/** 重置查询条件 */
 		initQuery() {
 			this.queryParams.lineId = null;
@@ -319,74 +267,43 @@ export default {
 			});
 		},
 
-		initState() {
-			this.accumulators = new Map();
-			this.templateConfig.series = [];
-		},
-
 		async getList() {
-			this.initState();
-
 			const { code, data } = await this.$axios({
 				url: '/analysis/equipment-analysis/quantity',
 				method: 'get',
 				params: this.queryParams,
 			});
-
-			// const { code, data } = response;
 			if (code == 0) {
 				this.graphList = this.objectToArray(data);
-				this.setXaxis();
+				// const eq1 = [
+				// 	{ totalQuantity: 20, startTime: 1693964578000 },
+				// 	{ totalQuantity: 43, startTime: 1693964678000 },
+				// 	{ totalQuantity: 12, startTime: 1693964778000 },
+				// 	{ totalQuantity: 11, startTime: 1693964878000 },
+				// 	{ totalQuantity: 98, startTime: 1693965478000 },
+				// 	{ totalQuantity: 87, startTime: 1693965578000 },
+				// ];
+				// eq1.key = 'SS1';
+				// const eq2 = [
+				// 	{ totalQuantity: 23, startTime: 1693961578000 },
+				// 	{ totalQuantity: 42, startTime: 1693964578000 },
+				// 	{ totalQuantity: 51, startTime: 1693965578000 },
+				// 	{ totalQuantity: 18, startTime: 1693966578000 },
+				// 	{ totalQuantity: 77, startTime: 1693966778000 },
+				// 	{ totalQuantity: 38, startTime: 1693967578000 },
+				// 	{ totalQuantity: 57, startTime: 1693969578000 },
+				// ];
+				// eq2.key = 'SS2';
+				// this.graphList = [eq1, eq2];
+
 				this.graphList.forEach(this.setSeries);
 			} else {
 				this.graphList = [];
+				this.graphList.forEach(this.setSeries);
 			}
 		},
 
-		setXaxis() {
-			const xaxis = {
-				type: 'category',
-				// interval: 12,
-				axisTick: {
-					alignWithLabel: true,
-					lineStyle: {
-						color: '#0003',
-					},
-				},
-				axisLabel: {
-					formatter: function (value, index) {
-						return new Date(+value)
-							.toLocaleTimeString()
-							.split(':')
-							.slice(0, 2)
-							.join(':');
-					},
-				},
-				data: this.timeArr,
-			};
-			this.templateConfig.xAxis = xaxis;
-		},
-
-		setYaxis() {},
-
-		setSeries(list) {
-			const data = Array(24).fill(null);
-			list.map((item, index) => {
-				const idx = this.timeArr.indexOf(item.startTime);
-				if (idx != -1) {
-					data[idx] = item.totalQuantity;
-				}
-			});
-			const seriesItem = {
-				name: list.key,
-				type: 'line',
-				symbol: 'circle',
-				data,
-			};
-			this.templateConfig.series.push(seriesItem);
-		},
-
-		setSeriesOld(eqArr) {
+		setSeries(eqArr) {
 			if (eqArr.length == 0) {
 				this.templateConfig.series = [];
 				return;
@@ -413,6 +330,18 @@ export default {
 			});
 		},
 
+		/** 获得设备产量 */
+		getEquipmentQuantity(equipmentArr) {
+			return equipmentArr.map((item) => item.totalQuantity);
+		},
+
+		/** 获得设备产量的时间 */
+		getTimeinfo(equipmentArr) {
+			return equipmentArr.map((item) =>
+				new Date(item.startTime).toLocaleTimeString()
+			);
+		},
+
 		/** 准备设备数据 */
 		async initEquipment() {
 			const { code, data } = await this.$axios({
@@ -461,25 +390,6 @@ export default {
 			}
 		},
 
-		/** 根据产线获取工段 */
-		async getWorksectionById(lineId) {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listByParentId',
-				method: 'get',
-				params: {
-					id: lineId,
-				},
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
 		async submitForm() {
 			const { code, data } = await this.$axios({
 				url: '/analysis/equipment-analysis/quantity',

src/views/equipment/timing-diagram/output/response.json

@@ -1,333 +0,0 @@
-{
-	"code": 0,
-	"data": {
-		"上片机": [
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695657600000,
-				"startTime": 1695657600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 189,
-				"outQuantity": 200,
-				"okQuantity": 189,
-				"nokQuantity": 11,
-				"recordTime": 1695661200000,
-				"startTime": 1695661200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695664800000,
-				"startTime": 1695664800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695668400000,
-				"startTime": 1695668400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695672000000,
-				"startTime": 1695672000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 170,
-				"outQuantity": 200,
-				"okQuantity": 170,
-				"nokQuantity": 30,
-				"recordTime": 1695675600000,
-				"startTime": 1695675600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695679200000,
-				"startTime": 1695679200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695682800000,
-				"startTime": 1695682800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 195,
-				"outQuantity": 200,
-				"okQuantity": 195,
-				"nokQuantity": 5,
-				"recordTime": 1695686400000,
-				"startTime": 1695686400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695690000000,
-				"startTime": 1695690000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695693600000,
-				"startTime": 1695693600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695697200000,
-				"startTime": 1695697200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695700800000,
-				"startTime": 1695700800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 196,
-				"outQuantity": 200,
-				"okQuantity": 196,
-				"nokQuantity": 4,
-				"recordTime": 1695704400000,
-				"startTime": 1695704400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 193,
-				"outQuantity": 200,
-				"okQuantity": 193,
-				"nokQuantity": 7,
-				"recordTime": 1695708000000,
-				"startTime": 1695708000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 190,
-				"outQuantity": 200,
-				"okQuantity": 190,
-				"nokQuantity": 10,
-				"recordTime": 1695711600000,
-				"startTime": 1695711600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695715200000,
-				"startTime": 1695715200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695718800000,
-				"startTime": 1695718800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695722400000,
-				"startTime": 1695722400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695726000000,
-				"startTime": 1695726000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695729600000,
-				"startTime": 1695729600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 189,
-				"outQuantity": 200,
-				"okQuantity": 189,
-				"nokQuantity": 11,
-				"recordTime": 1695733200000,
-				"startTime": 1695733200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 179,
-				"outQuantity": 200,
-				"okQuantity": 179,
-				"nokQuantity": 21,
-				"recordTime": 1695736800000,
-				"startTime": 1695736800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695740400000,
-				"startTime": 1695740400000
-			}
-		],
-		"下片机": [
-			{
-				"inQuantity": 200,
-				"totalQuantity": 190,
-				"outQuantity": 200,
-				"okQuantity": 190,
-				"nokQuantity": 10,
-				"recordTime": 1695672000000,
-				"startTime": 1695672000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 177,
-				"outQuantity": 200,
-				"okQuantity": 177,
-				"nokQuantity": 23,
-				"recordTime": 1695675600000,
-				"startTime": 1695675600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695679200000,
-				"startTime": 1695679200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695682800000,
-				"startTime": 1695682800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 185,
-				"outQuantity": 200,
-				"okQuantity": 185,
-				"nokQuantity": 15,
-				"recordTime": 1695686400000,
-				"startTime": 1695686400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695690000000,
-				"startTime": 1695690000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695693600000,
-				"startTime": 1695693600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 193,
-				"outQuantity": 200,
-				"okQuantity": 193,
-				"nokQuantity": 7,
-				"recordTime": 1695697200000,
-				"startTime": 1695697200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695700800000,
-				"startTime": 1695700800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695704400000,
-				"startTime": 1695704400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 192,
-				"outQuantity": 200,
-				"okQuantity": 192,
-				"nokQuantity": 8,
-				"recordTime": 1695708000000,
-				"startTime": 1695708000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695711600000,
-				"startTime": 1695711600000
-			}
-		]
-	}
-}

src/views/equipment/timing-diagram/status/demo.html

@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Document</title>
-	</head>
-	<body>
-		<div
-			id="app"
-			style="width: 100vw; height: 80vh; background: #ccc3; margin: 24px"></div>
-
-		<script src="./echarts.js"></script>
-		<script>
-			function getStartTime(timestamp) {
-				return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-			}
-
-			function renderItem(params, api) {
-				var categoryIndex = api.value(0);
-				var start = api.coord([api.value(1), categoryIndex]);
-				var end = api.coord([api.value(2), categoryIndex]);
-				console.log(`
-                    categoryIndex: ${categoryIndex},
-                    start: ${start},
-                    end: ${end},
-                    api.value0: ${api.value(0)}
-                    api.value1: ${api.value(1)}
-                    api.value2: ${api.value(2)}
-                    params.coordSys: ${JSON.stringify(params.coordSys)}
-                    api.size: ${api.size([0, 1])}
-                    api.style(): ${JSON.stringify(api.style())}
-                `);
-
-				var height = api.size([0, 1])[1] * 2;
-				// 用一个矩形去截取另一个矩形
-				var rectShape = echarts.graphic.clipRectByRect(
-					// 被截取矩形
-					{
-						x: start[0],
-						y: start[1] - height / 2,
-						width: end[0] - start[0],
-						height: height,
-					},
-					// 截取矩形
-					{
-						// 截取掉grid以外的部分，实质是计算方块的偏移量
-						x: params.coordSys.x, // {number} grid rect 的 x
-						// y: params.coordSys.y, // {number} grid rect 的 y
-						y: params.coordSys.y - 16, // {number} grid rect 的 y，并多减掉 16 个单位
-						width: params.coordSys.width, // {number} grid rect 的 width
-						height: params.coordSys.height, // {number} grid rect 的 height
-					}
-				);
-                console.log(`------------- ${JSON.stringify(rectShape)} -------------- `)
-				return (
-					rectShape && {
-						type: 'rect',
-						transition: ['shape'],
-						shape: rectShape,
-						style: api.style(),
-					}
-				);
-			}
-
-			function getXaxisRange(startTime) {
-				return Array(24)
-					.fill(startTime)
-					.map((item, index) => {
-						return new Date(item + index * 3600 * 1000)
-							.toLocaleTimeString()
-							.split(':')
-							.slice(0, 2)
-							.join(':');
-					});
-			}
-
-			function getTodayStart(today) {
-				const [y, m, d] = [
-					today.getFullYear(),
-					today.getMonth(),
-					today.getDate(),
-				];
-				return new Date(y, m, d).getTime();
-			}
-
-			/** 颜色配置 */
-			const types = [
-				{ name: '运行', color: '#288AFF' },
-				{ name: '故障', color: '#FC9C91' },
-				{ name: '计划停机', color: '#FFDC94' },
-				{ name: '空白', color: '#F2F4F9' },
-			];
-
-			const option = {
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'none',
-						// label: {
-						// 	backgroundColor: '#6a7985',
-						// },
-					},
-                    formatter: (params) => {
-                        // console.log('formatter', params)
-                        // return `
-                        // <div>${new Date(params[0].value[1]).toLocaleString()} ~ ${new Date(params[0].value[2]).toLocaleString()}</div>
-                        // <div style="display: flex; justify-content: space-between; min-width: 128px; align-items: center;">
-                        //     <span>${params[0].seriesName}</span>
-                        //     <span>${params[0].name}</span>
-                        // </div>
-                        // `
-                        return `
-                        <h1 style="font-size: 18px; font-weight: 600; letter-spacing: 1px;">${params[0].name} <span style="display: inline-block; margin-left: 8px; width: 12px; height: 12px; border-radius: 50%; background: ${params[0].color} "></span></h1>
-                        <div>${new Date(params[0].value[1]).toLocaleString()} ~ ${new Date(params[0].value[2]).toLocaleString()}</div>
-                        `
-                    }
-				},
-				grid: [
-					{
-						id: 0,
-						top: 10,
-                        left: 128,
-                        right: 64,
-						height: 56, 
-					},
-					// {
-					// 	id: 1,
-					// 	top: 80,
-					// 	height: 56,
-					// },
-				],
-				xAxis: [
-					{
-						id: 0,
-						gridIndex: 0,
-						axisTick: {
-							alignWithLabel: true,
-							inside: true,
-						},
-						type: 'time',
-						min: getTodayStart(new Date()), // <===
-						max: getStartTime(new Date().getTime() + 3600 * 24 * 1000), // <===
-						splitNumber: 10,
-						axisLabel: {
-							margin: 12,
-							// rotate: -15,
-							formatter: function (val) {
-								return new Date(val)
-									.toLocaleTimeString()
-									.split(':')
-									.slice(0, 2)
-									.join(':');
-							},
-						},
-						boundaryGap: false,
-						// data: getXaxisRange(getTodayStart(new Date())),
-					},
-					{
-						id: 1,
-						gridIndex: 0,
-						axisLabel: { show: false },
-						axisLine: { show: false },
-					},
-				],
-				yAxis: [
-					// 主y轴
-					{
-						id: 0,
-						gridIndex: 0,
-						type: 'value',
-						splitLine: { show: false },
-						name: '设备1',
-						nameLocation: 'center',
-						nameGap: 56,
-						nameRotate: 0,
-						nameTextStyle: {
-							fontSize: 18,
-						},
-						axisLine: {
-							show: true,
-							lineStyle: {},
-						},
-						axisLabel: { show: false },
-						axisTick: { show: false },
-					},
-					// 辅y轴
-					{
-						id: 1,
-						gridIndex: 0,
-						type: 'value',
-						splitLine: { show: false },
-						axisLabel: { show: false },
-						axisTick: { show: false },
-					},
-				],
-				series: [
-					{
-                        name: '设备1',
-						xAxisIndex: 0,
-						yAxisIndex: 0,
-						type: 'custom',
-						renderItem: renderItem,
-						itemStyle: {
-							opacity: 0.8,
-						},
-						encode: {
-							x: [1, 2],
-							y: 0,
-						},
-						//function getTimestamp(point) {
-						// const t = new Date();
-						// const [y,m,d] = [t.getFullYear(),t.getMonth(),t.getDate()]
-						// const [h,M] = point.split(':')
-						// return new Date(y,m,d,h,M,0,0).getTime()
-						//}
-						data: [
-							{
-								// 01:00 ~ 05:00
-								name: '运行',
-								value: [0, 1695747600000, 1695762000000, 0],
-								itemStyle: {
-									normal: {
-										color: types[0].color,
-									},
-								},
-							},
-							{
-								// 5:00 ~ 8:00
-								name: '故障',
-								value: [0, 1695762000000, 1695772800000, 0],
-								itemStyle: {
-									normal: {
-										color: types[1].color,
-									},
-								},
-							},
-							{
-								// 8:00 ~ 8:39
-								name: '计划停机',
-								value: [0, 1695772800000, 1695775140000, 0],
-								itemStyle: {
-									normal: {
-										color: types[2].color,
-									},
-								},
-							},
-							{
-								// 08:39 ~ 18:00
-								name: '运行',
-								value: [0, 1695775140000, 1695808800000, 0],
-								itemStyle: {
-									normal: {
-										color: types[0].color,
-									},
-								},
-							},
-							{
-								// 18:00 ~ 23:30
-								name: '计划停机',
-								value: [0, 1695808800000, 1695828600000, 0],
-								itemStyle: {
-									normal: {
-										color: types[2].color,
-									},
-								},
-							},
-						],
-					},
-				],
-			};
-
-			const el = document.getElementById('app');
-			const myChart = echarts.init(el);
-
-			console.log('mychart', myChart);
-			myChart.setOption(option);
-		</script>
-	</body>
-</html>

src/views/equipment/timing-diagram/status/gantt.js

@@ -1,235 +0,0 @@
-import * as echarts from 'echarts';
-
-
-function renderItem(params, api) {
-    var categoryIndex = api.value(0);
-    var start = api.coord([api.value(1), categoryIndex]);
-    var end = api.coord([api.value(2), categoryIndex]);
-    var height = api.size([0, 1])[1] * 1;
-    // var height = api.size([0, 1])[1] * 0.8;
-    // var height = 56;
-    var rectShape = echarts.graphic.clipRectByRect(
-        {
-            x: start[0],
-            y: start[1] - height / 2,
-            width: end[0] - start[0],
-            height: height,
-        },
-        {
-            x: params.coordSys.x,
-            y: params.coordSys.y,
-            width: params.coordSys.width,
-            height: params.coordSys.height,
-        }
-    );
-    return (
-        rectShape && {
-            type: 'rect',
-            transition: ['shape'],
-            shape: rectShape,
-            style: api.style(),
-        }
-    );
-}
-
-
-
-/** 颜色配置 */
-const types = [
-    { name: '运行', color: '#5ad8a6' },
-    { name: '故障', color: '#fc9c91' },
-    { name: '计划停机', color: '#000' },
-];
-
-
-/** 从时间戳获取 startTime */
-function getStartTime(timestamp) {
-    return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-}
-
-
-
-export default class GanttGraph {
-    constructor(el) {
-        this.chart = null;
-        this.el = el;
-        /** 默认配置 */
-        this.grid = {
-            top: 32,
-            left: 128,
-            right: 128,
-            bottom: 64,
-        }
-        this.tooltip = {
-            formatter: function (params) {
-                return (
-                    params.marker +
-                    params.name +
-                    ': ' +
-                    new Date(params.value[1]).toLocaleTimeString() +
-                    ' - ' +
-                    new Date(params.value[2]).toLocaleTimeString()
-                );
-            },
-        }
-        this.xAxis = {
-            type: 'time',
-            min: getStartTime(1691568181000), // <===
-            max: getStartTime(1691568181000 + 3600 * 24 * 1000), // <===
-            splitNumber: 10,
-            axisLabel: {
-                // rotate: -15,
-                formatter: function (val) {
-                    return new Date(val).toLocaleTimeString();
-                },
-            },
-            axisTick: {
-                show: true,
-            },
-            splitLine: {
-                show: false,
-            },
-        }
-        this.yAxis = [
-            {
-                interval: 40,
-                axisLine: {
-                    lineStyle: {
-                        color: '',
-                    },
-                },
-                axisLabel: {
-                    fontSize: 18,
-                },
-                axisTick: {
-                    show: false,
-                },
-                splitLine: {
-                    show: true,
-                },
-                // data: [], // <====
-                data: ['设备1', '设备2', '设备3', '设备4'],
-            },
-            {
-                axisLine: {
-                    lineStyle: {
-                        color: '',
-                    },
-                },
-                data: [],
-            },
-        ]
-        this.series = [
-            {
-                type: 'custom',
-                renderItem: renderItem,
-                itemStyle: {
-                    opacity: 0.8,
-                },
-                encode: {
-                    x: [1, 2],
-                    y: 0,
-                },
-                // data: [], // <===
-                data: [
-                    {
-                        name: '运行',
-                        value: [
-                            0,
-                            1691568181000,
-                            1691568181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '计划停机',
-                        value: [
-                            0,
-                            1691578581000,
-                            1691578581000 + 10 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[2].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '运行',
-                        value: [
-                            1,
-                            1691568181000,
-                            1691568181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '故障',
-                        value: [
-                            2,
-                            1691538181000,
-                            1691538181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[1].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '运行',
-                        value: [
-                            2,
-                            1691578181000,
-                            1691578181000 + 90 * 60 * 1000,
-                            90 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '计划停机',
-                        value: [
-                            3,
-                            1691528181000,
-                            1691528181000 + 240 * 60 * 1000,
-                            240 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[2].color,
-                            },
-                        },
-                    },
-                ],
-            },
-        ]
-    }
-
-    init() {
-        this.chart = echarts.init(this.el);
-        this.chart.setOption(this.getOption())
-    }
-
-    getOption() {
-        const { grid, xAxis, yAxis, series, tooltip } = this;
-        return {
-            grid, xAxis, yAxis, series, tooltip
-        }
-    }
-}

src/views/equipment/timing-diagram/status/index.vue

@@ -6,9 +6,7 @@
 -->
 
 <template>
-	<div
-		class="status-timegraph-container"
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
+	<div class="status-timegraph-container" style="background: #f2f4f9; flex: 1">
 		<el-row
 			class=""
 			style="
@@ -24,21 +22,16 @@
 				:formConfigs="searchBarFormConfig"
 				ref="search-bar"
 				:remove-blue="true"
-				@select-changed="handleSearchBarSelectChange"
 				@headBtnClick="handleSearchBarBtnClick" />
 		</el-row>
 
 		<el-row
 			class=""
 			style="
-				height: 1px;
-				flex: 1;
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 32px;
 				border-radius: 8px;
-				display: flex;
-				flex-direction: column;
 			">
 			<el-row :gutter="20">
 				<el-col :span="6">
@@ -71,15 +64,43 @@
 					</div>
 				</el-col>
 			</el-row>
-			<div
-				class="main-area"
-				style="flex: 1; display: flex; flex-direction: column">
-				<div
-					class="graphs"
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
-				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
+			<div class="main-area">
+				<div class="graphs" v-if="graphList.length">
+					<div class="graph" v-for="eq in graphList" :key="eq.key">
+						<h2 class="graph-title">{{ eq.key }}</h2>
+
+						<div class="graph-content">
+							<el-popover
+								trigger="hover"
+								v-for="blc in eq"
+								:key="blc.startTime"
+								:title="
+									blc.status == 0
+										? '运行'
+										: blc.status == 2
+										? '故障'
+										: '计划停机'
+								"
+								placement="top"
+								:content="new Date(blc.startTime).toLocaleTimeString()">
+								<div
+									slot="reference"
+									:key="blc.startTime + '__div'"
+									class="graph-item-fixed tick"
+									:class="{
+										running: blc.status == 0,
+										fault: blc.status == 2,
+										stop: blc.status == 1,
+									}"
+									:style="{ height: '32px', width: blc.duration * 2 + 'px' }"
+									:data-time="
+										new Date(blc.startTime).toLocaleTimeString()
+									"></div>
+							</el-popover>
+						</div>
+					</div>
+				</div>
+				<h2 v-else>请添加设备</h2>
 			</div>
 		</el-row>
 
@@ -107,16 +128,12 @@
 </template>
 
 <script>
-// import * as echarts from 'echarts';
-import Gantt from './gantt';
-
 export default {
 	name: 'SGStatus',
 	components: {},
 	props: {},
 	data() {
 		return {
-			chart: null,
 			searchBarFormConfig: [
 				{
 					type: 'select',
@@ -124,7 +141,6 @@ export default {
 					placeholder: '请选择产线',
 					selectOptions: [],
 					param: 'lineId',
-					onchange: true,
 				},
 				{
 					type: 'select',
@@ -137,13 +153,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间段',
-					dateType: 'date',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
 					rangeSeparator: '-',
-					placeholder: '选择日期',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'recordTime',
-					required: true,
 				},
 				{
 					type: 'button',
@@ -166,13 +185,11 @@ export default {
 				lineId: null,
 				sectionId: null,
 				equipmentId: null,
-				recordTime: null,
+				recordTime: [],
 			},
 			graphList: [],
 			open: false,
 			eqList: [],
-			startTime: null,
-			gantt: null
 			// demo: [
 			// 	[
 			// 		{
@@ -200,85 +217,15 @@ export default {
 		this.initProductline();
 		this.initWorksection();
 		this.initEquipment();
-		// this.getList();
-	},
-	mounted() {},
-	watch: {
-		graphList: {
-			handler(val) {
-				if (val && val.length) {
-					this.$nextTick(() => {
-						if (!this.chart) this.initChart();
-						this.setInitialConfig();
-						this.handleGraphList();
-					});
-				}
-				return;
-			},
-			deep: true,
-			immediate: true,
-		},
+		this.getList();
 	},
 	methods: {
-		setInitialConfig() {
-			console.log('in setInitialConfig', this.chartOption);
-			this.chart.setOption(this.chartOption);
-		},
-
-		handleGraphList() {
-			console.log('in handleGraphList:', this.graphList);
-			return;
-			const min = this.queryParams.recordTime
-				? new Date(this.queryParams.recordTime).getTime()
-				: this.findMin();
-
-			console.log('min is', min);
-			this.chartOption.xAxis.min = getStartTime(min);
-			this.chartOption.xAxis.max = getStartTime(min + 3600 * 24 * 1000);
-			this.graphList.forEach((arr) => {
-				this.chartOption.yAxis[0].data.push(arr.key);
-				arr.forEach((item) => {
-					this.chartOption.series[0].data.push({
-						name: ['运行', '故障', '计划停机'][item.status],
-						value: [
-							0,
-							item.startTime,
-							item.startTime + item.duration * 60 * 1000,
-							item.duration * 60 * 1000,
-						],
-						itemStyle: {
-							normal: {
-								color: types[item.status].color,
-							},
-						},
-					});
-				});
-				console.log('chartOptions', this.chartOption);
-			});
-		},
-
-		findMin() {
-			let min = 0;
-			this.graphList.forEach((arr) => {
-				arr.forEach((item) => {
-					if (min < item.startTime) min = item.startTime;
-				});
-			});
-			return min;
-		},
-
-		initChart() {
-			const el = document.getElementById('status-chart');
-			this.gantt = new Gantt(el);
-			this.gantt.init();
-		},
-
 		/** 重置查询条件 */
 		initQuery() {
 			this.queryParams.lineId = null;
 			this.queryParams.equipmentId = null;
 			this.queryParams.sectionId = null;
-			this.queryParams.recordTime = null;
+			this.queryParams.recordTime = [];
 		},
 
 		/** 对象到数组的转换 */
@@ -350,62 +297,13 @@ export default {
 			}
 		},
 
-		handleSearchBarSelectChange({ param, value }) {
-			if (!value) {
-				this.searchBarFormConfig[1].selectOptions = [];
-				return;
-			}
-			switch (param) {
-				case 'lineId':
-					this.$axios({
-						url: '/base/workshop-section/listByParentId',
-						method: 'get',
-						params: {
-							id: value,
-						},
-					}).then(({ code, data }) => {
-						if (code == 0) {
-							this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-								return {
-									name: item.name,
-									id: item.id,
-								};
-							});
-						}
-					});
-			}
-		},
-
 		handleSearchBarBtnClick({ btnName, ...payload }) {
 			switch (btnName) {
 				case 'search':
-					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.error('请选择时间段');
-						return;
-					}
-
-					this.startTime = new Date(payload.recordTime).getTime();
-
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
 					this.queryParams.equipmentId = payload.equipmentId || null;
-					this.queryParams.recordTime = payload.recordTime
-						? [
-								payload.recordTime,
-								new Date(
-									new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
-								)
-									.toLocaleDateString()
-									.split('/')
-									.map((value, index) => {
-										if (index == 1 || index == 2) {
-											return value.padStart(2, '0');
-										}
-										return value;
-									})
-									.join('-') + ' 00:00:00',
-						  ]
-						: null;
+					this.queryParams.recordTime = payload.recordTime || null;
 					this.getList();
 					break;
 				case 'compare':
@@ -595,13 +493,4 @@ export default {
 		background: #0b58ff;
 	}
 }
-
-.echarts__status-chart {
-	background: #ccc;
-}
-
-.echarts__status-chart > div {
-	height: 100% !important;
-	width: 100% !important;
-}
 </style>

src/views/monitoring/equipmentAlarmLog/index.vue

@@ -82,11 +82,10 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipment', label: '设备名称' },
+				{ width: 128, prop: 'productionLine', label: '产线' },
+				{ width: 128, prop: 'workshopSection', label: '工段' },
+				{ width: 128, prop: 'equipment', label: '设备名称' },
 				{
-					width: 90,
 					prop: 'alarmGrade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),

src/views/monitoring/equipmentProcessAmount/graph.vue

@@ -7,7 +7,6 @@
 
 <template>
 	<div class="chart-wrapper">
-		<div class="blue-title">各设备加工数量</div>
 		<div class="chart" ref="chart"></div>
 	</div>
 </template>
@@ -31,7 +30,7 @@ export default {
 					bottom: 56,
 				},
 				title: {
-					show: false,
+					show: true,
 					text: '各设备加工数量',
 					textStyle: {
 						color: '#232323',
@@ -133,22 +132,4 @@ export default {
 	width: 100%;
 	// background: lightcoral;
 }
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
 </style>

src/views/monitoring/equipmentProcessAmount/index.vue

@@ -21,7 +21,7 @@
 				title="点击切换工厂"
 				@mouseenter="factoryListOpen = true"
 				@mouseleave="factoryListOpen = false">
-				{{ currentFactory?.label || '点我选择工厂' }}
+				{{ currentFactory?.label || '工厂名称' }}
 				<div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
 					<ul
 						class="factory-list"
@@ -47,7 +47,7 @@
 					class="custom-tree-class"
 					:data="currentFactory?.children"
 					:props="treeProps"
-					:empty-text="''"
+					:empty-text="' - 暂无数据 - '"
 					icon-class="custom-icon-class"
 					@node-click="handleSidebarItemClick">
 					<!-- <div class="custom-tree-node" slot-scope="{ node, data }">
@@ -268,8 +268,7 @@ export default {
 			tableProps: [
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
-				// { prop: 'externalCode', label: '设备编码' },
-				{ prop: 'equipmentId', label: '设备编码' },
+				{ prop: 'externalCode', label: '设备编码' },
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'totalQuantity', label: '加工数量' },
 			],
@@ -527,7 +526,6 @@ li {
 }
 
 .custom-tree-class >>> .el-tree-node__content {
-	width: 100%;
 	height: auto !important;
 	padding: 8px 12px !important;
 }

src/views/monitoring/equipmentRecentHours/index.vue

@@ -25,8 +25,6 @@
 </template>
 
 <script>
-import moment from 'moment';
-
 export default {
 	name: 'QualityRecentHours',
 	components: {},
@@ -64,8 +62,7 @@ export default {
 
 			for (const key of Object.keys(hourData).sort()) {
 				const subprop = {
-					// label: 'key',
-					label: moment(key).format('YYYY-MM-DD HH:mm:ss'),
+					label: key,
 					children: [
 						{ prop: key + '__in', label: '进数据' },
 						{ prop: key + '__out', label: '出数据' },
@@ -88,11 +85,7 @@ export default {
 			this.list.splice(0);
 			let rowIndex = 0;
 			for (const line of list) {
-				const {
-					productLine,
-					specification = [],
-					data,
-				} = line;
+				const { productLine, specification, data } = line;
 
 				// 设置span的行数
 				this.spanInfo[rowIndex] = data.length;

src/views/monitoring/equipmentStatusAndParams/index.vue

@@ -110,7 +110,7 @@ export default {
 				},
 				{
 					prop: 'statusRecordTime',
-					label: '状态记录时间',
+					label: '状态量记录时间',
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
@@ -217,7 +217,7 @@ export default {
 			const { data } = await this.$axios({
 				url: '/base/equipment/listByLine',
 				method: 'get',
-				params: { id },
+				query: { id },
 			});
 			return data;
 		},

src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue

@@ -1,270 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for qualityInspectionRecord only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="innerDataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="检测内容"
-					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.inspectionDetId"
-						placeholder="请选择检测内容"
-						filterable
-						clearable
-						@change="handleInspectionDetChange">
-						<el-option
-							v-for="opt in inspectionDetList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="来源"
-					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.source"
-						placeholder="请选择来源"
-						filterable
-						clearable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '手动', value: 1 },
-								{ label: '自动', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						clearable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.sectionId"
-						placeholder="请选择工段"
-						clearable
-						filterable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in sectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="检测人员" prop="checkPerson">
-					<el-input
-						v-model="innerDataForm.checkPerson"
-						clearable
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入检测人员" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="检测时间"
-					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="innerDataForm.checkTime"
-						type="datetime"
-						placeholder="请选择检测时间"
-						value-format="timestamp"
-						@change="$emit('update', innerDataForm)"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="描述" prop="explainText">
-					<el-input
-						v-model="innerDataForm.explainText"
-						placeholder="请输入描述信息"
-						@change="$emit('update', innerDataForm)"
-						type="textarea"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="innerDataForm.remark"
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入备注"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			inspectionDetList: [],
-			productionLineList: [],
-			sectionList: [],
-			innerDataForm: {},
-			cacheInspectionDetList: null,
-		};
-	},
-	mounted() {
-		Promise.all([this.getProductLineList(), this.getInspectionDetList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
-	},
-	watch: {
-		// 'innerDataForm.productionLineId': {
-		// 	handler: async function (plId) {
-		// 		if (plId) await this.getWorksectionList(plId);
-		// 	},
-		// 	immediate: true,
-		// },
-		dataForm: {
-			handler: function (dataForm) {
-				this.innerDataForm = Object.assign({}, dataForm);
-
-				if (dataForm.productionLineId)
-					this.getWorksectionList(dataForm.productionLineId);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-
-		handleInspectionDetChange(value) {
-			const { id, content } = this.cacheInspectionDetList.find(
-				(item) => item.id == value
-			);
-			this.innerDataForm.inspectionDetId = id;
-			this.innerDataForm.inspectionDetContent = content;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		async handleProductlineChange(id) {
-			// await this.getWorksectionList(id);
-			this.innerDataForm.sectionId = null;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-
-		// 获取产线列表
-		async getProductLineList() {
-			const response = await this.$axios('/base/production-line/listAll');
-			this.productionLineList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-
-		// 获取检测内容列表
-		async getInspectionDetList() {
-			const response = await this.$axios(
-				'/base/quality-inspection-det/listAll'
-			);
-			this.cacheInspectionDetList = response.data;
-			this.inspectionDetList = response.data.map((item) => ({
-				label: item.content,
-				value: item.id,
-			}));
-		},
-
-		// 获取工段列表
-		async getWorksectionList(plId) {
-			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
-				{
-					params: {
-						id: plId,
-					},
-				}
-			);
-			this.sectionList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -39,7 +39,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>
@@ -53,15 +53,14 @@ import {
 	getQualityInspectionRecordPage,
 	exportQualityInspectionRecordExcel,
 } from '@/api/monitoring/qualityInspectionRecord';
-// import Editor from '@/components/Editor';
+import Editor from '@/components/Editor';
 import moment from 'moment';
-import DialogForm from './dialogForm.vue';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 export default {
 	name: 'QualityInspectionRecord',
 	components: {
-		DialogForm,
+		Editor,
 	},
 	mixins: [basicPageMixin],
 	data() {
@@ -273,38 +272,32 @@ export default {
 	},
 	created() {
 		this.getList();
-		// this.getProductLineList();
+		this.getProductLineList();
 	},
 	watch: {
-		form: {
-			handler: function (val) {
-				console.log('form change:', val);
-			},
-			deep: true
-		}
 		// 注册弹窗里产线改变时的监听事件
-		// 'form.productionLineId': {
-		// 	handler: function (val) {
-		// 		if (val == null) return;
-		// 		this.$axios('/base/workshop-section/listByParentId', {
-		// 			params: {
-		// 				id: val,
-		// 			},
-		// 		}).then((response) => {
-		// 			this.$set(
-		// 				this.rows[1][1], // 这里索引是硬编码，所以当 this.rows 里数据顺序改变时，此处也要改
-		// 				'options',
-		// 				response.data.map((item) => {
-		// 					return {
-		// 						label: item.name,
-		// 						value: item.id,
-		// 					};
-		// 				})
-		// 			);
-		// 		});
-		// 	},
-		// 	immediate: true,
-		// },
+		'form.productionLineId': {
+			handler: function (val) {
+				if (val == null) return;
+				this.$axios('/base/workshop-section/listByParentId', {
+					params: {
+						id: val,
+					},
+				}).then((response) => {
+					this.$set(
+						this.rows[1][1], // 这里索引是硬编码，所以当 this.rows 里数据顺序改变时，此处也要改
+						'options',
+						response.data.map((item) => {
+							return {
+								label: item.name,
+								value: item.id,
+							};
+						})
+					);
+				});
+			},
+			immediate: true,
+		},
 	},
 	methods: {
 		/** 获取搜索栏的产线列表 */
@@ -373,11 +366,7 @@ export default {
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
 				/** 因为后端返回的时间是时间戳格式，需转换 */
-				const info = {}
-				Object.keys(this.form).forEach(key => {
-					info[key] = response.data[key]
-				});
-				this.form = info;
+				this.form = this.filterData(response.data, Object.keys(this.form));
 				this.open = true;
 				this.title = '修改质量检查信息记录表';
 			});

src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue

@@ -147,7 +147,7 @@ export default {
 				},
 				yAxis: {
 					type: 'value',
-					name: '检测数量',
+					name: '单位/片',
 					nameTextStyle: {
 						color: '#999',
 						fontSize: 14,

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '中建材智能自动化研究院有限公司' // 网页标题
+const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口