From 956e255899e69cbe57919bac0be83703732291ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 4 Sep 2024 19:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84ws=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/websocket.js                        |  5 +-
 src/views/order/inventoryList/index.vue       | 41 ++++++------
 .../setting/advanced/setup/regularTime.vue    | 64 +++++++++++++------
 src/views/shipment/shipmentList/index.vue     | 40 ++++++------
 4 files changed, 87 insertions(+), 63 deletions(-)

diff --git a/src/utils/websocket.js b/src/utils/websocket.js
index 1d9a935..bfef0ea 100644
--- a/src/utils/websocket.js
+++ b/src/utils/websocket.js
@@ -148,7 +148,7 @@ function webSocketOnMessage(msg) {
 		}else{
 			showNot = ElNotification.error({
 				title: '系统退出',
-				message: result.msg,
+				message: result.data.msg,
 				duration:0
 			});
 			handleError('系统退出', result.msg);
@@ -156,8 +156,7 @@ function webSocketOnMessage(msg) {
 	}
 
 	eventBus.$emit('sockBack',result);
-
-	if(result.type == 'init'){
+	if(result.data && result.data.type == 1){
 		if(showNot && showNot.close){
 			showNot.close();
 		}
diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue
index e5390ec..18b347a 100644
--- a/src/views/order/inventoryList/index.vue
+++ b/src/views/order/inventoryList/index.vue
@@ -1,25 +1,26 @@
 <template>
-	<el-container class="mainBox mainHeaderNoBorderPadding">
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增库存</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<template #header>
-						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
-					</template>
-					<template #download>
-						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
-					</template>
-				</scImport>
-			</div>
-			<div class="right-panel">
-				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
-					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
-				</scExport>
-			</div>
-		</el-header>
+	<el-container class="mainBox mainBoxHeaderNoBorder">
+<!--		<el-header>-->
+<!--			<div class="left-panel">-->
+<!--				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增库存</el-button>-->
+<!--				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
+<!--					<template #header>-->
+<!--						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
+<!--					</template>-->
+<!--					<template #download>-->
+<!--						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
+<!--					</template>-->
+<!--				</scImport>-->
+<!--			</div>-->
+<!--			<div class="right-panel">-->
+<!--				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
+<!--					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
+<!--				</scExport>-->
+<!--			</div>-->
+<!--		</el-header>-->
+<!--		searchMainNoTop-->
 		<el-main class="nopadding">
-			<div class="searchMain searchMainNoTop">
+			<div class="searchMain">
 				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
 
 				<div class="searchItem searchBtn">
diff --git a/src/views/setting/advanced/setup/regularTime.vue b/src/views/setting/advanced/setup/regularTime.vue
index 70f863d..225f230 100644
--- a/src/views/setting/advanced/setup/regularTime.vue
+++ b/src/views/setting/advanced/setup/regularTime.vue
@@ -3,26 +3,34 @@
 		<el-main class="nopadding">
 			<div class="searchMain">
 				<div class="title">任务信息</div>
-				<el-form ref="form" :size="size" :model="form" label-width="100px">
-					<el-form-item label="任务名称" prop="name">
-						<el-select type="text" v-model="form.name" placeholder="请选择任务名称" style="width: 100%;" @visible-change="getNameList" @change="nameChange">
-							<el-option v-for="(item,index) in setMap.nameList" :key="index" :value="item.name" :label="item.name"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="任务描述" prop="memo">
-						<el-input type="text" v-model="form.memo" placeholder="请输入任务描述" disabled></el-input>
-					</el-form-item>
-					<el-form-item label="定时任务表达式" prop="cron_expression">
-						<el-input type="text" v-model="form.cron_expression" @input="cronExpressionInput" placeholder="请输入定时任务表达式"></el-input>
-					</el-form-item>
-					<el-form-item label="表达式描述" prop="cron_expression_desc">
-						<el-input type="text" v-model="form.cron_expression_desc" placeholder="请输入表达式描述" disabled></el-input>
-					</el-form-item>
-					<el-form-item label="">
-						<el-button :size="size" type="primary" @click="save" :loading="isSave">保存配置</el-button>
-					</el-form-item>
-				</el-form>
-				<div class="title">配置列表</div>
+				<div class="formRow">
+					<el-form ref="form" :size="size" :model="form" label-width="100px">
+						<el-form-item label="任务名称" prop="name">
+							<el-select type="text" v-model="form.name" placeholder="请选择任务名称" style="width: 100%;" @visible-change="getNameList" @change="nameChange">
+								<el-option v-for="(item,index) in setMap.nameList" :key="index" :value="item.name" :label="item.name">
+									<span style="float: left">{{ item.name }}</span>
+									<span style="float: right;color: var(--el-text-color-secondary);">{{ item.memo }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item label="任务描述" prop="memo">
+							<el-input type="text" v-model="form.memo" placeholder="请输入任务描述" disabled></el-input>
+						</el-form-item>
+						<el-form-item label="定时任务表达式" prop="cron_expression">
+							<el-input type="text" v-model="form.cron_expression" @input="cronExpressionInput" placeholder="请输入定时任务表达式"></el-input>
+						</el-form-item>
+						<el-form-item label="表达式描述" prop="cron_expression_desc">
+							<el-input type="text" v-model="form.cron_expression_desc" placeholder="请输入表达式描述" disabled></el-input>
+						</el-form-item>
+						<el-form-item label="">
+							<el-button :size="size" type="primary" @click="save" :loading="isSave">保存配置</el-button>
+						</el-form-item>
+					</el-form>
+					<el-image class="img" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/mingling.png" fit="contain"></el-image>
+				</div>
+				<div class="title">配置列表
+					<span class="tip">注意：此配置由专业IT管理员操作；无配置时以系统默认定时任务配置为准。</span>
+				</div>
 			</div>
 			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" :hidePagination="true">
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
@@ -169,6 +177,14 @@ export default {
 			font-weight: 500;
 			padding: 0 0 5px 0;
 			font-size: 13px;
+			display: flex;
+			align-items: center;
+			.tip{
+				margin-left: 10px;
+				color: var(--el-color-warning);
+				font-weight: 400;
+				font-size: 12px;
+			}
 		}
 	}
 	.searchMain{
@@ -178,4 +194,12 @@ export default {
 			width: 400px;
 		}
 	}
+	.formRow{
+		display: flex;
+		.img{
+			margin-left: 30px;
+			height: 165px;
+			border-radius: 8px;
+		}
+	}
 </style>
diff --git a/src/views/shipment/shipmentList/index.vue b/src/views/shipment/shipmentList/index.vue
index cf43731..1e82d8e 100644
--- a/src/views/shipment/shipmentList/index.vue
+++ b/src/views/shipment/shipmentList/index.vue
@@ -1,25 +1,25 @@
 <template>
-	<el-container class="mainBox mainHeaderNoBorderPadding">
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<template #header>
-						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
-					</template>
-					<template #download>
-						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
-					</template>
-				</scImport>
-			</div>
-			<div class="right-panel">
-				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
-					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
-				</scExport>
-			</div>
-		</el-header>
+	<el-container class="mainBox mainBoxHeaderNoBorder">
+<!--		<el-header>-->
+<!--			<div class="left-panel">-->
+<!--				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>-->
+<!--				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
+<!--					<template #header>-->
+<!--						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
+<!--					</template>-->
+<!--					<template #download>-->
+<!--						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
+<!--					</template>-->
+<!--				</scImport>-->
+<!--			</div>-->
+<!--			<div class="right-panel">-->
+<!--				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
+<!--					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
+<!--				</scExport>-->
+<!--			</div>-->
+<!--		</el-header>-->
 		<el-main class="nopadding">
-			<div class="searchMain searchMainNoTop">
+			<div class="searchMain">
 				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
 
 				<div class="searchItem searchBtn">