Merge pull request 'projects/mesxc-dy' (#379) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #379

.dockerignore

@@ -1,3 +1,3 @@
 .dockerignore
-dist
+#dist
 node_modules

.drone.yml

@@ -0,0 +1,59 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: node:16-alpine
+  pull: if_not_exists
+  environment:
+    NODE_ENV: ""
+  commands:
+  #- yarn install --frozen-lockfile
+  - yarn install 
+  - env ${NODE_ENV} yarn build:prod 
+
+- name: publish
+  image: docker:dind
+  pull: if_not_exists
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /root/.docker
+  commands:
+  - docker build -t hub.kszny.picaiba.com/kszny/xcac-ui ./
+  - docker push hub.kszny.picaiba.com/kszny/xcac-ui
+  depends_on:
+  - build
+
+- name: deploy
+  image: appleboy/drone-ssh
+  pull: if-not-exists
+  settings:
+    host:
+      - 172.24.145.74
+    username: root
+    password: Root@123
+    port: 22
+    command_timeout: 2m
+    script:
+    - docker pull hub.kszny.picaiba.com/kszny/xcac-ui
+    - docker run --rm -v /data/www/xcac:/tmp hub.kszny.picaiba.com/kszny/xcac-ui sh -c "rm -rf /tmp/* && mv -f /html /tmp"
+  depends_on:
+  - publish
+
+volumes:
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: dockerconfig
+  host:
+    path: /root/.docker
+
+trigger:
+  branch:
+  - projects/mesxc-test
+  event:
+  - push

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-23 13:52:57
+ # @LastEditTime: 2024-04-25 10:07:02
  # @LastEditors: zhp
  # @Description:
 ###
@@ -14,13 +14,14 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_JIMU_API = 'http://192.168.1.101:48082'
 
 # socket地址(现场)
-# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 # socket地址(公司线上)
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+# VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 # socket dcs地址(只有现场)
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 

Dockerfile

@@ -1,21 +1,3 @@
-FROM node:16-alpine as build-stage
+FROM busybox 
-
+LABEL maintainer thomas.hairong@gmail.com
-WORKDIR /admim
+COPY dist /html/
-
-COPY .npmrc package.json yarn.lock ./
-RUN --mount=type=cache,id=yarn-store,target=/root/.yarn-store \
-    yarn install --frozen-lockfile
-
-COPY . .
-ARG NODE_ENV=""
-RUN env ${NODE_ENV} yarn build:prod
-
-## -- stage: dist => nginx --
-FROM nginx:alpine
-
-ENV TZ=Asia/Shanghai
-
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build-stage /admim/dist /usr/share/nginx/html
-
-EXPOSE 80

package.json

@@ -50,7 +50,7 @@
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
     "clipboard": "2.0.8",
-    "code-brick-zj": "^1.0.5",
+    "code-brick-zj": "^1.1.0",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",

src/api/base/coreDepartment.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-30 14:37:28
+ * @LastEditTime: 2024-04-19 17:13:24
  * @LastEditors: DY
  * @Description: 
  */
@@ -65,4 +65,13 @@ export function getCoreDepartmentList(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 设备获得所有列表
+export function getDepartmentList(query) {
+  return request({
+    url: '/system/dept/list-all-simple',
+    method: 'get',
+    params: query
+  })
+}

src/api/quality/rawMaterialTraceability.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2023-10-31 10:55:20
- * @LastEditTime: 2023-12-06 14:09:14
+ * @LastEditTime: 2024-04-25 15:28:44
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
  */
 import request from '@/utils/request'
@@ -34,11 +34,11 @@ export function exportEnergyPlcExcel(query) {
   })
 }
 
-export function getOriginalGlassRetrace(query) {
+export function getOriginalGlassRetrace(data) {
    return request({
     url: '/base/original-glass-statistics/originalGlassRetrace',
-    method: 'get',
+    method: 'post',
-    params: query,
+    data
   })
 }
 

src/api/report/glass.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-12-08 10:26:48
- * @LastEditTime: 2023-12-13 17:16:00
+ * @LastEditTime: 2024-04-24 16:31:37
  * @LastEditors: DY
  * @Description: 
  */
@@ -59,3 +59,39 @@ export function exportGlasscExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 生产月报查询--冷端生产线
+export function productionMonthY(data) {
+  return request({
+    url: '/extend/customized-reports/productionMonthY',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产月报查询--深加工生产线
+export function productionMonthD(data) {
+  return request({
+    url: '/extend/customized-reports/productionMonthD',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产年报查询--冷端生产线
+export function productionYearY(data) {
+  return request({
+    url: '/extend/customized-reports/productionYearY',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产年报查询--冷端生产线
+export function productionYearD(data) {
+  return request({
+    url: '/extend/customized-reports/productionYearD',
+    method: 'post',
+    data: data
+  })
+}

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-22 09:42:45
+ * @LastEditTime: 2024-04-25 09:03:50
  * @LastEditors: zhp
  * @Description:
 -->
@@ -628,7 +628,7 @@ export default {
             `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
             `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
             `<div style = "${(item.product * 100).toFixed(0) >= 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>
-           <div style = "${(item.product * 100).toFixed(0) <= 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>`
+           <div style = "${(item.product * 100).toFixed(0) <= 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
           ])
           this.cutConfig.data = cutArr
           // this.$nextTick(() => {

src/views/OperationalOverview/components/ISRAChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-04-17 15:48:21
+ * @LastEditTime: 2024-04-24 15:48:32
  * @LastEditors: zhp
  * @Description:
 -->
@@ -113,7 +113,7 @@ export default {
 				color:this.colors,
 				title:{
 					text: num,
-					subtext: '总数/片',
+					subtext: '总数/个',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-23 14:04:24
+ * @LastEditTime: 2024-04-23 15:34:56
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,6 +83,9 @@ export default {
     this.chart = null
   },
   methods: {
+    // getNumLength(num) {
+    //   return num.toString().length;
+    // },
     initChart(nameList, passRateList, outputNumList) {
       console.log(nameList, passRateList)
      let  series= [
@@ -218,11 +221,10 @@ export default {
         // },
         yAxis: [
           {
-            min: function() { // 取最小值向下取整为最小刻度
+            min: function () { // 取最小值向下取整为最小刻度
               return 0
             },
-            max: function(value) { // 取最大值向上取整为最大刻度
+            max: function (value) { // 取最大值向上取整为最大刻度
-              return Math.ceil(value.max)
             },
             scale: true,
             type: 'value',
@@ -266,8 +268,16 @@ export default {
             // },
           },
           {
-            min: 0,
+            min: function () { // 取最小值向下取整为最小刻度
-            max: 100000,
+              return 0
+            },
+            max: function (value) { // 取最大值向上取整为最大刻度
+
+              // console.log(value.max.toString().length)
+              // String(value.max)[0]
+              // for
+              // return String(value.max)[0] +
+            },
             minInterval: 5,//间隔
             scale: true,
             type: 'value',

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-23 14:06:05
+ * @LastEditTime: 2024-04-23 15:36:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -217,12 +217,11 @@ export default {
           // },
           yAxis: [
             {
-              // min: function() { // 取最小值向下取整为最小刻度
+              min: function () { // 取最小值向下取整为最小刻度
-              //   return 0
+                return 0
-              // },
+              },
-              // max: function(value) { // 取最大值向上取整为最大刻度
+              max: function (value) { // 取最大值向上取整为最大刻度
-              //   return Math.ceil(value.max)
+              },
-              // },
               scale: true,
               type: 'value',
               name: '良品率/%',
@@ -265,8 +264,16 @@ export default {
               // },
             },
             {
-              min: 0,
+              min: function () { // 取最小值向下取整为最小刻度
-              max: 100000,
+                return 0
+              },
+              max: function (value) { // 取最大值向上取整为最大刻度
+
+                // console.log(value.max.toString().length)
+                // String(value.max)[0]
+                // for
+                // return String(value.max)[0] +
+              },
               minInterval: 5,//间隔
               scale: true,
               type: 'value',

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-22 12:15:49
+ * @LastEditTime: 2024-04-26 09:57:41
  * @Description:
 -->
 <template>
@@ -37,26 +37,32 @@
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
-          <base-container :show-time="true" :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
+          <base-container :show-time="false" :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
             <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
               <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
                 <!-- <el-col :span="12"> -->
                 <!-- <div style="height: 34px;"> -->
-                <span style="display: inline-block;width: 330px;">
+                <span style="display: inline-block;width: 400px">
-                  <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
+                  <span v-if="op.name" class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name
-                  <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
+                  }}</span>
+                  <el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider>
                   <!-- <span v-if="op.size" class="split"></span> -->
                   <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
-                    op.specifications }}</span>
+                  op.specifications }}</span>
                   <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
                   <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
-                    op.planQuantity }}</span>
+                  op.planQuantity }}</span>
+                  <span v-if="op.planQuantity" class="orderFinishTwo"
+                    style="font-size: 14px;opacity: calc(.6);">片</span>
                 </span>
-                <span v-if="op.actualQuantity" class="orderFinish" style="font-size: 14px;margin-left: 130px;">{{
+                <!-- <span style="overflow: hidden;"> -->
-                  op.actualQuantity
+                <span class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
-                  }}</span>
+                op.actualQuantity
+                }}</span>
+                <span v-if="op.actualQuantity" class="orderFinishTwo" style="font-size: 14px">片</span>
                 <el-divider class="split" style="background-color: rgba(0, 255, 247, 1)" v-if="op.actualQuantity"
                   direction="vertical"></el-divider>
+                <!-- </span> -->
                 <!-- </div> -->
                 <el-progress style="width: 620px;" text-color="rgba(0, 255, 247, 1)" :stroke-width="10"
                   define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
@@ -80,7 +86,7 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container  :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
+          <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
             :title="'产线产量及良品率'" :title-icon="'productLine'">
             <div class="myLegend">
               <div class=" barCircleLegend"></div>
@@ -110,78 +116,79 @@ const qualityYearList = [
 	{
 		name: '翻转机',
 		code: 'EQ20240110112358000235',
-		status: '正常',
+		status: '运行',
     error: true,
 	},
 	{
 		name: '烘干炉',
 		code: 'EQ20240110112537000241',
-		status: '计划停机',
+		status: '停机',
     error: true,
 	},
 	{
 		name: '清洗机',
 		code: '	EQ20240110112310000232',
-    status: '正常',
+    status: '故障',
     error: true,
 	},
 	{
 		name: '钢化清洗机',
 		code: 'EQ20240110111700000208',
-    status: '正常',
+    status: '故障',
     error: true,
 	},
 	{
 		name: '固化机',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+    status: '停机',
     error: false,
 	},
 	{
 		name: '磨边清洗机',
 		code: '	EQ20240110111700000208',
-    status: '正常',
+    status: '停机',
     error: true,
 	},
 	{
 		name: '预热机',
 		code: 'EQ20240110111700000205',
-		status: '故障',
+    status: '运行',
     error: false,
 	},
 	{
 		name: '下片机',
-		code: 'EQ20240115151435000279',
+    code: 'EQ20240115151435000279',
+    status: '故障',
     error: true,
 	},
 	{
 		name: '冷却机',
 		code: 'EQ20240110111700000203',
-    status: '正常',
+    status: '运行',
     error: false,
 	},
 	{
 		name: 'A储片机106',
 		code: 'EQ20240110111700000202',
-    status: '正常',
+    status: '停机',
     error: true,
 	},
 	{
 		name: '二次清洗机',
 		code: 'EQ20240110111700000209',
-    status: '正常',
+    status: '停机',
     error: true,
 	},
 	{
 		name: '二次磨边机',
 		code: '	EQ20240110110927000181',
-    status: '正常',
+    status: '停机',
     error: false,
 	},
 	{
 		name: '测试设备',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+    status: '运行',
     error: true,
 	},
 ];
@@ -292,11 +299,11 @@ export default {
 			// equipmentList:[],
 			EnergyMonitoringList: [],
 			eqConfig: {
-				header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
+        header: ['序号', '产线名', '设备名称', '设备状态'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [70, 100, 200, 90, 90],
+				columnWidth: [70, 150, 200, 120],
 				align: ['center'],
 				data: [],
 				// index:true,
@@ -373,15 +380,15 @@ export default {
 		this.websocketClose();
 		this.SJGWebsocketClose();
 	},
-	mounted() {
+  mounted() {
 		let detData = [
 			{
 				id: '1',
-				name: '测试工单',
+        name: '镀釉光伏玻璃GW',
         progressRate: 0.933333,
         specifications: '1100*5554*22',
-        plan: 11111,
+        plan: 111111111111,
-        actualQuantity:111,
+        actualQuantity:1000000111111,
 			},
 			{
 				id: '2',
@@ -452,12 +459,12 @@ export default {
 		this.orderList = detData.map((ele, index) => {
 			if (ele.progressRate && ele.progressRate != 1) {
 				return {
-					id: ele.id,
+          id: ele.id,
-					name: ele.name,
+          name: this.getStr(String(ele.name), 8),
           progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-          specifications: ele.specifications ?  '规格' + ele.specifications :null,
+          specifications: ele.specifications ? '规格' + ele.specifications : '',
-          planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
+          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan), 6) : '',
-          actualQuantity: ele.actualQuantity + '片',
+          actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 				};
 			}
 		});
@@ -473,16 +480,14 @@ export default {
 			this.EnergyMonitoringNameList,
 			this.EnergyMonitoringList
 		);
-		let eqArr = this.qualityYearList.map((item, index) => [
+    let eqArr = this.qualityYearList.map((item, index) => [
 			`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
 			// formatDate(item.planStartTime) || '',
-			`
+      `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''}</span>`,`
           <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
-			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
 		]);
     this.eqConfig.data = eqArr;
     let data = [
@@ -561,6 +566,15 @@ export default {
 	//   removeEventListener('resize', resizeFun)
 	// },
   methods: {
+    getStr(str,num) {
+          //你要处理的字符串
+      if (str.length > num) {      //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
+        str = str.substr(0, num) + "..."   //截取从第一个字符开始，往后取10个字符，剩余的用...代替
+        return str
+      } else {
+        return str
+      }
+    },
 		getData() {
 			let processArr = qualityMonthList.map((item, index) => [
 				// console.log(item)
@@ -729,12 +743,12 @@ export default {
 					this.orderList = this.SJGWsData.detData.map((ele, index) => {
 						if (ele.progressRate && ele.progressRate != 1) {
 							return {
-								id: ele.id,
+                id: ele.id,
-								name: ele.name,
+                name: this.getStr(String(ele.name), 8),
                 progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-                specifications: ele.specifications ?  '规格' + ele.specifications :null,
+                specifications: ele.specifications ? '规格' + ele.specifications : '',
-                planQuantity: ele.planQuantity  ? '计划' + ele.planQuantity + '片' : null,
+                planQuantity: ele.planQuantity ? '计划' + this.getStr(String(ele.planQuantity),6) : '',
-                actualQuantity: ele.actualQuantity ? ele.actualQuantity + '片' : null,
+                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 							};
 						}
 					});
@@ -743,13 +757,13 @@ export default {
 					let eqArr = this.SJGWsData.detData.map((item, index) => [
 						`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''
+            }</span>`,
 						`<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
-						`<span style="color:rgba(255,255,255,0.5)">${
+
-							item.code || ''
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
-						}</span>`,
+            // `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
 					]);
           this.eqConfig.data = eqArr;
           // this.$nextTick(() => {
@@ -971,7 +985,7 @@ export default {
 
 .now-secondary-title {
   display: inline-block;
-  width: 70px;
+  width: 110px;
 	margin: 0;
 	font-size: 14px;
 	line-height: 2em;
@@ -990,16 +1004,27 @@ export default {
   width: 60px;
   margin: 0;
   font-size: 14px;
+  text-align: right;
+  color: rgba(0, 255, 247, 1);
+}
+.orderFinishTwo{
+  display: inline-block;
+  width: 15px;
+  margin: 0;
+  font-size: 14px;
   line-height: 2em;
+  // text-overflow: ellipsis;
+  // white-space: nowrap;
+  // overflow: hidden;
   text-align: right;
   color: rgba(0, 255, 247, 1);
 }
 .orderPlan {
   display: inline-block;
-  width: 100px;
+  // width: 80px;
   margin: 0;
   font-size: 14px;
-  line-height: 2em;
+  // line-height: 2em;
   color: #fff;
   text-align: left;
 }

src/views/databoard/components/GasChart.vue

@@ -1,22 +1,26 @@
 <template>
 	<div>
-		<NotMsg v-show="notMsg"/>
+		<NotMsg v-show="notMsg" />
-		<div id='gasChart' class="gas-chart" style="width:600px;height:200px;" v-show='!notMsg'></div>
+		<div
+			id="gasChart"
+			class="gas-chart"
+			style="width: 600px; height: 200px"
+			v-show="!notMsg"></div>
 	</div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
-import resize from './../mixins/resize'
+import resize from './../mixins/resize';
-import NotMsg from './../components/NotMsg'
+import NotMsg from './../components/NotMsg';
 
 export default {
 	name: 'GasChart',
 	mixins: [resize],
-	components:{ NotMsg },
+	components: { NotMsg },
 	props: {
 		chartType: '', // 能源类型
-		chartTime: ''
+		chartTime: '',
 	},
 	data() {
 		const colors = [
@@ -31,159 +35,170 @@ export default {
 		];
 		return {
 			chart: null,
-			notMsg:false
+			notMsg: false,
 		};
 	},
 	computed: {
 		gasChartMsg() {
-			return this.$store.state.websocket.sumGasInfo
+			return this.$store.state.websocket.sumGasInfo;
 		},
 		energyWeekTrend() {
-			return this.$store.state.websocket.energyWeekTrend
+			return this.$store.state.websocket.energyWeekTrend;
 		},
 		energyMonthTrend() {
-			return this.$store.state.websocket.energyMonthTrend
+			return this.$store.state.websocket.energyMonthTrend;
 		},
 		energyYearTrend() {
-			return this.$store.state.websocket.energyYearTrend
+			return this.$store.state.websocket.energyYearTrend;
-		}
+		},
 	},
 	watch: {
-		energyWeekTrend: {// 监听周电能，更新图
+		energyWeekTrend: {
+			// 监听周电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '周' && this.chartType === '电耗能') {
-					this.updateChart()
+					this.updateChart();
-					this.$emit('emitFun')
+					this.$emit('emitFun');
 				}
-			}
+			},
 		},
-		energyMonthTrend: {// 监听月电能，更新图
+		energyMonthTrend: {
+			// 监听月电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '月' && this.chartType === '电耗能') {
-					this.updateChart()
+					this.updateChart();
-					this.$emit('emitFun')
+					this.$emit('emitFun');
 				}
-			}
+			},
 		},
-		energyYearTrend: {// 监听年电能，更新图
+		energyYearTrend: {
+			// 监听年电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '年' && this.chartType === '电耗能') {
-					this.updateChart()
+					this.updateChart();
-					this.$emit('emitFun')
+					this.$emit('emitFun');
 				}
-			}
+			},
 		},
-		gasChartMsg: {// 监听天然气，更新图
+		gasChartMsg: {
+			// 监听天然气，更新图
 			handler(newVal, oldVal) {
 				if (this.chartType === '天然气I' || this.chartType === '天然气II') {
-					this.updateChart()
+					this.updateChart();
-					this.$emit('emitFun')
+					this.$emit('emitFun');
 				}
-			}
+			},
 		},
-		chartTime: {// 监听时间变化，更新图
+		chartTime: {
+			// 监听时间变化，更新图
 			handler(newVal, oldVal) {
-				this.updateChart()
+				this.updateChart();
-			}
+			},
 		},
-		chartType: {// 监听能源类型变化，更新图
+		chartType: {
+			// 监听能源类型变化，更新图
 			handler(newVal, oldVal) {
-				this.updateChart()
+				this.updateChart();
-			}
+			},
-		}
+		},
 	},
 	mounted() {
 		this.$el.addEventListener('resize', () => {
 			console.log('resziing.....');
 		});
-		this.updateChart()
+		this.updateChart();
 	},
 	methods: {
 		updateChart() {
-			let gasName  = ''
+			let gasName = '';
 			const colors = ['#FFCB59'];
-			let temp = []
+			let temp = [];
-			let seriesData = []
+			let seriesData = [];
-			let xData = []
+			let xData = [];
-			let yData = []
+			let yData = [];
 			switch (this.chartType) {
-				case '电耗能':{
+				case '电耗能': {
-					gasName = '电耗能'
+					gasName = '电耗能';
 					if (this.chartTime === '周') {
-						temp = this.energyWeekTrend || []
+						temp = this.energyWeekTrend || [];
-					}else if(this.chartTime === '月') {
+					} else if (this.chartTime === '月') {
-						temp = this.energyMonthTrend || []
+						temp = this.energyMonthTrend || [];
-					}else{
+					} else {
-						temp = this.energyYearTrend || []
+						temp = this.energyYearTrend || [];
 					}
-					temp && temp.map(i => {
+					temp &&
-						xData.push(i.time)
+						temp.map((i) => {
-						yData.push(i.qty)
+							xData.push(i.time);
-					})
+							yData.push(i.qty);
+						});
 					break;
 				}
-				case '天然气I':{
+				case '天然气I': {
 					if (this.chartTime === '周') {
-						yData = this.gasChartMsg.hisSumGas1For7Day || []
+						yData = this.gasChartMsg.hisSumGas1For7Day || [];
-					}else if(this.chartTime === '月') {
+					} else if (this.chartTime === '月') {
-						yData = this.gasChartMsg.sumGas1ForMonth || []
+						yData = this.gasChartMsg.sumGas1ForMonth || [];
-					}else{
+					} else {
-						yData = this.gasChartMsg.sumGas1ForYear || []
+						yData = this.gasChartMsg.sumGas1ForYear || [];
 					}
-					gasName = '天然气I'
+					gasName = '天然气I';
-					xData = this.getXdata()
+					xData = this.getXdata();
 					break;
 				}
 				default:
-				gasName = '天然气II'
+					gasName = '天然气II';
-				if (this.chartTime === '周') {
+					if (this.chartTime === '周') {
-						yData = this.gasChartMsg.hisSumGas2For7Day || []
+						yData = this.gasChartMsg.hisSumGas2For7Day || [];
-					}else if(this.chartTime === '月') {
+					} else if (this.chartTime === '月') {
-						yData = this.gasChartMsg.sumGas2ForMonth || []
+						yData = this.gasChartMsg.sumGas2ForMonth || [];
-					}else{
+					} else {
-						yData = this.gasChartMsg.sumGas2ForYear || []
+						yData = this.gasChartMsg.sumGas2ForYear || [];
 					}
-				xData = this.getXdata()
+					xData = this.getXdata();
 			}
 			if (yData.length === 0) {
-         this.notMsg = true
+				this.notMsg = true;
-         return
+				return;
-      } else {
+			} else {
-        this.notMsg = false
+				this.notMsg = false;
-      }
+			}
 			if (yData.length == 0) {
-				seriesData = []
+				seriesData = [];
-			}else {
+			} else {
-				seriesData = [{
+				yData = yData.map((item) => {
-					name: gasName,
+					return (item = Number(item.toFixed(2)));
-					data: yData,
+				});
-					type: "line",
+				seriesData = [
-					areaStyle: {
+					{
+						name: gasName,
+						data: yData,
+						type: 'line',
+						areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-							{ offset: 0, color: '#FFCB59' + "40" },
+								{ offset: 0, color: '#FFCB59' + '40' },
-							{ offset: 0.5, color: '#FFCB59' + "20" },
+								{ offset: 0.5, color: '#FFCB59' + '20' },
-							{ offset: 1, color: '#FFCB59' + "00" },
+								{ offset: 1, color: '#FFCB59' + '00' },
 							]),
+						},
+						lineStyle: {
+							width: 1,
+						},
+						symbol: 'circle',
+						symbolSize: 5,
+						emphasis: {
+							focus: 'series',
+						},
 					},
-					lineStyle: {
+				];
-							width: 1
-					},
-					symbol: 'circle',
-					symbolSize: 5,
-					emphasis: {
-							focus: 'series'
-					}
-				}]
-					
 			}
 			// 绘图
 			if (
-        this.chart !== null &&
+				this.chart !== null &&
-        this.chart !== '' &&
+				this.chart !== '' &&
-        this.chart !== undefined
+				this.chart !== undefined
-      ) {
+			) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
+			}
 			this.chart = echarts.init(document.getElementById('gasChart'));
 			var option = {
 				color: colors,
@@ -204,7 +219,7 @@ export default {
 					},
 				},
 				yAxis: {
-					name: this.chartType === '电耗能'?'单位kwh':'单位Nm³',
+					name: this.chartType === '电耗能' ? '单位kwh' : '单位Nm³',
 					nameTextStyle: {
 						color: '#fff',
 						fontSize: 10,
@@ -230,10 +245,10 @@ export default {
 				series: seriesData,
 				tooltip: {
 					trigger: 'axis',
-					className: "gas-tooltip"
+					className: 'gas-tooltip',
 				},
-			}
+			};
-			option && this.chart.setOption(option)
+			option && this.chart.setOption(option);
 		},
 		getXdata() {
 			const today = new Date();
@@ -242,31 +257,39 @@ export default {
 			let days = 30;
 			if (this.chartTime === '周') {
 				return Array(7)
-						.fill(1)
+					.fill(1)
-						.map((_, index) => {
+					.map((_, index) => {
-							const today = new Date();
+						const today = new Date();
-							const dtimestamp = today - (index+1) * 24 * 60 * 60 * 1000;
+						const dtimestamp = today - (index + 1) * 24 * 60 * 60 * 1000;
-							return `${new Date(dtimestamp).getMonth()+1}.${new Date(dtimestamp).getDate()}`;}).reverse()
+						return `${new Date(dtimestamp).getMonth() + 1}.${new Date(
-			}else if (this.chartTime == "月") {
+							dtimestamp
+						).getDate()}`;
+					})
+					.reverse();
+			} else if (this.chartTime == '月') {
 				if (currentMonth in [1, 3, 5, 7, 8, 10, 12]) {
 					days = 31;
 				} else if (currentMonth == 2) {
 					days = this.isLeapYear(currentYear) ? 29 : 28;
 				}
 				return Array(days)
-						.fill(1)
+					.fill(1)
-						.map((_, index) => {
+					.map((_, index) => {
-							return `${currentMonth}.${days - index}`;}).reverse()
+						return `${currentMonth}.${days - index}`;
+					})
+					.reverse();
 			} else {
 				return Array(12)
-						.fill(1)
+					.fill(1)
-						.map((_, index) => {
+					.map((_, index) => {
-							return `${12 - index}`;}).reverse()
+						return `${12 - index}`;
+					})
+					.reverse();
 			}
 		},
 		isLeapYear(year) {
 			return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
-		}
+		},
 	},
 };
 </script>
@@ -278,12 +301,12 @@ export default {
 }
 </style>
 <style>
-  .gas-tooltip {
+.gas-tooltip {
-    background: #0a2b4f77 !important;
+	background: #0a2b4f77 !important;
-    border: none !important;
+	border: none !important;
-    backdrop-filter: blur(12px);
+	backdrop-filter: blur(12px);
-  }
+}
-  .gas-tooltip * {
+.gas-tooltip * {
-    color: #fff !important;
+	color: #fff !important;
-  }
+}
 </style>

src/views/databoard/components/ISRAChart.vue

@@ -1,70 +1,91 @@
 <template>
 	<div>
-		<NotMsg v-show="notMsg"/>
+		<NotMsg v-show="notMsg" />
-		<div id="israChart" class="isra-chart" style="width:600px;height:390px;" v-show='!notMsg'></div>
+		<div
+			id="israChart"
+			class="isra-chart"
+			style="width: 600px; height: 390px"
+			v-show="!notMsg"></div>
 	</div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
-import resize from './../mixins/resize'
+import resize from './../mixins/resize';
-import NotMsg from './../components/NotMsg'
+import NotMsg from './../components/NotMsg';
 
 export default {
 	name: 'ISRAChart',
 	mixins: [resize],
-	components:{ NotMsg },
+	components: { NotMsg },
 	props: {},
 	data() {
 		return {
 			chart: null,
-			notMsg:true,
+			notMsg: true,
-			colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
+			colors: ['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
-			chartData: []
+			chartData: [],
 		};
 	},
-	activated() {
+	activated() {},
-	},
 	computed: {
 		israChartMsg() {
-			return this.$store.state.websocket.israKiln
+			return this.$store.state.websocket.israKiln;
-		}
+		},
 	},
 	watch: {
 		israChartMsg: {
 			handler(newVal, oldVal) {
-				this.chartData = newVal || []
+				this.chartData = newVal || [];
-				this.updateChart()
+				this.updateChart();
-				this.$emit('emitFun')
+				this.$emit('emitFun');
-			}
+			},
-		}
+		},
 	},
 	methods: {
+		getEqualNewlineString(params, length) {
+			let text = '';
+			let count = Math.ceil(params.length / length); // 向上取整数
+			// 一行展示length个
+			if (count > 1) {
+				for (let z = 1; z <= count; z++) {
+					text += params.substr((z - 1) * length, length);
+					if (z < count) {
+						text += '\n';
+					}
+				}
+			} else {
+				text += params.substr(0, length);
+			}
+			return text;
+		},
 		updateChart() {
-			console.log('update')
+			console.log('update');
-			let num = 0
+			let num = 0;
-			this.chartData && this.chartData.length > 0 && this.chartData.map(i => {
+			this.chartData &&
-				num+=i.num
+				this.chartData.length > 0 &&
-			})
+				this.chartData.map((i) => {
+					num += i.num;
+				});
 			if (
-        this.chart !== null &&
+				this.chart !== null &&
-        this.chart !== '' &&
+				this.chart !== '' &&
-        this.chart !== undefined
+				this.chart !== undefined
-      ) {
+			) {
-        this.chart.dispose()
+				this.chart.dispose();
-      }
+			}
 			if (this.chartData && this.chartData.length > 0) {
-         this.notMsg = false
+				this.notMsg = false;
-      } else {
+			} else {
-        this.notMsg = true
+				this.notMsg = true;
-				return
+				return;
-      }
+			}
 			this.chart = echarts.init(document.getElementById('israChart'));
 			var option = {
-				color:this.colors,
+				color: this.colors,
-				title:{
+				title: {
 					text: num,
-					subtext: '总数',
+					subtext: '总数/个',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',
@@ -81,55 +102,92 @@ export default {
 					bottom: '2%',
 					left: 'center',
 					itemWidth: 18,
-					itemHeight:18,
+					itemHeight: 18,
 					icon: 'circle',
 					textStyle: {
-						color: '#fff'
+						color: '#fff',
 					},
-					data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
+					data:
-						name:item.name,
+						this.chartData &&
-						itemStyle:{
+						this.chartData.length > 0 &&
-							color: this.colors[index%4]
+						this.chartData.map((item, index) => ({
-						}
+							name: item.name,
-					}))
+							itemStyle: {
+								color: this.colors[index % 4],
+							},
+						})),
 				},
-				series:[{
+				series: [
+					{
 						name: 'ISRA缺陷检测',
 						type: 'pie',
 						center: ['50%', '40%'],
 						radius: ['45%', '70%'],
 						avoidLabelOverlap: true,
+						// label: {
+						// 	show: true,
+						// },
+						// labelLine: {
+						// 	show: true,
+						// },
 						label: {
-							show: false
+							show: true,
+							normal: {
+								alignTo: 'labelLine',
+								margin: 10,
+								edgeDistance: 10,
+								lineHeight: 16,
+								formatter: (params) => {
+									//调用自定义显示格式
+									return this.getEqualNewlineString(
+										params.value + ' | ' + params.percent.toFixed(0) + '%'
+									);
+								},
+								textStyle: {
+									// 提示文字的样式
+									// color: '#595959',
+									fontSize: 16,
+								},
+							},
 						},
 						labelLine: {
 							show: true,
+							length: 25,
+							length2: 10,
 						},
-						data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
+						data:
-						name:item.name,
+							this.chartData &&
-						value: item.num,
+							this.chartData.length > 0 &&
-						itemStyle:{
+							this.chartData.map((item, index) => ({
-							color:{
+								name: item.name,
-								type: 'linear',
+								value: item.num,
-								x: 1,
+								label: {
-								y: 1,
+									color: this.colors[index % 4],
-								x2: 0,
+								},
-								y2: 0,
+								itemStyle: {
-								global: false,
+									color: {
-								colorStops:[
+										type: 'linear',
-									{offset: 0,color: this.colors[index%4]},
+										x: 1,
-									{offset: 1,color: this.colors[index%4]+'33'}
+										y: 1,
-								]
+										x2: 0,
-							}
+										y2: 0,
-						}
+										global: false,
-					}))}],
+										colorStops: [
-					tooltip: {
+											{ offset: 0, color: this.colors[index % 4] },
-						trigger: 'item',
+											{ offset: 1, color: this.colors[index % 4] + '33' },
-						className: "isra-chart-tooltip"
+										],
+									},
+								},
+							})),
 					},
-			}
+				],
+				tooltip: {
+					trigger: 'item',
+					className: 'isra-chart-tooltip',
+				},
+			};
 			this.chart.setOption(option);
-		}
+		},
 	},
 };
 </script>
@@ -141,12 +199,12 @@ export default {
 }
 </style>
 <style>
-  .isra-chart-tooltip {
+.isra-chart-tooltip {
-    background: #0a2b4f77 !important;
+	background: #0a2b4f77 !important;
-    border: none !important;
+	border: none !important;
-    backdrop-filter: blur(12px);
+	backdrop-filter: blur(12px);
-  }
+}
-  .isra-chart-tooltip * {
+.isra-chart-tooltip * {
-    color: #fff !important;
+	color: #fff !important;
-  }
+}
 </style>

src/views/databoard/deepProcessing/EqAlarm.vue

@@ -1,77 +1,95 @@
 <template>
-  <div style="flex: 1;">
+	<div style="flex: 1">
-    <Container name="设备报警" size="middle" style="">
+		<Container
-      <TimePrompt class="timeShow" :timestr="timestr" />
+			name="设备报警"
-      <div style="padding: 5px 10px;">
+			size="middle"
-        <dv-scroll-board :config="config" style="width:575px;height:380px" ref='eqScrollBoard'/>
+			style="">
-      </div>
+			<TimePrompt
-    </Container>
+				class="timeShow"
-  </div>
+				:timestr="timestr" />
+			<div style="padding: 5px 10px">
+				<dv-scroll-board
+					:config="config"
+					style="width: 575px; height: 380px"
+					ref="eqScrollBoard" />
+			</div>
+		</Container>
+	</div>
 </template>
 <script>
 import Container from '../components/Container.vue';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
 export default {
-  name: 'EqAlarm',
+	name: 'EqAlarm',
-  components: { Container, TimePrompt },
+	components: { Container, TimePrompt },
-  computed: {
+	computed: {
-    sjgEquipment() {
+		sjgEquipment() {
-      return this.$store.state.websocket.sjgEquipment
+			return this.$store.state.websocket.sjgEquipment;
-    }
+		},
-  },
+	},
-  data() {
+	data() {
-    return {
+		return {
-      timestr: '',
+			timestr: '',
-      config: {
+			config: {
-        header: ['序号', '设备名称', '设备编码','设备状态','是否故障'],
+				header: ['序号', '产线名', '设备名称', '设备状态'],
-        headerBGC: 'rgba(32, 55, 96, 0.8)',
+				headerBGC: 'rgba(32, 55, 96, 0.8)',
-        oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
-        evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [60, 150, 190],
+				columnWidth: [60, 120, 280],
-        align: ['center'],
+				align: ['center'],
-        data: [],
+				data: [],
-        // data: [
+				// data: [
-        //   [1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
+				//   [1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
-        //   [2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
+				//   [2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
-        //   [3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
+				//   [3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
-        //   [4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
+				//   [4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
-        //   [5, '11线下片台', '	EQ20240110130743000250', '正常', '否'],
+				//   [5, '11线下片台', '	EQ20240110130743000250', '正常', '否'],
-        //   [6, '10线下片台', '	EQ20240110130743000250', '正常', '否'],
+				//   [6, '10线下片台', '	EQ20240110130743000250', '正常', '否'],
-        //   [7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
+				//   [7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
-        //   [8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
+				//   [8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
-        //   [9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
+				//   [9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
-        //   [10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
+				//   [10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
-        // ],
+				// ],
-        rowNum: 10
+				rowNum: 10,
-      }
+			},
-    }
+		};
-  },
+	},
-  mounted(){
+	mounted() {
-    this.timestr = switchShowTime('日')
+		this.timestr = switchShowTime('日');
-  },
+	},
-  watch:{
+	watch: {
-    sjgEquipment: {
+		sjgEquipment: {
 			handler(newVal, oldVal) {
-        let outArr = this.sjgEquipment.map((item, index) => [
+				let outArr = this.sjgEquipment.map((item, index) => [
-          index+1,
+					index + 1,
-          `<span title=${item.name || ''}>${item.name || ''}</span>`,
+					`<span title=${item.lineName || ''}>${item.lineName || ''}</span>`,
-          `<span title=${item.code || ''}>${item.code || ''}</span>`,
+					`<span title=${item.name || ''}>${item.name || ''}</span>`,
-          item.status,
+					`<span><div style="${
-          item.error? '是': '否'
+						item.status == '运行'
-      ]);
+							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
-        this.config.data = outArr
+							: item.status == '故障'
-        this.$refs['eqScrollBoard'].updateRows(outArr)
+							? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
-        this.timestr = switchShowTime('日')
+							: 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
-			}
+					}"></div>  ${item.status || ''}</span>`,
-		}
+					// `<span"><div style="${
-  }
+					// 	item.error == false
-}
+					// 		? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+					// 		: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
+					// }"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
+				]);
+				this.config.data = outArr;
+				this.$refs['eqScrollBoard'].updateRows(outArr);
+				this.timestr = switchShowTime('日');
+			},
+		},
+	},
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .timeShow {
-  position: absolute;
+	position: absolute;
-  top: 20px;
+	top: 20px;
-  left: 170px;
+	left: 170px;
 }
-</style>
+</style>

src/views/databoard/deepProcessing/WorkOrderMonitoring.vue

@@ -1,67 +1,88 @@
 <template>
-  <Container name="工单监控" size="middle" style="">
+	<Container
-    <TimePrompt class="timeShow" :timestr="timestr" />
+		name="工单监控"
-    <div style="padding: 5px 10px;" class="WOMonitoring">
+		size="middle"
-      <dv-scroll-board :config="config" style="width:900px;height:380px" ref='worderScrollBoard'/>
+		style="">
-    </div>
+		<TimePrompt
-  </Container>
+			class="timeShow"
+			:timestr="timestr" />
+		<div
+			style="padding: 5px 10px"
+			class="WOMonitoring">
+			<dv-scroll-board
+				:config="config"
+				style="width: 900px; height: 380px"
+				ref="worderScrollBoard" />
+		</div>
+	</Container>
 </template>
 <script>
 import Container from '../components/Container.vue';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
-import { formatDate } from '@/utils'
+import { formatDate } from '@/utils';
 export default {
-  name: 'WorkOrderMonitoring',
+	name: 'WorkOrderMonitoring',
-  components: { Container, TimePrompt },
+	components: { Container, TimePrompt },
-  computed: {
+	computed: {
-    order() {
+		order() {
-      return this.$store.state.websocket.workOrder
+			return this.$store.state.websocket.workOrder;
-    }
+		},
-  },
+	},
-  data() {
+	data() {
-    return {
+		return {
-      timestr: '',
+			timestr: '',
-      config: {
+			config: {
-        header: ['序号', '工单名称', '规格','产线','工单状态', '计划完成时间','计划产量','实际产量'],
+				header: [
-        headerBGC: 'rgba(32, 55, 96, 0.8)',
+					'序号',
-        oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+					'工单名称',
-        evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+					'规格',
-        columnWidth: [60, 120, 120, 60, 100, 150],
+					'产线',
-        align: ['center'],
+					'工单状态',
-        data: [],
+					'计划完成时间',
-        rowNum:10
+					'计划产量',
-      }
+					'实际产量',
-    }
+					'完成进度',
-  },
+				],
-  mounted(){
+				headerBGC: 'rgba(32, 55, 96, 0.8)',
-    this.timestr = switchShowTime('日')
+				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
-  },
+				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-  watch:{
+				columnWidth: [60, 120, 120, 60, 100, 150],
-    order: {
+				align: ['center'],
+				data: [],
+				rowNum: 10,
+			},
+		};
+	},
+	mounted() {
+		this.timestr = switchShowTime('日');
+	},
+	watch: {
+		order: {
 			handler(newVal, oldVal) {
-        let outArr = this.order.map((item, index) => [
+				let outArr = this.order.map((item, index) => [
-          index+1,
+					index + 1,
-          `<span title=${item.name || ''}>${item.name || ''}</span>`,
+					`<span title=${item.name || ''}>${item.name || ''}</span>`,
-          item.specifications,
+					item.specifications,
-          item.lines,
+					item.lines,
-          this.getDictDatas(this.DICT_TYPE.ORDER_STATUS)[item.status]?.label,
+					this.getDictDatas(this.DICT_TYPE.ORDER_STATUS)[item.status]?.label,
-          formatDate(item.planFinishTime),
+					formatDate(item.planFinishTime),
-          item.planQuantity,
+					item.planQuantity,
-          item.planAssignQuantity
+					item.actualQuantity,
-      ]);
+					(item.progressRate * 100).toFixed(0) + '%',
-        this.config.data = outArr
+				]);
-        this.$refs['worderScrollBoard'].updateRows(outArr)
+				this.config.data = outArr;
-        this.timestr = switchShowTime('日')
+				this.$refs['worderScrollBoard'].updateRows(outArr);
-			}
+				this.timestr = switchShowTime('日');
-		}
+			},
-  }
+		},
-}
+	},
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .timeShow {
-  position: absolute;
+	position: absolute;
-  top: 20px;
+	top: 20px;
-  left: 170px;
+	left: 170px;
 }
-</style>
+</style>

src/views/databoard/kiln/EnergeCost.vue

@@ -1,22 +1,24 @@
-<!-- 
-    filename: MaterialCost.vue
-    author: liubin
-    date: 2023-12-06 09:09:27
-    description: 
--->
-
 <template>
-	<Container name="能耗" size="middle" style="">
+	<Container
-		<TimePrompt class="timeShow" :timestr="timestr" />
+		name="能耗"
+		size="middle"
+		style="">
 		<EnergeTop />
 		<SplitLine :horizontal="true" />
-		<div class="" style="flex: 2; padding: 8px">
+		<div
+			class=""
+			style="flex: 2; padding: 8px">
 			<div
 				class="header-line"
 				style="margin: 8px 0 16px; display: flex; align-items: center">
-				<h2 class="" style="margin: 0; color: #0ee8fe; margin-right: 12px">
+				<h2
+					class=""
+					style="margin: 0; color: #0ee8fe; margin-right: 12px">
 					能耗趋势图
 				</h2>
+				<TimePrompt
+					class="timeShow"
+					:timestr="timestr" />
 				<!-- <Switcher /> -->
 				<div>
 					<!-- <span class="lgd lgd-total">总量</span> -->
@@ -32,11 +34,21 @@
 					justify-content: space-between;
 				">
 				<SelectorBtnGroup
-					:options="['电耗能', '天然气I', '天然气II']" @emitFun='toggleType' :active='chartType'/>
+					:options="['电耗能', '天然气I', '天然气II']"
-				<SelectorBtnGroup :options="['周', '月', '年']" @emitFun='toggleDate' :active='chartTime'/>
+					@emitFun="toggleType"
+					:active="chartType" />
+				<SelectorBtnGroup
+					:options="['周', '月', '年']"
+					@emitFun="toggleDate"
+					:active="chartTime" />
 			</div>
-			<div class="chart" style="height: 200px; margin-top: 8px;">
+			<div
-				<GasChart :chartType='chartType' :chartTime='chartTime' @emitFun='dateUpdate'/>
+				class="chart"
+				style="height: 200px; margin-top: 8px">
+				<GasChart
+					:chartType="chartType"
+					:chartTime="chartTime"
+					@emitFun="dateUpdate" />
 			</div>
 		</div>
 	</Container>
@@ -51,7 +63,7 @@ import EnergeTop from './EnergeTop';
 import GasChart from '../components/GasChart.vue';
 import SelectorBtnGroup from '../components/SelectorBtnGroup';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
 export default {
 	name: 'EnergeCost',
 	components: {
@@ -61,48 +73,43 @@ export default {
 		EnergeTop,
 		GasChart,
 		SelectorBtnGroup,
-		TimePrompt
+		TimePrompt,
 	},
 	props: {},
 	data() {
 		return {
-			chartType:'电耗能',
+			chartType: '电耗能',
-			chartTime:'周',
+			chartTime: '周',
-			timestr: ''
+			timestr: '',
 		};
 	},
 	mounted() {
-    this.timestr = switchShowTime(this.chartTime)
+		this.timestr = switchShowTime(this.chartTime);
-  },
+	},
 	computed: {
 		gasInfoMsg() {
-			return this.$store.state.websocket.gasInfo
+			return this.$store.state.websocket.gasInfo;
 		},
 	},
 	methods: {
 		// 切换能源
 		toggleType(val) {
-			this.chartType = val
+			this.chartType = val;
 		},
 		// 切换时间
 		toggleDate(val) {
-			this.chartTime = val
+			this.chartTime = val;
-			this.timestr = switchShowTime(val)
+			this.timestr = switchShowTime(val);
 		},
 		// 数据更新
-    dateUpdate() {
+		dateUpdate() {
-      this.timestr = switchShowTime(this.chartTime)
+			this.timestr = switchShowTime(this.chartTime);
-    }
+		},
 	},
 };
 </script>
 
 <style scoped lang="scss">
-.timeShow {
-  position: absolute;
-  top: 20px;
-  left: 120px;
-}
 .lgd {
 	color: #fff;
 

src/views/databoard/kiln/GasHandle.vue

@@ -1,7 +1,11 @@
 <template>
-	<div class="gas-handle" style="flex: 2">
+	<div
-		<Container name="烟气处理" size="large" style="">
+		class="gas-handle"
-			<TimePrompt class="timeShow" :timestr="timestr" />
+		style="flex: 2">
+		<Container
+			name="烟气处理"
+			size="large"
+			style="">
 			<div
 				class=""
 				style="
@@ -24,7 +28,13 @@
 						">
 						氧气含量
 					</span>
-					<span style="font-size: 20px; line-height: 1.24; flex: 1">{{exhaustGasInfo?.O2_float ? (Number(exhaustGasInfo.O2_float)).toFixed(2) : ''}}%</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">
+						{{
+							exhaustGasInfo?.O2_float
+								? Number(exhaustGasInfo.O2_float).toFixed(2)
+								: ''
+						}}%
+					</span>
 				</ShadowRect>
 				<ShadowRect>
 					<div
@@ -33,13 +43,19 @@
 							line-height: 1.24;
 							flex: 1;
 							text-align: right;
-							padding:5px 8px 5px 0;
+							padding: 5px 8px 5px 0;
 							letter-spacing: 3px;
 						">
 						<p style="margin: 0; line-height: inherit">氮氧化物</p>
 						<p style="margin: 0; line-height: inherit">排放浓度</p>
 					</div>
-					<span style="font-size: 20px; line-height: 1.24; flex: 1.2">{{exhaustGasInfo?.NOX_float ? (Number(exhaustGasInfo.NOX_float)).toFixed(2) : ''}}mg/m³</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1.2">
+						{{
+							exhaustGasInfo?.NOX_float
+								? Number(exhaustGasInfo.NOX_float).toFixed(2)
+								: ''
+						}}mg/m³
+					</span>
 				</ShadowRect>
 
 				<ShadowRect>
@@ -49,16 +65,22 @@
 							line-height: 1.24;
 							flex: 1;
 							text-align: right;
-							padding:5px 8px 5px 0;
+							padding: 5px 8px 5px 0;
 							letter-spacing: 3px;
 						">
 						<p style="margin: 0; line-height: inherit">二氧化硫</p>
 						<p style="margin: 0; line-height: inherit">排放浓度</p>
 					</div>
-					<span style="font-size: 20px; line-height: 1.24; flex: 1">{{exhaustGasInfo?.SO2_float ? (Number(exhaustGasInfo.SO2_float)).toFixed(2) : ''}}mg/m³</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">
+						{{
+							exhaustGasInfo?.SO2_float
+								? Number(exhaustGasInfo.SO2_float).toFixed(2)
+								: ''
+						}}mg/m³
+					</span>
 				</ShadowRect>
 
-				<ShadowRect>
+				<!-- <ShadowRect>
 					<span
 						style="
 							font-size: 20px;
@@ -70,17 +92,30 @@
 						">
 						颗粒物浓度
 					</span>
-					<span style="font-size: 20px; line-height: 1.24; flex: 1.2">{{exhaustGasInfo?.dust_float ? (Number(exhaustGasInfo.dust_float)).toFixed(2) : ''}}mg/m³</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1.2">
-				</ShadowRect>
+						{{
+							exhaustGasInfo?.dust_float
+								? Number(exhaustGasInfo.dust_float).toFixed(2)
+								: ''
+						}}mg/m³
+					</span>
+				</ShadowRect> -->
 			</div>
 			<KilnLine :horizontal="true" />
-			<div class="" style="flex: 2; padding: 8px">
+			<div
+				class=""
+				style="flex: 2; padding: 8px">
 				<div
 					class="header-line"
 					style="margin-bottom: 10px; display: flex; align-items: center">
-					<h2 class="" style="margin: 5px 0; color: #0ee8fe; margin-right: 12px">
+					<h2
+						class=""
+						style="margin: 5px 0; color: #0ee8fe; margin-right: 12px">
 						烟气趋势图
 					</h2>
+					<TimePrompt
+						class="timeShow"
+						:timestr="timestr" />
 					<!-- <Switcher /> -->
 					<div>
 						<!-- <span class="lgd lgd-total">总量</span> -->
@@ -95,12 +130,23 @@
 						align-items: center;
 						justify-content: space-between;
 					">
+					<!-- :options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" -->
 					<SelectorBtnGroup
-						:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" @emitFun='toggleType' :active='chartType'/>
+						:options="['氧气含量', '二氧化硫', '氮氧化物']"
-					<SelectorBtnGroup :options="['日', '周', '月', '年']" @emitFun='toggleDate' :active='chartTime' />
+						@emitFun="toggleType"
+						:active="chartType" />
+					<SelectorBtnGroup
+						:options="['日', '周', '月', '年']"
+						@emitFun="toggleDate"
+						:active="chartTime" />
 				</div>
-				<div class="chart" style="height: 250px;margin-top: 10px;">
+				<div
-					<FlueGasChart :chartType='chartType' :chartTime='chartTime' @emitFun='dateUpdate'/>
+					class="chart"
+					style="height: 250px; margin-top: 10px">
+					<FlueGasChart
+						:chartType="chartType"
+						:chartTime="chartTime"
+						@emitFun="dateUpdate" />
 				</div>
 			</div>
 		</Container>
@@ -115,7 +161,7 @@ import KilnLine from '../components/line';
 import SelectorBtnGroup from '../components/SelectorBtnGroup';
 import FlueGasChart from '../components/FlueGasChart';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
 
 export default {
 	name: 'GasHandle',
@@ -125,49 +171,44 @@ export default {
 		KilnLine,
 		SelectorBtnGroup,
 		FlueGasChart,
-		TimePrompt
+		TimePrompt,
 	},
 	props: {},
 	data() {
 		return {
-			chartType:'氧气含量',
+			chartType: '氧气含量',
-			chartTime:'日',
+			chartTime: '日',
-			timestr: ''
+			timestr: '',
 		};
 	},
 	computed: {
 		exhaustGasInfo() {
-			return this.$store.state.websocket.exhaustGasInfo
+			return this.$store.state.websocket.exhaustGasInfo;
-		}
+		},
 	},
 	mounted() {
-    this.timestr = switchShowTime(this.chartTime)
+		this.timestr = switchShowTime(this.chartTime);
-  },
+	},
 	methods: {
 		// 烟气
 		toggleType(val) {
-			console.log('烟气' + val)
+			console.log('烟气' + val);
-			this.chartType = val
+			this.chartType = val;
 		},
 		// 切换时间
 		toggleDate(val) {
-			this.chartTime = val
+			this.chartTime = val;
-			this.timestr = switchShowTime(val)
+			this.timestr = switchShowTime(val);
 		},
 		// 数据更新
-    dateUpdate() {
+		dateUpdate() {
-      this.timestr = switchShowTime(this.chartTime)
+			this.timestr = switchShowTime(this.chartTime);
-    }
+		},
 	},
 };
 </script>
 
 <style scoped lang="scss">
-.timeShow {
-  position: absolute;
-  top: 20px;
-  left: 170px;
-}
 .gas-handle {
 }
 

src/views/databoard/kiln/MaterialCost.vue

@@ -3,6 +3,9 @@
 		name="原料用量统计"
 		size="middle"
 		style="">
+		<TimePrompt
+			class="timeShow"
+			:timestr="timestr" />
 		<div style="flex: 1; display: flex; gap: 8px; flex-direction: column">
 			<div
 				class="absolute"
@@ -10,8 +13,8 @@
 					flex: 2;
 					padding: 12px 12px 0 12px;
 					display: grid;
-					grid-template-columns: repeat(2, 1fr);
+					grid-template-columns: repeat(3, 1fr);
-					grid-auto-rows: repeat(4, 1fr);
+					grid-auto-rows: repeat(3, 1fr);
 					gap: 8px;
 				">
 				<ShadowRect
@@ -22,7 +25,8 @@
 						class="material"
 						style="
 							flex: 1;
-							padding-bottom: 3px;
+							padding-bottom: 18px;
+							padding-top: 18px;
 							display: flex;
 							flex-direction: column;
 							gap: 4px;
@@ -53,20 +57,33 @@
 <script>
 import Container from '../components/Container';
 import ShadowRect from '../components/ShadowRect.vue';
+import TimePrompt from '../components/TimePrompt';
+import { switchShowTime } from '../utils';
 export default {
 	name: 'MaterialCost',
-	components: { Container, ShadowRect },
+	components: { Container, ShadowRect, TimePrompt },
 	props: {},
 	data() {
-		return {};
+		return {
+			timestr: '',
+		};
 	},
 	computed: {
 		materialMsg() {
 			return this.$store.state.websocket.material;
 		},
 	},
+	mounted() {
+		this.timestr = switchShowTime('日');
+	},
 	methods: {},
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss" scoped>
+.timeShow {
+	position: absolute;
+	top: 20px;
+	left: 210px;
+}
+</style>

src/views/databoard/utils/index.js

@@ -29,6 +29,8 @@ export const switchShowTime = (type) => {
       }
       if (lastMonth === 12) {
         startYear = currentYear - 1
+      }else{
+        startYear = currentYear
       }
       startTime = startYear+'.'+lastMonth+'.'+day
       endTime = currentYear+'.'+(nowTime.getMonth()+1)+'.28'

src/views/databoard/wholePlant/OrderStatus.vue

@@ -1,70 +1,94 @@
 <template>
-  <div style="flex: 1;" class="orderContainer">
+	<div
-    <Container name="订单完成情况" size="small" style="">
+		style="flex: 1"
-      <TimePrompt class="timeShow" :timestr="timestr" />
+		class="orderContainer">
-      <div style="padding: 5px 10px;">
+		<Container
-        <dv-scroll-board :config="config" style="width:575px;height:230px" ref='orderScrollBoard'/>
+			name="订单完成情况"
-      </div>
+			size="small"
-    </Container>
+			style="">
-  </div>
+			<TimePrompt
+				class="timeShow"
+				:timestr="timestr" />
+			<div style="padding: 5px 10px">
+				<dv-scroll-board
+					:config="config"
+					style="width: 575px; height: 230px"
+					ref="orderScrollBoard" />
+			</div>
+		</Container>
+	</div>
 </template>
 <script>
-import Container from '../components/Container'
+import Container from '../components/Container';
 import TimePrompt from '../components/TimePrompt';
-import { formatDate } from '@/utils'
+import { formatDate } from '@/utils';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
 export default {
-  name: 'OrderStatus',
+	name: 'OrderStatus',
-  components: { Container, TimePrompt },
+	components: { Container, TimePrompt },
-  computed: {
+	computed: {
-    order() {
+		order() {
-      return this.$store.state.websocket.order
+			return this.$store.state.websocket.order;
-    }
+		},
-  },
+	},
-  data() {
+	data() {
-    return {
+		return {
-      timestr: '',
+			timestr: '',
-      config: {
+			config: {
-        header: ['上线时间', '客户名称', '规格','完成度'],
+				header: ['上线时间', '客户名称', '规格', '完成度'],
-        headerBGC: 'rgba(32, 55, 96, 0.8)',
+				headerBGC: 'rgba(32, 55, 96, 0.8)',
-        oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
-        evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [155, 160, 150],
+				columnWidth: [155, 160, 150],
-        data: [],
+				data: [],
-        rowNum: 6
+				rowNum: 6,
-      }
+			},
-    }
+		};
-  },
+	},
-  mounted() {
+	mounted() {
-    this.timestr = switchShowTime('日')
+		this.timestr = switchShowTime('日');
-  },
+	},
-  watch:{
+	watch: {
-    order:{
+		order: {
-      handler() {
+			handler() {
-        let outArr = this.order.map((item) => [
+				let outArr = this.order.map((item) => [
-        formatDate(item.planStartTime) || '',
+					formatDate(item.planStartTime) || '',
-          `<span title=${item.customerName || ''}>${item.customerName || ''}</span>`,
+					`<span title=${item.customerName || ''}>${
-          `<span title=${item.specifications || ''}>${item.specifications || ''}</span>`,
+						item.customerName || ''
-          `<span style="display:inline-block;width:60px;">${item.completeRate?(item.completeRate*100).toFixed(2)+'%':'0%'}</span>
+					}</span>`,
+					`<span title=${item.specifications || ''}>${
+						item.specifications || ''
+					}</span>`,
+					`<span style="display:inline-block;width:60px;">${
+						item.completeRate
+							? (item.completeRate * 100).toFixed(2) + '%'
+							: '0%'
+					}</span>
           <div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;">
             <svg xmlns="http://www.w3.org/200/svg" height="20" width="20">
               <circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/>
-              <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${item.completeRate?item.completeRate.toFixed(2)*37.68+','+((1-item.completeRate.toFixed(2))*37.68):(0+','+37.68)}"/>
+              <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${
+								item.completeRate
+									? item.completeRate.toFixed(2) * 37.68 +
+									  ',' +
+									  (1 - item.completeRate.toFixed(2)) * 37.68
+									: 0 + ',' + 37.68
+							}"/>
             </svg>
-          </div>`
+          </div>`,
-      ]);
+				]);
-      this.config.data = outArr
+				this.config.data = outArr;
-      this.$refs['orderScrollBoard'].updateRows(outArr)
+				this.$refs['orderScrollBoard'].updateRows(outArr);
-      this.timestr = switchShowTime('日')
+				this.timestr = switchShowTime('日');
-      }
+			},
-    }
+		},
-  }
+	},
-}
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .timeShow {
-  position: absolute;
+	position: absolute;
-  top: 20px;
+	top: 20px;
-  left: 210px;
+	left: 210px;
 }
-</style>
+</style>

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-25 15:44:49
+ * @LastEditTime: 2024-04-22 15:04:40
  * @Description:
 -->
 <template>
@@ -165,7 +165,7 @@ import SmallTitle from './SmallTitle';
 import { parseTime } from '@/utils/ruoyi';
 import attrAdd from './attr-add';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { getDepartmentList } from "@/api/base/coreDepartment";
 import { groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { getDictDataLabel } from '@/utils/dict';
 
@@ -289,7 +289,7 @@ export default {
 				return item
 			}) || [];
 			// 部门列表
-			const res1 = await getCoreDepartmentList();
+			const res1 = await getDepartmentList();
 			this.departmentOptions = res1.data || []
 			// 巡检人
 			let inspectorList = [];

src/views/equipment/base/inspection/Settings/add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-15 18:38:52
+ * @LastEditTime: 2024-04-22 14:56:03
  * @Description:
 -->
 <template>
@@ -99,7 +99,7 @@ import {
 	createCheckOrder,
 	updateCheckOrder,
 } from '@/api/equipment/base/inspection/settings';
-import { getCoreDepartmentList } from '@/api/base/coreDepartment';
+import { getDepartmentList } from '@/api/base/coreDepartment';
 import { groupClassesListAll } from '@/api/monitoring/teamProduction';
 import { getDictDataLabel } from '@/utils/dict';
 // import { getEquipmentAll } from '@/api/base/equipment'
@@ -195,7 +195,7 @@ export default {
 		},
 		async getDict() {
 			// 部门列表
-			const res = await getCoreDepartmentList();
+			const res = await getDepartmentList();
 			this.departmentOptions = res.data || [];
 			const res1 = await groupClassesListAll();
 			this.groupOptions =

src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue

@@ -320,7 +320,7 @@ export default {
 		async getList(source = 'department') {
 			const urls = [
 				'/base/core-production-line/listAll',
-				'/base/core-department/listAll',
+				'/system/dept/list-all-simple',
 				'/base/core-worker/listAll',
 			];
 			let res;

src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue

@@ -540,7 +540,7 @@ export default {
 		async getList(source = 'department') {
 			const urls = [
 				'/base/core-production-line/listAll',
-				'/base/core-department/listAll',
+				'system/dept/list-all-simple',
 				'/base/core-worker/listAll',
 			];
 			let res;

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

@@ -609,7 +609,7 @@ export default {
 		async getList(source = 'department') {
 			const urls = [
 				'/base/core-production-line/listAll',
-				'/base/core-department/listAll',
+				'/system/dept/list-all-simple',
 				'/base/core-worker/listAll',
 			];
 			let res;

src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-13 15:55:36
+ * @LastEditTime: 2024-04-19 17:13:45
  * @Description:
 -->
 <template>
@@ -114,7 +114,7 @@
 import basicAdd from '../../../../core/mixins/basic-add';
 // import { getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct";
 import { getWorkerList } from '@/api/base/worker'
-import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { getDepartmentList } from "@/api/base/coreDepartment";
 import { createPlan, updatePlan, getCode, getPlan } from '@/api/equipment/base/maintain/planconfig';
 import { getCorePLList } from '@/api/base/coreProductionLine';
 import { parseTime } from '../../../../core/mixins/code-filter';
@@ -175,7 +175,7 @@ export default {
 		async getDict() {
 			// 部门列表
 			this.menuOptions = []
-			const res = await getCoreDepartmentList();
+			const res = await getDepartmentList();
 			this.departmentlList = res.data.map(item => {
 				item.parentId = item.parentId ? item.parentId : 0
 				return item

src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue

@@ -25,6 +25,14 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="24">
+        <el-form-item label="重置方式" prop="resetMethod" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-radio-group v-model="dataForm.resetMethod">
+            <el-radio :label="0">自动</el-radio>
+            <el-radio :label="1">手动</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
       <el-col :span="24">
         <el-form-item label="检测内容" prop="inspectionDetIdList"
           :rules="[{ required: true, message: '不能为空', trigger: 'change' }]">
@@ -109,6 +117,7 @@ export default {
         sectionId: null,
         productionLineId: null,
         inspectionDetIdList:[],
+        resetMethod: 0
       },
       disabled:false,
 			formLoading: true,
@@ -143,7 +152,7 @@ export default {
   methods: {
     init(obj) {
       // console.log(productionLineId);
-      console.log(obj)
+      console.log('你好打印', obj)
       this.getProductionLineList()
       this.getQualityInspectionDetList()
       this.visible = true
@@ -162,6 +171,7 @@ export default {
             console.log(res);
             this.dataForm.inspectionDetIdList = res.data
             this.dataForm.productionLineId = obj.productionLineId
+            this.dataForm.resetMethod = obj.resetMethod
             this.getWorksectionList(obj.productionLineId)
             this.dataForm.sectionId = obj.sectionId
           })

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

@@ -151,7 +151,8 @@ export default {
             productionLineId:item.productionLineId,
             productionLineName:item.productionLineName,
             sectionId: item.sectionId,
-            sectionName: item.sectionName
+            sectionName: item.sectionName,
+            resetMethod: item.resetMethod
          }
         })
         this.listQuery.total = response.data.total;

src/views/quality/base/qualityIsra/index.vue

@@ -86,16 +86,19 @@ import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
 import * as echarts from 'echarts';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import { parseTime } from '@/utils/ruoyi';
 
 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
 export default {
-  name: 'statisticalData',
+  name: 'QualityIsra',
 	// components: {
 	// 	DialogForm,
 	// },
   mixins: [tableHeightMixin],
 	data() {
     return {
+      isFold: false,
       list: [],
       dynamicProps: [],
       activeName: 'day',
@@ -106,6 +109,16 @@ export default {
       weekListUrl: '/base/quality-isra-statistics/weekList',
       monthListUrl: '/base/quality-isra-statistics/monthList',
       searchBarFormConfig: [
+        {
+          type: 'select',
+          label: '是否报废',
+          placeholder: '请选择是否报废',
+          param: 'checkDiscard',
+          selectOptions: [
+            { name: '否', id: 0 },
+						{ name: '是', id: 1 }
+          ],
+        },
         {
           type: 'select',
           label: '缺陷类型',
@@ -114,6 +127,17 @@ export default {
           selectOptions: [],
           labelField: 'name',
           valueField: 'name',
+          defaultSelect: [],
+          filterable: true
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'lineName',
+          filterable: true,
           defaultSelect: []
         },
 				{
@@ -139,8 +163,9 @@ export default {
 			],
 			// 查询参数
 			queryParams: {
+        checkDiscard: undefined,
         checkType:undefined,
-        // productionId: undefined,
+        lineName: undefined,
         startTime: undefined,
         endTime: undefined,
 				// productionLineId: null,
@@ -149,6 +174,7 @@ export default {
   },
 	created() {
 		// this.getProductLineList();
+    // this.isFold = this.searchBarWidth('QualityIsraBox', 1198);
   },
   computed: {
     tableProps() {
@@ -168,29 +194,19 @@ export default {
     },
   },
   mounted() {
-    // if (this.$route.query.woIdString) {
+    if (this.$route.query.lineName) {
-    //   console.log(this.$route.query.woIdString)
+      // console.log('打印看看产线', this.$route.query.lineName)
-    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+      this.queryParams.lineName = this.$route.query.lineName
-    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+      this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
-    //   // let arr =[]
+    }
-    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
+    if (this.$route.query.startTime && this.$route.query.endTime) {
-    //   console.log(this.searchBarFormConfig[0].defaultSelect);
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.startTime)))
-    // }
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.endTime)))
-    // if (this.$route.params.startTime && this.$route.params.endTime) {
+      this.searchBarFormConfig[3].defaultSelect = [
-    //   this.searchBarFormConfig[0].defaultSelect = [
+        this.queryParams.startTime,
-    //     this.$route.params.startTime,
+        this.queryParams.endTime,
-    //     this.$route.params.endTime,
+      ];
-    //   ];
+    }
-    //   this.queryParams.param = {};
-    //   this.$set(
-    //     this.queryParams.param,
-    //     'startTime',
-    //     this.$route.params.startTime
-    //   );
-    //   this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-    // } else {
-    //   this.searchBarFormConfig[0].defaultSelect = [];
-    // }
     this.getList()
     this.getData()
     this.getDict()
@@ -393,8 +409,12 @@ export default {
           pageNo:1
         }
       });
-      console.log(res)
+      // console.log(res)
-      this.searchBarFormConfig[0].selectOptions = res.data.list
+      this.searchBarFormConfig[1].selectOptions = res.data.list
+      await getCorePLList().then((res) => {
+				// console.log(res);
+				this.searchBarFormConfig[2].selectOptions = res.data;
+			})
       // this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
       //   return {
       //     name: item.name,
@@ -425,7 +445,7 @@ export default {
     },
 		/** 查询列表 */
     async getDataList() {
-      console.log(this.queryParams);
+      console.log('查询条件', this.queryParams);
 			this.loading = true;
 			// 执行查询
       const {
@@ -467,7 +487,10 @@ export default {
     },
 		/** 取消按钮 */
     handleSearchBarBtnClick(val) {
+      console.log('11111', val)
       if (val.btnName === 'search') {
+        this.queryParams.checkDiscard = (val?.checkDiscard === 0 || val?.checkDiscard === 1) ? val?.checkDiscard : undefined
+        this.queryParams.lineName = val.lineName ? val.lineName : undefined
         this.queryParams.checkType = val.checkType ? val.checkType : undefined
         // this.queryParams.productionId = val.productionId ? val.productionId : undefined
         this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined

src/views/quality/base/qualityScrapLog/add-or-updata.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-09 15:14:08
+ * @LastEditTime: 2024-04-28 17:10:02
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
-  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+  <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
     <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="工单号" prop="workOrderId">
@@ -60,7 +60,7 @@
     </el-row>
     <el-col :span="8">
       <el-form-item label="来源" prop="source">
-        <el-select v-model="dataForm.source" placeholder="请选择来源" multiple>
+        <el-select v-model="dataForm.source" placeholder="请选择来源">
           <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
         </el-select>
       </el-form-item>
@@ -70,15 +70,145 @@
         <el-input v-model="dataForm.remark" placeholder="备注" />
       </el-form-item>
     </el-col>
-  </el-form>
+  </el-form> -->
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="auto">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="工单号"
+					prop="workOrderId">
+					<el-select
+						filterable
+						v-model="dataForm.workOrderId"
+						placeholder="请选择工单号"
+						style="width: 100%">
+						<el-option
+							v-for="dict in workOrderList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="数量"
+					prop="num"
+					style="width: 100%">
+					<el-input
+						v-model="dataForm.num"
+						placeholder="请输入数量" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId">
+					<el-select
+						v-model="dataForm.lineId"
+						placeholder="请选择产线"
+						@change="getWorksectionById"
+						style="width: 100%">
+						<el-option
+							v-for="dict in lineList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="工段"
+					prop="sectionId">
+					<el-select
+						v-model="dataForm.sectionId"
+						placeholder="请选择工段"
+						style="width: 100%">
+						<el-option
+							v-for="dict in sectionList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报废时间"
+					prop="logTime">
+					<el-date-picker
+						style="width: 100%"
+						v-model="dataForm.logTime"
+						type="datetime"
+						value-format="timestamp"
+						placeholder="选择日期"></el-date-picker>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报废原因"
+					prop="detId">
+					<el-select
+						v-model="dataForm.detId"
+						placeholder="请选择报废原因"
+						multiple
+						style="width: 100%">
+						<el-option
+							v-for="dict in detList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item
+					label="描述"
+					prop="description">
+					<el-input
+						v-model="dataForm.description"
+						type="textarea"
+						:rows="4"
+						placeholder="请输入描述"
+						style="width: 100%" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-col :span="24">
+			<el-form-item
+				label="备注"
+				prop="remark">
+				<el-input
+					v-model="dataForm.remark"
+					placeholder="备注"
+					style="width: 100%" />
+			</el-form-item>
+		</el-col>
+	</el-form>
 </template>
 
 <script>
 import basicAdd from './basic-add';
 import {
-  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+	createQualityScrapLog,
-  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
+	updateQualityScrapLog,
-import { getList,} from "@/api/base/qualityScrapType";
+	getQualityScrapLog,
+	getWorkOrderList,
+	getTeamList,
+	getDetList,
+	getLineList,
+} from '@/api/base/qualityScrapLog';
+import { getList } from '@/api/base/qualityScrapType';
 // import { getMaterialList } from "@/api/base/material";
 import moment from 'moment';
 export default {
@@ -86,32 +216,22 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: false,
+				isGetCode: false,
-        // codeURL: getCode,
+				// codeURL: getCode,
-        createURL: createQualityScrapLog,
+				createURL: createQualityScrapLog,
-        updateURL: updateQualityScrapLog,
+				updateURL: updateQualityScrapLog,
-        infoURL: getQualityScrapLog,
+				infoURL: getQualityScrapLog,
-      },
+			},
-      lineList:[],
+			lineList: [],
-      typeList: [],
+			typeList: [],
-      workOrderList: [],
+			workOrderList: [],
-      detList:[],
+			detList: [],
-      teamList: [],
+			teamList: [],
-      sectionList:[],
+			sectionList: [],
-      sourceList: [
-        {
-          id: 1,
-          name: '平板端',
-        },
-        {
-          id: 2,
-          name: '网页端',
-        }
-      ],
 			dataForm: {
         id: undefined,
         logTime: undefined,
-        source:1,
+        source: 2,
         detId: undefined,
         workOrderId: null,
         teamId: undefined,
@@ -120,120 +240,137 @@ export default {
         lineId:undefined,
         description:undefined,
         // description: undefined,
-        remark: undefined,
+        remark: undefined
+				// id: undefined,
+				// logTime: undefined,
+				// detId: undefined,
+				// workOrderId: null,
+				// teamId: undefined,
+				// num: undefined,
+				// sectionId: undefined,
+				// lineId: undefined,
+				// description: undefined,
+				// // description: undefined,
+				// remark: undefined,
 			},
 			// materialList: [],
 			dataRule: {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
-        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+				workOrderId: [
-        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+					{ required: true, message: '工单号不能为空', trigger: 'change' },
-        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+				],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+				detId: [
+					{ required: true, message: '报废原因不能为空', trigger: 'change' },
+				],
 
-        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+				logTime: [
-      }
+					{ required: true, message: '报废时间不能为空', trigger: 'change' },
+				],
+			},
 		};
 	},
 	mounted() {
-		this.getDict()
+		this.getDict();
-    console.log('我看看', this.dataForm)
+		console.log('我看看', this.dataForm);
-    // this.getCurrentTime()
+		// this.getCurrentTime()
-    // this.dataForm.logTime = new Date()
+		// this.dataForm.logTime = new Date()
 	},
-  methods: {
+	methods: {
-    // getCurrentTime() {
+		// getCurrentTime() {
-    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
+		//   // new Date().Format("yyyy-MM-dd HH:mm:ss")
-    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
+		//   // this.dataForm.logTime = year + "-" + month + "-" + day;
-    //   // console.log(this.dataForm.logTime);
+		//   // console.log(this.dataForm.logTime);
-    // },
+		// },
 		async getDict() {
-      // 物料列表
+			// 物料列表
-      const res = await getList()
+			const res = await getList();
-      this.typeList = res.data
+			this.typeList = res.data;
-      getWorkOrderList().then((res) => {
+			getWorkOrderList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.workOrderList = res.data.map((item) => {
+				this.workOrderList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getLineList().then((res) => {
+			getLineList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.lineList = res.data.map((item) => {
+				this.lineList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getDetList().then((res) => {
+			getDetList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.detList = res.data.map((item) => {
+				this.detList = res.data.map((item) => {
-          return {
+					return {
-            name: item.content,
+						name: item.content,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getTeamList().then((res) => {
+			getTeamList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.teamList = res.data.map((item) => {
+				this.teamList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-    },
+		},
-    async getWorksectionById(lineId) {
+		async getWorksectionById(lineId) {
-      if (lineId) {
+			if (lineId) {
-        const { code, data } = await this.$axios({
+				const { code, data } = await this.$axios({
-          url: '/base/core-workshop-section/listByParentId',
+					url: '/base/core-workshop-section/listByParentId',
-          method: 'get',
+					method: 'get',
-          params: {
+					params: {
-            id: lineId,
+						id: lineId,
-          },
+					},
-        });
+				});
-        if (code == 0) {
+				if (code == 0) {
-          console.log(data)
+					console.log(data);
-          this.sectionList = data.map((item) => {
+					this.sectionList = data.map((item) => {
-            return {
+						return {
-              name: item.name,
+							name: item.name,
-              id: item.id,
+							id: item.id,
-            };
+						};
-          });
+					});
-        }
+				}
-      } else {
+			} else {
-        this.$axios({
+				this.$axios({
-          url: '/base/core-workshop-section/listAll',
+					url: '/base/core-workshop-section/listAll',
-          method: 'get',
+					method: 'get',
-          // params: {
+					// params: {
-          //   id: lineId,
+					//   id: lineId,
-          // },
+					// },
-        }).then((res) => {
+				}).then((res) => {
-          // console.log(data)
+					// console.log(data)
-          this.sectionList = res.data.map((item) => {
+					this.sectionList = res.data.map((item) => {
-            return {
+						return {
-              name: item.name,
+							name: item.name,
-              id: item.id,
+							id: item.id,
-            };
+						};
-          });
+					});
-        })
+				});
-      }
+			}
-    },
+		},
 		// setMaterialCode() {
 		// 	const chooseM = this.materialList.filter(item => {
 		// 		return item.id === this.dataForm.materialId

src/views/quality/base/qualityScrapLog/basic-add.js

@@ -58,10 +58,6 @@ export default {
             this.dataForm.detId = response.data.detIdList
             this.getWorksectionById(this.dataForm.lineId)
             this.dataForm.logTime = new Date(response.data.logTime)
-
-            // if (this.setData) {
-            //   this.setDataForm()
-            // }
           });
         } else {
           if (this.urlOptions.isGetCode) {

src/views/quality/base/qualityScrapLog/basic-page.js

@@ -24,7 +24,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },

src/views/quality/base/qualityScrapLog/detail-or-updata.vue

@@ -6,239 +6,322 @@
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="visible" width="50%">
+	<el-dialog
-    <small-title slot="title" :no-padding="true">
+		:visible.sync="visible"
-      {{ '详情' }}
+		width="50%">
-    </small-title>
+		<small-title
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+			slot="title"
-      label-width="auto">
+			:no-padding="true">
-      <el-row :gutter="24">
+			{{ '详情' }}
-        <el-col :span="8">
+		</small-title>
-          <el-form-item label="工单号" prop="workOrderId">
+		<el-form
-            <el-select disabled v-model="dataForm.workOrderId" placeholder="请选择工单号">
+			:model="dataForm"
-              <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+			:rules="dataRule"
-            </el-select>
+			ref="dataForm"
-          </el-form-item>
+			@keyup.enter.native="dataFormSubmit()"
-        </el-col>
+			label-width="auto">
-        <el-col :span="8">
+			<el-row :gutter="24">
-          <el-form-item label="数量" prop="num">
+				<el-col :span="8">
-            <el-input disabled v-model="dataForm.num" placeholder="请输入数量" />
+					<el-form-item
-          </el-form-item>
+						label="工单号"
-        </el-col>
+						prop="workOrderId">
-        <el-col :span="8">
+						<el-select
-          <el-form-item label="报废时间" prop="logTime">
+							disabled
-            <el-date-picker disabled v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+							v-model="dataForm.workOrderId"
-              placeholder="选择日期">
+							placeholder="请选择工单号"
-            </el-date-picker>
+							style="width: 100%">
-          </el-form-item>
+							<el-option
-        </el-col>
+								v-for="dict in workOrderList"
-      </el-row>
+								:key="dict.id"
-      <el-row :gutter="20">
+								:label="dict.name"
-        <el-col :span="8">
+								:value="dict.id" />
-          <el-form-item label="产线" prop="lineId">
+						</el-select>
-            <el-select disabled v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
+					</el-form-item>
-              <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+				</el-col>
-            </el-select>
+				<el-col :span="8">
-          </el-form-item>
+					<el-form-item
-        </el-col>
+						label="数量"
-        <el-col :span="8">
+						prop="num">
-          <el-form-item label="工段" prop="sectionId">
+						<el-input
-            <el-select v-model="dataForm.sectionId" placeholder="请选择工段" disabled>
+							disabled
-              <el-option v-for="dict in sectionList" :key="dict.id" :label="dict.name" :value="dict.id" />
+							v-model="dataForm.num"
-            </el-select>
+							placeholder="请输入数量"
-          </el-form-item>
+							style="width: 100%" />
-        </el-col>
+					</el-form-item>
-        <el-col :span="8">
+				</el-col>
-          <el-form-item label="报废原因" prop="detId">
+				<el-col :span="8">
-            <el-select v-model="dataForm.detId" placeholder="请选择报废原因" multiple disabled>
+					<el-form-item
-              <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+						label="报废时间"
-            </el-select>
+						prop="logTime"
-          </el-form-item>
+						style="width: 100%">
-        </el-col>
+						<el-date-picker
-      </el-row>
+							disabled
-      <el-row :gutter="20">
+							v-model="dataForm.logTime"
-        <el-col :span="24">
+							type="datetime"
-          <el-form-item label="描述" prop="description">
+							value-format="yyyy-MM-dd HH:mm:ss"
-            <el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" />
+							placeholder="选择日期"></el-date-picker>
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
-      </el-row>
+			</el-row>
-      <el-col :span="8">
+			<el-row :gutter="20">
-        <el-form-item label="备注" prop="remark">
+				<el-col :span="8">
-          <el-input v-model="dataForm.remark" placeholder="备注" />
+					<el-form-item
-        </el-form-item>
+						label="产线"
-      </el-col>
+						prop="lineId">
-    </el-form>
+						<el-select
-  </el-dialog>
+							disabled
-
+							v-model="dataForm.lineId"
+							placeholder="请选择产线"
+							@change="getWorksectionById"
+							style="width: 100%">
+							<el-option
+								v-for="dict in lineList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="工段"
+						prop="sectionId">
+						<el-select
+							v-model="dataForm.sectionId"
+							placeholder="请选择工段"
+							disabled
+							style="width: 100%">
+							<el-option
+								v-for="dict in sectionList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="报废原因"
+						prop="detId">
+						<el-select
+							v-model="dataForm.detId"
+							placeholder="请选择报废原因"
+							multiple
+							disabled
+							style="width: 100%">
+							<el-option
+								v-for="dict in detList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<el-form-item
+						label="描述"
+						prop="description">
+						<el-input
+							v-model="dataForm.description"
+							type="textarea"
+							:rows="4"
+							placeholder="请输入描述" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item
+						label="备注"
+						prop="remark">
+						<el-input
+							v-model="dataForm.remark"
+							placeholder="备注" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+	</el-dialog>
 </template>
 
 <script>
 import basicAdd from './basic-add';
 import {
-  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+	createQualityScrapLog,
-  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
+	updateQualityScrapLog,
-import { getList,} from "@/api/base/qualityScrapType";
+	getQualityScrapLog,
+	getWorkOrderList,
+	getTeamList,
+	getDetList,
+	getLineList,
+} from '@/api/base/qualityScrapLog';
+import { getList } from '@/api/base/qualityScrapType';
 import SmallTitle from './SmallTitle';
 export default {
-  components: {
+	components: {
-    SmallTitle,
+		SmallTitle,
-  },
+	},
 	mixins: [basicAdd],
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: false,
+				isGetCode: false,
-        // codeURL: getCode,
+				// codeURL: getCode,
-        createURL: createQualityScrapLog,
+				createURL: createQualityScrapLog,
-        updateURL: updateQualityScrapLog,
+				updateURL: updateQualityScrapLog,
-        infoURL: getQualityScrapLog,
+				infoURL: getQualityScrapLog,
-      },
+			},
-      lineList:[],
+			lineList: [],
-      typeList: [],
+			typeList: [],
-      workOrderList: [],
+			workOrderList: [],
-      detList:[],
+			detList: [],
-      teamList: [],
+			teamList: [],
-      sourceList: [
+			sourceList: [
-        {
+				{
-          id: 1,
+					id: 1,
-          name: '手动',
+					name: '手动',
-        },
+				},
-        {
+				{
-          id: 2,
+					id: 2,
-          name: '自动',
+					name: '自动',
-        }
+				},
-      ],
+			],
-      sectionList:[],
+			sectionList: [],
-      visible:false,
+			visible: false,
 			dataForm: {
-        id: undefined,
+				id: undefined,
-        logTime: undefined,
+				logTime: undefined,
-        source:1,
+				source: 1,
-        detId: undefined,
+				detId: undefined,
-        workOrderId: null,
+				workOrderId: null,
-        teamId: undefined,
+				teamId: undefined,
-        num: undefined,
+				num: undefined,
-        lineId:undefined,
+				lineId: undefined,
-        description:undefined,
+				description: undefined,
-        // description: undefined,
+				// description: undefined,
-        remark: undefined,
+				remark: undefined,
 			},
 			// materialList: [],
 			dataRule: {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
-        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+				workOrderId: [
-        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+					{ required: true, message: '工单号不能为空', trigger: 'change' },
-        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+				],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+				detId: [
+					{ required: true, message: '报废原因不能为空', trigger: 'change' },
+				],
 
-        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+				logTime: [
-      }
+					{ required: true, message: '报废时间不能为空', trigger: 'change' },
+				],
+			},
 		};
 	},
 	mounted() {
-		this.getDict()
+		this.getDict();
-    console.log('我看看', this.dataForm)
+		console.log('我看看', this.dataForm);
-    // this.getCurrentTime()
+		// this.getCurrentTime()
 	},
-  methods: {
+	methods: {
-    // init() {
+		// init() {
-    //   this.dialogVisible = true
+		//   this.dialogVisible = true
-    // },
+		// },
-    // getCurrentTime() {
+		// getCurrentTime() {
-    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
+		//   // new Date().Format("yyyy-MM-dd HH:mm:ss")
-    //   this.dataForm.logTime = new Date()
+		//   this.dataForm.logTime = new Date()
-    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
+		//   // this.dataForm.logTime = year + "-" + month + "-" + day;
-    //   console.log(this.dataForm.logTime);
+		//   console.log(this.dataForm.logTime);
-    // },
+		// },
-    async getDict() {
+		async getDict() {
-      // 物料列表
+			// 物料列表
-      const res = await getList()
+			const res = await getList();
-      this.typeList = res.data
+			this.typeList = res.data;
-      getWorkOrderList().then((res) => {
+			getWorkOrderList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.workOrderList = res.data.map((item) => {
+				this.workOrderList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getLineList().then((res) => {
+			getLineList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.lineList = res.data.map((item) => {
+				this.lineList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getDetList().then((res) => {
+			getDetList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.detList = res.data.map((item) => {
+				this.detList = res.data.map((item) => {
-          return {
+					return {
-            name: item.content,
+						name: item.content,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      getTeamList().then((res) => {
+			getTeamList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.teamList = res.data.map((item) => {
+				this.teamList = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-    },
+		},
-    async getWorksectionById(lineId) {
+		async getWorksectionById(lineId) {
-      if (lineId) {
+			if (lineId) {
-        const { code, data } = await this.$axios({
+				const { code, data } = await this.$axios({
-          url: '/base/core-workshop-section/listByParentId',
+					url: '/base/core-workshop-section/listByParentId',
-          method: 'get',
+					method: 'get',
-          params: {
+					params: {
-            id: lineId,
+						id: lineId,
-          },
+					},
-        });
+				});
-        if (code == 0) {
+				if (code == 0) {
-          console.log(data)
+					console.log(data);
-          this.sectionList = data.map((item) => {
+					this.sectionList = data.map((item) => {
-            return {
+						return {
-              name: item.name,
+							name: item.name,
-              id: item.id,
+							id: item.id,
-            };
+						};
-          });
+					});
-        }
+				}
-      } else {
+			} else {
-        this.$axios({
+				this.$axios({
-          url: '/base/core-workshop-section/listAll',
+					url: '/base/core-workshop-section/listAll',
-          method: 'get',
+					method: 'get',
-          // params: {
+					// params: {
-          //   id: lineId,
+					//   id: lineId,
-          // },
+					// },
-        }).then((res) => {
+				}).then((res) => {
-          // console.log(data)
+					// console.log(data)
-          this.sectionList = res.data.map((item) => {
+					this.sectionList = res.data.map((item) => {
-            return {
+						return {
-              name: item.name,
+							name: item.name,
-              id: item.id,
+							id: item.id,
-            };
+						};
-          });
+					});
-        })
+				});
-      }
+			}
-    },
+		},
 	},
 };
 </script>

src/views/quality/base/qualityScrapLog/index.vue

@@ -1,19 +1,45 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+			:formConfigs="formConfig"
-      :limit="listQuery.pageSize" :table-data="tableData">
+			ref="searchBarForm"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			@headBtnClick="buttonClick" />
-        @clickBtn="handleClick" />
+		<base-table
-    </base-table>
+			:max-height="tableH"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			v-loading="dataListLoading"
-      @pagination="getDataList" />
+			:table-props="tableProps"
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+			:page="listQuery.pageNo"
-      @confirm="handleConfirm" :before-close="handleCancel" width="50%">
+			:limit="listQuery.pageSize"
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+			:table-data="tableData">
-    </base-dialog>
+			<method-btn
-    <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+				v-if="tableBtn.length"
-  </div>
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+		<detail-or-update
+			v-if="detailOrUpdateVisible"
+			ref="detailOrUpdate"
+			@refreshDataList="successSubmit" />
+	</div>
 </template>
 
 <script>
@@ -23,201 +49,211 @@ import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getQualityScrapLogPage,
+	getQualityScrapLogPage,
-  deleteQualityScrapLog,
+	deleteQualityScrapLog,
-  getWorkOrderList,
+	getWorkOrderList,
-  // getTeamList
+	// getTeamList
 } from '@/api/base/qualityScrapLog';
 
 const tableProps = [
-	// {
-	// 	prop: 'createTime',
-	// 	label: '添加时间',
-	// 	filter: parseTime
-  // },
-  {
-    prop: 'createTime',
-    label: '报废时间',
-    filter: parseTime
-  },
-  {
-    prop: 'lineName',
-    label: '产线名称'
-  },
-  {
-    prop: 'sectionName',
-    label: '工段'
-  },
-  {
-    prop: 'workOrderName',
-    label: '工单名称'
-  },
-  {
-    prop: 'num',
-    label: '数量'
-  },
 	{
-    prop: 'detContent',
+		prop: 'createTime',
-    label: '报废原因'
+		label: '报废时间',
-  },
+		filter: parseTime,
-  {
+		width: 160,
-    prop: 'source',
+	},
-    label: '来源',
+	{
-    filter: (val) => val == 1 ? '平板端' : '网页端'
+		prop: 'lineName',
-  },
+		label: '产线名称',
+		width: 90,
+	},
+	{
+		prop: 'sectionName',
+		label: '工段',
+		minWidth: 100,
+	},
+	{
+		prop: 'workOrderName',
+		label: '工单名称',
+		minWidth: 160,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+		width: 90,
+	},
+	{
+		prop: 'detContent',
+		label: '报废原因',
+		minWidth: 160,
+	},
+	{
+		prop: 'source',
+		label: '来源',
+		filter: (val) => ['', '平板端', '网页端'][val],
+		width: 90,
+	},
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getQualityScrapLogPage,
+				getDataListURL: getQualityScrapLogPage,
-        deleteURL: deleteQualityScrapLog,
+				deleteURL: deleteQualityScrapLog,
 				// exportURL: exportFactoryExcel,
 			},
 			tableProps,
 			tableBtn: [
-        this.$auth.hasPermi(`base:quality-scrap-log:update`)
+				this.$auth.hasPermi(`base:quality-scrap-log:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
-          : undefined,
+					: undefined,
-        this.$auth.hasPermi(`base:quality-scrap-log:detail`)
+				this.$auth.hasPermi(`base:quality-scrap-log:detail`)
-          ? {
+					? {
-            type: 'detail',
+							type: 'detail',
-            btnName: '详情',
+							btnName: '详情',
-          }
+					  }
-          : undefined,
+					: undefined,
-        this.$auth.hasPermi(`base:quality-scrap-log:delete`)
+				this.$auth.hasPermi(`base:quality-scrap-log:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
-      tableData: [],
+			tableData: [],
-      detailOrUpdateVisible:false,
+			detailOrUpdateVisible: false,
 			formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId',
-          filterable: true
-        },
-        // {
-        //   type: 'select',
-        //   label: '班组',
-        //   selectOptions: [],
-        //   labelField: 'name',
-        //   valueField: 'id',
-        //   param: 'teamId',
-        //   filterable: true
-        // },
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
+					type: 'select',
+					label: '工单',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+					filterable: true,
+				},
+				// {
+				//   type: 'select',
+				//   label: '班组',
+				//   selectOptions: [],
+				//   labelField: 'name',
+				//   valueField: 'id',
+				//   param: 'teamId',
+				//   filterable: true
+				// },
+				{
+					type: this.$auth.hasPermi('base:quality-scrap-det:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-        {
+				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+						? 'separate'
+						: '',
 					// type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
 		};
 	},
 	components: {
-    AddOrUpdate,
+		AddOrUpdate,
-    DetailOrUpdate
+		DetailOrUpdate,
 	},
-  mounted() {
+	mounted() {
-    this.getDict()
+		this.getDict();
-    this.getDataList()
+		this.getDataList();
-  },
+	},
-  methods: {
+	methods: {
-    otherMethods(val) {
+		otherMethods(val) {
-      if (val.type === 'detail') {
+			if (val.type === 'detail') {
-        this.detailOrUpdateVisible = true;
+				this.detailOrUpdateVisible = true;
-        // this.addOrEditTitle = "详情";
+				// this.addOrEditTitle = "详情";
-        this.$nextTick(() => {
+				this.$nextTick(() => {
-          this.$refs.detailOrUpdate.init(val.data.id, true);
+					this.$refs.detailOrUpdate.init(val.data.id, true);
-        });
+				});
-      }
+			}
-    },
+		},
-    deleteHandle(id, name, index, data) {
+		deleteHandle(id, name, index, data) {
-      this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+			this.$confirm(`确认要删除序号为${index}的数据项?`, '提示', {
-        confirmButtonText: "确定",
+				confirmButtonText: '确定',
-        cancelButtonText: "取消",
+				cancelButtonText: '取消',
-        type: "warning",
+				type: 'warning',
-      })
+			})
-        .then(() => {
+				.then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
+						this.$message({
-              message: "操作成功",
+							message: '操作成功',
-              type: "success",
+							type: 'success',
-              duration: 1500,
+							duration: 1500,
-              onClose: () => {
+							onClose: () => {
-                this.getDataList();
+								this.getDataList();
-              },
+							},
-            });
+						});
-          });
+					});
-        })
+				})
-        .catch(() => { });
+				.catch(() => {});
-    },
+		},
-    // 获取数据列表
+		// 获取数据列表
-    getDict() {
+		getDict() {
-      getWorkOrderList().then((res) => {
+			getWorkOrderList().then((res) => {
-        console.log(res);
+				console.log(res);
-        // console.log(response);
+				// console.log(response);
-        this.formConfig[0].selectOptions = res.data.map((item) => {
+				this.formConfig[0].selectOptions = res.data.map((item) => {
-          return {
+					return {
-            name: item.name,
+						name: item.name,
-            id: item.id
+						id: item.id,
-          }
+					};
-        })
+				});
-        // console.log(this.formConfig[0].selectOptions);
+				// console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
+				// this.listQuery.total = response.data.total;
-      })
+			});
-      // getTeamList().then((res) => {
+			// getTeamList().then((res) => {
-      //   console.log(res);
+			//   console.log(res);
-      //   // console.log(response);
+			//   // console.log(response);
-      //   this.formConfig[1].selectOptions = res.data.map((item) => {
+			//   this.formConfig[1].selectOptions = res.data.map((item) => {
-      //     return {
+			//     return {
-      //       name: item.name,
+			//       name: item.name,
-      //       id: item.id
+			//       id: item.id
-      //     }
+			//     }
-      //   })
+			//   })
-      //   // console.log(this.formConfig[0].selectOptions);
+			//   // console.log(this.formConfig[0].selectOptions);
-      //   // this.listQuery.total = response.data.total;
+			//   // this.listQuery.total = response.data.total;
-      // })
+			// })
-    },
+		},
-    getDataList() {
+		getDataList() {
-      this.dataListLoading = true;
+			this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-        this.tableData = response.data.list;
+				this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
+				this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
+				this.dataListLoading = false;
-      });
+			});
-    },
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 20;
-          this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
+					this.listQuery.workOrderId = val.workOrderId
-          // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
+						? val.workOrderId
+						: undefined;
+					// this.listQuery.teamId = val.teamId ? val.teamId : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
@@ -227,7 +263,7 @@ export default {
 						pageNo: 1,
 						total: 1,
 					};
-					this.getDataList()
+					this.getDataList();
 					break;
 				case 'add':
 					this.addOrEditTitle = '新增';

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

@@ -1,20 +1,59 @@
 <!--
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
- * @LastEditors: zhp
+ * @LastEditors: DY
- * @LastEditTime: 2024-04-07 16:25:19
+ * @LastEditTime: 2024-04-29 15:25:52
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+    <el-form
+			:inline="true"
+			:model="listQuery"
+			class="blueTip">
+      <el-form-item label="合格证号" prop="certificateNumber">
+				<el-input size="small" v-model="listQuery.certificateNumber" clearable placeholder="合格证号" @blur="countTimes(1)" @clear="countArray[0] = false"></el-input>
+			</el-form-item>
+      <el-form-item label="成品周转编号" prop="packagingCode">
+				<el-input size="small" v-model="listQuery.packagingCode" clearable placeholder="成品周转编号" @blur="countTimes(2)" @clear="countArray[1] = false"></el-input>
+			</el-form-item>
+      <el-form-item label="原片周转编号" prop="glassCode">
+				<el-input size="small" v-model="listQuery.glassCode" clearable placeholder="原片周转编号" @blur="countTimes(3)" @clear="countArray[2] = false"></el-input>
+			</el-form-item>
+			<el-form-item label="包装全检时间及产线" prop="val">
+				<el-date-picker
+					v-model="listQuery.packTime"
+					value-format="timestamp"
+					type="datetime"
+					size="small"
+          clearable
+					placeholder="包装全检时间"
+          @change="countTimes('timestamp3')"
+        />
+        <el-select v-model="listQuery.lineName" size="small" clearable filterable placeholder="产线" @change="countTimes('timestamp3')" style="margin-left: 5px">
+          <el-option v-for="(item, index) in lineOptions" :key="index" :label="item.name" :value="item.name"></el-option>
+        </el-select>
+			</el-form-item>
+      <el-form-item>
+        <el-button
+          v-if="this.$auth.hasPermi('monitoring:rawMaterial-traceability:query')"
+          type="primary"
+          size="small"
+          @click="getList">
+          查询
+        </el-button>
+      </el-form-item>
+		</el-form>
+    <!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="list"> -->
+    <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="100"
       :table-data="list">
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
-        @clickBtn="handleClick" /> -->
+        @clickBtn="handleClick" />
     </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getList" />
+      @pagination="getList" /> -->
     <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
   </div>
 </template>
@@ -23,61 +62,76 @@
 // import AddOrUpdate from './add-or-updata';
 // import unitDict from './unitDict';
 // import basicPage from '../mixins/basic-page';
-import { publicFormatter } from '@/utils/dict';
+// import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';
 
-import {
+import { getOriginalGlassRetrace } from '@/api/quality/rawMaterialTraceability';
-  getOriginalGlassRetrace,
-  getWorkOrderList,
-  // exportEnergyPlcExcel
-} from '@/api/quality/rawMaterialTraceability';
 
 const tableProps = [
-
   {
-    prop: 'orderName',
+    prop: 'certificateNumber',
-    label: '订单名称',
+    label: '合格证号',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
   },
   {
-    prop: 'workOrderName',
+    prop: 'boxNumber',
-    label: '工单名称',
+    label: '箱号',
-  },
+    minWidth: 150,
-  {
+		showOverflowtooltip: true,
-    prop: 'palletNumber',
+    filter: (val) => val ? val : '--'
-    label: '托号',
-  },
-  {
-    prop: 'transportQuantity',
-    label: '该托片数',
   },
   {
     prop: 'packagingCode',
-    label: '包装条码',
+    label: '成品周转编号',
-  },
+    minWidth: 180,
-  {
+		showOverflowtooltip: true,
-    prop: 'originalGlassLineName',
+    filter: (val) => val ? val : '--'
-    label: '原片产线',
-  },
-  {
-    prop: 'originalGlassOutputTime',
-    label: '原片下片时间',
-    filter: parseTime
   },
   {
     prop: 'deepProcessingLineName',
     label: '深加工产线',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
   },
   {
     prop: 'deepProcessingInputTime',
     label: '深加工上片时间',
-    filter: parseTime
+    // filter: (val) => parseTime(val) ? parseTime(val) : '--',
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
   },
   {
-    prop: 'productionOutputTime',
+    prop: 'deepProcessingOutputTime',
     label: '深加工下片时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
   },
+  {
+    prop: 'glassCode',
+    label: '原片周转编码',
+    minWidth: 150,
+		showOverflowtooltip: true
+  },
+  {
+    prop: 'originalGlassLineName',
+    label: '原片产线',
+    minWidth: 150,
+		showOverflowtooltip: true
+  },
+  {
+    prop: 'originalGlassOutputTime',
+    label: '原片下片时间',
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
+  }
   // {
   //   prop: 'scrapDetail',
   //   label: '详情',
@@ -88,64 +142,93 @@ const tableProps = [
 export default {
   // mixins: [basicPage],
   mixins: [tableHeightMixin],
+  name: 'originalGlassRetrace',
   data() {
     return {
-      // urlOptions: {
+      lineOptions: [],
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
       tableProps,
-      // tableBtn: [
+      tableBtn: [
-      //   // this.$auth.hasPermi(`base:packaging-print-log:update`)
+        // this.$auth.hasPermi(`base:packaging-print-log:update`)
-      //   //   ?
+        //   ?
-      //     {
+          {
-      //       type: 'edit',
+            type: 'detail0',
-      //       btnName: '编辑',
+            btnName: '成品缺陷详情',
-      //     },
+          },
-      //     // : undefined,
+          // : undefined,
-      //   // this.$auth.hasPermi(`base:packaging-print-log:delete`)
+        // this.$auth.hasPermi(`base:packaging-print-log:delete`)
-      //   //   ?
+        //   ?
-      //     {
+          {
-      //       type: 'delete',
+            type: 'detail1',
-      //       btnName: '删除',
+            btnName: '原片缺陷详情',
-      //     }
+          }
-      //     // : undefined,
+          // : undefined,
 
-      // ].filter((v) => v),
+      ].filter((v) => v),
       list: [],
       listQuery: {
-        pageSize: 10,
+        // pageSize: 10,
-        pageNo: 1,
+        // pageNo: 1,
-        total: 0,
+        // total: 0,
-        workOrderId: undefined,
+        certificateNumber: undefined,
-        startTime: undefined,
+        packagingCode: undefined,
-        endTime:undefined,
+        packTime: null,
+        lineName: null,
+        glassCode: undefined
       },
+      useTime: false,
+      countArray: [false, false, false, false],
       // tableH: this.tableHeight(260),
       formConfig: [
+        // {
+        //   type: 'select',
+        //   label: '工单',
+        //   selectOptions: [],
+        //   labelField: 'name',
+        //   valueField: 'name',
+        //   param: 'workOrderName',
+        //   filterable: true
+        // },
+        {
+          type: 'input',
+          label: '合格证号',
+          placeholder: '合格证号',
+          param: 'certificateNumber',
+
+        },
+        {
+          type: 'input',
+          label: '成品周转编号',
+          placeholder: '成品周转编号',
+          param: 'packagingCode'
+        },
+        {
+          type: 'datePicker',
+          label: '包装全检时间及产线',
+          dateType: 'datetimerange',
+          format: 'timestamp',
+          valueFormat: "timestamp",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
         {
           type: 'select',
-          label: '工单',
+          label: '',
           selectOptions: [],
           labelField: 'name',
           valueField: 'name',
-          param: 'workOrderName',
+          param: 'lineName',
           filterable: true
         },
-        // {
+        {
-        //   type: 'datePicker',
+          type: 'input',
-        //   label: '时间段',
+          label: '原片周转编号',
-        //   dateType: 'daterange',
+          placeholder: '原片周转编号',
-        //   format: 'yyyy-MM-dd',
+          param: 'glassCode'
-        //   valueFormat: "yyyy-MM-dd",
+        },
-        //   rangeSeparator: '-',
-        //   startPlaceholder: '开始时间',
-        //   endPlaceholder: '结束时间',
-        //   param: 'timeVal',
-        //   defaultSelect: [],
-        //   width: 250
-        // },
         {
 
           type: this.$auth.hasPermi('monitoring:rawMaterial-traceability:query') ? 'button' : '',
@@ -191,41 +274,109 @@ export default {
     // window.addEventListener('resize', () => {
     //   this.tableH = this.tableHeight(260)
     // })
-    this.getList()
+    countArray: [false, false, false, false],
+    this.useTime = false
+    // this.getList()
     this.getDict()
   },
   methods: {
+    handleClick(raw) {
+			if (raw.type === 'detail1') {
+        // 原片缺陷
+        // console.log('你好', raw.data._pageIndex)
+        // const tempArray = this?.list[raw.data._pageIndex]
+        // console.log('你好tempArray', tempArray)
+        // let startTime = raw.data.originalGlassOutputTime
+        // if (tempArray) {
+        //   startTime = tempArray.originalGlassOutputTime
+        // }
+        // console.log('你好', parseTime(raw.data.originalGlassOutputTime))
+        const startTime = new Date(raw.data.originalGlassOutputTime)
+        const endTime = new Date(raw.data.originalGlassOutputTime)
+        startTime.setHours(startTime.getHours() - 1)
+        startTime.setMinutes(0)
+        startTime.setSeconds(0)
+        endTime.setHours(endTime.getHours() + 1)
+        endTime.setMinutes(0)
+        // endTime.setSeconds(0)
+        // console.log('设置时间', startTime, parseTime(startTime))
+        // console.log('设置时间11', endTime, parseTime(endTime))
+				this.$router.push({
+          path: '/quality/base/quality-isra',
+          query: {
+            // deepProcessingLineId: raw.data.deepProcessingLineId,
+            lineName: raw.data.deepProcessingLineName,
+            endTime: endTime,
+            startTime: startTime
+          },
+        });
+			} else {
+				// 成品缺陷
+				this.$router.push({
+          path: '/quality/base/quality-inspection-data/detection-information/statistical-data',
+          query: {
+            startTime: raw.data.deepProcessingInputTime,
+            endTime: raw.data.deepProcessingOutputTime
+          },
+        });
+			}
+		},
+    countTimes(val) {
+      if (val === 1) {
+        this.countArray[0] = this.listQuery.certificateNumber !== '' && this.listQuery.certificateNumber !== undefined
+      }
+      if (val === 2) {
+        this.countArray[1] = this.listQuery?.packagingCode !== '' && this.listQuery?.packagingCode !== undefined
+      }
+      if (val === 3) {
+        this.countArray[2] = this.listQuery?.glassCode !== '' && this.listQuery?.glassCode !== undefined
+      }
+      if (val === 'timestamp3') {
+        if ((this.listQuery.packTime !== '' && this.listQuery.packTime !== null) || (this.listQuery?.lineName !== '' && this.listQuery.lineName !== null)) {
+          this.useTime = true
+          this.countArray[3] = true
+        } else {
+          this.useTime = false
+          this.countArray[3] = true
+        }
+      }
+    },
     getList() {
-      getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+      let trueArray = this.countArray.filter(val => val === true)
-        console.log(res);
+      if (trueArray.length !== 1) {
-        this.list = res.data || []
+        this.$message.error('请选择一个条件进行查询！')
-        console.log(this.list);
+      } else {
-        // this.listQuery.total = res.data.total || 0
+        if (this.useTime === true) {
-      })
+          if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') {
+
+            getOriginalGlassRetrace({
+              lineNameList: [this.listQuery.lineName],
+               ...this.listQuery
+            }).then(res => {
+              console.log(res);
+              this.list = res.data || []
+              console.log(this.list);
+              // this.listQuery.total = res.data.total || 0
+            })
+          } else {
+            this.$message.error('选择包装全检时，时间和产线均为必填！')
+          }
+        } else {
+          getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+            console.log(res);
+            this.list = res.data || []
+            console.log(this.list);
+          })
+        }
+      }
+      
     },
     getDict() {
-      // 获取产品的属性列表
+      // 获取产线
-      // getCustomerList().then((response) => {
+      getCorePLList().then((res) => {
-      //   console.log(response);
+				console.log(res);
-      //   this.customerList = response.data
+				this.lineOptions = res.data;
-      //   // this.listQuery.total = response.data.total;
+			})
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
     },
     // handleExport() {
     //   // 处理查询参数
@@ -243,7 +394,7 @@ export default {
     buttonClick(val) {
       console.log(val)
       if (val.btnName === 'search') {
-        this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
+        this.listQuery.certificateNumber = val.certificateNumber ? val.certificateNumber :undefined
         // this.queryParams.status = val.status
         // if (val.timeVal && val.timeVal.length != 0 ) {
         // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
@@ -272,3 +423,17 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 18px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 8px;
+	margin-left: 16px;
+}
+</style>

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

@@ -1,26 +1,52 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <!-- 搜索工作栏 -->
+		<!-- 搜索工作栏 -->
-    <SearchBar :isFold="true" :formConfigs="searchBarFormConfig" ref="search-bar"
+		<SearchBar
-      @headBtnClick="handleSearchBarBtnClick" />
+			:isFold="true"
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
-    <!-- 列表 -->
+		<!-- 列表 -->
-    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
+		<base-table
-      @emitFun="handleEmitFun">
+			:table-props="tableProps"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
+			:page="queryParams.pageNo"
-        @clickBtn="handleTableBtnClick" />
+			:limit="queryParams.pageSize"
-    </base-table>
+			:table-data="list"
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="90"
+				fixed="right"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
 
-    <!-- 分页组件 -->
+		<!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
-      @pagination="getList" />
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
 
-    <!-- 对话框(添加 / 修改) -->
+		<!-- 对话框(添加 / 修改) -->
-    <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%" @close="cancel" @cancel="cancel"
+		<base-dialog
-      @confirm="submitForm">
+			:dialogTitle="title"
-      <DialogForm v-if="open" ref="form" v-model="form" />
+			:dialogVisible="open"
-    </base-dialog>
+			width="50%"
-  </div>
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>
@@ -37,27 +63,34 @@ import moment from 'moment';
 import DialogForm from './dialogForm.vue';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
 	name: 'QualityInspectionRecord',
 	components: {
 		DialogForm,
 	},
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
-      rows: [
+			rows: [
-        [
+				[
-          {
+					{
-            select: true,
+						select: true,
-            label: '工单名称',
+						label: '工单名称',
-            url: 'base/core-work-order/listbyfilter',
+						url: 'base/core-work-order/listbyfilter',
-            prop: 'workOrderId',
+						prop: 'workOrderId',
-            rules: [{ required: true, message: '工单名称不能为空', trigger: 'change' }],
+						rules: [
-            bind: {
+							{
-              filterable: true,
+								required: true,
-            },
+								message: '工单名称不能为空',
-          }
+								trigger: 'change',
-        ],
+							},
+						],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
 				[
 					{
 						select: true,
@@ -65,7 +98,9 @@ export default {
 						url: '/base/quality-inspection-det/listAll',
 						prop: 'inspectionDetId',
 						labelKey: 'content',
-						rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '检测内容不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -93,7 +128,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '产线不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -113,7 +150,6 @@ export default {
 						label: '检测人员',
 						prop: 'checkPerson',
 					},
-
 				],
 				[{ textarea: true, label: '描述', prop: 'explainText' }],
 				[{ input: true, label: '备注', prop: 'remark' }],
@@ -121,32 +157,32 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'select',
-          label: '工单名称',
+					label: '工单名称',
-          placeholder: '请选择工单名称',
+					placeholder: '请选择工单名称',
 					param: 'workOrderId',
-          selectOptions: [],
+					selectOptions: [],
-          filterable:true
+					filterable: true,
 				},
 				{
-          type: 'select',
+					type: 'select',
 					label: '检测内容',
-          placeholder: '请输入检测内容',
+					placeholder: '请输入检测内容',
-          selectOptions: [],
+					selectOptions: [],
-          param: 'inspectionDetContent',
+					param: 'inspectionDetContent',
-          filterable: true
+					filterable: true,
-        },
+				},
-        {
+				{
-          type: 'select',
+					type: 'select',
-          label: '检测人员',
+					label: '检测人员',
-          placeholder: '请选择检测人员',
+					placeholder: '请选择检测人员',
-          selectOptions: [],
+					selectOptions: [],
-          param: 'checkPerson',
+					param: 'checkPerson',
-          filterable: true,
+					filterable: true,
-          multiple:true,
+					multiple: true,
-        },
+				},
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '检测时间',
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
@@ -159,27 +195,21 @@ export default {
 					// width: 350,
 				},
 				{
-          type: this.$auth.hasPermi(
+					type: this.$auth.hasPermi('base:quality-inspection-record:query')
-            'base:quality-inspection-record:query'
+						? 'button'
-          )
+						: '',
-            ? 'button'
-            : '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-        {
+				{
-          type: this.$auth.hasPermi(
+					type: this.$auth.hasPermi('base:quality-inspection-record:create')
-            'base:quality-inspection-record:create'
+						? 'separate'
-          )
+						: '',
-            ? 'separate'
-            : '',
 					// type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi(
+					type: this.$auth.hasPermi('base:quality-inspection-record:create')
-						'base:quality-inspection-record:create'
-					)
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -195,7 +225,7 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-        this.$auth.hasPermi('base:quality-inspection-record:delete')
+				this.$auth.hasPermi('base:quality-inspection-record:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -207,64 +237,66 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 160,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        },
+				},
-        {
+				{
-          // width: 128,
+					prop: 'workOrderName',
-          prop: 'workOrderName',
+					label: '工单名称',
-          label: '工单名称',
+					minWidth: 180,
-        },
+					showOverflowtooltip: true,
-        {
+				},
-          // width: 128,
-          prop: 'productionLineName',
-          label: '产线',
-        },
-        {
-          // width: 128,
-          prop: 'sectionName',
-          label: '工段',
-        },
 				{
-					// width: 128,
 					prop: 'inspectionDetContent',
 					label: '检测内容',
+					minWidth: 180,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'productionLineName',
+					label: '产线',
+					minWidth: 80,
+				},
+				{
+					prop: 'sectionName',
+					label: '工段',
+					minWidth: 120,
 				},
-				// {
-				// 	// width: 128,
-        //   prop: 'productionLineName',
-				// 	label: '产线',
-				// },
 				{
-					// width: 128,
 					prop: 'checkPerson',
 					label: '检测人员',
+					showOverflowtooltip: true,
 				},
 				{
-					// width: 160,
 					prop: 'checkTime',
 					label: '检测时间',
+					width: 160,
 					filter: (val) =>
 						val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '-',
 				},
 				{
-					width: 90,
 					prop: 'source',
 					label: '来源',
-          filter: (val) => val == 1 ? '平板端' : '网页端',
+					width: 80,
+					filter: (val) => ['', '平板端', '网页端'][val],
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-      searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId','checkPerson'],
+			searchBarKeys: [
+				'inspectionDetContent',
+				'checkTime',
+				'workOrderId',
+				'checkPerson',
+			],
 			form: {
-        id: undefined,
+				id: undefined,
-        // workOrderId:undefined,
+				// workOrderId:undefined,
 				inspectionDetId: undefined,
 				inspectionDetContent: undefined,
 				productionLineId: undefined,
 				sectionId: undefined,
-        checkPerson: undefined,
+				checkPerson: undefined,
-        workOrderId:undefined,
+				workOrderId: undefined,
 				checkTime: undefined,
 				source: undefined,
 				explainText: undefined,
@@ -273,26 +305,26 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-        pageSize: 10,
+				pageSize: 20,
-        workOrderId:null,
+				workOrderId: null,
 				inspectionDetContent: null,
-        checkTime: [],
+				checkTime: [],
-        checkPerson:undefined,
+				checkPerson: undefined,
 				// productionLineId: null,
 			},
 		};
 	},
 	created() {
 		this.getList();
-		this.getProductLineList()
+		this.getProductLineList();
 	},
 	watch: {
 		form: {
 			handler: function (val) {
 				console.log('form change:', val);
 			},
-			deep: true
+			deep: true,
-		}
+		},
 		// 注册弹窗里产线改变时的监听事件
 		// 'form.productionLineId': {
 		// 	handler: function (val) {
@@ -318,29 +350,29 @@ export default {
 		// },
 	},
 	methods: {
-    /** 获取搜索栏的产线列表 */
+		/** 获取搜索栏的产线列表 */
-    deleteHandle(id, name, index, data) {
+		deleteHandle(id, name, index, data) {
-      this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+			this.$confirm(`确认要删除序号为${index}的数据项?`, '提示', {
-        confirmButtonText: "确定",
+				confirmButtonText: '确定',
-        cancelButtonText: "取消",
+				cancelButtonText: '取消',
-        type: "warning",
+				type: 'warning',
-      })
+			})
-        .then(() => {
+				.then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
+						this.$message({
-              message: "操作成功",
+							message: '操作成功',
-              type: "success",
+							type: 'success',
-              duration: 1500,
+							duration: 1500,
-              onClose: () => {
+							onClose: () => {
-                this.getDataList();
+								this.getDataList();
-              },
+							},
-            });
+						});
-          });
+					});
-        })
+				})
-        .catch(() => { });
+				.catch(() => {});
-    },
+		},
 		getProductLineList() {
-      this.$axios('/base/core-work-order/listbyfilter').then((response) => {
+			this.$axios('/base/core-work-order/listbyfilter').then((response) => {
 				this.searchBarFormConfig[0].selectOptions = response.data.map(
 					(item) => {
 						return {
@@ -349,34 +381,36 @@ export default {
 						};
 					}
 				);
-      })
+			});
-      this.$axios('/base/quality-inspection-det/listAll').then((response) => {
+			this.$axios('/base/quality-inspection-det/listAll').then((response) => {
-        this.searchBarFormConfig[1].selectOptions = response.data.map(
+				this.searchBarFormConfig[1].selectOptions = response.data.map(
-          (item) => {
+					(item) => {
-            return {
+						return {
-              name: item.content,
+							name: item.content,
-              id: item.content,
+							id: item.content,
-            };
+						};
-          }
+					}
-        );
+				);
-      })
+			});
-      this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
+			this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
-          pageNo: 1,
+				pageNo: 1,
-          pageSize: 999
+				pageSize: 999,
-      }).then((res) => {
+			}).then((res) => {
-        // console.log(response);
+				// console.log(response);
-        this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
+				this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
-          name: item.username,
+					name: item.username,
-          id: item.username,
+					id: item.username,
-        }));
+				}));
-        })
+			});
 		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
-      // 执行查询
+			// 执行查询
-      let str = this.queryParams.checkPerson ?  this.queryParams.checkPerson.join() :undefined
+			let str = this.queryParams.checkPerson
-      this.queryParams.checkPerson = str
+				? this.queryParams.checkPerson.join()
+				: undefined;
+			this.queryParams.checkPerson = str;
 			getQualityInspectionRecordPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@@ -396,8 +430,8 @@ export default {
 				inspectionDetContent: undefined,
 				sectionId: undefined,
 				checkPerson: undefined,
-        checkTime: undefined,
+				checkTime: undefined,
-        workOrderId:undefined,
+				workOrderId: undefined,
 				source: undefined,
 				explainText: undefined,
 				remark: undefined,
@@ -426,14 +460,14 @@ export default {
 			this.reset();
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
-        /** 因为后端返回的时间是时间戳格式，需转换 */
+				/** 因为后端返回的时间是时间戳格式，需转换 */
-        console.log(response.data);
+				console.log(response.data);
-				const info = {}
+				const info = {};
-				Object.keys(this.form).forEach(key => {
+				Object.keys(this.form).forEach((key) => {
-					info[key] = response.data[key]
+					info[key] = response.data[key];
 				});
-        this.form = info;
+				this.form = info;
-        console.log(this.form);
+				console.log(this.form);
 				this.open = true;
 				this.title = '修改质量检查信息记录表';
 			});
@@ -444,9 +478,9 @@ export default {
 				if (!valid) {
 					return;
 				}
-        // 修改的提交
+				// 修改的提交
-        let str = this.form.checkPerson ? this.form.checkPerson.join() : null
+				let str = this.form.checkPerson ? this.form.checkPerson.join() : null;
-        this.form.checkPerson = str
+				this.form.checkPerson = str;
 				if (this.form.id != null) {
 					updateQualityInspectionRecord(this.form).then((response) => {
 						this.$modal.msgSuccess('修改成功');

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

@@ -60,26 +60,26 @@ export default {
       list: [],
       dynamicProps:[],
       searchBarFormConfig: [
-        {
+        // {
-          type: 'select',
+        //   type: 'select',
-          label: '工单名称',
+        //   label: '工单名称',
-          placeholder: '请选择工单名称',
+        //   placeholder: '请选择工单名称',
-          param: 'workOrderIdList',
+        //   param: 'workOrderIdList',
-          selectOptions: [],
+        //   selectOptions: [],
-          multiple: true,
+        //   multiple: true,
-          labelField: 'name',
+        //   labelField: 'name',
-          valueField: 'id',
+        //   valueField: 'id',
-          defaultSelect: [],
+        //   defaultSelect: [],
-          filterable: true
+        //   filterable: true
-        },
+        // },
-				{
+				// {
-					type: 'select',
+				// 	type: 'select',
-					label: '产品',
+				// 	label: '产品',
-          placeholder: '请选择产品',
+        //   placeholder: '请选择产品',
-          param: 'productionId',
+        //   param: 'productionId',
-          selectOptions: [],
+        //   selectOptions: [],
-          filterable: true
+        //   filterable: true
-				},
+				// },
 				// {
 				// 	type: 'input',
 				// 	label: '检测内容',
@@ -193,8 +193,8 @@ export default {
 			// },
 			// 查询参数
 			queryParams: {
-        workOrderIdList:undefined,
+        // workOrderIdList:undefined,
-        productionId: undefined,
+        // productionId: undefined,
         startTime: undefined,
         endTime: undefined,
 				// productionLineId: null,
@@ -207,16 +207,16 @@ export default {
   computed: {
     tableProps() {
       return [
-        {
+        // {
-          // width: 128,
+        //   // width: 128,
-          prop: 'workOrderName',
+        //   prop: 'workOrderName',
-          label: '工单名称',
+        //   label: '工单名称',
-        },
+        // },
-        {
+        // {
-          // width: 128,
+        //   // width: 128,
-          prop: 'productionName',
+        //   prop: 'productionName',
-          label: '产品',
+        //   label: '产品',
-        },
+        // },
         {
           // width: 160,
           prop: 'inspectionContent',
@@ -259,17 +259,17 @@ export default {
     },
   },
   mounted() {
-    if (this.$route.query.woIdString) {
+    // if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString)
+    //   console.log(this.$route.query.woIdString)
-      this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
-      // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-      // let arr =[]
+    //   // let arr =[]
-      this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
+    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
-      console.log(this.searchBarFormConfig[0].defaultSelect);
+    //   console.log(this.searchBarFormConfig[0].defaultSelect);
-    }
+    // }
     if (this.$route.query.startTime && this.$route.query.endTime) {
       // console.log(this.$route.query.startTime);
-      this.searchBarFormConfig[2].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
+      this.searchBarFormConfig[0].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
       this.queryParams.startTime = moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss')
       this.queryParams.endTime = moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss')
     }
@@ -370,8 +370,8 @@ export default {
 		/** 取消按钮 */
     handleSearchBarBtnClick(val) {
       if (val.btnName === 'search') {
-        this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
+        // this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
-        this.queryParams.productionId = val.productionId ? val.productionId : undefined
+        // this.queryParams.productionId = val.productionId ? val.productionId : undefined
         this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
         this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
         this.getList()

src/views/report/Environmental/sectionProduction/index.vue

@@ -68,6 +68,7 @@ export default {
 					label: '生产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'select',
@@ -75,7 +76,7 @@ export default {
 					selectOptions: [
 						{ id: '1', name: '当前班次' },
 						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
+						{ id: '3', name: '昨日日报' },
 					],
 					defaultSelect: '1',
 					param: 'timeType',
@@ -104,6 +105,7 @@ export default {
 					label: '生产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'select',
@@ -112,7 +114,7 @@ export default {
 					selectOptions: [
 						{ id: '1', name: '当前班次' },
 						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
+						{ id: '3', name: '昨日日报' },
 					],
 					param: 'timeType',
 					clearable: false,
@@ -137,12 +139,12 @@ export default {
 			queryParams: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			queryParams2: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			tableProp1,
 			tableProp: [],
@@ -150,11 +152,11 @@ export default {
 			tableProp2: [],
 			tableData2: [],
 			procedureName: [
-				{ name: '压延(拉引量t)', ename: 'calenderingCapacity' },
+				// { name: '压延(拉引量t)', ename: 'calenderingCapacity' },
 				{ name: '优化切割(片)', ename: 'cuttingNum' },
 				{ name: '堆垛(片)', ename: 'unloadPieces' },
 				{ name: '堆垛(托)', ename: 'unloadCount' },
-				{ name: '良品率(%)', ename: 'rate' },
+				{ name: '优切良品率(%)', ename: 'rate' },
 			],
 			span: [], //表2第一列合并
 		};
@@ -196,6 +198,7 @@ export default {
 				this.tableProp = [];
 				let timeArr = this.uniqueTime(data, 'timeStr');
 				let arr = [];
+				let arr1 = [];
 				timeArr.map((item) => {
 					let obj = {};
 					obj.prop = item.timeStr;
@@ -203,7 +206,17 @@ export default {
 					obj.minWidth = 140;
 					arr.push(obj);
 				});
-				this.tableProp = this.tableProp1.concat(arr); //表头
+				let obj1 = {};
+				obj1.children = arr.length > 0 ? arr : [{ label: '合计' }];
+				obj1.label =
+					'24小时原片工段产量表(' +
+					moment(this.queryParams.startTime).format('YYYY-MM-DD HH:mm:ss') +
+					'-' +
+					moment(this.queryParams.endTime).format('YYYY-MM-DD HH:mm:ss') +
+					')';
+				arr1.push(obj1);
+				this.tableProp = this.tableProp1.concat(arr1); //表头
+				console.log(this.tableProp);
 				this.transferData(data);
 			});
 		},
@@ -286,7 +299,6 @@ export default {
 		transferData(data) {
 			let tempData = [];
 			let lineNum = 0; //第一条产线
-			let sumArr = [];
 			for (let i = 0; i < data.length; i++) {
 				if (i === 0) {
 					this.procedureName.map((item) => {
@@ -299,37 +311,28 @@ export default {
 					});
 					lineNum++;
 				} else {
-					if (data[i].timeStr === '总计') {
+					if (data[i].lineName === data[i - 1].lineName) {
-						sumArr.push(data[i]);
+						//相同产线,添加列
-					} else {
+						let startNum = 4 * (lineNum - 1);
-						if (data[i].lineName === data[i - 1].lineName) {
+						let endNum = 4 * lineNum - 1;
-							//相同产线,添加列
+						for (let k = startNum; k <= endNum; k++) {
-							let startNum = 5 * (lineNum - 1);
+							let str = this.procedureName[k % 4];
-							let endNum = 5 * lineNum - 1;
+							tempData[k][data[i].timeStr] = data[i][str.ename];
-							for (let k = startNum; k <= endNum; k++) {
-								let str = this.procedureName[k % 5];
-								tempData[k][data[i].timeStr] = data[i][str.ename];
-							}
-						} else {
-							//不同产线，同时添加5行
-							this.procedureName.map((item) => {
-								let obj = {};
-								obj.lineName = data[i].lineName;
-								obj.procedure = item.name;
-								obj.eName = item.ename;
-								obj[data[i].timeStr] = data[i][item.ename];
-								tempData.push(obj);
-							});
-							lineNum++;
 						}
+					} else {
+						//不同产线，同时添加5行
+						this.procedureName.map((item) => {
+							let obj = {};
+							obj.lineName = data[i].lineName;
+							obj.procedure = item.name;
+							obj.eName = item.ename;
+							obj[data[i].timeStr] = data[i][item.ename];
+							tempData.push(obj);
+						});
+						lineNum++;
 					}
 				}
 			}
-			for (let j = 0; j < tempData.length; j++) {
-				sumArr.map((item) => {
-					tempData[j]['总计'] = item[tempData[j].eName];
-				});
-			}
 			this.tableData = tempData;
 
 			this.$nextTick(() => {
@@ -355,9 +358,9 @@ export default {
 		// 合并第一列
 		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 			if (columnIndex === 0) {
-				if (rowIndex % 5 === 0) {
+				if (rowIndex % 4 === 0) {
 					return {
-						rowspan: 5,
+						rowspan: 4,
 						colspan: 1,
 					};
 				} else {
@@ -379,9 +382,17 @@ export default {
 						obj.lineName = data[i].lineName;
 						obj.procedure = data[i].productDet[j].name;
 						data[i].productDet[j].data.map((item) => {
-							obj[item.timeStr] = item.input || null;
+							obj[item.timeStr] = item.output
+								? item.output
+								: item.input
+								? item.input
+								: null;
 						});
-						obj.sum = data[i].productDet[j].allInput;
+						obj.sum = data[i].productDet[j].allOutput
+							? data[i].productDet[j].allOutput
+							: data[i].productDet[j].allInput
+							? data[i].productDet[j].allInput
+							: null;
 						this.tableData2.push(obj);
 					}
 				}
@@ -395,7 +406,17 @@ export default {
 					arr.push(obj);
 				});
 				arr.push({ prop: 'sum', label: '合计' });
-				this.tableProp2 = this.tableProp1.concat(arr); //表头
+				let arr1 = [];
+				let obj1 = {};
+				obj1.children = arr;
+				obj1.label =
+					'24小时深加工工段产量表(' +
+					moment(this.queryParams2.startTime).format('YYYY-MM-DD HH:mm:ss') +
+					'-' +
+					moment(this.queryParams2.endTime).format('YYYY-MM-DD HH:mm:ss') +
+					')';
+				arr1.push(obj1);
+				this.tableProp2 = this.tableProp1.concat(arr1); //表头
 				this.getSpanArr(this.tableData2);
 				this.$nextTick(() => {
 					this.reTable2();
@@ -461,7 +482,7 @@ export default {
 		top: 0;
 		left: 0;
 		background-color: #ebeef5;
-		transform: rotate(-70deg);
+		transform: rotate(-63deg);
 		-webkit-transform-origin: top;
 		transform-origin: top;
 		width: 1px;
@@ -469,11 +490,11 @@ export default {
 	.el-table thead.is-group tr:last-of-type th:nth-child(1):before {
 		content: '';
 		position: absolute;
-		height: 67px;
+		height: 93px;
 		top: 0;
-		left: 75px;
+		left: 55px;
 		background-color: #ebeef5;
-		transform: rotate(-70deg);
+		transform: rotate(-63deg);
 		-webkit-transform-origin: top;
 		transform-origin: top;
 		width: 1px;

src/views/report/Product/monthly.vue

@@ -0,0 +1,389 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2024-04-22 15:49:56
+ * @LastEditTime: 2024-04-26 10:32:29
+ * @LastEditors: DY
+ * @Description: 
+-->
+<template>
+	<div class="weekly">
+		<el-form
+			:inline="true"
+			:model="listQuery"
+			class="blueTip">
+			<el-form-item
+				label="月份"
+				prop="reportTime">
+				<el-date-picker
+					v-model="listQuery.time"
+					value-format="timestamp"
+					type="month"
+					size="small"
+					placeholder="选择月"></el-date-picker>
+			</el-form-item>
+			<el-button
+				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
+				type="primary"
+				size="small"
+				@click="getList">
+				查询
+			</el-button>
+			<el-button
+				v-if="
+					this.$auth.hasPermiAnd([
+						'base:report-auto-original-glass:export',
+						'base:report-auto-production:export',
+					])
+				"
+				type="primary"
+				size="small"
+				plain
+				@click="handleExport">
+				导出
+			</el-button>
+		</el-form>
+		<base-table
+			ref="productionDataMonthTable11"
+			id="productionDataMonthTable1"
+			:table-props="tableProps"
+			:table-data="tableData"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH" />
+		<base-table
+		ref="productionDataMonthTable22"
+			id="productionDataMonthTable2"
+			:table-props="tableProps1"
+			:table-data="tableData1"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH"
+			style="margin-top: 15px" />
+	</div>
+</template>
+
+<script>
+import { productionMonthY, productionMonthD } from '@/api/report/glass';
+import { parseTime } from '../../core/mixins/code-filter';
+import FileSaver from 'file-saver';
+import * as XLSX from 'xlsx/xlsx.mjs';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+export default {
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 350,
+			listQuery: {
+				time: '',
+			},
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+			// reportTime: '',
+			// glassWeekShow: false,
+			// proWeekShow: false,
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
+	},
+	created() {
+		let now = new Date()
+    now.setHours(0, 0, 0, 0)
+    now.setDate(1)
+    let startOfMonth = now.getTime()
+    this.listQuery.time = startOfMonth
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		getTime1() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.$set(this.tableProps[2], 'label', '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')')
+			this.$set(this.tableProps1[2], 'label', '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')') 
+			// this.tableProps[2].label = '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			// this.tableProps1[2].label = '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			console.log(this.tableProps, this.tableProps1)
+		},
+		async getList() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
+			this.tableData = [];
+			this.tableProps = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc',
+					label: '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			this.tableData1 = [];
+			this.tableProps1 = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true,
+				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			await productionMonthY(this.listQuery).then((res) => {
+				this.resData = res.data;
+				// 设置表头
+				Object.keys(this.resData).forEach((item) => {
+					this.tableProps[2].children.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData(this.resData);
+			});
+			await productionMonthD(this.listQuery).then((res) => {
+				this.resData1 = res.data;
+				// 设置表头
+				Object.keys(this.resData1).forEach((item) => {
+					this.tableProps1[2].children.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData1(this.resData1);
+			});
+			// this.getTime1()
+		},
+		// 设置表格2数据
+		buildTableData1(data) {
+			let keys = Object.keys(data);
+			let tempData = [];
+			let subKeys = Object.keys(data[keys[0]]);
+			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+			for (let i = 0; i < keys.length; i++) {
+				if (i === 0) {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							let obj = {};
+							obj.lineName = subKeys[j];
+							obj.paramsName = sub2Keys[k];
+							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+							tempData.push(obj);
+						}
+					}
+				} else {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							for (let v = 0; v < tempData.length; v++) {
+								if (
+									tempData[v].lineName === subKeys[j] &&
+									tempData[v].paramsName === sub2Keys[k]
+								) {
+									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+								}
+							}
+						}
+					}
+				}
+			}
+			this.tableData1 = tempData;
+			this.getSpanArr1(this.tableData1);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
+		},
+		// 设置表格数据
+		buildTableData(data) {
+			let keys = Object.keys(data);
+			let tempData = [];
+			let subKeys = Object.keys(data[keys[0]]);
+			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+			for (let i = 0; i < keys.length; i++) {
+				if (i === 0) {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							let obj = {};
+							obj.lineName = subKeys[j];
+							obj.paramsName = sub2Keys[k];
+							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+							tempData.push(obj);
+						}
+					}
+				} else {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							for (let v = 0; v < tempData.length; v++) {
+								if (
+									tempData[v].lineName === subKeys[j] &&
+									tempData[v].paramsName === sub2Keys[k]
+								) {
+									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+								}
+							}
+						}
+					}
+				}
+			}
+			this.tableData = tempData;
+			this.getSpanArr(this.tableData);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataMonthTable11.doLayout('productionDataMonthTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataMonthTable22.doLayout('productionDataMonthTable2');
+		},
+		getSpanArr1(data) {
+			this.span2 = [];
+			for (var i = 0; i < data.length; i++) {
+				if (i === 0) {
+					this.span2.push(1);
+					this.index1 = 0;
+				} else {
+					if (data[i].lineName === data[i - 1].lineName) {
+						this.span2[this.index1] += 1;
+						this.span2.push(0);
+					} else {
+						this.span2.push(1);
+						this.index1 = i;
+					}
+				}
+			}
+		},
+		// 获取合并行
+		getSpanArr(data) {
+			this.span1 = [];
+			for (var i = 0; i < data.length; i++) {
+				if (i === 0) {
+					this.span1.push(1);
+					this.index = 0;
+				} else {
+					if (data[i].lineName === data[i - 1].lineName) {
+						this.span1[this.index] += 1;
+						this.span1.push(0);
+					} else {
+						this.span1.push(1);
+						this.index = i;
+					}
+				}
+			}
+		},
+		objectSpanMethod1({ rowIndex, columnIndex }) {
+			if (columnIndex === 0) {
+				const _row = this.span1[rowIndex];
+				return {
+					rowspan: _row,
+					colspan: 1,
+				};
+			}
+		},
+		handleExport() {
+			const xlsxParam = { raw: true };
+			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 workbook = XLSX.utils.book_new();
+			var ws = XLSX.utils.table_to_sheet(
+				tables,
+				xlsxParam
+			);
+			XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总');
+
+			let tables1 = document.querySelectorAll('.el-table')[1].cloneNode(true)
+			const fix1 = tables1.querySelector('.el-table__fixed')
+			const fixRight1 = tables1.querySelector('.el-table__fixed-right')
+			if (fix1) {
+				tables1.removeChild(fix1)
+			}
+			if (fixRight1) {
+				tables1.removeChild(fixRight1)
+			}
+			var prows = XLSX.utils.table_to_sheet(
+				tables1,
+				xlsxParam
+			);
+			XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总');
+			let fileName = '生产数据汇总表-月报.xlsx';
+			var wbout = XLSX.write(workbook, {
+				bookType: 'xlsx',
+				bookSST: true,
+				type: 'array',
+			});
+			try {
+				FileSaver.saveAs(
+					new Blob([wbout], { type: 'application/octet-stream' }),
+					fileName
+				);
+				this.$message.success('导出成功');
+			} catch (e) {
+				if (typeof console !== 'undefined') console.log(e, wbout);
+			}
+			return wbout;
+		},
+		handleEmitFun(payload) {
+			console.log('payload', payload);
+		},
+	},
+};
+</script>
+
+<style scoped>
+.weekly {
+	padding: 16px;
+}
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 18px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 8px;
+	margin-left: 16px;
+}
+</style>

src/views/report/Product/weekly.vue

@@ -0,0 +1,198 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2024-04-22 15:49:56
+ * @LastEditTime: 2024-04-25 14:31:53
+ * @LastEditors: DY
+ * @Description: 
+-->
+<template>
+  <div class="weekly">
+    <el-form :inline="true" :model="listQuery" class="blueTip">
+      <el-form-item label="周" prop="reportTime">
+        <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
+          :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          style="width: 350px" placeholder="选择周">
+        </el-date-picker>
+      </el-form-item>
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
+        查询
+      </el-button>
+      <el-button v-if="this.$auth.hasPermiAnd(['base:report-auto-original-glass:export', 'base:report-auto-production:export'])" type="primary" size="small" plain
+        @click="handleExport">导出</el-button>
+    </el-form>
+    <glassWeek v-if="glassWeekShow" ref="glassWeek" :product="false" :params="listQuery" />
+    <proWeek v-if="proWeekShow" ref="proWeek" :product="false" :params="listQuery" />
+  </div>
+</template>
+
+<script>
+import glassWeek from '../glass/weekly.vue'
+import proWeek from '../productionWeekReport/index.vue'
+import { parseTime } from '../../core/mixins/code-filter'
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx/xlsx.mjs'
+
+export default {
+  components: { glassWeek, proWeek },
+  data() {
+    return {
+      listQuery: {
+				// pageSize: 10,
+				// pageNo: 1,
+				// total: 0,
+				reportType: 3,
+				reportTime: []
+      },
+      startTimeStamp: '',
+      endTimeStamp: '',
+      reportTime: '',
+      glassWeekShow: false,
+      proWeekShow: false,
+      proTabaleData: []
+    }
+  },
+  created() {
+    this.getCurrentWeekStartTimeAndEndTime()
+    this.glassWeekShow = true
+    this.proWeekShow = true
+  },
+  methods: {
+    // handleExport() {
+    //   this.$nextTick(() => {
+    //     this.$refs['glassWeek'].handleExport()
+    //     this.$refs['proWeek'].handleExport()
+    //   })
+    // },
+    handleExport() {
+      const xlsxParam = { raw: true }
+      let workbook = XLSX.utils.book_new()
+      var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
+      XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩周原片生产汇总')
+      var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
+      XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩周成品生产汇总')
+      let fileName = '生产数据汇总表-周报.xlsx';
+      var wbout = XLSX.write(workbook, {
+        bookType: 'xlsx',
+        bookSST: true,
+        type: 'array',
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], { type: 'application/octet-stream' }),
+          fileName
+        );
+        this.$message.success('导出成功');
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, wbout);
+      }
+      return wbout;
+    },
+    search() {
+      this.$nextTick(() => {
+        this.$refs['glassWeek'].getDataList()
+        this.$refs['proWeek'].getDataList()
+      })
+    },
+    changeTime(val) {
+      console.log(val);
+			if(val) {
+					let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
+					this.startTimeStamp = this.timeFun(timeStamp - 24 * 60 * 60 * 1000); //开始时间
+					this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 6); //结束时间
+					console.log(this.startTimeStamp, this.endTimeStamp)
+				this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+			} else {
+					this.listQuery.reportTime = []
+			}
+		},
+    getCurrentWeekStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      var weekday = new Array(7);
+      weekday[0] = "Sunday";
+      weekday[1] = "Monday";
+      weekday[2] = "Tuesday";
+      weekday[3] = "Wednesday";
+      weekday[4] = "Thursday";
+      weekday[5] = "Friday";
+      weekday[6] = "Saturday";
+      // console.log(weekday[this.reportTime.getDay()]);
+      if (weekday[this.reportTime.getDay()] === 'Monday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 4 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() + 3 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Tuesday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 5 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() + 2 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Wednesday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 6 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() + 1 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Thursday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 7 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime())
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Friday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 8 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() - 1 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Saturday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 9 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() - 2 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      } else if (weekday[this.reportTime.getDay()] === 'Sunday') {
+        this.startTimeStamp = this.timeFun(new Date().getTime() - 10 * 24 * 60 * 60 * 1000)
+        this.endTimeStamp = this.timeFun(new Date().getTime() + 3 * 24 * 60 * 60 * 1000)
+        this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:00').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        // this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间
+        // this.changeTime(reportTime)
+      }
+    },
+    //时间戳转为yy-mm-dd hh:mm:ss
+		timeFun(unixtimestamp) {
+				var unixtimestamp = new Date(unixtimestamp);
+				var year = 1900 + unixtimestamp.getYear();
+				var month = "0" + (unixtimestamp.getMonth() + 1);
+				var date = "0" + unixtimestamp.getDate();
+				return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
+		}
+  }
+}
+</script>
+
+<style scoped>
+.weekly {
+  padding-top: 16px;
+}
+.blueTip::before{
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8PX;
+  margin-top: 8px;
+  margin-left: 16px;
+}
+</style>

src/views/report/Product/year.vue

@@ -0,0 +1,387 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2024-04-22 15:49:56
+ * @LastEditTime: 2024-04-26 10:34:12
+ * @LastEditors: DY
+ * @Description: 
+-->
+<template>
+	<div class="weekly">
+		<el-form
+			:inline="true"
+			:model="listQuery"
+			class="blueTip">
+			<el-form-item
+				label="年份"
+				prop="reportTime">
+				<el-date-picker
+					v-model="listQuery.time"
+					value-format="timestamp"
+					type="year"
+					size="small"
+					placeholder="选择年"></el-date-picker>
+			</el-form-item>
+			<el-button
+				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
+				type="primary"
+				size="small"
+				@click="getList">
+				查询
+			</el-button>
+			<el-button
+				v-if="
+					this.$auth.hasPermiAnd([
+						'base:report-auto-original-glass:export',
+						'base:report-auto-production:export',
+					])
+				"
+				type="primary"
+				size="small"
+				plain
+				@click="handleExport">
+				导出
+			</el-button>
+		</el-form>
+		<base-table
+		ref="productionDataYearTable11"
+			id="productionDataYearTable1"
+			:table-props="tableProps"
+			:table-data="tableData"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH" />
+		<base-table
+		ref="productionDataYearTable22"
+			id="productionDataYearTable2"
+			:table-props="tableProps1"
+			:table-data="tableData1"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH"
+			style="margin-top: 15px" />
+	</div>
+</template>
+
+<script>
+import { productionYearY, productionYearD } from '@/api/report/glass';
+import { parseTime } from '../../core/mixins/code-filter';
+import FileSaver from 'file-saver';
+import * as XLSX from 'xlsx/xlsx.mjs';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+export default {
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 350,
+			listQuery: {
+				time: '',
+			},
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+			// reportTime: '',
+			// glassWeekShow: false,
+			// proWeekShow: false,
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
+	},
+	created() {
+		let now = new Date()
+    now.setHours(0, 0, 0, 0)
+    now.setDate(1)
+		now.setMonth(0)
+    let startOfMonth = now.getTime()
+    // let firstDayOfMonth = new Date(startOfMonth)
+		// console.log('看看', parseTime(firstDayOfMonth))
+    this.listQuery.time = startOfMonth
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		getTime() {
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.tableProps[0].label = '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+			this.tableProps1[0].label = '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+		},
+		async getList() {
+			// this.getTime()
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
+			this.tableData = [];
+			this.tableProps = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc',
+					label: '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			this.tableData1 = [];
+			this.tableProps1 = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			await productionYearY(this.listQuery).then((res) => {
+				this.resData = res.data;
+				// 设置表头
+				Object.keys(this.resData).forEach((item) => {
+					this.tableProps[2].children.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData(this.resData);
+			});
+			await productionYearD(this.listQuery).then((res) => {
+				this.resData1 = res.data;
+				// 设置表头
+				Object.keys(this.resData1).forEach((item) => {
+					this.tableProps1[2].children.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData1(this.resData1);
+			});
+		},
+		// 设置表格2数据
+		buildTableData1(data) {
+			let keys = Object.keys(data);
+			let tempData = [];
+			let subKeys = Object.keys(data[keys[0]]);
+			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+			for (let i = 0; i < keys.length; i++) {
+				if (i === 0) {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							let obj = {};
+							obj.lineName = subKeys[j];
+							obj.paramsName = sub2Keys[k];
+							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+							tempData.push(obj);
+						}
+					}
+				} else {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							for (let v = 0; v < tempData.length; v++) {
+								if (
+									tempData[v].lineName === subKeys[j] &&
+									tempData[v].paramsName === sub2Keys[k]
+								) {
+									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+								}
+							}
+						}
+					}
+				}
+			}
+			this.tableData1 = tempData;
+			this.getSpanArr1(this.tableData1);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
+		},
+		// 设置表格数据
+		buildTableData(data) {
+			let keys = Object.keys(data);
+			let tempData = [];
+			let subKeys = Object.keys(data[keys[0]]);
+			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+			for (let i = 0; i < keys.length; i++) {
+				if (i === 0) {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							let obj = {};
+							obj.lineName = subKeys[j];
+							obj.paramsName = sub2Keys[k];
+							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+							tempData.push(obj);
+						}
+					}
+				} else {
+					for (let j = 0; j < subKeys.length; j++) {
+						for (let k = 0; k < sub2Keys.length; k++) {
+							for (let v = 0; v < tempData.length; v++) {
+								if (
+									tempData[v].lineName === subKeys[j] &&
+									tempData[v].paramsName === sub2Keys[k]
+								) {
+									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+								}
+							}
+						}
+					}
+				}
+			}
+			this.tableData = tempData;
+			this.getSpanArr(this.tableData);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataYearTable11.doLayout('productionDataYearTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataYearTable22.doLayout('productionDataYearTable2');
+		},
+		getSpanArr1(data) {
+			this.span2 = [];
+			for (var i = 0; i < data.length; i++) {
+				if (i === 0) {
+					this.span2.push(1);
+					this.index1 = 0;
+				} else {
+					if (data[i].lineName === data[i - 1].lineName) {
+						this.span2[this.index1] += 1;
+						this.span2.push(0);
+					} else {
+						this.span2.push(1);
+						this.index1 = i;
+					}
+				}
+			}
+		},
+		// 获取合并行
+		getSpanArr(data) {
+			this.span1 = [];
+			for (var i = 0; i < data.length; i++) {
+				if (i === 0) {
+					this.span1.push(1);
+					this.index = 0;
+				} else {
+					if (data[i].lineName === data[i - 1].lineName) {
+						this.span1[this.index] += 1;
+						this.span1.push(0);
+					} else {
+						this.span1.push(1);
+						this.index = i;
+					}
+				}
+			}
+		},
+		objectSpanMethod1({ rowIndex, columnIndex }) {
+			if (columnIndex === 0) {
+				const _row = this.span1[rowIndex];
+				return {
+					rowspan: _row,
+					colspan: 1,
+				};
+			}
+		},
+		handleExport() {
+			const xlsxParam = { raw: true };
+			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 workbook = XLSX.utils.book_new();
+			var ws = XLSX.utils.table_to_sheet(
+				tables,
+				xlsxParam
+			);
+			XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩年原片生产汇总');
+
+			let tables1 = document.querySelectorAll('.el-table')[1].cloneNode(true)
+			const fix1 = tables1.querySelector('.el-table__fixed')
+			const fixRight1 = tables1.querySelector('.el-table__fixed-right')
+			if (fix1) {
+				tables1.removeChild(tables1.querySelector('.el-table__fixed'))
+			}
+			if (fixRight1) {
+				tables1.removeChild(tables1.querySelector('.el-table__fixed-right'))
+			}
+			var prows = XLSX.utils.table_to_sheet(
+				tables1,
+				xlsxParam
+			);
+			XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩年成品生产汇总');
+			let fileName = '生产数据汇总表-年报.xlsx';
+			var wbout = XLSX.write(workbook, {
+				bookType: 'xlsx',
+				bookSST: true,
+				type: 'array',
+			});
+			try {
+				FileSaver.saveAs(
+					new Blob([wbout], { type: 'application/octet-stream' }),
+					fileName
+				);
+				this.$message.success('导出成功');
+			} catch (e) {
+				if (typeof console !== 'undefined') console.log(e, wbout);
+			}
+			return wbout;
+		},
+		handleEmitFun(payload) {
+			console.log('payload', payload);
+		},
+	},
+};
+</script>
+
+<style scoped>
+.weekly {
+	padding: 16px;
+}
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 18px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 8px;
+	margin-left: 16px;
+}
+</style>

src/views/report/glass/inputTable.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-04-12 14:21:34
+ * @LastEditTime: 2024-04-26 15:59:39
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div>
-    <el-row style="float: right; margin-bottom: 5px">
+    <el-row v-if="isShowEdit" style="float: right; margin-bottom: 5px">
       <el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
         size="small" @click="edit = true">编辑</el-button>
       <el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
@@ -38,15 +38,15 @@
 import { updateGlass, updateGlassRemark } from '@/api/report/glass';
 
 const cols = [
+  {
+    prop: 'lineName',
+    label: '生产线',
+  },
   {
 		prop: 'xc',
 		label: '许昌安彩周原片生产汇总',
-		align: 'center',
+		// align: '200px',
 		children: [
-			{
-				prop: 'lineName',
-				label: '生产线',
-			},
 			{
 				prop: 'm',
 				label: '拉引量㎡',
@@ -152,6 +152,10 @@ const cols = [
       type: {
         type: Number,
         default: 3,
+      },
+      isShowEdit: {
+        type: Boolean,
+        default: true
       }
     },
     data() {
@@ -174,11 +178,12 @@ const cols = [
       },
       time: {
         immediate: true,
+        deep: true,
         handler(newv, oldv) {
-          if (newv[0] !== '') {
+          if (newv[0] !== '' && newv[0] !== undefined) {
-            this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
+            this.cols[1].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
           } else {
-            this.cols[0].label = this.date
+            this.cols[1].label = this.date
           }
         }
       },
@@ -203,15 +208,15 @@ const cols = [
             text2 = '上年'
             text3 = '原片合计（片/年）'
           }
-          this.cols[0].children[1].children[0].label = text1
+          this.cols[1].children[0].children[0].label = text1
-          this.cols[0].children[1].children[1].label = text2
+          this.cols[1].children[0].children[1].label = text2
-          this.cols[0].children[2].children[0].label = text1
+          this.cols[1].children[1].children[0].label = text1
-          this.cols[0].children[2].children[1].label = text2
+          this.cols[1].children[1].children[1].label = text2
-          this.cols[0].children[3].children[0].label = text1
+          this.cols[1].children[2].children[0].label = text1
-          this.cols[0].children[3].children[1].label = text2
+          this.cols[1].children[2].children[1].label = text2
-          this.cols[0].children[4].children[0].label = text1
+          this.cols[1].children[3].children[0].label = text1
-          this.cols[0].children[4].children[1].label = text2
+          this.cols[1].children[3].children[1].label = text2
-          this.cols[0].children[2].label = text3
+          this.cols[1].children[1].label = text3
         }
       }
     },

src/views/report/glass/month.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div>
+    <div v-if="product">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="月" prop="reportTime">
           <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
@@ -14,7 +14,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
+    <inputTable :date="date" :data="tableData" :isShowEdit="product" :time="listQuery.reportTime" :sum="all" :key="listQuery.reportTime[0]"
       :type="listQuery.reportType" @refreshDataList="getDataList" />
     <!-- <pagination
 			:limit.sync="listQuery.pageSize"
@@ -33,6 +33,16 @@ import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
 	components: { inputTable },
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -40,9 +50,6 @@ export default {
 				exportURL: exportGlasscExcel
 			},
 			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
 				reportType: 4,
 				reportTime: []
       },
@@ -101,6 +108,9 @@ export default {
       const res = await getCorePLList()
       this.proLineList = res.data;
       this.dataListLoading = true;
+       if (this?.params) {
+        this.listQuery = {...this.params}
+      }
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
           message: '请选择时间',

src/views/report/glass/weekly.vue

@@ -4,7 +4,7 @@
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" /> -->
-    <div>
+    <div v-if="product">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="周" prop="reportTime">
           <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
@@ -21,7 +21,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
+    <inputTable :date="date" :data="tableData" :isShowEdit="product" :time="listQuery.reportTime" :sum="all" :key="listQuery.reportTime[0]"
       :type="listQuery.reportType" @refreshDataList="getDataList" />
   </div>
 </template>
@@ -35,6 +35,16 @@ import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
 	components: { inputTable },
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -42,9 +52,6 @@ export default {
 				exportURL: exportGlasscExcel
 			},
 			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
 				reportType: 3,
 				reportTime: []
       },
@@ -89,11 +96,12 @@ export default {
   },
   created () {
     // this.getDict()
+    this.getCurrentWeekStartTimeAndEndTime()
   },
 	mounted() {
 		// const day = new Date().getDay()
     // console.log('周四', day)
-    this.getCurrentWeekStartTimeAndEndTime()
+    // this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
     this.getDataList()
 	},
@@ -190,6 +198,10 @@ export default {
       const res = await getCorePLList()
       this.proLineList = res.data;
       this.dataListLoading = true;
+      if (this?.params) {
+        this.listQuery = {...this.params}
+        // this.$set(this.listQuery, 'reportTime', this.params.reportTime)
+      }
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
           message: '请选择时间',

src/views/report/glass/year.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div>
+    <div v-if="product">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="年" prop="reportTime">
           <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
@@ -16,7 +16,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
+    <inputTable :date="date" :data="tableData" :isShowEdit="product" :time="listQuery.reportTime" :sum="all" :key="listQuery.reportTime[0]"
       :type="listQuery.reportType" @refreshDataList="getDataList" />
   </div>
 </template>
@@ -30,6 +30,16 @@ import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
 	components: { inputTable },
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -37,9 +47,9 @@ export default {
 				exportURL: exportGlasscExcel
 			},
 			listQuery: {
-				pageSize: 10,
+				// pageSize: 10,
-				pageNo: 1,
+				// pageNo: 1,
-				total: 0,
+				// total: 0,
 				reportType: 5,
 				reportTime: []
       },
@@ -54,11 +64,10 @@ export default {
 	},
   created() {
 		// this.getDict()
+    this.getCurrentYearFirst()
   },
   mounted () {
-    this.getCurrentYearFirst()
+    this.getDataList();
-    this.getDataList()
-      ;
   },
   methods: {
     getCurrentYearFirst() {
@@ -101,6 +110,9 @@ export default {
       const res = await getCorePLList()
       this.proLineList = res.data;
       this.dataListLoading = true;
+      if (this?.params) {
+        this.listQuery = {...this.params}
+      }
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
           message: '请选择时间',

src/views/report/ingredientReport/day.vue

@@ -1,10 +1,3 @@
-<!--
- * @Author: zhp
- * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 15:23:05
- * @LastEditors: zhp
- * @Description:
--->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
@@ -24,19 +17,23 @@
       </el-table-column>
     </el-table> -->
 
-    <el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
+    <el-table id="exportTable" :header-cell-style="{
-      <el-table-column label="原料样式" align="right" width="150">
+      background: '#F2F4F9',
-        <el-table-column prop="className" label="时间" width="120">
+      color: '#606266'
+    }" class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
+      <el-table-column align="center" prop="" :label=" '配料日报' + time " width="120">
+        <el-table-column label="原料样式" align="right" width="150">
+          <el-table-column prop="className" label="时间" width="150">
+          </el-table-column>
         </el-table-column>
-      </el-table-column>
+        <el-table-column align="center" prop="putType" label="" width="180">
-      <el-table-column prop="putType" label="" width="180">
+        </el-table-column>
-      </el-table-column>
+        <!-- <el-table-column prop label="参考标准及评价方法">
-      <!-- <el-table-column prop label="参考标准及评价方法">
         <el-table-column prop="activityName"></el-table-column>
         <el-table-column prop="message"></el-table-column>
       </el-table-column> -->
-      <el-table-column v-for="(item,index) in codeList " :prop="item" :label="item">
+        <el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :key="index" :prop="item"  :label="item">
-        <!-- <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
           <el-col :span="12">
             {{ codeList[index] }}
           </el-col>
@@ -49,6 +46,7 @@
             </el-col>
           </el-row>
         </template> -->
+        </el-table-column>
       </el-table-column>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -74,6 +72,7 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+import moment from 'moment'
 // import { getList, } from "@/api/base/qualityScrapType";
 const headers = [
   // {
@@ -119,7 +118,7 @@ const headers = [
 ];
 
 export default {
-  mixins: [ tableHeightMixin],
+  mixins: [tableHeightMixin],
   data() {
     return {
       urlOptions: {
@@ -127,37 +126,36 @@ export default {
         // deleteURL: deleteQualityHotMaterial,
         // exportURL: exportFactoryExcel,
       },
-      codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14' ],
+      codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11','sj14'],
       tableData: [],
       listQuery: {
         startTime: undefined,
-        endTime:undefined
+        endTime: undefined
       },
+      time: '',
       formConfig: [
         {
           type: 'datePicker',
-          label: '时间段',
+          label: '时间',
-          dateType: 'daterange',
+          dateType: 'date',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd',
           valueFormat: "timestamp",
           rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: Date.now(),
-          width: 250
+          width: 150
         },
         {
-          type:'button',
+          type: 'button',
           btnName: '查询',
           name: 'search',
           color: 'primary',
         },
         {
-          type:'button',
+          type: 'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
@@ -170,14 +168,29 @@ export default {
   },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
+    this.listQuery.startTime = Date.now()
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.time = moment(new Date((Date.now())).setHours(8, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours( 7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
+    this.listQuery.endTime = Date.now()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     // this.getSpanArr(this.tableData)
     // this.getDict();
   },
   methods: {
+    timestampToTime(date) {
+      // 时间戳为10位需*1000，时间戳为13位不需乘1000
+      // var date = new Date(timestamp * 1000);
+      var Y = date.getFullYear() + "-";
+      var M =
+        (date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1) + "-";
+      var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      var h = date.getHours() + ":";
+      var m = date.getMinutes() + ":";
+      var s = date.getSeconds();
+      return Y + M + D + h + m + s;
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       let spanOneArr = [], concatOne = 0;
       this.tableData.map((item, index) => {
@@ -203,22 +216,30 @@ export default {
           colspan: _col
         }
       }
-      if (columnIndex === 1 ) {
+      if (columnIndex === 1) {
         if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
           return {
             rowspan: 2,
             colspan: 1
           }
+        }
       }
-      }
+      if (columnIndex === 1) {
-      if (columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6)  {
+        if (rowIndex % 2 == 1) {
-        if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) {
           return {
             rowspan: 1,
             colspan: 2
           }
         }
       }
+      if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 ) {
+        if (rowIndex % 2 == 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        }
+      }
     },
     handleExport() {
       // 处理查询参数
@@ -244,7 +265,7 @@ export default {
             //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
             new Blob([wbout], { type: "application/octet-stream" }),
             //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "配料日报.xlsx"
           );
         } catch (e) {
           if (typeof console !== "undefined") console.log(e, wbout);
@@ -266,15 +287,15 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.listQuery.startTime = '1713197388000';
+      // this.listQuery.startTime = '1713197388000';
-      this.listQuery.endTime = '1713254961000';
+      // this.listQuery.endTime = '1713254961000';
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         // console.log(res)
         // console.log(res.data)
         let arr = [
           {
             classType: 1,
-            className:'白班(8:00-20:00)',
+            className: '白班(8:00-20:00)',
             'sj1': null,
             'sj2': null,
             'sj3': null,
@@ -284,10 +305,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
-            putType: '投入数量'
+            putType: '原料投入(kg)'
           },
           {
             classType: 1,
@@ -301,9 +321,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
           {
@@ -318,8 +338,7 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
             putType: '投入次数'
           },
@@ -335,9 +354,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
           {
@@ -352,10 +371,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
-            putType: '投入数量',
+            putType: '原料投入(kg)',
           },
           {
             classType: 2,
@@ -369,13 +387,13 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
           {
-            classType:2,
+            classType: 2,
             className: '夜班(20:00-8:00)',
             'sj1': null,
             'sj2': null,
@@ -386,8 +404,7 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
             putType: '投入次数',
           },
@@ -403,9 +420,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
           {
@@ -420,10 +437,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
-            putType: '投入数量',
+            putType: '原料投入(kg)',
           },
           {
             classType: 3,
@@ -437,9 +453,9 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
           {
@@ -454,8 +470,7 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
             putType: '投入次数',
           },
@@ -471,37 +486,57 @@ export default {
             'sj8': null,
             'sj10': null,
             'sj11': null,
-            'sj12': null,
+
-            'sj13': null,
             'sj14': null,
+            'sj1+sj2': null,
             putType: ''
           },
         ]
         res.data.forEach((ele) => {
+          if (ele.classType === 1 && ele.code == 'sj1+sj2') {
+            arr[1]['putType'] = ele.useNum
+            arr[3]['putType'] = ele.putNum
+            // arr[1]['sj2'] = ele.putNum
+            // arr[3]['sj2'] = ele.useNum
+          } else if (ele.classType === 2 && ele.code == 'sj1+sj2') {
+            arr[5]['putType'] = ele.useNum
+            arr[7]['putType'] = ele.putNum
+            // arr[5]['sj2'] = ele.putNum
+            // arr[7]['sj2'] = ele.useNum
+          } else if (ele.classType === 3 && ele.code == 'sj1+sj2') {
+            arr[9]['putType'] = ele.useNum
+            arr[11]['putType'] = ele.putNum
+            // arr[9]['sj2'] = ele.putNum
+            // arr[11]['sj2'] = ele.useNum
+          }
           this.codeList.forEach((item) => {
             if (ele.classType === 1 && ele.code == item) {
               // console.log(arr[0][item])
-              arr[0][item] = ele.putNum
+              arr[0][item] = ele.useNum
-              arr[2][item] = ele.useNum
+              arr[2][item] = ele.putNum
             } else if (ele.classType === 2 && ele.code == item) {
-              arr[4][item] = ele.putNum
+              arr[4][item] = ele.useNum
-              arr[6][item] = ele.useNum
+              arr[6][item] = ele.putNum
             } else if (ele.classType === 3 && ele.code == item) {
-              arr[8][item] = ele.putNum
+              arr[8][item] = ele.useNum
-              arr[10][item] = ele.useNum
+              arr[10][item] = ele.putNum
             }
           })
         })
         // console.log(arr)
         this.tableData = arr
+        console.log(this.tableData);
         this.dataListLoading = false;
       });
     },
     buttonClick(val) {
+      console.log(val.checkTime)
+      // Date.now() - 24 * 60 * 60 - 1000
       switch (val.btnName) {
         case 'search':
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined;
           this.getDataList();
           break;
         case 'export':
@@ -515,6 +550,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable{
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
@@ -523,42 +562,46 @@ export default {
   padding: 0;
   height: 35px;
 }
+
 ::v-deep.el-table thead.is-group th {
   background: none;
 }
 
-::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type {
+/* ::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type {
+  border-bottom: none;
+} */
+::v-deep.el-table thead.is-group tr:nth-child(2) th:nth-child(1) {
   border-bottom: none;
 }
 
-::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type:before {
+::v-deep.el-table thead.is-group tr:nth-child(2) th:first-of-type:before {
   content: '';
   position: absolute;
   width: 1px;
-  height: 75px;
+  height: 90px;
   /*这里需要自己调整，根据td的宽度和高度*/
   top: 0;
   left: 0;
   background-color: grey;
   opacity: 0.3;
   display: block;
-  transform: rotate(-53deg);
+  transform: rotate(-60deg);
   /*这里需要自己调整，根据线的位置*/
   transform-origin: top;
 }
 
-::v-deep.el-table thead.is-group tr:last-of-type th:first-of-type:before {
+::v-deep.el-table thead.is-group tr:nth-child(3) th:first-of-type:before {
   content: '';
   position: absolute;
   width: 1px;
-  height: 75px;
+  height: 90px;
   /*这里需要自己调整，根据td的宽度和高度*/
   bottom: 0;
   right: 0;
   background-color: grey;
   opacity: 0.3;
   display: block;
-  transform: rotate(-54deg);
+  transform: rotate(-60deg);
   /*这里需要自己调整，根据线的位置*/
   transform-origin: bottom;
 }

src/views/report/productionMonthReport/index.vue

@@ -1,30 +1,32 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:46
+ * @LastEditTime: 2024-04-24 15:27:49
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form :inline="true" :model="dataForm" class="blueTip">
+    <div v-if="product">
-      <el-form-item label="月" prop="reportTime">
+      <el-form :inline="true" :model="dataForm" class="blueTip">
-        <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
+        <el-form-item label="月" prop="reportTime">
-        </el-date-picker>
+          <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
-      </el-form-item>
+          </el-date-picker>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        </el-form-item>
-        查询
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
-      </el-button>
+          查询
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+        </el-button>
-        @click="handleExport">导出</el-button>
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
-    </el-form>
+          @click="handleExport">导出</el-button>
-    <el-row style="float: right; margin-bottom: 5px">
+      </el-form>
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-row style="float: right; margin-bottom: 5px">
-        size="small" @click="editDataList()">编辑</el-button>
+        <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
-      <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
+          size="small" @click="editDataList()">编辑</el-button>
-      <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
+        <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
-    </el-row>
+        <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+      </el-row>
+    </div>
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
@@ -286,6 +288,16 @@ export default {
 	// 	DialogForm,
 	// },
 	// mixins: [basicPageMixin],
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
     return {
       list: [],
@@ -484,7 +496,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */
@@ -653,16 +665,21 @@ export default {
       }
     },
     async getDataList() {
-      if (this.monthValue.length > 0) {
+      if (this?.params) {
-        console.log(this.monthValue)
+        this.dataForm = {...this.params}
-        this.dataForm.reportTime[0] = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' 07:00:01'
+        this.timeTips = this.dataForm.reportTime[0] + ' - ' + this.dataForm.reportTime[1]
-        // this.queryParams.startTime = this.monthValue[0]
-        this.dataForm.reportTime[1] = moment(this.monthValue[1]).format('YYYY-MM-DD') + ' 07:00:00'
-        this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
-        console.log(this.timeTips);
       } else {
-        // this.$modal.msgError('月范围不能为空')
+        if (this.monthValue.length > 0) {
-        // return false
+          console.log(this.monthValue)
+          this.dataForm.reportTime[0] = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' 07:00:01'
+          // this.queryParams.startTime = this.monthValue[0]
+          this.dataForm.reportTime[1] = moment(this.monthValue[1]).format('YYYY-MM-DD') + ' 07:00:00'
+          this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
+          console.log(this.timeTips);
+        } else {
+          // this.$modal.msgError('月范围不能为空')
+          // return false
+        }
       }
       if (this.dataForm.reportTime.length == 0) {
         this.$message({

src/views/report/productionWeekReport/index.vue

@@ -1,42 +1,50 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:51
+ * @LastEditTime: 2024-04-26 16:01:20
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form :inline="true" :model="dataForm" class="blueTip">
+    <div v-if="product">
-      <el-form-item>
+      <el-form :inline="true" :model="dataForm" class="blueTip">
-        <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
+        <el-form-item>
-          :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
-          style="width: 350px" placeholder="选择周">
+            :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
-        </el-date-picker>
+            style="width: 350px" placeholder="选择周">
-      </el-form-item>
+          </el-date-picker>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        </el-form-item>
-        查询
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
-      </el-button>
+          查询
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+        </el-button>
-        @click="handleExport">导出</el-button>
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
-    </el-form>
+          @click="handleExport">导出</el-button>
-    <el-row style="float: right; margin-bottom: 5px">
+      </el-form>
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-row style="float: right; margin-bottom: 5px">
-        size="small" @click="editDataList()">编辑</el-button>
+        <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
-      <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
+          size="small" @click="editDataList()">编辑</el-button>
-      <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
+        <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
-    </el-row>
+        <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+      </el-row>
+    </div>
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
-      <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
+      <el-table-column prop="lineId" label="生产线" align="center">
-        <el-table-column prop="lineId" label="生产线" align="center">
+        <template slot-scope="scope">
+          <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+          <span v-else>{{ scope.row.lineName }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'">
+        <!-- <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
             <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="本周" align="center">
             <template slot-scope="scope">
@@ -292,6 +300,16 @@ export default {
 	// 	DialogForm,
 	// },
 	// mixins: [basicPageMixin],
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
     return {
       list: [],
@@ -505,7 +523,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */
@@ -622,11 +640,16 @@ export default {
       return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
     },
     async getDataList() {
-      if (this.weekValue1 && this.weekValue2) {
+      if (this?.params) {
-        this.dataForm.reportTime[0] = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 07:00:01'
+        this.dataForm = {...this.params}
-        // this.queryParams.startTime = this.monthValue[0]
+        this.timeTips = this.dataForm.reportTime[0] + ' - ' + this.dataForm.reportTime[1]
-        this.dataForm.reportTime[1] = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 07:00:00'
       } else {
+        if (this.weekValue1 && this.weekValue2) {
+          this.dataForm.reportTime[0] = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 07:00:01'
+          // this.queryParams.startTime = this.monthValue[0]
+          this.dataForm.reportTime[1] = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 07:00:00'
+        } else {
+        }
       }
       if (this.dataForm.reportTime.length == 0) {
         this.$message({

src/views/report/productionYearReport/index.vue

@@ -1,34 +1,36 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:54
+ * @LastEditTime: 2024-04-24 15:28:10
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form :inline="true" :model="dataForm" class="blueTip">
+    <div v-if="product">
-      <el-form-item>
+      <el-form :inline="true" :model="dataForm" class="blueTip">
-        <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
+        <el-form-item>
-          :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
-          style="width: 350px" placeholder="选择年">
+            :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
-        </el-date-picker>
+            style="width: 350px" placeholder="选择年">
-      </el-form-item>
+          </el-date-picker>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        </el-form-item>
-        查询
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
-      </el-button>
+          查询
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+        </el-button>
-        @click="handleExport">导出</el-button>
+        <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
-      <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
+          @click="handleExport">导出</el-button>
-      <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
+        <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
-    </el-form>
+        <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
-    <el-row style="float: right; margin-bottom: 5px">
+      </el-form>
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-row style="float: right; margin-bottom: 5px">
-        size="small" @click="editDataList()">编辑</el-button>
+        <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
-      <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
+          size="small" @click="editDataList()">编辑</el-button>
-      <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
+        <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
-    </el-row>
+        <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+      </el-row>
+    </div>
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
@@ -294,6 +296,16 @@ export default {
 	// 	DialogForm,
 	// },
 	// mixins: [basicPageMixin],
+  props: {
+    product: {
+      type: Boolean,
+      default: true
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
 	data() {
     return {
       list: [],
@@ -440,7 +452,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */
@@ -556,15 +568,20 @@ export default {
       return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
     },
     async getDataList() {
-      this.timeTips = moment(this.dataForm.reportTime[0]).format('YYYY-MM-DD') + " - " + moment(this.dataForm.reportTime[1]).format('YYYY-MM-DD')
+      if (this?.params) {
-      console.log(this.yearValue1);
+        this.dataForm = {...this.params}
-      if (this.yearValue1 && this.yearValue2) {
+        this.timeTips = this.dataForm.reportTime[0] + ' - ' + this.dataForm.reportTime[1]
-        if (this.yearValue2 < this.yearValue1) {
+      } else {
-          this.$modal.msgError('结束时间不能早于开始时间')
+        this.timeTips = moment(this.dataForm.reportTime[0]).format('YYYY-MM-DD') + " - " + moment(this.dataForm.reportTime[1]).format('YYYY-MM-DD')
-          return false
+        console.log(this.yearValue1);
-        } else {
+        if (this.yearValue1 && this.yearValue2) {
-          // this.dataForm.reportTime[0] = this.transformYear(this.yearValue1)
+          if (this.yearValue2 < this.yearValue1) {
-          // this.dataForm.reportTime[1] = this.transformYear(this.yearValue2)
+            this.$modal.msgError('结束时间不能早于开始时间')
+            return false
+          } else {
+            // this.dataForm.reportTime[0] = this.transformYear(this.yearValue1)
+            // this.dataForm.reportTime[1] = this.transformYear(this.yearValue2)
+          }
         }
       }
       if (this.dataForm.reportTime.length == 0) {

src/views/report/qcReport/cutDayReport/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:15:22
+ * @LastEditTime: 2024-04-26 15:22:57
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
@@ -12,8 +12,14 @@
       background: '#F2F4F9',
       color: '#606266'
     }" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%">
-      <el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
+      <el-table-column v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
-        <el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center">
+        <el-table-column v-for="(it, indexNo) in item.children" :key="indexNo" :prop="it.prop" :label="it.label" align="center">
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+    <el-table class="baseTable" :max-height="tableH" id="exportTableChild" :data="tableDataChild" style="width: 100%">
+      <el-table-column v-for="(item, indexn) in tablePropsChild" :key="indexn" :prop="item.prop" :label="item.label" align="center">
+        <el-table-column v-for="(it, indexi) in item.children" :key="indexi" :prop="it.prop" :label="it.label" align="center">
         </el-table-column>
       </el-table-column>
     </el-table>
@@ -41,6 +47,38 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+import { parseTime } from '../../../core/mixins/code-filter';
+
+const tablePropsChild = [
+  {
+    prop: '',
+    label: '人工堆垛人员'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+]
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
   // {
@@ -70,7 +108,7 @@ const tableProps = [
       },
       {
         prop: 'thickness',
-        label: '厚度'
+        label: '厚度mm'
       },
       {
         prop: 'glassCode',
@@ -79,7 +117,9 @@ const tableProps = [
       {
         prop: 'stackingType',
         label: '堆垛方式',
-        filter: (val) => val == 1 ? '集装架' : '堵头箱',
+        // filter: (val) =>
+        //   val != null ? ['集装架', '堵头箱'][val] : '',
+        // filter: ((val) => { val == 1 ? '集装架' : '堵头箱' }),
       },
       {
         prop: 'pieces',
@@ -95,16 +135,16 @@ const tableProps = [
       },
       {
         prop: 'dusting',
-        label: '堆垛情况',
+        label: '喷粉情况',
       },
       {
         prop: 'palletNumber',
-        label: '堆垛时间',
-      },
-      {
-        prop: 'endTime',
         label: '集装架号',
       },
+      {
+        prop: 'remark',
+        label: '备注',
+      }
     ]
   }
 ];
@@ -118,14 +158,16 @@ export default {
         // deleteURL: deleteQualityHotMaterial,
         // exportURL: exportFactoryExcel,
       },
+      tablePropsChild,
       tableProps,
       tableData: [],
+      tableDataChild:[],
       mergeArr: [],//记录合并行数
       pos: 0,
       listQuery: {
         startTime: undefined,
         endTime: undefined,
-        lineId: null,
+        lineId: undefined,
       },
       formConfig: [
         // {
@@ -147,13 +189,13 @@ export default {
           type: 'datePicker',
           label: '时间段',
           dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd',
           valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
           width: 350
         },
         {
@@ -163,6 +205,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'lineId',
+          // multiple:true,
           filterable: true
         },
         {
@@ -190,9 +233,10 @@ export default {
   },
   created() { },
   mounted() {
-    // this.formConfig[1].defaultSelect[]
+    // this.formConfig[1].defaultSelect[0] =
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
+    // this.formConfig[1].defaultSelect[0] =
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     this.getDict()
@@ -284,7 +328,36 @@ export default {
             //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
             new Blob([wbout], { type: "application/octet-stream" }),
             //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "切割堆垛日报.xlsx"
+          );
+        } catch (e) {
+          if (typeof console !== "undefined") console.log(e, wbout);
+        }
+        return wbout;
+        //do something......
+      })
+      var xlsxParam = { raw: true };
+      /* 从表生成工作簿对象 */
+      import('xlsx').then(excel => {
+        var wb = excel.utils.table_to_book(
+          document.querySelector("#exportTableChild"),
+          xlsxParam
+        );
+        /* 获取二进制字符串作为输出 */
+        var wbout = excel.write(wb, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array",
+        });
+        try {
+          FileSaver.saveAs(
+            //Blob 对象表示一个不可变、原始数据的类文件对象。
+            //Blob 表示的不一定是JavaScript原生格式的数据。
+            //File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
+            //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
+            new Blob([wbout], { type: "application/octet-stream" }),
+            //设置导出文件名称
+            "切割堆垛日报.xlsx"
           );
         } catch (e) {
           if (typeof console !== "undefined") console.log(e, wbout);
@@ -292,7 +365,6 @@ export default {
         return wbout;
         //do something......
       })
-
     },
     // otherMethods(val) {
     //   if (val.type === 'detail') {
@@ -318,7 +390,23 @@ export default {
         //   //   console.log();
         //   // }
         // })
-        this.tableData = response.data
+        this.tableData = response.data.map((ele) => {
+          return {
+            lineName: ele.lineName,
+            className: ele.className,
+            groupName: ele.groupName,
+            size: ele.size,
+            thickness: ele.thickness,
+            glassCode: ele.glassCode,
+            stackingType: ele.stackingType == 1 ? '集装架' : '堵头箱',
+            pieces: ele.pieces,
+            originCode: ele.originCode,
+            endTime: parseTime(ele.endTime),
+            dusting: ele.dusting,
+            palletNumber: ele.palletNumber,
+            remark:ele.remark
+          }
+        })
         // let obj = {}
         // response.data.reduce((prev, curr) => {
         //   console.log(prev, curr)
@@ -376,8 +464,8 @@ export default {
           // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
           // this.listQuery.startTime = '1706144404000';
           // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24*60*60*1000 : undefined;
           this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
@@ -405,12 +493,16 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
-.baseTable .el-table__body tr.current-row>td.el-table__cell {
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
+::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
 
-.baseTable .el-table .el-table__cell {
+::v-deep .baseTable .el-table .el-table__cell {
   padding: 0;
   height: 35px;
 }

src/views/report/qcReport/fullInspection/index.vue

@@ -1,19 +1,19 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 15:08:44
+ * @LastEditTime: 2024-04-26 16:12:51
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div class="app-container">
     <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-      <el-form-item label="日" prop="startTime">
+      <el-form-item label="时间" prop="startTime">
-        <el-date-picker v-model="listQuery.startTime" value-format="timestamp" type="date" placeholder="选择日期">
+        <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="产线" prop="productionLineId">
-        <el-select v-model="listQuery.productionLineId" placeholder="请选择">
+        <el-select v-model="listQuery.productionLineId" placeholder="请选择" clearable>
           <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
@@ -46,7 +46,10 @@
       </el-table-column>
     </el-table> -->
 
-    <el-table class="baseTable" :data="tableData" style="width: 100%">
+    <el-table :header-cell-style="{
+      background: '#F2F4F9',
+      color: '#606266'
+    }" id="exportTable" class="baseTable" :data="tableData" style="width: 100%">
       <el-table-column label="时间" align="right" width="150">
         <el-table-column prop="name" label="缺陷" width="120">
         </el-table-column>
@@ -57,18 +60,8 @@
         <el-table-column prop="activityName"></el-table-column>
         <el-table-column prop="message"></el-table-column>
       </el-table-column> -->
-      <el-table-column v-for="(item, index) in codeList " :prop="item.prop" :label="item.label">
+      <el-table-column v-for="(item, index) in codeList " :key="index" :prop="item.prop" :label="item.label">
       </el-table-column>
-      <div slot="append" v-if="this.tableData.length != 0" style="text-align: center">
-        <!--在此处添加你想要插入在表格最后一行的内容-->
-
-        <el-col :span="8">
-          合计
-        </el-col>
-        <el-col :span="8">
-          {{ sum }}
-        </el-col>
-      </div>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
       @pagination="getDataList" /> -->
@@ -155,59 +148,59 @@ export default {
       radio:'晚班查询',
       lineList:[],
       codeList: [
-        {
+        // {
-          label: '19:00',
+        //   label: '19:00',
-          prop: 'num0'
+        //   prop: 'num0'
 
-        },
+        // },
-        {
+        // {
-          label: '20:00',
+        //   label: '20:00',
-          prop: 'num1'
+        //   prop: 'num1'
-        },
+        // },
-        {
+        // {
-          label: '21:00',
+        //   label: '21:00',
-          prop: 'num2'
+        //   prop: 'num2'
-        },
+        // },
-        {
+        // {
-          label: '22:00',
+        //   label: '22:00',
-          prop: 'num3'
+        //   prop: 'num3'
-        },
+        // },
-        {
+        // {
-          label: '23:00',
+        //   label: '23:00',
-          prop: 'num4'
+        //   prop: 'num4'
-        },
+        // },
-        {
+        // {
-          label: '00:00',
+        //   label: '00:00',
-          prop: 'num5'
+        //   prop: 'num5'
-        },
+        // },
-        {
+        // {
-          label: '01:00',
+        //   label: '01:00',
-          prop: 'num6'
+        //   prop: 'num6'
-        },
+        // },
-        {
+        // {
-          label: '02:00',
+        //   label: '02:00',
-          prop: 'num7'
+        //   prop: 'num7'
-        },
+        // },
-        {
+        // {
-          label: '03:00',
+        //   label: '03:00',
-          prop: 'num8'
+        //   prop: 'num8'
-        },
+        // },
-        {
+        // {
-          label: '04:00',
+        //   label: '04:00',
-          prop: 'num9'
+        //   prop: 'num9'
-        },
+        // },
-        {
+        // {
-          label: '05:00',
+        //   label: '05:00',
-          prop: 'num10'
+        //   prop: 'num10'
-        },
+        // },
-        {
+        // {
-          label: '06:00',
+        //   label: '06:00',
-          prop: 'num11'
+        //   prop: 'num11'
-        },
+        // },
-        {
+        // {
-          label: '合计',
+        //   label: '不良合计',
-          prop: 'sum'
+        //   prop: 'sum'
-        }
+        // }
       ],
       tableData: [],
       formConfig: [
@@ -221,7 +214,7 @@ export default {
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [Date.now() - 24 * 60 * 60*1000, Date.now()],
           width: 350
         },
         {
@@ -234,7 +227,7 @@ export default {
           type: 'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
@@ -250,8 +243,8 @@ export default {
     // this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
     // this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
-    this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
+    this.listQuery.startTime = new Date()
-    this.getDataList()
+    // this.getDataList()
     this.getDict()
     // this.getSpanArr(this.tableData)
     // this.getDict();
@@ -263,28 +256,12 @@ export default {
       this.lineList = res.data
     },
     // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    //   let spanOneArr = [], concatOne = 0;
+    //   if (columnIndex === 1) {
-    //   this.tableData.map((item, index) => {
+    //     if (rowIndex === this.tableData.length-1) {
-    //     if (index === 0) {
+    //       return {
-    //       spanOneArr.push(1);
+    //         rowspan: 1,
-    //     } else {
+    //         colspan: 4
-    //       //第一列需合并相同内容的判断条件
+    //       }
-    //       if (item.className === this.tableData[index - 1].className) {
-    //         spanOneArr[concatOne] += 1;
-    //         spanOneArr.push(0);
-    //       } else {
-    //         spanOneArr.push(1);
-    //         concatOne = index;
-    //       };
-    //     }
-    //   });
-
-    //   if (columnIndex === 0) {
-    //     const _row = spanOneArr[rowIndex];
-    //     const _col = _row > 0 ? 1 : 0;
-    //     return {
-    //       rowspan: _row,
-    //       colspan: _col
     //     }
     //   }
     // },
@@ -305,132 +282,7 @@ export default {
       return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
     },
     handleGetClass(e) {
-
-      this.listQuery.startTime = new Date(new Date().setHours(0, 7, 0, 0)).getTime()
-      // console.log(startTime1)
-      this.codeList = []
-      if (e === '早班查询') {
-        let arr = [
-          {
-            label: '07:00',
-            prop:'num0'
-          },
-          {
-            label: '08:00',
-            prop: 'num1'
-          },
-          {
-            label: '09:00',
-            prop: 'num2'
-          },
-          {
-            label: '10:00',
-            prop: 'num3'
-          },
-          {
-            label: '11:00',
-            prop: 'num4'
-          },
-          {
-            label: '12:00',
-            prop: 'num5'
-          },
-          {
-            label: '13:00',
-            prop: 'num6'
-          },
-          {
-            label: '14:00',
-            prop: 'num7'
-          },
-          {
-            label: '15:00',
-            prop: 'num8'
-          },
-          {
-            label: '16:00',
-            prop: 'num9'
-          },
-          {
-            label: '17:00',
-            prop: 'num10'
-          },
-          {
-            label: '18:00',
-            prop: 'num11'
-          },
-          {
-            label: '合计',
-            prop: 'sum'
-          }
-        ]
-        arr.forEach((ele,index) => [
-          this.codeList.push(ele)
-        ])
         this.getDataList()
-      } else {
-        // this.codeList = []
-        this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
-       let  arr = [
-          {
-           label: '19:00',
-           prop: 'num0'
-
-          },
-          {
-            label: '20:00',
-            prop: 'num1'
-          },
-          {
-            label: '21:00',
-            prop: 'num2'
-          },
-          {
-            label: '22:00',
-            prop: 'num3'
-          },
-          {
-            label: '23:00',
-            prop: 'num4'
-          },
-          {
-            label: '00:00',
-            prop: 'num5'
-          },
-          {
-            label: '01:00',
-            prop: 'num6'
-          },
-          {
-            label: '02:00',
-            prop: 'num7'
-          },
-          {
-            label: '03:00',
-            prop: 'num8'
-          },
-          {
-            label: '04:00',
-            prop: 'num9'
-          },
-          {
-            label: '05:00',
-            prop: 'num10'
-          },
-          {
-            label: '06:00',
-            prop: 'num11'
-         },
-         {
-           label: '合计',
-           prop: 'sum'
-         }
-        ]
-        arr.forEach((ele, index) => [
-          this.codeList.push(ele)
-        ])
-        this.getDataList()
-      }
     },
     handleExport() {
       // 处理查询参数
@@ -456,8 +308,9 @@ export default {
             //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
             new Blob([wbout], { type: "application/octet-stream" }),
             //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "全检检验记录.xlsx"
           );
+          this.$message.success('导出成功');
         } catch (e) {
           if (typeof console !== "undefined") console.log(e, wbout);
         }
@@ -477,19 +330,45 @@ export default {
     // },
     // 获取数据列表
     getDataList() {
-      this.dataListLoading = true;
+      var str = null
+      if (this.radio == '晚班查询') {
+        console.log(this.radio);
+        str = new Date(new Date(this.listQuery.startTime).setHours(19, 0, 0, 0)).getTime()
+      } else {
+        str = new Date(new Date(this.listQuery.startTime).setHours(7, 0, 0, 0)).getTime()
+      }
+      // this.dataListLoading = true;
       // this.listQuery.startTime = '1713197388000';
       // this.listQuery.endTime = '1713254961000';
       this.urlOptions.getDataListURL({
         // productionLineId: '1696716506443354114',
-        // startTime: '1705618800000'
+        // startTime: '1705618800000',
         productionLineId: this.listQuery.productionLineId,
-        startTime:this.listQuery.startTime
+        startTime: str
       },).then(res => {
         let count = 0
         let arr = []
         console.log(res.data)
-        this.sum = res.data.allSum
+
+        res.data?.timeStrList.push('不良合计')
+        this.codeList = res.data.timeStrList.map((ele, index) => {
+          if (ele === '不良合计') {
+            return {
+              label: ele,
+              prop: 'sum'
+            }
+          } else {
+            return {
+              label: ele,
+              prop: 'num' + index
+            }
+          }
+
+        })
+        console.log(this.codeList)
+        // res.data.timeStrList.forEach((ele, index) => [
+        //   this.codeList.push(ele)
+        // ])
         for (let i in res.data.qualityInspectionRecordReportLineVOMap) {
           count ++,
           console.log(res.data.qualityInspectionRecordReportLineVOMap[i])
@@ -510,130 +389,11 @@ export default {
         }
         console.log(arr);
         this.tableData = arr
-        // console.log(res)
+        this.tableData.push({
-        // console.log(res.data)
+          name: '检验员',
-        // let arr = [
+          num11: '合计',
-        //   {
+          sum: res.data.allSum
-        //     classType: 1,
+        })
-        //     className: '白班(8:00-20:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量'
-        //   },
-        //   {
-        //     classType: 1,
-        //     className: '白班(8:00-20:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数'
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '夜班(20:00-8:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量',
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '夜班(20:00-8:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数',
-        //   },
-        //   {
-        //     classType: 1,
-        //     className: '全天',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量',
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '全天',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数',
-        //   }
-        // ]
-        // res.data.forEach((ele) => {
-        //   this.codeList.forEach((item) => {
-        //     if (ele.classType === 1 && ele.code == item) {
-        //       // console.log(arr[0][item])
-        //       arr[0][item] = ele.putNum
-        //       arr[1][item] = ele.useNum
-        //     } else if (ele.classType === 2 && ele.code == item) {
-        //       arr[2][item] = ele.putNum
-        //       arr[3][item] = ele.useNum
-        //     } else if (ele.classType === 3 && ele.code == item) {
-        //       arr[4][item] = ele.putNum
-        //       arr[5][item] = ele.useNum
-        //     }
-        //   })
-        // })
-        // // console.log(arr)
-        // this.tableData = arr
-        // this.dataListLoading = false;
       });
     },
     buttonClick(val) {
@@ -654,6 +414,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }

src/views/report/qcReport/israLineReport/index.vue

@@ -3,7 +3,8 @@
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
-			@headBtnClick="buttonClick" />
+			@headBtnClick="buttonClick"
+			@datepicker-change="datepickerChange" />
 		<base-table
 			class="israLineReportTable1"
 			ref="israLineReportTable11"
@@ -25,7 +26,7 @@ const tableProp1 = [
 	{
 		prop: 'lineName',
 		label: '生产线',
-		width: 110,
+		width: 90,
 		fixed: true,
 	},
 	{
@@ -57,20 +58,23 @@ export default {
 					type: 'datePicker',
 					label: '时间段',
 					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm',
-					valueFormat: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 					defaultSelect: [],
-					width: 250,
+					width: 300,
+					onchange: true,
+					clearable: false,
 				},
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'button',
@@ -92,7 +96,7 @@ export default {
 			queryParams: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			tableProp1,
 			tableProp: [],
@@ -105,11 +109,14 @@ export default {
 	},
 	mounted() {
 		this.tableProp = this.tableProp1;
-		let start = moment().format('yyyy-MM-DD');
+		let start = moment(moment().format('yyyy-MM-DD') + ' 07:00:00').format(
-		let end = moment().format('yyyy-MM-DD');
+			'yyyy-MM-DD HH:mm:ss'
+		);
+		let end =
+			moment(moment().valueOf() + 86400000).format('yyyy-MM-DD') + ' 06:59:59';
 		this.formConfig[0].defaultSelect = [start, end];
-		this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
+		this.queryParams.startTime = moment(start).valueOf();
-		this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
+		this.queryParams.endTime = moment(end).valueOf();
 		this.getList();
 	},
 	methods: {
@@ -235,15 +242,22 @@ export default {
 				}
 			}
 		},
+		// 时间选择器change
+		datepickerChange(val) {
+			console.log(val);
+			let start = moment(
+				moment(val.value[0]).format('yyyy-MM-DD') + ' 07:00:00'
+			).format('yyyy-MM-DD HH:mm:ss');
+			let end =
+				moment(moment(val.value[1]).valueOf() + 86400000).format('yyyy-MM-DD') +
+				' 06:59:59';
+			this.formConfig[0].defaultSelect = [start, end];
+		},
 		buttonClick(val) {
 			if (val.btnName === 'search') {
 				if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.startTime = moment(
+					this.queryParams.startTime = moment(val.timeVal[0]).valueOf();
-						val.timeVal[0] + ' 00:00:00'
+					this.queryParams.endTime = moment(val.timeVal[1]).valueOf();
-					).valueOf();
-					this.queryParams.endTime = moment(
-						val.timeVal[1] + ' 23:59:59'
-					).valueOf();
 				}
 				this.queryParams.lineId = val.lineId;
 				this.getList();

src/views/report/qcReport/lineReport.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:15:45
+ * @LastEditTime: 2024-04-26 15:31:24
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
@@ -11,9 +11,9 @@
     <el-table :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
-    }" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
+    }" class="baseTable" border :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
       :span-method="objectSpanMethod">
-      <el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
+      <el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
       </el-table-column>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -39,6 +39,7 @@ import {
   getOriginalLineDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { width } from '@antv/x6-common/lib/dom/position';
 import FileSaver from 'file-saver'
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
@@ -49,11 +50,13 @@ const tableProps = [
   // },
   {
     prop: 'lineName',
-    label: '产线'
+    label: '生产线',
+    width:'100'
   },
   {
     prop: 'equipmentName',
-    label: ''
+    label: '机械手名称',
+    width: '200'
   },
   {
     prop: 'num',
@@ -100,7 +103,7 @@ export default {
       listQuery: {
         startTime: undefined,
         endTime: undefined,
-        lineId:null,
+        lineId:undefined,
       },
       formConfig: [
         // {
@@ -122,13 +125,13 @@ export default {
           type: 'datePicker',
           label: '时间段',
           dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          // format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59, 0)).getTime()],
           width: 350
         },
         {
@@ -138,6 +141,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'lineId',
+          multiple:true,
           filterable: true
         },
         {
@@ -154,7 +158,7 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
@@ -166,8 +170,8 @@ export default {
   created() { },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     this.getDict()
@@ -361,8 +365,8 @@ export default {
           // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
           // this.listQuery.startTime = '1706144404000';
           // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
           this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
@@ -391,6 +395,11 @@ export default {
 };
 </script>
 <style>
+
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 .baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }

src/views/report/qcReport/optimizeCutData.vue

@@ -1,19 +1,18 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-23 15:15:52
+ * @LastEditTime: 2024-04-26 15:20:45
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table show-summary :header-cell-style="{
+    <el-table :max-height="tableH" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
-    }" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
+    }" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod">
-      :span-method="objectSpanMethod">
+      <el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
-      <el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
       </el-table-column>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -40,6 +39,8 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+// import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
   // {
@@ -49,11 +50,13 @@ const tableProps = [
   // },
   {
     prop: 'lineName',
-    label: '产线'
+    label: '产线',
+    width:'150',
   },
   {
     prop: 'dataType',
-    label: ''
+    label: '类型',
+    width: '150',
   },
   {
     prop: 'type',
@@ -65,11 +68,16 @@ const tableProps = [
   },
   {
     prop: 'area',
-    label: '面积'
+    label: '面积(㎡)'
   },
   {
     prop: 'rate',
-    label: '占比',
+    label: '占比(%)',
+    // filter: (val) => val == false ? '不合格' : '合格',
+  },
+  {
+    prop: 'rateSum',
+    label: '综合成品率(%)',
     // filter: (val) => val == false ? '不合格' : '合格',
   },
   // {
@@ -121,13 +129,13 @@ export default {
           type: 'datePicker',
           label: '时间段',
           dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          // format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()],
           width: 350
         },
         {
@@ -137,6 +145,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'lineId',
+          multiple:true,
           filterable: true
         },
         {
@@ -153,7 +162,7 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
@@ -165,8 +174,8 @@ export default {
   created() { },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     this.getDict()
@@ -179,34 +188,6 @@ export default {
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },
-    getSummaries(param) {
-      console.log(columns)
-
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计';
-          return;
-        }
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] += ' ';
-        } else {
-          sums[index] = '-';
-        }
-      });
-
-      return sums;
-    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       let spanOneArr = [], concatOne = 0;
       let spanTwoArr = [], concatTwo = 0;
@@ -276,7 +257,7 @@ export default {
             //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
             new Blob([wbout], { type: "application/octet-stream" }),
             //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "原片各线优化切割堆垛表.xlsx"
           );
         } catch (e) {
           if (typeof console !== "undefined") console.log(e, wbout);
@@ -312,14 +293,15 @@ export default {
         // })
         this.tableData = response.data.map((ele) => {
           return {
-            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样' : '废版',
+            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样板' : ele.dataType == 4 ? '合计' : ele.dataType == 3 ? '废版' : '',
             code: ele.code,
             putNum: ele.putNum,
             lineName: ele.lineName,
-            type: ele.type,
+            type: ele.type == '合计' ? '' : ele.type,
             pieces: ele.pieces,
             area: ele.area,
-            rate: ele.rate
+            rate: ele.lineName != '总计' &&  ele.rate ? (ele.rate * 100).toFixed(2) : '',
+            rateSum: ele.lineName === '总计' ? (ele.rate * 100).toFixed(2) : ''
             // useNum: ele.useNum,
             // num: ele.num,
             // size: typeof (ele.size)
@@ -383,8 +365,10 @@ export default {
           // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
           // this.listQuery.startTime = '1706144404000';
           // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
+          // this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          // this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
           this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
@@ -412,13 +396,18 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
-.baseTable .el-table__body tr.current-row>td.el-table__cell {
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
+::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
 
-.baseTable .el-table .el-table__cell {
+::v-deep .baseTable .el-table .el-table__cell {
   padding: 0;
   height: 35px;
 }
+
 </style>

src/websocket/wsInterface.js

@@ -111,7 +111,10 @@ const mesEN = new WsConnect(
     if (msgData == null) return;
     switch (msgData?.type) {
       case "EnergyInfo": {
-        store.dispatch({ type: "websocket/setEnergyInfo", payload: msgData.data })
+        let keys = Object.keys(msgData.data)
+        if (keys.includes('elecQty1') || keys.includes('waterQty')) {
+          store.dispatch({ type: "websocket/setEnergyInfo", payload: msgData.data })
+        }
         break;
       }
       case "EnergyTrend": {