From 177f899cfb899d46c570247c66c53cefc6142d34 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 4 Jan 2024 15:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8D=E8=89=AF=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcTable.js                    |   8 +
 src/views/quality/checkTypeProject/index.vue  |   2 +-
 src/views/quality/produceReport/index.vue     |   5 +-
 src/views/quality/qcProduce/index.vue         |   1 +
 src/views/quality/qcTableXJ/index.vue         |  29 +--
 src/views/quality/qcTableXJAnalysis/index.vue | 198 ++++++++++++++++++
 6 files changed, 216 insertions(+), 27 deletions(-)
 create mode 100644 src/views/quality/qcTableXJAnalysis/index.vue

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 481e912..0d56b5e 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -41,3 +41,11 @@ export function getXJCheckTableDetail(query) {
 		params: query
 	});
 }
+
+export function getXJChartData(query) {
+	return request({
+		url: '/quality/staticTable/getXJChartData',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 1e8eca0..2bf54c8 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -114,7 +114,7 @@
                   <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
               </template>
           </el-table-column>
-          <el-table-column label="检验规则编码" align="center" prop="projectNo" />
+          <el-table-column label="检验规则编码" width="100" align="center" prop="projectNo" />
           <el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="250"/>
           <el-table-column label="标准值" align="left" prop="standardValue" :show-overflow-tooltip="true" width="250"/>
           <el-table-column label="上差值" align="left" prop="upperDiff" />
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 2cba9c8..d14359a 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -87,12 +87,13 @@
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="产线名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="产线名称" align="center" prop="supplierName" width="120"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
+			<el-table-column label="检验节点" align="center" prop="checkName" width="120"/>
 			<el-table-column label="检验结果" align="center" prop="checkResult">
 			    <template slot-scope="scope">
 					<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
@@ -453,7 +454,7 @@ export default {
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
 				this.open = true;
-				this.title = "查看来料报告";
+				this.title = "查看过程检验报告";
 			});
 			this.getCheckedProjectList();
 		},
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 668c18b..c17d427 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -193,6 +193,7 @@
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
+			<el-table-column label="检验节点" align="center" prop="checkName" />
 			<el-table-column label="检验结果" align="center" prop="checkResult" />
 			<el-table-column label="是否启用" align="center" width="100">
 				<template slot-scope="scope">
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index ad31ae1..1fb1a67 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -17,14 +17,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="批次编码" prop="incomeBatchNo">
-				<el-input
-					v-model="queryParams.incomeBatchNo"
-					placeholder="请输入批次编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="工单生产日期" prop="incomeTime">
 				<el-date-picker clearable
 					v-model="queryParams.incomeTime"
@@ -35,18 +27,6 @@
 					>
 				</el-date-picker>
 			</el-form-item>
-			<!--
-			<el-form-item label="单据状态" prop="status">
-				<el-select
-				v-model="queryParams.status"
-				placeholder="请选择单据状态"
-				@change="$forceUpdate()"
-				clearable
-				style="width:205px"
-				@keyup.enter.native="handleQuery">
-				<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-				</el-select>
-			</el-form-item>-->
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,15 +49,15 @@
 
 		<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column prop="orderNo" label="订单编码" width="130" align="center"/>
-			<el-table-column label="订单批次" align="center" prop="incomeBatchNo" width="180">
+			<el-table-column label="订单编码" align="center" prop="orderNo" width="180">
 				 <template slot-scope="scope">
 					<el-button
 						type="text"
 						@click="handleDetail(scope.row)"
-					>{{scope.row.incomeBatchNo}}</el-button>
+					>{{scope.row.orderNo}}</el-button>
 				</template>
 			</el-table-column>
+			<el-table-column prop="incomeBatchNo" label="批次" width="300" align="center"/>
 			<el-table-column prop="incomeTime" label="生产日期" width="100" align="center"/>
 			<el-table-column prop="materialName" label="产品名称"align="center"/>
 			<el-table-column prop="materialCode" label="产品编码" width="150" align="center"
@@ -294,6 +274,7 @@ export default {
 		/** 重置按钮操作 */
 		resetQuery() {
 			this.resetForm("queryForm");
+			this.getDate();
 			this.handleQuery();
 		},
 		// 多选框选中数据
@@ -348,7 +329,7 @@ export default {
 			this.reset();
 			let sr = row;
      
-			this.queryParams.incomeBatchNo = sr.incomeBatchNo;
+			this.queryParams.orderNo = sr.orderNo;
 			getXJCheckTableDetail(this.queryParams).then(response => {
 				this.pOrderTableList = response;
 				this.openReport = true;
diff --git a/src/views/quality/qcTableXJAnalysis/index.vue b/src/views/quality/qcTableXJAnalysis/index.vue
new file mode 100644
index 0000000..737b4ff
--- /dev/null
+++ b/src/views/quality/qcTableXJAnalysis/index.vue
@@ -0,0 +1,198 @@
+<template>
+    <div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" style="margin-bottom: 0px;">
+      <el-form-item label="订单编码" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入订单编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品编号" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入产品编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工单生产日期" prop="ymdms">
+        <el-date-picker clearable
+          v-model="queryParams.ymdms"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择工单生产日期"
+          style="width:205px"
+          >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+		</el-form>
+		<el-row :gutter="20">
+			<el-col :sm="24" :lg="24">
+				<span style="font-size: 20px;margin: 40%;color: cadetblue;">{{title}}</span>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+				<div style="border: 1px solid #cfdee4;">
+				    <div id="orderline" style="width:100%;height:500px"></div>
+				</div>
+		</el-row>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons')
+import { getXJChartData} from "@/api/quality/qcTable";
+import moment from "moment/moment";
+export default {
+  name: "XJChart",
+  components: {},
+  data() {
+    return {
+        title:"巡检小时不良率折线图",
+        // 查询参数
+        queryParams: {
+          ymdms: null,
+          workorderCode: null,
+          workorderName: null,
+          parentOrder: null,
+          orderId: null,
+          orderCode: null,
+          productId: null,
+          productCode: null,
+          prodType: null,
+          productName: null,
+          productSpc: null,
+          productDate: null,
+          createTimeStart:null,
+          createTimeEnd:null
+        }
+      }
+  },
+	mounted(){
+    this.getDate();
+    this.getList();
+  },
+	methods: {
+    /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			this.queryParams.ymdms =start
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m +"-"+d;
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.getList();
+		},
+
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.getDate();
+			this.handleQuery();
+		},
+		getList() {
+
+			let myChart = this.$echarts.init(document.getElementById('orderline'))
+			getXJChartData(this.queryParams).then(data => {
+
+        if(data == ''){
+          return
+        }
+        let seriesResult =  data.series;
+        seriesResult.forEach(se => {
+            se.type = 'line';//bar//line
+        });
+
+				myChart.setOption({
+              tooltip: {
+                trigger: 'axis'
+              },
+              legend: {
+                data: data.legendData
+              },
+              grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+              },
+              toolbox: {
+                feature: {
+                  saveAsImage: {}
+                }
+              },
+              xAxis: {
+                type: 'category',
+                boundaryGap: false,
+                data: data.xAxisData
+              },
+              yAxis: {
+                type: 'value',
+                axisLabel: {
+                  formatter: '{value} %'
+                }
+              },
+              series: seriesResult
+          },
+          true
+			  )
+			})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tagbox {
+  display: flex;
+  /* overflow: scroll; */
+  position: relative;
+  width: 80%;
+  padding-left: 26px;
+  margin-bottom: 15px;
+  .tagboxlabel{
+    width: 100px;
+    text-align: right;
+    vertical-align: middle;
+    font-size: 14px;
+    color: black;
+    line-height: 40px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-right: 12px;
+  }
+  .tag {
+    width: 720px;
+    border: 1px #DCDFE6 solid;
+    height: 60px;
+    padding: 5px 15px;
+    overflow-y: scroll;
+    .tagitem{
+      margin-left: 5px;
+    }
+  }
+  .button1{
+    width: 37px;
+    height: 37px;
+    position: absolute;
+        right: -39px;
+    top: 2px;
+
+  }
+}
+</style>
+
+