.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-09-12 14:01:15
+ # @LastEditTime: 2023-09-11 15:55:29
- # @LastEditors: zhp
+ # @LastEditors: DY
  # @Description: 
 ### 
 # 开发环境配置
@@ -12,7 +12,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.188:48080'
+VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'

.env.prod

@@ -8,9 +8,7 @@ VUE_APP_TITLE = 芋道管理系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 根据服务器或域名修改
-# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-PUBLIC_PATH = 'http://192.168.0.33:8888/'
-
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 

src/api/core/analysis/index.js

@@ -1,24 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2023-09-13 09:53:45
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-export function getYieldAnalysisPageData(data) {
-  return request({
-    url: '/analysis/production-analysis/getOutput',
-    method: 'post',
-    data: data
-  })
-}
-
-export function getCT(data) {
-  return request({
-    url: '/analysis/production-analysis/getCT',
-    method: 'post',
-    data: data
-  })
-}

src/api/core/monitoring/index.js

@@ -1,16 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2023-09-13 09:46:44
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-export function getSectionDataSearch(data) {
-  return request({
-    url: '/monitoring/production-monitor/getSectionDataSearch',
-    method: 'post',
-    data: data
-  })
-}

src/router/index.js

@@ -247,7 +247,7 @@ Router.prototype.push = function push(location) {
 
 export default new Router({
   base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
-  mode: 'hash', // 去掉url中的#
+  mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({y: 0}),
   routes: constantRoutes
 })

src/views/base/equipmentBindSection/dialogForm.vue

@@ -1,219 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.productionLineId"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="workshopSectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.workshopSectionId"
-						placeholder="请选择工段"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in worksectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="设备"
-					prop="equipmentId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.equipmentId"
-						placeholder="请选择设备"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in equipmentList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item label="工段排序" prop="sort">
-					<el-input
-						v-model="dataForm.sort"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线数据类型" prop="lineDataType">
-					<el-select
-						v-model="dataForm.lineDataType"
-						placeholder="请选择产线数据类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '无类型', value: 0 },
-								{ label: '进口统计', value: 1 },
-								{ label: '出口统计', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="工段数据类型" prop="sectionDataType">
-					<el-select
-						v-model="dataForm.sectionDataType"
-						placeholder="请选择工段数据类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '无类型', value: 0 },
-								{ label: '进口统计', value: 1 },
-								{ label: '出口统计', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			productionLineList: [],
-			equipmentList: [],
-			worksectionList: [],
-			dataFormCache: null,
-		};
-	},
-	mounted() {
-		Promise.all([this.getProductLineList(), this.getEquipmentList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
-	},
-	watch: {
-		'dataForm.productionLineId': {
-			handler: async function (plId) {
-				if (plId) await this.getWorksectionList(plId);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleProductlineChange(id) {
-			await this.getWorksectionList(id);
-			this.dataForm.workshopSectionId = null;
-			this.$emit('update', this.dataForm);
-		},
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-		// 获取产线列表
-		async getProductLineList() {
-			const response = await this.$axios('/base/production-line/listAll');
-			this.productionLineList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		// 获取设备列表
-		async getEquipmentList() {
-			const response = await this.$axios(
-				'/base/equipment/page?pageNo=1&pageSize=100'
-			);
-			this.equipmentList = response.data.list.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		// 获取工段列表
-		async getWorksectionList(plId) {
-			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
-				{
-					params: {
-						id: plId,
-					},
-				}
-			);
-			this.worksectionList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>

src/views/base/equipmentBindSection/index.vue

@@ -37,7 +37,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>
@@ -53,10 +53,10 @@ import {
 } from '@/api/base/equipmentBindSection';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import DialogForm from './dialogForm.vue';
+
 export default {
 	name: 'EquipmentBindSection',
-	components: { DialogForm },
+	components: {},
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -181,8 +181,8 @@ export default {
 						select: true,
 						label: '工段',
 						url: '/base/workshop-section/listByParentId', // 根据产线获取
-						// depends: '__product_line', // 依赖产线获取数据
+            // depends: '__product_line', // 依赖产线获取数据
-						depends: 'productionLineId',
+            depends: 'productionLineId',
 						prop: 'workshopSectionId',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},

src/views/base/equipmentPlcConnect/http.js

@@ -1,13 +1,6 @@
-/*
- * @Author: zhp
- * @Date: 2023-09-11 16:18:44
- * @LastEditTime: 2023-09-12 14:25:01
- * @LastEditors: zhp
- * @Description:  
- */
 import Mock from 'mockjs';
 
-const baseURL = 'http://192.168.1.188:48080/admin-api';
+const baseURL = 'http://192.168.1.49:48080/admin-api';
 
 Mock.setup({
 	timeout: 200,

src/views/core/analysis/LineChart.vue

@@ -1,93 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-09-13 10:33:20
- * @LastEditors: zhp
- * @Description:
--->
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import * as echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-// import resize from './mixins/resize'
-
-export default {
-  // mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '350px'
-    },
-    // autoResize: {
-    //   type: Boolean,
-    //   default: true
-    // }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  // watch: {
-  //   chartData: {
-  //     deep: true,
-  //     handler(val) {
-  //       this.setOptions(val)
-  //     }
-  //   }
-  // },
-  mounted() {
-    // this.$nextTick(() => {
-    //   this.initChart()
-    // })
-  },
-  // beforeDestroy() {
-  //   if (!this.chart) {
-  //     return
-  //   }
-  //   this.chart.dispose()
-  //   this.chart = null
-  // },
-  methods: {
-    initChart(xData, yData,lineName) {
-      console.log(xData,yData);
-      this.chart = echarts.init(this.$el, 'macarons')
-      this.setOptions(xData, yData, lineName)
-    },
-    setOptions(xData, yData, lineName) {
-      let seriesData = []
-        lineName.forEach((item,index) => {
-          seriesData.push({
-            name: item,
-            data: yData[index],
-            type: 'line',
-          })
-        })
-      this.chart.setOption({
-        xAxis: {
-          type: 'category',
-          data: xData
-        },
-        legend: {
-          data:lineName
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: seriesData
-      })
-    }
-  }
-}
-</script>

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

@@ -1,200 +1,159 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-09-11 14:21:21
+ * @LastEditTime: 2023-09-11 14:26:04
+ * @LastEditors: zhp
+ * @Description:
+-->
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
+			:formConfigs="formConfig"
-    <line-chart ref="lineChart" />
+			ref="searchBarForm"
-    <!-- <pagination
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData" />
+		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" /> -->
+			@pagination="getDataList" />
-  </div>
+	</div>
 </template>
 
 <script>
-// import basicPage from '../../mixins/basic-page';
+import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getCT } from '@/api/core/analysis/index';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
-import lineChart from '../LineChart'
+import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
-// const tableProps = [
+const tableProps = [
-// 	// {
+	{
-//   //   prop: 'lineName',
+		prop: 'productionLineName',
-// 	// 	label: '产线',
+		label: '产线名称',
-// 	// 	align: 'center',
+		align: 'center',
-// 	// },
+	},
-//   // {
+  {
-//   //   prop: 'sum',
+    prop: '',
-//   //   label: '合计',
+    label: '工段名称',
-//   //   align: 'center',
+    align: 'center',
-//   // },
+  },
-//   // {
+  {
-//   //   prop: 'dynamicValue',
+    prop: '',
-//   //   label: 'dynamicName',
+    label: '进片数量/片',
-//   //   align: 'center',
+    align: 'center',
-//   //   children:[
+  },
-
+  {
-//   //   ]
+    prop: '',
-//   // }
+    label: '出片数量/片',
-// ];
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗面积/m²',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗比例/%',
+    align: 'center',
+  }
+];
 
 export default {
-  components: {
+	mixins: [basicPage],
-    lineChart,
+	data() {
-  },
+		return {
-  // mixins: [basicPage],
+			urlOptions: {
-  data() {
+				getDataListURL: getLineBindProductLogPage,
-    return {
+			},
-      urlOptions: {
+			tableProps,
-        getDataListURL: getCT,
+			tableData: [],
-      },
+      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
-      tableProps: [],
+			formConfig: [
-      dataListLoading: false,
+				{
-      tableData: [],
+					type: 'select',
-      listQuery: {
+					label: '产线',
-        // time: ''
+					selectOptions: [],
-        endTime: undefined,
+					param: 'productionLineId',
-        lineId:undefined,
+					defaultSelect: '',
-        startTime:undefined
+					filterable: true,
-      },
+				},
-      xData: [],
+				{
-      yData: [],
+					type: 'datePicker',
-      optionArrUrl: [getProductionLinePage],
+					label: '时间',
-      formConfig: [
+					dateType: 'daterange',
-        {
+					format: 'yyyy-MM-dd',
-          type: 'select',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          label: '产线',
+					rangeSeparator: '-',
-          selectOptions: [],
+					startPlaceholder: '开始时间',
-          param: 'lineIds',
+					endPlaceholder: '结束时间',
-          defaultSelect: '',
+					param: 'createTime',
-          multiple: true,
+				},
-          filterable: true,
+				{
-        },
+					type: 'button',
-        {
+					btnName: '搜索',
-          type: 'datePicker',
+					name: 'search',
-          label: '时间',
+					color: 'primary',
-          dateType: 'datetime',
+				},
-          format: 'yyyy-MM-dd',
+				{
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					type: 'button',
-          rangeSeparator: '-',
+					btnName: '导出',
-          startPlaceholder: '开始时间',
+					name: 'export',
-          endPlaceholder: '结束时间',
+				},
-          param: 'time',
+			],
-        },
+		};
-        {
+	},
-          type: 'button',
+	components: {
-          btnName: '搜索',
+	},
-          name: 'search',
+	created() {
-          color: 'primary',
+		this.getArr();
-        }
+	},
-      ],
+	methods: {
-    };
+		getArr() {
-  },
+			const params = {
-  created() {
+				page: 1,
-    this.getArr();
+				limit: 500,
-  },
+			};
-  methods: {
+			this.optionArrUrl.forEach((item, index) => {
-    getArr() {
+				item(params).then((response) => {
-      const params = {
+					this.formConfig[index].selectOptions = response.data.list;
-        page: 1,
+				});
-        limit: 500,
+			});
-      };
+		},
-      this.optionArrUrl.forEach((item, index) => {
+		buttonClick(val) {
-        item(params).then((response) => {
+			switch (val.btnName) {
-          this.formConfig[index].selectOptions = response.data.list
+				case 'search':
-        });
+					this.listQuery.pageNo = 1;
-      });
+					this.listQuery.pageSize = 10;
-    },
+					this.listQuery.productionLineId = val.productionLineId;
-    getData() {
+					this.listQuery.productId = val.productId;
-      this.listQuery.lineId = '1672847052717821953'
+					this.listQuery.createTime = val.createTime;
-      this.listQuery.startTime = '1693497600000';
+					this.getDataList();
-      this.listQuery.endTime = '1693843200000';
+					break;
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+				case 'reset':
-        console.log(res)
+					this.$refs.searchBarForm.resetForm();
-        let arr = [
+					this.listQuery = {
-          {
+						pageSize: 10,
-            prop: 'sectionName',
+						pageNo: 1,
-            label: '工段',
+						total: 1,
-            align: 'center',
+					};
-          },
+					this.getDataList();
-          {
+					break;
-            prop: 'equName',
+				default:
-            label: '设备',
+					console.log(val);
-            align: 'center',
+			}
-          },
+		},
-        ]
+	},
-        let eqArr= []
-        res.data.data.forEach((ele, index) => {
-          console.log(ele);
-          eqArr.push(ele.equName)
-        })
-        console.log(eqArr)
-        // console.log(res.data.nameData.slice(1))
-        res.data.nameData.forEach(item => {
-          if (eqArr[0] === item.parentId) {
-            const props = {
-              'prop': item.name,
-              'label': item.name,
-              'align': 'center'
-            }
-          }
-          arr[2].children.push(props)
-        })
-        let obj = {
-          lineName: res.data.data[0].lineName,
-          sum: res.data.data[0].sum,
-        }
-        res.data.data[0].data[0].children.forEach((item, index) => {
-          console.log(item)
-          // let data = 'data' + Number(index+1)
-          obj['' + item.dynamicName + ''] = item.dynamicValue
-        })
-        this.tableData = [obj]
-        console.log(this.tableData)
-        console.log(arr)
-        this.tableProps = arr
-        let xData = []
-
-        res.data.nameData.forEach(item => {
-          xData.push(item.name)
-          // arr[2].children.push(props)
-        })
-        let yData = []
-        res.data.data[0].data[0].children.forEach((item, index) => {
-          // console.log(item)
-          yData.push(item.dynamicValue)
-          // let data = 'data' + Number(index+1)
-          // obj['' + item.dynamicName + ''] = item.dynamicValue
-        })
-        console.log(this.yData)
-        this.$refs.lineChart.initChart(xData, yData)
-        // this.total = response.data.total;
-        // this.dataListLoading = false;
-      });
-    },
-    buttonClick(val) {
-      // console.log(val)
-      switch (val.btnName) {
-        case 'search':
-          // this.listQuery.pageNo = 1;
-          // this.listQuery.pageSize = 10;
-          this.getData()
-          break;
-        case 'reset':
-          this.$refs.searchBarForm.resetForm();
-          this.listQuery = {
-            pageSize: 10,
-            pageNo: 1,
-            total: 1,
-          };
-          this.getDataList();
-          break;
-        default:
-          console.log(val);
-      }
-    },
-  },
 };
 </script>

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

@@ -1,95 +1,114 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
+			:formConfigs="formConfig"
-    <line-chart ref="lineChart" />
+			ref="searchBarForm"
-    <!-- <pagination
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData" />
+		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" /> -->
+			@pagination="getDataList" />
-  </div>
+	</div>
 </template>
 
 <script>
-// import basicPage from '../../mixins/basic-page';
+import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
-import lineChart from '../LineChart'
+import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
-// const tableProps = [
+const tableProps = [
-// 	// {
+	{
-//   //   prop: 'lineName',
+		prop: 'productionLineName',
-// 	// 	label: '产线',
+		label: '产线',
-// 	// 	align: 'center',
+		align: 'center',
-// 	// },
+	},
-//   // {
+  {
-//   //   prop: 'sum',
+    prop: '',
-//   //   label: '合计',
+    label: '合计',
-//   //   align: 'center',
+    align: 'center',
-//   // },
+  },
-//   // {
+  {
-//   //   prop: 'dynamicValue',
+    prop: '',
-//   //   label: 'dynamicName',
+    label: '进片数量/片',
-//   //   align: 'center',
+    align: 'center',
-//   //   children:[
+  },
-
+  {
-//   //   ]
+    prop: '',
-//   // }
+    label: '出片数量/片',
-// ];
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗面积/m²',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗比例/%',
+    align: 'center',
+  }
+];
 
 export default {
-  components: {
+	mixins: [basicPage],
-    lineChart,
-  },
-	// mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getYieldAnalysisPageData,
+				getDataListURL: getLineBindProductLogPage,
 			},
-      tableProps:[],
+			tableProps,
-      dataListLoading:false,
+			tableData: [],
-      tableData: [],
+      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
-      listQuery: {
-        lineIds: [],
-        time: ''
-      },
-      xData: [],
-      yData:[],
-      optionArrUrl: [getProductionLinePage ],
 			formConfig: [
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-          param: 'lineIds',
+					param: 'productionLineId',
-          defaultSelect: '',
+					defaultSelect: '',
-          multiple:true,
 					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
-					dateType: 'datetime',
+					dateType: 'daterange',
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-          param: 'time',
+					param: 'createTime',
 				},
 				{
 					type: 'button',
 					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
-				}
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+				},
 			],
 		};
 	},
+	components: {
+	},
 	created() {
 		this.getArr();
 	},
@@ -101,109 +120,19 @@ export default {
 			};
 			this.optionArrUrl.forEach((item, index) => {
 				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list
+					this.formConfig[index].selectOptions = response.data.list;
 				});
 			});
-    },
+		},
-    getData() {
+		buttonClick(val) {
-      // this.listQuery.lineIds = ['1672847052717821953']
-      // this.listQuery.productId = val.productId;
-      // this.listQuery.time = '1694486098000';
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
-        let arr = [
-          	{
-              prop: 'lineName',
-          		label: '产线',
-          		align: 'center',
-          	},
-            {
-              prop: 'sum',
-              label: '合计',
-              align: 'center',
-            },
-            {
-              prop: res.data.nameData[0].name,
-              label: res.data.nameData[0].name,
-              align: 'center',
-              children:[
-
-              ]
-            }
-        ]
-        console.log(res.data.nameData.slice(1))
-        res.data.nameData.slice(1).forEach(item => {
-          const props = {
-            'prop': item.name,
-            'label': item.name,
-            'align': 'center'
-          }
-          arr[2].children.push(props)
-        })
-        let tableDataArr =[]
-        res.data.data.forEach(item => {
-          let obj = {}
-          obj.lineName= item.lineName,
-           obj.sum= item.sum,
-          item.data.forEach((ele, index) => {
-            // console.log(ele)
-            ele.children.forEach((e) => {
-              console.log(e.dynamicName)
-              obj['' + e.dynamicName + ''] = e.dynamicValue
-              console.log(obj['' + e.dynamicName + '']);
-            })
-          })
-          tableDataArr.push(obj)
-        });
-        this.tableData = tableDataArr
-        console.log(this.tableData)
-        console.log(arr)
-        this.tableProps = arr
-        let xData = []
-
-        res.data.nameData.slice(1).forEach(item => {
-          xData.push(item.name)
-          // arr[2].children.push(props)
-        })
-        let yAllData = []
-        let lineName = []
-        res.data.data.forEach(item => {
-          let yData = []
-          lineName.push(item.lineName)
-          // let obj = {}
-          // obj.lineName = item.lineName,
-          //   obj.sum = item.sum,
-          item.data.forEach((ele, index) => {
-              // console.log(ele)
-            ele.children.forEach((e) => {
-              // let yData = []
-              yData.push(e.dynamicValue)
-              })
-            })
-          yAllData.push(yData)
-        });
-        console.log(lineName)
-        // res.data.data[0].data[0].children.forEach((item, index) => {
-        //   // console.log(item)
-        //   yData.push(item.dynamicValue)
-        //   // let data = 'data' + Number(index+1)
-        //   // obj['' + item.dynamicName + ''] = item.dynamicValue
-        // })
-        // console.log(this.yData)
-        this.$refs.lineChart.initChart(xData, yAllData, lineName)
-        // this.total = response.data.total;
-        // this.dataListLoading = false;
-      });
-    },
-    buttonClick(val) {
-      // console.log(val)
 			switch (val.btnName) {
-        case 'search':
+				case 'search':
-          this.listQuery.lineIds = val.lineIds ? val.lineIds :undefined
+					this.listQuery.pageNo = 1;
-          // this.listQuery.productId = val.productId;
+					this.listQuery.pageSize = 10;
-          this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
+					this.listQuery.productionLineId = val.productionLineId;
-					// this.listQuery.pageNo = 1;
+					this.listQuery.productId = val.productId;
-          // this.listQuery.pageSize = 10;
+					this.listQuery.createTime = val.createTime;
-          this.getData()
+					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();

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

@@ -7,82 +7,78 @@
 		<base-table
 			v-loading="dataListLoading"
 			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
 			:table-data="tableData" />
-		<!-- <pagination
+		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" /> -->
+			@pagination="getDataList" />
 	</div>
 </template>
 
 <script>
-// import basicPage from '../../mixins/basic-page';
+import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getSectionDataSearch } from '@/api/core/monitoring';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
 import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
 const tableProps = [
 	{
-    prop: 'proLineName',
+		prop: 'productionLineName',
 		label: '产线名称',
 		align: 'center',
 	},
   {
-    prop: 'sectionName',
+    prop: '',
     label: '工段名称',
     align: 'center',
   },
   {
-    prop: 'inputNum',
+    prop: '',
     label: '进片数量/片',
     align: 'center',
   },
   {
-    prop: 'outputNum',
+    prop: '',
     label: '出片数量/片',
     align: 'center',
   },
   {
-    prop: 'lossNum',
+    prop: '',
     label: '损耗数量/片',
     align: 'center',
   },
   {
-    prop: 'lossArea',
+    prop: '',
     label: '损耗面积/m²',
     align: 'center',
   },
   {
-    prop: 'lossRate',
+    prop: '',
     label: '损耗比例/%',
     align: 'center',
   }
 ];
 
 export default {
-	// mixins: [basicPage],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getSectionDataSearch,
+				getDataListURL: getLineBindProductLogPage,
 			},
 			tableProps,
-      tableData: [],
+			tableData: [],
-      listQuery: {
-        proLineId:undefined,
-        sectionId: undefined,
-        startTime: undefined,
-        endTime: undefined,
-      },
       optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
 			formConfig: [
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-          param: 'proLineId',
+					param: 'productionLineId',
 					defaultSelect: '',
 					filterable: true,
 				},
@@ -90,7 +86,7 @@ export default {
 					type: 'select',
 					label: '工段',
 					selectOptions: [],
-          param: 'sectionId',
+					param: 'productId',
 					defaultSelect: '',
 					filterable: true,
 				},
@@ -103,7 +99,7 @@ export default {
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					param: 'timeSlot',
+					param: 'createTime',
 				},
 				{
 					type: 'button',
@@ -122,8 +118,7 @@ export default {
 	components: {
 	},
 	created() {
-    this.getArr();
+		this.getArr();
-    this.getDataList()
 	},
 	methods: {
 		getArr() {
@@ -136,30 +131,16 @@ export default {
 					this.formConfig[index].selectOptions = response.data.list;
 				});
 			});
-    },
+		},
-    getDataList() {
+		buttonClick(val) {
-      // this.listQuery.proLineId = '1672847052717821953';
+			switch (val.btnName) {
-      // this.listQuery.startTime = '1690626657000'
+				case 'search':
-      // this.listQuery.endTime = '1693564257000'
+					this.listQuery.pageNo = 1;
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+					this.listQuery.pageSize = 10;
-        this.tableData = res.data
+					this.listQuery.productionLineId = val.productionLineId;
-        // this.total = response.data.total;
+					this.listQuery.productId = val.productId;
-        this.dataListLoading = false;
+					this.listQuery.createTime = val.createTime;
-      });
+					this.getDataList();
-    },
-    buttonClick(val) {
-      console.log(val)
-      switch (val.btnName) {
-        case 'search':
-          console.log(val.timeSlot);
-
-					// this.listQuery.pageNo = 1;
-          // this.listQuery.pageSize = 10;
-          this.listQuery.proLineId = val.proLineId ? val.proLineId : undefined
-          this.listQuery.sectionId = val.sectionId ? val.sectionId : undefined
-          this.listQuery.startTime = val.timeSlot ? new Date(val.timeSlot[0]).getTime() : undefined
-          this.listQuery.endTime = val.timeSlot ? new Date(val.timeSlot[1]).getTime() : undefined
-          this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();

src/views/monitoring/equipmentFullParams/index.vue

@@ -12,7 +12,31 @@
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<div v-if="tableList.length" class="tables">
+		<!-- <base-table
+			:table-props="[
+				{ type: 'index', label: '序号' },
+				{ prop: 'name', label: '设备名称', align: 'center' },
+				{ prop: 'code', label: '设备代码', align: 'center' },
+				{ prop: 'time', label: '时间', align: 'center' },
+			]"
+			:table-data="[
+				{ index: 1, name: '1', code: 'c1', time: '2021-08-31 09:14:19' },
+				{ index: 2, name: '2', code: 'c2', time: '2021-08-31 09:14:19' },
+				{ index: 3, name: '3', code: 'c3', time: '2021-08-31 09:14:19' },
+				{ index: 4, name: '4', code: 'c4', time: '2021-08-31 09:14:19' },
+				{ index: 5, name: '5', code: 'c5', time: '2021-08-31 09:14:19' },
+			]"
+			:span-method="
+				({ rowIndex, columnIndex }) => {
+					if (rowIndex == 1 && columnIndex == 0) {
+						return [1, 3];
+					}
+					return [1, 1];
+				}
+			"
+			@emitFun="(val) => handleEmitFun(table, val)"></base-table> -->
+
+		<div class="tables">
 			<div class="custom-table" v-for="table in tableList" :key="table.key">
 				<!-- {{ JSON.stringify(spanMethod) }} -->
 				<base-table
@@ -34,14 +58,16 @@
 							getListFor(table, { page, limit, current })
 					" />
 			</div>
+			<!-- v-show="table.dataManager?.total > 0"
+				:total="table.dataManager?.total || 0" -->
+			<!-- @size-change="($event) => handleSizeChange(table, $event)" -->
 		</div>
-		<div v-else style="margin-top: 20px; color: #c7c7c7; text-align: center;">暂无数据</div>
 	</div>
 </template>
 
 <script>
 import LocalDataManager from './utils/local-data-manager';
-// import response from './response';
+import response from './response';
 import moment from 'moment';
 
 export default {
@@ -97,14 +123,14 @@ export default {
 				time: [new Date(aWeekAgo), new Date(today)],
 			},
 			tableList: [
-				// {
+				{
-				// 	key: 'base-table__key__1',
+					key: 'base-table__key__1',
-				// 	tableProps: [],
+					tableProps: [],
-				// 	list: [],
+					list: [],
-				// 	pageNo: 1,
+					pageNo: 1,
-				// 	pageSize: 3,
+					pageSize: 3,
-				// 	total: 0,
+					total: 0,
-				// },
+				},
 			],
 		};
 	},
@@ -126,7 +152,7 @@ export default {
 		if (this.name)
 			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
 
-		// this.handleResponse();
+		this.handleResponse();
 	},
 	methods: {
 		buildProps(table) {
@@ -173,9 +199,11 @@ export default {
 			return { props, firstLineData };
 		},
 
-		handleResponse(response) {
+		handleResponse() {
 			const { code, data } = response;
 			if (code == 0) {
+				console.log('response', code, data);
+
 				// 处理一个表格
 				data.forEach((table, index) => {
 					console.log('handle index:', index, table);
@@ -192,28 +220,26 @@ export default {
 
 					// 处理某一表格的各个行
 					const { data } = table;
-					if (data) {
+					data.forEach((row, idx) => {
-						data.forEach((row, idx) => {
+						const listItem = {
-							const listItem = {
+							index: idx + 1,
-								index: idx + 1,
+							time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
-								time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
+							plcCode: row.plcCode,
-								plcCode: row.plcCode,
+						};
-							};
+						row.data.forEach((column) => {
-							row.data.forEach((column) => {
+							listItem[column.dynamicName] = column.dynamicValue;
-								listItem[column.dynamicName] = column.dynamicValue;
-							});
-							this.tableList[index].list.push(listItem);
-							this.tableList[index].total++;
 						});
+						this.tableList[index].list.push(listItem);
+						this.tableList[index].total++;
+					});
 
-						// 处理分页
+					// 处理分页
-						const { pageNo, pageSize, list } = this.tableList[index];
+					const { pageNo, pageSize, list } = this.tableList[index];
-						this.tableList[index].dataManager = new LocalDataManager(
+					this.tableList[index].dataManager = new LocalDataManager(
-							list,
+						list,
-							pageNo,
+						pageNo,
-							pageSize
+						pageSize
-						);
+					);
-					}
 				});
 			}
 		},
@@ -229,13 +255,12 @@ export default {
 
 		/** 查询 */
 		async handleQuery() {
-			this.handleResponse(
+			const { data } = this.$axios({
-				await this.$axios({
+				url: '/monitoring/equipment-monitor/runLog',
-					url: '/monitoring/equipment-monitor/runLog',
+				method: 'get',
-					method: 'get',
+				params: this.queryParams,
-					params: this.queryParams,
+			});
-				})
+			console.log('data', data);
-			);
 		},
 
 		async handleSearchBarBtnClick({ btnName, timeVal }) {

yarn.lock

@@ -1859,11 +1859,6 @@ address@^1.1.2:
   resolved "https://registry.npmmirror.com/address/-/address-1.2.1.tgz"
   integrity sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==
 
-adler-32@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
-  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
-
 aes-decrypter@1.0.3:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
@@ -2744,14 +2739,6 @@ caseless@~0.12.0:
   resolved "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-cfb@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
-  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
-  dependencies:
-    adler-32 "~1.3.0"
-    crc-32 "~1.2.0"
-
 chalk@2.3.0:
   version "2.3.0"
   resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
@@ -3012,11 +2999,6 @@ code-brick-zj@^1.0.2:
   resolved "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz#f9f5fa97faa65262e887a3a15014827ac95b1fea"
   integrity sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==
 
-codepage@~1.15.0:
-  version "1.15.0"
-  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
-  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
@@ -3342,11 +3324,6 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-crc-32@~1.2.0, crc-32@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
-  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
-
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
@@ -4872,11 +4849,6 @@ forwarded@0.2.0:
   resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-frac@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
-  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
@@ -9159,13 +9131,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-ssf@~0.11.2:
-  version "0.11.2"
-  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
-  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
-  dependencies:
-    frac "~1.1.2"
-
 sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
@@ -10496,21 +10461,11 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wmf@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
-  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
-
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-word@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
-  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
@@ -10567,19 +10522,6 @@ xhr@2.4.0:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
-xlsx@^0.18.5:
-  version "0.18.5"
-  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
-  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
-  dependencies:
-    adler-32 "~1.3.0"
-    cfb "~1.2.1"
-    codepage "~1.15.0"
-    crc-32 "~1.2.1"
-    ssf "~0.11.2"
-    wmf "~1.0.1"
-    word "~0.3.0"
-
 xml-js@1.6.11:
   version "1.6.11"
   resolved "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"