From 9e475887b5349e6defc5b781d1ecde69c6071cac Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 25 Mar 2024 15:24:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A6=96=E9=A1=B5=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=EF=BC=8C6=E3=80=817=E3=80=8110=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E6=98=A8=E6=97=A5=E6=A0=B8=E5=BF=83=E6=8C=87=E6=A0=87=E5=92=8C?=
 =?UTF-8?q?=E6=9C=AC=E6=9C=88=E7=B4=AF=E8=AE=A1=E4=BA=A4=E4=BB=98=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B=E6=98=BE=E7=A4=BA=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/widgets/index_photon.vue | 1054 ++++++++++++++++-------
 1 file changed, 753 insertions(+), 301 deletions(-)

diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue
index 152c19eb..166a751e 100644
--- a/src/views/home/widgets/index_photon.vue
+++ b/src/views/home/widgets/index_photon.vue
@@ -4,23 +4,45 @@
 			<div class="retangleWrap retangleWrapTop">
 				<div class="retangle retangleImg">
 					<div class="companyName">中建材光子科技有限公司</div>
-					<div class="companyDesc">公司秉承“善用资源，服务建设”的核心理念，践行“材料创造美</div>
-					<div class="companyDesc">好世界”的企业使命，坚持“创新、绩效、和谐、责任”的核心价</div>
-					<div class="companyDesc">值观，努力成长为具有创新精神和全球视野的光子材料领先企业。</div>
-					<img class="topCardImg" src="img/topCard.png">
+					<div class="companyDesc">
+						公司秉承“善用资源，服务建设”的核心理念，践行“材料创造美
+					</div>
+					<div class="companyDesc">
+						好世界”的企业使命，坚持“创新、绩效、和谐、责任”的核心价
+					</div>
+					<div class="companyDesc">
+						值观，努力成长为具有创新精神和全球视野的光子材料领先企业。
+					</div>
+					<img class="topCardImg" src="img/topCard.png" />
 				</div>
 			</div>
 			<div class="retangleWrap">
 				<div class="retangle countRetangle">
-					<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-						<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">昨日核心指标</div>
+					<div
+						style="
+							display: flex;
+							justify-content: space-between;
+							padding: 0 24px;
+						"
+					>
+						<div
+							style="
+								color: rgb(30, 30, 30);
+								font-size: 16px;
+								font-weight: 400;
+								line-height: 24px;
+							"
+						>
+							昨日核心指标
+						</div>
 						<!-- <div style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;">时间</div> -->
 					</div>
-					<div style="padding-top: 20px;display: flex;">
+					<div style="padding-top: 20px; display: flex">
 						<div class="countItem">
 							<div class="countname">预制棒合格数</div>
 							<p class="countnum">{{ dayPassNum7 }}</p>
-							<p class="countrate">同比前天
+							<p class="countrate">
+								同比前天
 								<span :class="bindClass(tongbi7)">
 									{{ tongbi7 }}%
 									<span v-if="tongbi7 < 0"> ▼</span>
@@ -31,7 +53,8 @@
 						<div class="countItem">
 							<div class="countname">预制管合格数</div>
 							<p class="countnum">{{ dayPassNum10 }}</p>
-							<p class="countrate">同比前天
+							<p class="countrate">
+								同比前天
 								<span :class="bindClass(tongbi10)">
 									{{ tongbi10 }}%
 									<span v-if="tongbi10 < 0"> ▼</span>
@@ -42,7 +65,8 @@
 						<div class="countItem">
 							<div class="countname">AVG合格数</div>
 							<p class="countnum">{{ dayAVGcountOk }}</p>
-							<p class="countrate">同比前天
+							<p class="countrate">
+								同比前天
 								<span :class="bindClass(AVGOktongbi)">
 									{{ AVGOktongbi }}%
 									<span v-if="AVGOktongbi < 0"> ▼</span>
@@ -53,7 +77,8 @@
 						<div class="countItem">
 							<div class="countname">预制棒管交付数</div>
 							<p class="countnum">{{ dayPayNum6 }}</p>
-							<p class="countrate">同比前天
+							<p class="countrate">
+								同比前天
 								<span :class="bindClass(tongbi06)">
 									{{ tongbi06 }}%
 									<span v-if="tongbi06 < 0"> ▼</span>
@@ -64,7 +89,8 @@
 						<div class="countItem">
 							<div class="countname">AVG交付数</div>
 							<p class="countnum">{{ dayAVGcountDelivered }}</p>
-							<p class="countrate">同比前天
+							<p class="countrate">
+								同比前天
 								<span :class="bindClass(AVGDelivertongbi)">
 									{{ AVGDelivertongbi }}%
 									<span v-if="AVGDelivertongbi < 0"> ▼</span>
@@ -77,10 +103,17 @@
 			</div>
 			<div class="retangleWrap retangleWrapmiddle">
 				<div class="retangle middleRetangle">
-					<div style="padding: 20px 0;display: flex;">
+					<div style="padding: 20px 0; display: flex">
 						<div class="middleItem">
 							<div class="countname">本月累积交付数</div>
-							<div style="display: flex;justify-content: space-around;padding-top: 25px;font-size: 20px;">
+							<div
+								style="
+									display: flex;
+									justify-content: space-around;
+									padding-top: 25px;
+									font-size: 20px;
+								"
+							>
 								<div>
 									<div>预制棒管</div>
 									<p class="countnum">{{ monthPayNum6 }}</p>
@@ -91,27 +124,47 @@
 								</div>
 							</div>
 						</div>
-						<div class="middleItem" style="display: flex;">
-							<el-progress type="circle" :stroke-width="15" :show-text="false" :percentage="monthPassRate7" />
-							<div style="margin-left: 20px;">
+						<div class="middleItem" style="display: flex">
+							<el-progress
+								type="circle"
+								:stroke-width="15"
+								:show-text="false"
+								:percentage="monthPassRate7"
+							/>
+							<div style="margin-left: 20px">
 								<div class="countname">预制棒合格率</div>
-								<p class="countnum" style="line-height: 82px">{{ monthPassRate7 }}%</p>
+								<p class="countnum" style="line-height: 82px">
+									{{ monthPassRate7 }}%
+								</p>
 							</div>
 						</div>
-						<div class="middleItem" style="display: flex;">
-							<el-progress type="circle" :stroke-width="15" :show-text="false"
-								:percentage="monthPassRate10" />
-							<div style="margin-left: 20px;">
+						<div class="middleItem" style="display: flex">
+							<el-progress
+								type="circle"
+								:stroke-width="15"
+								:show-text="false"
+								:percentage="monthPassRate10"
+							/>
+							<div style="margin-left: 20px">
 								<div class="countname">预制管合格率</div>
-								<p class="countnum" style="line-height: 82px">{{ monthPassRate10 }}%</p>
+								<p class="countnum" style="line-height: 82px">
+									{{ monthPassRate10 }}%
+								</p>
 								<!-- <p class="countrate">同比上周 8.63%</p> -->
 							</div>
 						</div>
-						<div class="middleItem" style="display: flex;">
-							<el-progress type="circle" :stroke-width="15" :show-text="false" :percentage="monthRateAVG" />
-							<div style="margin-left: 20px;">
+						<div class="middleItem" style="display: flex">
+							<el-progress
+								type="circle"
+								:stroke-width="15"
+								:show-text="false"
+								:percentage="monthRateAVG"
+							/>
+							<div style="margin-left: 20px">
 								<div class="countname">AVG合格率</div>
-								<p class="countnum" style="line-height: 82px">{{ monthRateAVG }}%</p>
+								<p class="countnum" style="line-height: 82px">
+									{{ monthRateAVG }}%
+								</p>
 								<!-- <p class="countrate">同比上周 8.63%</p> -->
 							</div>
 						</div>
@@ -120,25 +173,59 @@
 			</div>
 			<el-row>
 				<el-col :span="14">
-					<div class="retangleWrap" style="padding-right: 0;">
+					<div class="retangleWrap" style="padding-right: 0">
 						<div class="retangle bottomRetangle">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-								<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">
-									本月生产合格趋势</div>
-								<div style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;">
-									<el-radio-group v-model="deptName" @change="deptNameChange">
+							<div
+								style="
+									display: flex;
+									justify-content: space-between;
+									padding: 0 24px;
+								"
+							>
+								<div
+									style="
+										color: rgb(30, 30, 30);
+										font-size: 16px;
+										font-weight: 400;
+										line-height: 24px;
+									"
+								>
+									本月生产合格趋势
+								</div>
+								<div
+									style="
+										color: rgb(122, 121, 121);
+										size: 12px;
+										font-weight: 290;
+										line-height: 22px;
+									"
+								>
+									<el-radio-group
+										v-model="deptName"
+										@change="deptNameChange"
+									>
 										<el-radio label="6车间">6车间</el-radio>
 										<el-radio label="7车间">7车间</el-radio>
-										<el-radio label="10车间">10车间</el-radio>
+										<el-radio label="10车间"
+											>10车间</el-radio
+										>
 									</el-radio-group>
 								</div>
 							</div>
-							<div style="padding: 20px 24px 0 24px;background: #ffffff;">
+							<div
+								style="
+									padding: 20px 24px 0 24px;
+									background: #ffffff;
+								"
+							>
 								<div class="bottomItem">
-									<div class="countname">本月计划完成度</div>
-									<p class="countnum">{{ hgNumber }}%</p>
+									<!-- <div class="countname">本月计划完成度</div>
+									<p class="countnum">{{ hgNumber }}%</p> -->
 									<!-- <p class="countrate">同比上周<span class="redColor"> 8.63%▲</span> 月同比6.47%</p> -->
-									<div id="barCharts" style="width: 100%;height: 218px;"></div>
+									<div
+										id="barCharts"
+										style="width: 100%; height: 289px"
+									></div>
 								</div>
 							</div>
 						</div>
@@ -147,91 +234,204 @@
 				<el-col :span="10">
 					<div class="retangleWrap retangleWrapTable">
 						<div class="retangle tableRetangle">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-								<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">库存情况
+							<div
+								style="
+									display: flex;
+									justify-content: space-between;
+									padding: 0 24px;
+								"
+							>
+								<div
+									style="
+										color: rgb(30, 30, 30);
+										font-size: 16px;
+										font-weight: 400;
+										line-height: 24px;
+									"
+								>
+									库存情况
 								</div>
 								<div
-									style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;height:23px">
-									<el-radio-group v-model="materialType" @change="materialTypeChange">
+									style="
+										color: rgb(122, 121, 121);
+										size: 12px;
+										font-weight: 290;
+										line-height: 22px;
+										height: 23px;
+									"
+								>
+									<el-radio-group
+										v-model="materialType"
+										@change="materialTypeChange"
+									>
 										<el-radio label="20">半成品</el-radio>
 										<el-radio label="10">成品</el-radio>
 									</el-radio-group>
 								</div>
 							</div>
-							<div style="padding: 20px 24px 24px 24px;">
-								<el-table :data="tableData" style="width: 100%;height: 293px;">
-									<el-table-column label="#" type="index" width="50"></el-table-column>
-									<el-table-column prop="name" label="名称"></el-table-column>
-									<el-table-column prop="specification" label="规格"></el-table-column>
-									<el-table-column prop="model" label="型号"></el-table-column>
-									<el-table-column prop="unit" label="单位"></el-table-column>
-									<el-table-column prop="count" label="库存"></el-table-column>
+							<div style="padding: 20px 24px 24px 24px">
+								<el-table
+									:data="tableData"
+									style="width: 100%; height: 293px"
+								>
+									<el-table-column
+										label="#"
+										type="index"
+										width="50"
+									></el-table-column>
+									<el-table-column
+										prop="name"
+										label="名称"
+									></el-table-column>
+									<el-table-column
+										prop="specification"
+										label="规格"
+									></el-table-column>
+									<el-table-column
+										prop="model"
+										label="型号"
+									></el-table-column>
+									<el-table-column
+										prop="unit"
+										label="单位"
+									></el-table-column>
+									<el-table-column
+										prop="count"
+										label="库存"
+									></el-table-column>
 								</el-table>
 							</div>
 						</div>
 					</div>
 				</el-col>
 			</el-row>
-			<el-row style="margin-bottom: 20px;">
+			<el-row style="margin-bottom: 20px">
 				<el-col :span="7">
-					<div class="retangleWrap" style="padding-right: 0;">
-						<!-- <div class="retangle bottomRetangle">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;"> 
-								<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">月度趋势</div>
-								<div style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;">...</div>
+					<div class="retangleWrap" style="padding-right: 0">
+						<div class="retangle bottomRetangle warningContainer">
+							<div class="warningHead">
+								<div class="warningHeadText">预警提示</div>
 							</div>
-							<div style="padding: 20px 24px 24px 24px;">
-								<div style="display: flex;">
-									<el-icon style="color: #409EFF;font-size: 35px;"><WarningFilled/></el-icon>
-									<div>
-										<p>设备检验</p>
-										<p>提醒日期</p>
+							<div class="warningTableHead">
+								<div style="flex: 2">名称</div>
+								<div class="warningFlex1">型号</div>
+								<div class="warningFlex1">规格</div>
+								<div
+									class="warningFlex1"
+									style="text-align: right"
+								>
+									数量
+								</div>
+							</div>
+							<div class="warningTbleBody">
+								<div
+									style="height: fit-content"
+									v-if="warningMaterial.length > 0"
+								>
+									<div
+										v-for="item in warningMaterial"
+										:key="item.id"
+										style="display: flex; height: 25px"
+									>
+										<div style="flex: 2">
+											{{ item.name }}
+										</div>
+										<div class="warningFlex1">
+											{{ item.model }}
+										</div>
+										<div class="warningFlex1">
+											{{ item.specification }}
+										</div>
+										<div
+											class="warningFlex1 warningNumberStyle"
+										>
+											{{ item.count }}
+										</div>
 									</div>
 								</div>
-								<div style="display: flex;margin-top: 20px;">
-									<el-icon style="color: #409EFF;font-size: 35px;"><WarningFilled/></el-icon>
-									<div>
-										<p>设备检验</p>
-										<p>提醒日期</p>
-									</div>
-								</div>
-							</div>
-						</div> -->
-						<div class="retangle bottomRetangle" style="background: rgb(20,141,255);color:#ffffff;">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-								<div style="font-size: 16px;font-weight: 400;line-height: 24px;">预警提示</div>
-							</div>
-							<div style="padding: 20px 24px 24px 24px;height: 311px;">
-								<div>
-									<p>延期任务数量上月同比增加 <span style="font-size: 24px;">10.23%</span></p>
-								</div>
+								<div v-else>暂无数据</div>
 							</div>
 						</div>
 					</div>
 				</el-col>
 				<el-col :span="10">
-					<div class="retangleWrap retangleWrapTable" style="padding-right: 0;">
+					<div
+						class="retangleWrap retangleWrapTable"
+						style="padding-right: 0"
+					>
 						<div class="retangle tableRetangle">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-								<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">生产设备
+							<div
+								style="
+									display: flex;
+									justify-content: space-between;
+									padding: 0 24px;
+								"
+							>
+								<div
+									style="
+										color: rgb(30, 30, 30);
+										font-size: 16px;
+										font-weight: 400;
+										line-height: 24px;
+									"
+								>
+									生产设备
 								</div>
 							</div>
-							<div style="padding: 20px 24px 24px 24px;">
-								<el-table :data="equipList" style="width: 100%;height: 285px;">
-									<el-table-column prop="number" label="设备编号" />
-									<el-table-column prop="name" label="设备名称" />
-									<el-table-column prop="belong_dept_name" label="所在车间" />
-									<el-table-column prop="state" label="设备状态">
+							<div style="padding: 20px 24px 24px 24px">
+								<el-table
+									:data="equipList"
+									style="width: 100%; height: 285px"
+								>
+									<el-table-column
+										prop="number"
+										label="设备编号"
+									/>
+									<el-table-column
+										prop="name"
+										label="设备名称"
+									/>
+									<el-table-column
+										prop="belong_dept_name"
+										label="所在车间"
+									/>
+									<el-table-column
+										prop="state"
+										label="设备状态"
+									>
 										<template #default="scope">
-											<el-tag class="ml-2" type="success" v-if="scope.row.state == 10">{{
-												eqState_[scope.row.state] }}</el-tag>
-											<el-tag class="ml-2" type="warning" v-if="scope.row.state == 20">{{
-												eqState_[scope.row.state] }}</el-tag>
-											<el-tag class="ml-2" type="info" v-if="scope.row.state == 30">{{
-												eqState_[scope.row.state] }}</el-tag>
-											<el-tag class="ml-2" type="danger" v-if="scope.row.state == 40">{{
-												eqState_[scope.row.state] }}</el-tag>
-
+											<el-tag
+												class="ml-2"
+												type="success"
+												v-if="scope.row.state == 10"
+												>{{
+													eqState_[scope.row.state]
+												}}</el-tag
+											>
+											<el-tag
+												class="ml-2"
+												type="warning"
+												v-if="scope.row.state == 20"
+												>{{
+													eqState_[scope.row.state]
+												}}</el-tag
+											>
+											<el-tag
+												class="ml-2"
+												type="info"
+												v-if="scope.row.state == 30"
+												>{{
+													eqState_[scope.row.state]
+												}}</el-tag
+											>
+											<el-tag
+												class="ml-2"
+												type="danger"
+												v-if="scope.row.state == 40"
+												>{{
+													eqState_[scope.row.state]
+												}}</el-tag
+											>
 										</template>
 									</el-table-column>
 								</el-table>
@@ -242,8 +442,22 @@
 				<el-col :span="7">
 					<div class="retangleWrap retangleWrapTable">
 						<div class="retangle tableRetangle">
-							<div style="display: flex;justify-content: space-between;padding: 0 24px;">
-								<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">日历
+							<div
+								style="
+									display: flex;
+									justify-content: space-between;
+									padding: 0 24px;
+								"
+							>
+								<div
+									style="
+										color: rgb(30, 30, 30);
+										font-size: 16px;
+										font-weight: 400;
+										line-height: 24px;
+									"
+								>
+									日历
 								</div>
 							</div>
 							<div style="">
@@ -257,19 +471,19 @@
 	</div>
 </template>
 <script>
-import * as echarts from 'echarts';
+import * as echarts from "echarts";
 export default {
 	data() {
 		return {
-			time: '',
-			day: '',
-			year_s: '',
-			day_s: '',
-			month_s: '',
-			deptName: '10车间',
-			materialType: '20',
-			yesterday: '',
-			yesterdayBefore: '',
+			time: "",
+			day: "",
+			year_s: "",
+			day_s: "",
+			month_s: "",
+			deptName: "10车间",
+			materialType: "20",
+			yesterday: "",
+			yesterdayBefore: "",
 			yearData: [],
 			monthData: [],
 			warningNum: 0,
@@ -277,25 +491,25 @@ export default {
 			chartData: [],
 			tableData: [],
 			equipList: [],
-			calendarValue: '',
+			warningMaterial: [],
+			calendarValue: "",
 			eqState_: {
-				10: '完好',
-				20: '限用',
-				30: '在修',
-				40: '禁用',
+				10: "完好",
+				20: "限用",
+				30: "在修",
+				40: "禁用",
 			},
 			dayPassNum7: 0,
 			tongbi7: 0,
 			dayPassNum10: 0,
 			tongbi10: 0,
-			dayPayNum6: 0,//交付数
+			dayPayNum6: 0, //交付数
 			tongbi06: 0,
 
 			monthPayNum6: 0,
 			monthPassRate7: 0,
 			monthPassRate10: 0,
 
-
 			dayAVGcountOk: 0,
 			AVGOktongbi: 0,
 			dayAVGcountDelivered: 0,
@@ -305,56 +519,57 @@ export default {
 			hgNumber: 0,
 			option: {
 				tooltip: {
-					trigger: 'axis',
+					trigger: "axis",
 					axisPointer: {
-						type: 'cross',
+						type: "cross",
 						label: {
-							backgroundColor: '#6a7985'
-						}
-					}
+							backgroundColor: "#6a7985",
+						},
+					},
 				},
-				grid: {  // 图表距离边框的距离，可用百分比和数字（px）配置
-					top: '5%',
-					left: '1%',
-					right: '1%',
-					bottom: '5%',
-					containLabel: true
+				grid: {
+					// 图表距离边框的距离，可用百分比和数字（px）配置
+					top: "5%",
+					left: "1%",
+					right: "1%",
+					bottom: "5%",
+					containLabel: true,
 				},
 				xAxis: {
-					type: 'category',
+					type: "category",
 					axisLabel: {
-						// show: false, // X 轴标签文字旋转角度  
+						// show: false, // X 轴标签文字旋转角度
 					},
-					data: []
+					data: [],
 				},
 				yAxis: {
-					type: 'value',
+					type: "value",
 					axisLabel: {
-						show: false, // X 轴标签文字旋转角度  
+						show: false, // X 轴标签文字旋转角度
 					},
 				},
 				series: {
 					data: [],
-					type: 'bar',
+					type: "bar",
 					barMaxWidth: 50,
 					emphasis: {
-						focus: 'series'
+						focus: "series",
 					},
 					label: {
 						show: true,
-						position: 'top',
-						color: '#000'
+						position: "top",
+						color: "#000",
 					},
 					itemStyle: {
 						borderRadius: [5, 5, 0, 0],
-						normal: { color: 'rgb(20, 141, 255)' }
-					}
-				}
-			}
-		}
+						normal: { color: "rgb(20, 141, 255)" },
+					},
+				},
+			},
+		};
 	},
 	mounted() {
-		this.$emit('on-mounted');
+		this.$emit("on-mounted");
 		let that = this;
 		var myDate = new Date();
 		let year = myDate.getFullYear();
@@ -365,9 +580,21 @@ export default {
 		that.day_s = day;
 
 		let yesterday = new Date(myDate.getTime() - 24 * 60 * 60 * 1000);
-		this.yesterday = yesterday.getFullYear() + "-" + (yesterday.getMonth() + 1) + "-" + yesterday.getDate();
-		let yesterdayBefore = new Date(yesterday.getTime() - 24 * 60 * 60 * 1000);
-		this.yesterdayBefore = yesterdayBefore.getFullYear() + "-" + (yesterdayBefore.getMonth() + 1) + "-" + yesterdayBefore.getDate();
+		this.yesterday =
+			yesterday.getFullYear() +
+			"-" +
+			(yesterday.getMonth() + 1) +
+			"-" +
+			yesterday.getDate();
+		let yesterdayBefore = new Date(
+			yesterday.getTime() - 24 * 60 * 60 * 1000
+		);
+		this.yesterdayBefore =
+			yesterdayBefore.getFullYear() +
+			"-" +
+			(yesterdayBefore.getMonth() + 1) +
+			"-" +
+			yesterdayBefore.getDate();
 		that.getdayData();
 		that.getMonthData();
 		this.getAVGDayData();
@@ -375,24 +602,29 @@ export default {
 		this.getEquipList();
 		this.getMaterialList();
 		this.getProductStatistic();
+		this.getMaterialWarning();
 	},
 	methods: {
 		// 动态绑定Class
 		bindClass(rate) {
 			let classInfo = {
-				socketDom: true, redColor: false, greenColor: true
-			}
+				socketDom: true,
+				redColor: false,
+				greenColor: true,
+			};
 			if (rate > 0) {
-				classInfo.greenColor = true
+				classInfo.greenColor = true;
 			} else if (rate < 0) {
-				classInfo.redColor = true
+				classInfo.redColor = true;
 			}
-			return classInfo
+			return classInfo;
 		},
 		getEquipList() {
-			this.$API.em.equipment.list.req({ page: 0, type: 10 }).then(res => {
-				this.equipList = res
-			})
+			this.$API.em.equipment.list
+				.req({ page: 0, type: 10 })
+				.then((res) => {
+					this.equipList = res;
+				});
 		},
 		materialTypeChange() {
 			this.getMaterialList();
@@ -400,240 +632,422 @@ export default {
 		//获取库存
 		getMaterialList() {
 			let that = this;
-			that.$API.mtm.material.list.req({ page: 0, type: that.materialType }).then(res => {
-				that.tableData = res.filter(item => {
-					return item.count > 0;
+			that.$API.mtm.material.list
+				.req({ page: 0, type: that.materialType })
+				.then((res) => {
+					that.tableData = res.filter((item) => {
+						return item.count > 0;
+					});
+				});
+		},
+		//库存警告
+		getMaterialWarning() {
+			let that = this;
+			that.$API.mtm.material.list
+				.req({ page: 0, type__in: "10,20", count__lte: 1 })
+				.then((res) => {
+					if (res.length > 0) {
+						console.log("getMaterialWarning", res);
+						that.warningMaterial = res;
+					} else {
+					}
 				});
-				console.log('getMaterialList', res)
-			})
 		},
-
 		showTime() {
-			this.time = this.$TOOL.dateFormat(new Date(), 'hh:mm:ss')
-			this.day = this.$TOOL.dateFormat(new Date(), 'yyyy年MM月dd日')
+			this.time = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
+			this.day = this.$TOOL.dateFormat(new Date(), "yyyy年MM月dd日");
 		},
 		interEquipment() {
-			this.$router.replace({ path: '/em/equipment' })
+			this.$router.replace({ path: "/em/equipment" });
 		},
-		//昨日数据
+		//昨日数据---6、7、10车间
 		getdayData() {
 			let that = this;
 			let date = that.yesterday;
 			let obj6 = {
-				query: { start_date: date, end_date: date, mio_type: 'sale_out', material_id: '' },
+				query: {
+					start_date: date,
+					end_date: date,
+					mio_type: "sale_out",
+					material_id: "",
+				},
 			};
 			let obj7 = {
-				query: { start_date: date, end_date: date, dept_name: "7车间" },
+				query: {
+					start_date: date,
+					end_date: date,
+					dept_name: "7车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 			let obj10 = {
-				query: { start_date: date, end_date: date, dept_name: "10车间" },
+				query: {
+					start_date: date,
+					end_date: date,
+					dept_name: "10车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 
 			let date0 = that.yesterdayBefore;
 			let obj06 = {
-				query: { start_date: date0, end_date: date0, mio_type: 'sale_out', material_id: '' },
+				query: {
+					start_date: date0,
+					end_date: date0,
+					mio_type: "sale_out",
+					material_id: "",
+				},
 			};
 			let obj07 = {
-				query: { start_date: date0, end_date: date0, dept_name: "7车间" },
+				query: {
+					start_date: date0,
+					end_date: date0,
+					dept_name: "7车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 			let obj010 = {
-				query: { start_date: date0, end_date: date0, dept_name: "10车间" },
+				query: {
+					start_date: date0,
+					end_date: date0,
+					dept_name: "10车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 			//7车间昨日合格数
-			that.$API.bi.dataset.exec.req('lineDay', obj7).then((res7) => {
-				let list7 = res7.data2.ds0;
-				if (list7.length > 0) {
-					this.dayPassNum7 = list7[0].合格数;
-				}
-				//7车间前天合格数
-				that.$API.bi.dataset.exec.req('lineDay', obj07).then((res07) => {
-					let list07 = res07.data2.ds0;
-					if (list07.length > 0) {
-						this.tongbi7 = Math.round((this.dayPassNum7 - list07[0].合格数) / list07[0].合格数 * 100);
+			that.dayPassNum7 = 0;
+			that.$API.bi.dataset.exec.req("lineDay", obj7).then((res7) => {
+				console.log("lineDay:7车间昨日数据", res7);
+				if (res7.data2.ds0) {
+					let list7 = res7.data2.ds0;
+					if (list7.length > 0) {
+						list7.forEach((item7) => {
+							that.dayPassNum7 += item7.合格数;
+						});
 					}
-				});
+				}
+				let beforData7 = 0;
+				//7车间前天合格数
+				that.$API.bi.dataset.exec
+					.req("lineDay", obj07)
+					.then((res07) => {
+						console.log("lineDay:7车间前天数据", res7);
+						if (res07.data2.ds0) {
+							let list07 = res07.data2.ds0;
+							if (list07.length > 0) {
+								list07.forEach((item07) => {
+									beforData7 += item07.合格数;
+								});
+							}
+						}
+						if (beforData7 !== 0) {
+							this.tongbi7 = Math.round(
+								((this.dayPassNum7 - beforData7) / beforData7) *
+									100
+							);
+						} else {
+							this.tongbi7 = this.dayPassNum7;
+						}
+					});
 			});
 			//10车间昨日合格数
-			that.$API.bi.dataset.exec.req('lineDay', obj10).then((res10) => {
-				console.log('res10', res10);
-				let list10 = res10.data2.ds0;
-				if (list10.length > 0) {
-					this.dayPassNum10 = list10[0].合格数;
+			that.dayPassNum10 = 0;
+			that.$API.bi.dataset.exec.req("lineDay", obj10).then((res10) => {
+				console.log("lineDay:10车间昨日数据", res10);
+				if (res10.data2.ds0) {
+					let list10 = res10.data2.ds0;
+					if (list10.length > 0) {
+						list10.forEach((item10) => {
+							that.dayPassNum10 += item10.合格数;
+						});
+					}
 				}
 				//10车间前天合格数
-				that.$API.bi.dataset.exec.req('lineDay', obj010).then((res010) => {
-					console.log('res10', res010);
-					let list010 = res010.data2.ds0;
-					if (list010.length > 0) {
-						this.tongbi10 = Math.round((this.dayPassNum10 - list010[0].合格数) / list010[0].合格数 * 100);
-					}
-				});
+				let beforData10 = 0;
+				that.$API.bi.dataset.exec
+					.req("lineDay", obj010)
+					.then((res010) => {
+						console.log("lineDay:10车间前天数据", res010);
+						if (res010.data2.ds0) {
+							let list010 = res010.data2.ds0;
+							if (list010.length > 0) {
+								list010.forEach((item010) => {
+									beforData10 += item010.合格数;
+								});
+							}
+						}
+						if (beforData10 !== 0) {
+							this.tongbi10 = Math.round(
+								((this.dayPassNum10 - beforData10) /
+									beforData10) *
+									100
+							);
+						} else {
+							this.tongbi7 = this.dayPassNum7;
+						}
+					});
 			});
 			//6车昨日交付数
-			that.$API.bi.dataset.exec.req('saleOutDay', obj6).then((res6) => {
-				let list6 = res6.data2.ds0;
-				if (list6.length > 0) {
-					this.dayPayNum6 = list6[0].交付数;
-				}
-				//6车前日交付数
-				that.$API.bi.dataset.exec.req('saleOutDay', obj06).then((res06) => {
-					let list06 = res06.data2.ds0;
-					if (list06.length > 0) {
-						this.tongbi06 = Math.round((this.dayPayNum6 - list06[0].交付数) / list06[0].交付数 * 100);
+			this.dayPayNum6 = 0;
+			that.$API.bi.dataset.exec.req("saleOutDay", obj6).then((res6) => {
+				if (res6.data2.ds0) {
+					let list6 = res6.data2.ds0;
+					if (list6.length > 0) {
+						list6.forEach((item6) => {
+							this.dayPayNum6 += item6.交付数;
+						});
 					}
-				});
+				}
+				let beforData6 = 0;
+				//6车前日交付数
+				that.$API.bi.dataset.exec
+					.req("saleOutDay", obj06)
+					.then((res06) => {
+						if (res06.data2.ds0) {
+							let list06 = res06.data2.ds0;
+							if (list06.length > 0) {
+								list06.forEach((item06) => {
+									beforData6 += item06.交付数;
+								});
+							}
+						}
+						if (beforData6 !== 0) {
+							this.tongbi06 = Math.round(
+								((this.dayPassNum6 - beforData6) / beforData6) *
+									100
+							);
+						} else {
+							this.tongbi06 = this.dayPassNum6;
+						}
+					});
 			});
 		},
-		//本月合格数&本月交付统计
+		//本月合格数&本月交付统计---6、7、10车间
 		getMonthData() {
 			let that = this;
-			let start_date = that.year_s + '-' + that.month_s + '-01';
-			let end_date = that.year_s + '-' + that.month_s + '-' + that.day_s;
+			this.monthPayNum6 = 0;
+			this.monthPassRate7 = 0;
+			this.monthPassRate10 = 0;
+			let start_date = that.year_s + "-" + that.month_s + "-01";
+			let end_date = that.year_s + "-" + that.month_s + "-" + that.day_s;
 			let obj6 = {
-				query: { start_date: start_date, end_date: end_date, mio_type: 'sale_out', material_id: '' },
+				query: {
+					start_date: start_date,
+					end_date: end_date,
+					mio_type: "sale_out",
+					material_id: "",
+				},
 			};
 			let obj7 = {
-				query: { start_date: start_date, end_date: end_date, dept_name: "7车间" },
+				query: {
+					start_date: start_date,
+					end_date: end_date,
+					dept_name: "7车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 			let obj10 = {
-				query: { start_date: start_date, end_date: end_date, dept_name: "10车间" },
+				query: {
+					start_date: start_date,
+					end_date: end_date,
+					dept_name: "10车间",
+					group_bys_material: "",
+					order_bys_material: "",
+					select_cols_material: "",
+				},
 			};
 			//7车间本月合格率
-			that.$API.bi.dataset.exec.req('lineMonth', obj7).then((res7) => {
-				// console.log('7车间本月合格率:',res7);
-				let list7 = res7.data2.ds0;
-				let sum = 0, rate = 0;
-				if (list7.length > 0) {
-					list7.forEach(item => {
-						sum = sum + item.合格率;
-					});
-					rate = sum / list7.length;
+			that.$API.bi.dataset.exec.req("lineMonth", obj7).then((res7) => {
+				console.log("7车间本月合格率:", res7);
+				let sum_ok = 0,
+					sum_real = 0,
+					rate = 0;
+				if (res7.data2.ds0) {
+					let list7 = res7.data2.ds0;
+					if (list7.length > 0) {
+						list7.forEach((item) => {
+							sum_ok = sum_ok + item.合格数;
+							sum_real = sum_real + item.生产数;
+						});
+						rate = (sum_ok / sum_real) * 100;
+					}
 				}
 				this.monthPassRate7 = Math.round(rate);
-				// console.log('7车间本月合格率:',this.monthPassRate7);
-				// debugger;
 			});
 			//10车间本月合格率
-			that.$API.bi.dataset.exec.req('lineMonth', obj10).then((res10) => {
+			that.$API.bi.dataset.exec.req("lineMonth", obj10).then((res10) => {
 				this.monthPassRate10 = 0;
-				let list10 = res10.data2.ds0;
-				let sum = 0, rate = 0;
-				if (list10.length > 0) {
-					list10.forEach(item => {
-						sum = sum + item.合格率;
-					});
-					rate = sum / list10.length;
+				let sum_ok_10 = 0,
+					sum_real_10 = 0,
+					rate_10 = 0;
+				if (res10.data2.ds0) {
+					let list10 = res10.data2.ds0;
+					if (list10.length > 0) {
+						list10.forEach((item) => {
+							sum_ok_10 = sum_ok_10 + item.合格数;
+							sum_real_10 = sum_real_10 + item.生产数;
+						});
+						rate_10 = (sum_ok_10 / sum_real_10) * 100;
+					}
 				}
-				this.monthPassRate10 = Math.round(rate);
-				// console.log('10车间本月合格率:',this.monthPassRate10);
-				// debugger;
+				this.monthPassRate10 = Math.round(rate_10);
 			});
 			//6车间本月交付数
-			that.$API.bi.dataset.exec.req('saleOutMonth', obj6).then((res6) => {
-				// console.log('6车间本月交付数:',res6);
-				let list6 = res6.data2.ds0;
-				let sum = 0;
-				list6.forEach(item => {
-					sum = sum + item.交付数;
-				});
-				this.monthPayNum6 = sum;
-				// console.log('6车间本月交付数:',this.monthPayNum6);
-				// debugger;
+			that.$API.bi.dataset.exec.req("saleOutMonth", obj6).then((res6) => {
+				if (res6.data2.ds0) {
+					let list6 = res6.data2.ds0;
+					let sum6 = 0;
+					if (list6.length > 0) {
+						list6.forEach((item) => {
+							sum6 = sum6 + item.交付数;
+						});
+					}
+					this.monthPayNum6 = sum6;
+				}
 			});
-			//本月合格率
 		},
 		//获取昨日AVG的生产记录
 		getAVGDayData() {
 			let that = this;
 			let date = that.yesterday;
 			let date0 = that.yesterdayBefore;
-			this.$API.wpm.otherlog.list.req({ product: 'AVG', page: 0, handle_date__gte: date, handle_date__lte: date }).then(res => {
-				let list = res;
-				let count_ok = 0, count_delivered = 0;
-				if (list.length > 0) {
-					list.forEach(item => {
-						count_ok = count_ok + item.count_ok;
-						count_delivered = count_delivered + item.count_delivered;
-					})
-					that.dayAVGcountOk = count_ok;
-					that.dayAVGcountDelivered = count_delivered;
-					this.$API.wpm.otherlog.list.req({ product: 'AVG', page: 0, handle_date__gte: date0, handle_date__lte: date0 }).then(res0 => {
-						let list0 = res0;
-						let count_ok0 = 0, count_delivered0 = 0;
-						if (list0.length > 0) {
-							list0.forEach(item0 => {
-								count_ok0 = count_ok0 + item0.count_ok;
-								count_delivered0 = count_delivered0 + item0.count_delivered;
+			this.$API.wpm.otherlog.list
+				.req({
+					product: "AVG",
+					page: 0,
+					handle_date__gte: date,
+					handle_date__lte: date,
+				})
+				.then((res) => {
+					let list = res;
+					let count_ok = 0,
+						count_delivered = 0;
+					if (list.length > 0) {
+						list.forEach((item) => {
+							count_ok = count_ok + item.count_ok;
+							count_delivered =
+								count_delivered + item.count_delivered;
+						});
+						that.dayAVGcountOk = count_ok;
+						that.dayAVGcountDelivered = count_delivered;
+						this.$API.wpm.otherlog.list
+							.req({
+								product: "AVG",
+								page: 0,
+								handle_date__gte: date0,
+								handle_date__lte: date0,
 							})
-							that.AVGOktongbi = Math.round((count_ok - count_ok0) / count_ok0 * 100);
-							that.AVGDelivertongbi = Math.round((count_delivered - count_delivered0) / count_delivered0 * 100);
-						}
-					})
-				}
-			})
+							.then((res0) => {
+								let list0 = res0;
+								let count_ok0 = 0,
+									count_delivered0 = 0;
+								if (list0.length > 0) {
+									list0.forEach((item0) => {
+										count_ok0 = count_ok0 + item0.count_ok;
+										count_delivered0 =
+											count_delivered0 +
+											item0.count_delivered;
+									});
+									that.AVGOktongbi = Math.round(
+										((count_ok - count_ok0) / count_ok0) *
+											100
+									);
+									that.AVGDelivertongbi = Math.round(
+										((count_delivered - count_delivered0) /
+											count_delivered0) *
+											100
+									);
+								}
+							});
+					}
+				});
 		},
 		getAVGMonthData() {
 			let that = this;
-			let start_date = that.year_s + '-' + that.month_s + '-01';
-			let end_date = that.year_s + '-' + that.month_s + '-' + that.day_s;
+			let start_date = that.year_s + "-" + that.month_s + "-01";
+			let end_date = that.year_s + "-" + that.month_s + "-" + that.day_s;
 			let obj = {
 				query: { start_date: start_date, end_date: end_date },
 			};
-			that.$API.bi.dataset.exec.req('AVGMonth', obj).then((res) => {
+			that.$API.bi.dataset.exec.req("AVGMonth", obj).then((res) => {
 				let list = res.data2.ds0;
-				let sum = 0, count_real = 0, count_ok = 0;
-				list.forEach(item => {
+				let sum = 0,
+					count_real = 0,
+					count_ok = 0;
+				list.forEach((item) => {
 					sum = sum + item.交付数;
 					count_ok = count_ok + item.count_ok;
 					count_real = count_real + item.count_real;
 				});
 				this.monthPayNumAVG = sum;
 				if (count_real != 0) {
-					this.monthRateAVG = Math.round((count_ok / count_real) * 100)
+					this.monthRateAVG = Math.round(
+						(count_ok / count_real) * 100
+					);
 				} else {
 					this.monthRateAVG = 0;
 				}
-
 			});
 		},
 		getProductStatistic() {
 			let that = this;
-			let start_date = that.year_s + '-' + that.month_s + '-01';
-			let end_date = that.year_s + '-' + that.month_s + '-' + that.day_s;
+			let start_date = that.year_s + "-" + that.month_s + "-01";
+			let end_date = that.year_s + "-" + that.month_s + "-" + that.day_s;
 			let obj = {
-				query: { start_date: start_date, end_date: end_date, dept_name: this.deptName },
+				query: {
+					start_date: start_date,
+					end_date: end_date,
+					dept_name: this.deptName,
+				},
 			};
-			that.$API.bi.dataset.exec.req('productStatistic', obj).then((res) => {
-				console.log('productStatistic:', res);
-				let list = res.data2.ds0;
-				let chartData = [], xAxisData = [], hgNumber = 0;
-				for (let i = 0; i < that.day_s; i++) {
-					let dindex = i + 1;
-					xAxisData.push(dindex + '日')
-					for (let j = 0; j < list.length; j++) {
-						if (list[j].日 == dindex) {
-							chartData[i] = list[j].合格数;
-							if (list[j].合格数 >= list[j].任务数) {
-								hgNumber++;
+			that.$API.bi.dataset.exec
+				.req("productStatistic", obj)
+				.then((res) => {
+					console.log("productStatistic:", res);
+					let list = res.data2.ds0;
+					let chartData = [],
+						xAxisData = [],
+						hgNumber = 0;
+					for (let i = 0; i < that.day_s; i++) {
+						let dindex = i + 1;
+						xAxisData.push(dindex + "日");
+						for (let j = 0; j < list.length; j++) {
+							if (list[j].日 == dindex) {
+								chartData[i] = list[j].合格数;
+								if (list[j].合格数 >= list[j].任务数) {
+									hgNumber++;
+								}
 							}
 						}
 					}
-				}
-				this.hgNumber = ((hgNumber / xAxisData.length) * 100).toFixed(2);
-				this.chartData = chartData;
-				this.option.xAxis.data = xAxisData;
-				this.option.series.data = chartData;
-				//柱状图
-				var dom = document.getElementById("barCharts");
-				var myChart = echarts.init(dom);
-				myChart.setOption(this.option, true);
-			});
+					this.hgNumber = (
+						(hgNumber / xAxisData.length) *
+						100
+					).toFixed(2);
+					this.chartData = chartData;
+					this.option.xAxis.data = xAxisData;
+					this.option.series.data = chartData;
+					//柱状图
+					var dom = document.getElementById("barCharts");
+					var myChart = echarts.init(dom);
+					myChart.setOption(this.option, true);
+				});
 		},
 		deptNameChange() {
 			this.getProductStatistic();
 		},
-	}
-}
+	},
+};
 </script>
 <style scoped lang="scss">
 .retangleWrap {
@@ -654,7 +1068,11 @@ export default {
 	height: 188px;
 	color: #ffffff;
 	padding-left: 43px;
-	background: linear-gradient(180.00deg, rgb(58, 149, 255), rgb(27, 92, 255) 100%);
+	background: linear-gradient(
+		180deg,
+		rgb(58, 149, 255),
+		rgb(27, 92, 255) 100%
+	);
 }
 
 .companyName {
@@ -709,7 +1127,7 @@ export default {
 
 .countrate {
 	line-height: 20px;
-	color: rgba(0, 0, 0, .45);
+	color: rgba(0, 0, 0, 0.45);
 }
 
 .redColor {
@@ -747,4 +1165,38 @@ export default {
 	box-sizing: border-box;
 	background: #ffffff;
 }
+.warningContainer {
+	background: rgb(20, 141, 255);
+	color: #ffffff;
+}
+.warningHead {
+	display: flex;
+	justify-content: space-between;
+	padding: 0 24px;
+}
+.warningHeadText {
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 24px;
+}
+.warningTableHead {
+	display: flex;
+	height: 35px;
+	line-height: 35px;
+	font-size: 18spx;
+	padding: 0 24px;
+}
+.warningTbleBody {
+	padding: 0 24px;
+	height: 276px;
+	overflow-y: scroll;
+}
+.warningFlex1 {
+	flex: 1;
+}
+.warningNumberStyle {
+	color: red;
+	font-weight: bold;
+	text-align: right;
+}
 </style>