From af0ebb512dbcdc41ed899beb112c5c3bcb57d035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 17 Jan 2024 13:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=95=BF=E6=98=A5=E6=B4=BE=E6=A0=BC1.?=
 =?UTF-8?q?5=E3=80=91=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E5=8A=9F=E8=83=BD+=E6=97=A5=E5=B8=B8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=8F=90=E9=86=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedate/m100Online/normalPritIndex.vue   |  3 ++
 .../pg-fis/basedate/planControl/index.vue     | 54 +++++++++++++++++--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index d28abde..e5b62f5 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -780,6 +780,9 @@ export default {
       this.getList();
     },
     open() {
+      if(this.$route.name != 'pg-M100Online'){
+        return
+      }
       // let productLineList = [];
       // productLineList.forEach(element => {
       //   element=this.listQuery.productLine;
diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue
index e475d18..884115f 100644
--- a/vue/src/views/pg-fis/basedate/planControl/index.vue
+++ b/vue/src/views/pg-fis/basedate/planControl/index.vue
@@ -2,7 +2,7 @@
 <template>
 	<div class="cr-body-content">
 	  <div ref="box">
-		<flexbox class="content-header">
+		<flexbox class="content-header" id="planControl-content-header">
 		  <el-form
 			:model="listQuery"
 			ref="searchForm"
@@ -176,6 +176,9 @@
 				>导入
 			  </el-button>
 			</el-form-item>
+			<el-form-item>
+            	<div class="tipper" v-if="tipper != ''" v-html="tipper"></div>
+			</el-form-item>
 		  </el-form>
 		</flexbox>
 	  </div>
@@ -265,6 +268,7 @@
 	mixins: [message_table],
 	data() {
 	  return {
+		tipper:"",
 		showExcelImport: false,
 		form: {},
 		list: null,
@@ -298,10 +302,15 @@
 	  };
 	},
 	mounted() {
+		let timer = setInterval(() => {
+			this.getTipper();
+    	}, 60000);
 	  this.$nextTick(() => { 
-		  var offsetHei = document.documentElement.clientHeight;
-		  let boxH = this.$refs.box.offsetHeight;
-		  this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
+		this.getTipper();
+		this.changeMainTableHeight()
+		//   var offsetHei = document.documentElement.clientHeight;
+		//   let boxH = this.$refs.box.offsetHeight;
+		//   this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
 	  });
 	},
 	created() {
@@ -457,6 +466,36 @@
 		//导入
 		this.showExcelImport = true;
 	  },
+	  // 更改主表格高度
+	  changeMainTableHeight(){
+		this.$nextTick(()=>{
+			var offsetHei = document.documentElement.clientHeight;
+			// let boxH = this.$refs.box.offsetHeight;
+			let headerH = document.getElementById("planControl-content-header").clientHeight
+			let footerH = this.totalCount > 0 ? 67 : 0 //footer高度
+			this.tableHeight = offsetHei - headerH - 67 - 79; //79为页面上部标签高度
+			//this.tableHeight = offsetHei -260
+		})
+		},
+	  getTipper(){
+		if(this.$route.name != 'pg-planControl'){
+			return
+		}
+		this.$axios.posts( "/api/newjit/import-record/print-timeout-remind" ).then((res) => {
+			this.tipper = ""
+			let _item = ""
+			let _style = ""
+			if (res.timeoutMinutes >= res.configMinutes) {
+				//写提示信息
+				_style = "color:red;font-weight:bold"
+			} else {
+				_style = "color:green"
+			}
+			_item = `<span style=${_style}>已经${res.timeoutMinutes}分钟没有导入计划\xa0\xa0\xa0\xa0</span>`
+			this.tipper += _item
+			this.changeMainTableHeight()
+		})
+	  }
 	},
   };
   </script>
@@ -464,6 +503,13 @@
   
   <style lang="scss" scoped>
   @import "../../../pg-fis/styles/crmtable.scss";
+  .tipper{
+		border: solid 1px #ddd;
+		border-radius: 5px;
+		display: inline-block;
+		padding: 10px;
+		line-height: 20px;
+	}
   </style>
   
   
\ No newline at end of file