From 3d3aef776aa359e6caaee1d1357b1f8d3c5de18a Mon Sep 17 00:00:00 2001
From: guanxiaohan <guanxiaohan@et.com>
Date: Mon, 30 Sep 2024 09:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/img/tuobu/fuwuyigua.png                | Bin 5542 -> 6364 bytes
 src/api/equipment/index.js                    |  28 +
 src/api/itemManagement/itemList.js            |   7 +
 .../applicationExamine/index.vue              |  45 +-
 src/page/itemManagement/itemList/index.vue    | 164 ++---
 src/page/opsVisualization/serviceDataOAM.vue  |   6 +-
 src/page/opsVisualization/tuobu.vue           |  16 +-
 src/router/views/index.js                     |   8 +
 src/views/equipment/index.vue                 |   4 +
 src/views/equipment/operationDetails.vue      | 652 ++++++++++++++++++
 src/views/opsVisualization/tuobu.vue          |   2 +-
 vue.config.js                                 |  15 +-
 12 files changed, 835 insertions(+), 112 deletions(-)
 create mode 100644 src/views/equipment/operationDetails.vue

diff --git a/public/img/tuobu/fuwuyigua.png b/public/img/tuobu/fuwuyigua.png
index afb832da5e5a2f14d35d988ceda887d2987e82f9..54ee2b003bab21e93234fa7ccd68d9be216fa21d 100644
GIT binary patch
literal 6364
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
WVWGk`Q-kaOKUiDZ;ci-Z9s555qQ=7j

literal 5542
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

diff --git a/src/api/equipment/index.js b/src/api/equipment/index.js
index 05aebe0..8b09649 100644
--- a/src/api/equipment/index.js
+++ b/src/api/equipment/index.js
@@ -315,3 +315,31 @@ export const getDetail = (query) => {
     params: query,
   });
 };
+export const save = (data) => {
+  return request({
+    url: "/api/blade-desk/equipOperate/save",
+    method: "post",
+    data,
+  });
+};
+export const findPage = (params) => {
+  return request({
+    url: "/api/blade-desk/equipOperate/findPage",
+    method: "get",
+    params,
+  });
+};
+export const detail = (params) => {
+  return request({
+    url: "/api/blade-desk/equipOperate/detail",
+    method: "get",
+    params,
+  });
+};
+export const equipOperateRemove = (params) => {
+  return request({
+    url: "/api/blade-desk/equipOperate/remove",
+    method: "get",
+    params,
+  });
+};
diff --git a/src/api/itemManagement/itemList.js b/src/api/itemManagement/itemList.js
index 45d4469..01da7e3 100644
--- a/src/api/itemManagement/itemList.js
+++ b/src/api/itemManagement/itemList.js
@@ -41,4 +41,11 @@ export const historyDetail = (params) => {
     method: 'get',
     params
   })
+}
+export const check = (params) => {
+  return request({
+    url: '/api/blade-desk/goods/check',
+    method: 'get',
+    params
+  })
 }
\ No newline at end of file
diff --git a/src/page/itemManagement/applicationExamine/index.vue b/src/page/itemManagement/applicationExamine/index.vue
index 31d3272..05ef34d 100644
--- a/src/page/itemManagement/applicationExamine/index.vue
+++ b/src/page/itemManagement/applicationExamine/index.vue
@@ -9,16 +9,16 @@
 				<el-form-item label="物品大类">
 					<el-select
 						class="search_select"
-						v-model="queryForm.type"
+						v-model="queryForm.bigClass"
 						placeholder="请选择物品大类"
 						clearable
 						filterable
 					>
 						<el-option
 							v-for="item in typeList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value">
+							:key="item.dictValue"
+							:label="item.dictKey"
+							:value="item.dictValue">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -32,9 +32,9 @@
 					>
 						<el-option
 							v-for="item in brandList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value">
+							:key="item.dictValue"
+							:label="item.dictKey"
+							:value="item.dictValue">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -213,9 +213,9 @@
 						>
 							<el-option
 								v-for="item in typeList"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
+								:key="item.dictValue"
+								:label="item.dictKey"
+								:value="item.dictValue">
 							</el-option>
 						</el-select>
 					</el-form-item>
@@ -245,11 +245,19 @@
 						label="品牌"
 						prop="brand"
 					>
-						<el-input
+						<el-select
+							class="search_select"
 							v-model="registerForm.brand"
-							placeholder="请输入品牌"
+							placeholder="请选择物品品牌"
 							disabled
-						/>
+						>
+							<el-option
+								v-for="item in brandList"
+								:key="item.dictValue"
+								:label="item.dictKey"
+								:value="item.dictValue">
+							</el-option>
+						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -400,6 +408,7 @@
 <script>
 	import { findPage, detail, remove } from "@/api/itemManagement/applicationExamine";
 	import { goodsApplySave } from "@/api/itemManagement/itemList";
+	import {getDictionary} from '@/api/system/dictbiz'
 	export default {
 		data() {
 			return {
@@ -536,6 +545,16 @@
 			// init
 			init() {
 				this.findPage()
+				this.selectDict()
+			},
+			// 字典
+			async selectDict() {
+				await getDictionary({code: 'big_class'}).then(res => {
+					this.typeList = res.data.data.filter(item => item.parentId != '0')
+				})
+				await getDictionary({code: 'brand'}).then(res => {
+					this.brandList = res.data.data.filter(item => item.parentId != '0')
+				})
 			},
 			// 查询列表数据
 			findPage() {
diff --git a/src/page/itemManagement/itemList/index.vue b/src/page/itemManagement/itemList/index.vue
index c795ffa..6a81e32 100644
--- a/src/page/itemManagement/itemList/index.vue
+++ b/src/page/itemManagement/itemList/index.vue
@@ -16,9 +16,9 @@
 					>
 						<el-option
 							v-for="item in typeList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value">
+							:key="item.dictValue"
+							:label="item.dictKey"
+							:value="item.dictValue">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -32,9 +32,9 @@
 					>
 						<el-option
 							v-for="item in brandList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value">
+							:key="item.dictValue"
+							:label="item.dictKey"
+							:value="item.dictValue">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -205,13 +205,14 @@
 						<el-select
 							v-model="registerForm.bigClass"
 							placeholder="请选择物品大类"
+							filterable
 							:disabled="dialogFormDisabled"
 						>
 							<el-option
 								v-for="item in typeList"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
+								:key="item.dictValue"
+								:label="item.dictKey"
+								:value="item.dictValue">
 							</el-option>
 						</el-select>
 					</el-form-item>
@@ -248,11 +249,20 @@
 						label="品牌"
 						prop="brand"
 					>
-						<el-input
+						<el-select
+							class="search_select"
 							v-model="registerForm.brand"
-							placeholder="请输入品牌"
+							placeholder="请选择物品品牌"
+							filterable
 							:disabled="dialogFormDisabled"
-						/>
+						>
+							<el-option
+								v-for="item in brandList"
+								:key="item.dictValue"
+								:label="item.dictKey"
+								:value="item.dictValue">
+							</el-option>
+						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -293,18 +303,11 @@
 						label="货位"
 						prop="allocation"
 					>
-						<el-select
+						<el-input
 							v-model="registerForm.allocation"
-							placeholder="请选择货位"
+							placeholder="请输入货位"
 							:disabled="dialogFormDisabled"
-						>
-							<el-option
-								v-for="item in goodsAllocationList"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
+						/>
 					</el-form-item>
 				</el-col>
 				<el-col
@@ -494,7 +497,8 @@
 </template>
 
 <script>
-	import { findPage, detail, save, goodsApplySave, remove, historyDetail } from "@/api/itemManagement/itemList";
+	import { findPage, detail, save, goodsApplySave, remove, historyDetail, check } from "@/api/itemManagement/itemList";
+	import {getDictionary} from '@/api/system/dictbiz'
 	export default {
 		data() {
 			return {
@@ -503,34 +507,8 @@
 					brand: '',
 					name: '',
 				},
-				typeList: [
-					{
-						value: '1',
-						label: '类型1'
-					},
-					{
-						value: '2',
-						label: '类型2'
-					},
-					{
-						value: '3',
-						label: '类型3'
-					}
-				],
-				brandList: [
-					{
-						value: '1',
-						label: '品牌1'
-					},
-					{
-						value: '2',
-						label: '品牌2'
-					},
-					{
-						value: '3',
-						label: '品牌3'
-					}
-				],
+				typeList: [],
+				brandList: [],
 				tableData: [],
 				multipleSelection: [],
 				currentPage: 1,
@@ -539,20 +517,6 @@
 				registerDialogVisible: false,
 				dialogFormType: '',
 				dialogFormDisabled: false,
-				goodsAllocationList: [
-					{
-						label: '货位1',
-						value: '1',
-					},
-					{
-						label: '货位2',
-						value: '2',
-					},
-					{
-						label: '货位3',
-						value: '3',
-					},
-				],
 				registerForm: {
 					bigClass: '',
 					name: '',
@@ -581,7 +545,7 @@
 						{ required: true, message: '请输入物品编号', trigger: 'blur' },
 					],
 					brand: [
-						{ required: true, message: '请输入品牌', trigger: 'blur' },
+						{ required: true, message: '请选择品牌', trigger: 'blur' },
 					],
 					model: [
 						{ required: true, message: '请输入型号', trigger: 'blur' },
@@ -604,7 +568,7 @@
 							trigger: 'blur' },
 					],
 					allocation: [
-						{ required: true, message: '请输入选择货位', trigger: 'blur' },
+						{ required: true, message: '请输入货位', trigger: 'blur' },
 					],
 					inNum: [
 						{ 
@@ -673,6 +637,16 @@
 			// init
 			init() {
 				this.findPage()
+				this.selectDict()
+			},
+			// 字典
+			async selectDict() {
+				await getDictionary({code: 'big_class'}).then(res => {
+					this.typeList = res.data.data.filter(item => item.parentId != '0')
+				})
+				await getDictionary({code: 'brand'}).then(res => {
+					this.brandList = res.data.data.filter(item => item.parentId != '0')
+				})
 			},
 			// 查询列表数据
 			findPage() {
@@ -795,29 +769,39 @@
 			registerHandleClick(type) {
 				if(type == 'confirm') {
 					if(this.dialogFormType == 'add') {
-						const fieldsToValidate = ['bigClass','name','code','brand','model','standard','price','allocation','inNum','unit','useTo','inDate','remarks']
-						this.$refs.registerForm.validate((valid) => {
-							if (valid) {
-								this.registerForm.num = 0
-								save(this.registerForm).then(res => {
-									this.$message({
-										message: '入库成功',
-										type: 'success'
-									});
-									this.registerHandleClose()
-									this.currentPage = 1
-									this.pageSize = 10
-									this.findPage()
-								}).catch(error => {
-									this.$message({
-										message: '入库失败',
-										type: 'error'
-									});
-								})
+						check({code: this.registerForm.code}).then(res => {
+							if(!res.data) {
+								this.$message({
+									message: '该编号已存在',
+									type: 'error'
+								});
+								return;
 							} else {
-								return false;
+								const fieldsToValidate = ['bigClass','name','code','brand','model','standard','price','allocation','inNum','unit','useTo','inDate','remarks']
+								this.$refs.registerForm.validate((valid) => {
+									if (valid) {
+										this.registerForm.num = 0
+										save(this.registerForm).then(res => {
+											this.$message({
+												message: '入库成功',
+												type: 'success'
+											});
+											this.registerHandleClose()
+											this.currentPage = 1
+											this.pageSize = 10
+											this.findPage()
+										}).catch(error => {
+											this.$message({
+												message: '入库失败',
+												type: 'error'
+											});
+										})
+									} else {
+										return false;
+									}
+								}, fieldsToValidate);
 							}
-						}, fieldsToValidate);
+						})
 					} else if(this.dialogFormType == 'edit') {
 						const fieldsToValidate = ['bigClass','name','brand','model','standard','price','allocation','unit','useTo','inDate','remarks']
 						this.$refs.registerForm.validate((valid) => {
@@ -825,7 +809,7 @@
 								this.registerForm.num = this.registerForm.inNum
 								save(this.registerForm).then(res => {
 									this.$message({
-										message: '入库成功',
+										message: '修改成功',
 										type: 'success'
 									});
 									this.registerHandleClose()
@@ -834,7 +818,7 @@
 									this.findPage()
 								}).catch(error => {
 									this.$message({
-										message: '入库失败',
+										message: '修改失败',
 										type: 'error'
 									});
 								})
diff --git a/src/page/opsVisualization/serviceDataOAM.vue b/src/page/opsVisualization/serviceDataOAM.vue
index d5f7384..e82bd43 100644
--- a/src/page/opsVisualization/serviceDataOAM.vue
+++ b/src/page/opsVisualization/serviceDataOAM.vue
@@ -315,10 +315,10 @@ export default {
 
   computed: {},
   mounted() {
-    const { equipCode = "", warnStatus = "", classCode } = this.$route.query;
+    const { equipCode = "", warnStatus, classCode } = this.$route.query;
     this.equipCode = equipCode;
-    this.warnStatus = warnStatus;
-    this.classCode = classCode;
+    this.warnStatus = warnStatus || '';
+    this.classCode = classCode || '';
     this.handleSearch();
   },
   methods: {
diff --git a/src/page/opsVisualization/tuobu.vue b/src/page/opsVisualization/tuobu.vue
index 893008a..8f7d5ce 100644
--- a/src/page/opsVisualization/tuobu.vue
+++ b/src/page/opsVisualization/tuobu.vue
@@ -22,7 +22,7 @@
 		<div class="center_jiedian_box">
 			<jiedian class="jiedian jiedian_1" :img="'jiedian_blue'" :status="dataList.some(item => item.name == 'mqtt服务' && item.status == 1)"  :text="'mqtt服务'" :left="'-33'"></jiedian>
 			<jiedian class="jiedian jiedian_2" :img="'jiedian_blue'" :status="dataList.some(item => item.name == 'http服务' && item.status == 1)"  :text="'http服务'" :left="'-30'"></jiedian>
-			<jiedian class="jiedian jiedian_3" :img="'jiedian_blue'" :status="dataList.some(item => item.name == 'modebus服务' && item.status == 1)"  :text="'modebus服务'" :left="'-30'"></jiedian>
+			<jiedian class="jiedian jiedian_3" :img="'jiedian_blue'" :status="dataList.some(item => item.name == 'modBus服务' && item.status == 1)"  :text="'modBus服务'" :left="'-30'"></jiedian>
 		</div>
 		<img class="server_1_bottom_center_left" src="../../../public/img/tuobu/server_1_bottom_center.png" alt="">
 		<div class="bottom_jiedian_box_1">
@@ -75,6 +75,7 @@
 			<jiedian class="jiedian jiedian_1" :status="dataList.some(item => item.type == 'redis' && item.status == 1)" :img="'jiedian_blue'" :text="'resdis服务监控'" :left="'0'" :top="'40'"></jiedian>
 			<jiedian class="jiedian jiedian_2" :status="dataList.some(item => item.type == 'mysql' && item.status == 1)" :img="'jiedian_blue'" :text="'数据库监控'" :left="'10'" :top="'40'"></jiedian>
 		</div>
+		<el-button class="goto_button" @click="goto">告警详情</el-button>
 	</div>
 </template>
 
@@ -155,6 +156,14 @@ export default {
 			if (this.timer) {
 				clearInterval(this.timer);
 			}
+		},
+		goto() {
+			this.$router.push({
+				path: '/opsVisualization/serviceDataOAM',
+				query: {
+					warnStatus: '1'
+				}
+			})
 		}
 	}
 }
@@ -166,6 +175,11 @@ export default {
 		width: calc(100% - 218px);
 		margin-left: 218px;
 		position: relative;
+		.goto_button{
+			position: absolute;
+			top: 20px;
+			right: 20px;
+		}
 		.server_1{
 			position: absolute;
 			left: 400px;
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8c4d804..41c09a7 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -116,6 +116,14 @@ export default [{
 		},
 		component: () =>
 			import( /* webpackChunkName: "views" */ '@/views/equipment/doorRecord')
+	}, {
+		path: 'operationDetails',
+		name: '操作明细',
+		meta: {
+			i18n: 'dashboard'
+		},
+		component: () =>
+			import( /* webpackChunkName: "views" */ '@/views/equipment/operationDetails')
 	}]
 },
 {
diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue
index 66f77eb..81b39a3 100644
--- a/src/views/equipment/index.vue
+++ b/src/views/equipment/index.vue
@@ -29,6 +29,7 @@
 					<template slot-scope="{row,index}" slot="menu">
 						<el-button type="text" size="small" @click="handleAdd('look',row)">查看</el-button>
 						<el-button type="text" size="small" @click="handleAdd('edit',row)">编辑</el-button>
+						<el-button type="text" size="small" @click="operationDetails(row)">操作明细</el-button>
 						<!-- <el-button v-if="row.modelId" type="text" size="small" @click="addModel(row)">编辑模型</el-button>
 						<el-button v-else type="text" size="small" @click="addModel(row)">添加模型</el-button> -->
 					</template>
@@ -863,6 +864,9 @@
 					})
 				}
 			},
+			operationDetails(row) {
+				this.$router.push({path: '/equipment/operationDetails', query: {name: row.name, code: row.code}})
+			},
 			chooseFloor(e){
 				getLc1(Number(e)).then(res => {
 					this.ruleForm.floored = null;
diff --git a/src/views/equipment/operationDetails.vue b/src/views/equipment/operationDetails.vue
new file mode 100644
index 0000000..4b52bed
--- /dev/null
+++ b/src/views/equipment/operationDetails.vue
@@ -0,0 +1,652 @@
+<template>
+	<basic-container class="content">
+		<div class="content-top">
+			<el-form
+				:inline="true"
+				:model="queryForm"
+				class="serch_form"
+			>
+				<el-form-item label="类型">
+					<el-select
+						class="search_select"
+						v-model="queryForm.type"
+						placeholder="请选择类型"
+						clearable
+						filterable
+					>
+						<el-option
+							v-for="item in typeList"
+							:key="item.dictValue"
+							:label="item.dictKey"
+							:value="item.dictValue">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button class="search_button" @click="handleSearch">
+                        <i class="el-icon-search"></i>
+                    </el-button>
+				</el-form-item>
+			</el-form>
+			<div>
+				<el-button v-if="multipleSelection.length != 0" class="register" @click="batchDeletion">批量删除</el-button>
+				<el-button class="register" @click="handleAdd">新增</el-button>
+				<el-button class="register" @click="handleBack">返回</el-button>
+			</div>
+		</div>
+		<div class="content-main">
+			<el-table
+				:data="tableData"
+				stripe
+				border
+				style="width: 100%"
+				:header-cell-style="{'text-align':'center'}"
+				:cell-style="{'text-align':'center'}"
+				@selection-change="handleSelectionChange">
+				<el-table-column
+					type="selection"
+					width="55">
+				</el-table-column>
+				<el-table-column
+					type="index"
+					label="序号"
+      				width="70">
+				</el-table-column>
+				<el-table-column
+					prop="code"
+					label="设备编码">
+				</el-table-column>
+				<el-table-column
+					prop="name"
+					label="设备名称">
+				</el-table-column>
+				<el-table-column
+					prop="type"
+					label="类型">
+				</el-table-column>
+				<el-table-column
+					prop="operateTime"
+					label="操作时间">
+				</el-table-column>
+				<el-table-column
+					prop="operateUser"
+					label="操作人员">
+				</el-table-column>
+				<el-table-column
+					prop="remarks"
+					label="备注">
+				</el-table-column>
+				<el-table-column
+					prop="address"
+					label="操作"
+					width="150"
+					align="center"
+				>
+					<template slot-scope="scope">
+						<el-popover
+							placement="bottom"
+							width="150"
+							trigger="hover">
+							<div class="more-box">
+								<div
+									class="item"
+									@click="handleOperation('view', scope.row)">查看
+                                </div>
+								<div
+									class="item"
+									@click="handleOperation('edit', scope.row)">编辑
+                                </div>
+								<div
+									class="item"
+									@click="handleOperation('delete', scope.row)">删除
+                                </div>
+							</div>
+							<div class="more" slot="reference">更多</div>
+						</el-popover>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="el_pagination">
+				<!-- <div
+					style="
+						width: 100%;
+						height: 100%;
+						position: absolute;
+						background: rgba(255,255,255,.9);
+						z-index: 9;
+						position: absolute;
+						top: 0;
+						left: 0;
+					"
+					v-show="loading"
+				></div> -->
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage"
+					:page-sizes="[6, 10, 20, 50, 100]"
+					:page-size="pageSize"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+		<el-dialog
+			:title="title"
+			:append-to-body="true"
+			:visible.sync="dialongVisable"
+			width="50%"
+			:before-close="handleClose">
+			<el-form
+				class="dialogForm"
+				:model="dialogForm"
+				label-width="80px"
+				ref="dialogForm"
+			>
+				<el-col :span="8">
+					<el-form-item label="设备名称" prop="name">
+						<el-input
+							v-model="dialogForm.name"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="设备编码" prop="code">
+						<el-input
+							v-model="dialogForm.code"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="类型" prop="type">
+						<el-select
+							v-model="dialogForm.type"
+							placeholder="请选择类型"
+							:disabled="dialogFormDisabled"
+						>
+							<el-option
+								v-for="item in typeList"
+								:key="item.dictValue"
+								:label="item.dictKey"
+								:value="item.dictValue">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="操作人员" prop="operateUser">
+						<el-input
+							v-model="dialogForm.operateUser"
+							placeholder="请输入操作人员"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="操作时间" prop="operateTime">
+						<el-date-picker
+							v-model="dialogForm.operateTime"
+							value-format="yyyy-MM-dd"
+							type="date"
+							placeholder="选择操作时间"
+							:disabled="dialogFormDisabled">
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注" prop="remarks">
+						<el-input
+							v-model="dialogForm.remarks"
+							placeholder="选输入备注"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-form>
+			<div class="dialog-footer">
+				<el-button v-if="dialogFormType != 'view'" @click="dialogHandleClick('cancel')">取 消</el-button>
+				<el-button type="primary" @click="dialogHandleClick('confirm')">确 定</el-button>
+			</div>
+		</el-dialog>
+		
+	</basic-container>
+</template>
+
+<script>
+	import { save, findPage, detail, equipOperateRemove } from "@/api/equipment/index";
+	import {getDictionary} from '@/api/system/dictbiz'
+	export default {
+		data() {
+			return {
+				queryForm: {
+					type: '',
+				},
+				typeList: [],
+				tableData: [],
+				multipleSelection: [],
+				currentPage: 1,
+				pageSize: 10,
+				total: 0,
+				dialongVisable: false,
+				dialogFormDisabled: false,
+				dialogFormType: '',
+				dialogForm: {
+					name: '',
+					code: '',
+					type: '',
+					operateUser: '',
+					operateTime: '',
+					remarks: '',
+				},
+				rules: {
+					type: [
+						{ required: true, message: '请选择类型', trigger: 'blur' },
+					],
+					operateTime: [
+						{ required: true, message: '请选择操作时间', trigger: 'blur' },
+					],
+					operateUser: [
+						{ required: true, message: '请选择操作人员', trigger: 'blur' },
+					],
+				}
+			}
+		},
+		computed: {
+			title() {
+				if(this.dialogFormType == 'view') {
+					return '查看详情'
+				} else if(this.dialogFormType == 'edit') {
+					return '编辑'
+				} else if(this.dialogFormType == 'add') {
+					return '新增'
+                }
+			}
+		},
+		mounted() {
+			this.dialogForm.name = this.$route.query.name
+			this.dialogForm.code = this.$route.query.code
+			this.init()
+		},
+		methods: {
+			// init
+			init() {
+				this.findPage()
+				this.selectDict()
+			},
+			// 字典
+			selectDict() {
+				getDictionary({code: 'operate_type'}).then(res => {
+					this.typeList = res.data.data.filter(item => item.parentId != '0')
+				})
+			},
+			// 查询列表数据
+			findPage() {
+				let params = {
+					...this.queryForm,
+					code: this.dialogForm.code,
+					current: this.currentPage,
+					size: this.pageSize
+				}
+				findPage(params).then(res => {
+					this.tableData = res.data.data.records
+					this.total = res.data.data.total
+				})
+			},
+			// 点击搜索按钮
+			handleSearch() {
+				this.currentPage = 1
+				this.findPage()
+			},
+			// 表格选择变化
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			handleAdd() {
+				this.dialogFormType = 'add'
+				this.dialongVisable = true
+			},
+			// 批量删除
+			batchDeletion() {
+				this.$confirm('确认批量删除删除所选数据?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					let ids = []
+					this.multipleSelection.forEach(item => {
+						ids.push(item.id)
+					})
+					equipOperateRemove({ids: ids.join(',')}).then(res => {
+						this.$message({
+							message: '删除成功',
+							type: 'success'
+						})
+						this.findPage()
+					}).catch(err => {
+						this.$message({
+							type: 'error',
+							message: '删除失败!'
+						})
+					})
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					})
+				})
+			},
+			// 查看弹窗表单详情
+			detail(id) {
+				detail({id}).then(res => {
+					console.log(res)
+					this.dialogForm = res.data.data
+				})
+			},
+			// 表格更多选项点击
+			handleOperation(type, row) {
+				this.dialogFormType = type
+				if(type == 'view') {
+					this.dialongVisable = true
+					this.dialogFormDisabled = true
+					this.detail(row.id)
+				} else if(type == 'edit') {
+					this.dialongVisable = true
+					this.detail(row.id)
+				} else if(type == 'delete') {
+					this.$confirm('确认删除该条数据?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						equipOperateRemove({ids: row.id}).then(res => {
+							this.$message({
+								message: '删除成功',
+								type: 'success'
+							})
+							this.findPage()
+						}).catch(err => {
+							this.$message({
+								type: 'error',
+								message: '删除失败!'
+							})
+						})
+					}).catch(() => {
+						this.$message({
+							type: 'info',
+							message: '已取消删除'
+						})
+					})
+				}
+			},
+			dialogHandleClick(type) {
+				if(type == 'confirm') {
+					if(this.dialogFormType == 'add') {
+						const fieldsToValidate = ['type','operateUser','operateTime']
+						this.$refs.dialogForm.validate((valid) => {
+							if (valid) {
+								save(this.dialogForm).then(res => {
+									this.$message({
+										message: '入库成功',
+										type: 'success'
+									});
+									this.handleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '入库失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else if(this.dialogFormType == 'edit') {
+						const fieldsToValidate = ['type','operateUser','operateTime']
+						this.$refs.dialogForm.validate((valid) => {
+							if (valid) {
+								save(this.dialogForm).then(res => {
+									this.$message({
+										message: '修改成功',
+										type: 'success'
+									});
+									this.handleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '修改失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					}
+				} else {
+					this.handleClose()
+				}
+			},
+			// 弹窗关闭
+			handleClose() {
+				this.dialongVisable = false
+				this.dialogFormDisabled = false
+				this.resetForm()
+				this.dialogForm = {
+					name: this.$route.query.name,
+					code: this.$route.query.code,
+					type: '',
+					operateUser: '',
+					operateTime: '',
+					remarks: '',
+				}
+			},
+			// 重置表单
+			resetForm() {
+				this.$refs['dialogForm'].resetFields();
+			},
+			// 分页
+			handleSizeChange(val) {
+				this.currentPage = 1
+				this.pageSize = val
+				this.findPage()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				this.findPage()
+			},
+			handleBack() {
+				this.$router.push({path: '/equipment/index'})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		height: 100%;
+    background-color: white;
+		padding: 20px !important;
+		.content-top{
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-start;
+			.register{
+				height: 40px;
+			}
+			.serch_form {
+				// display: flex;
+				// margin-bottom: 30px;
+				.el-form-item{
+					// padding: 0 10px;
+					margin-right: 20px !important;
+				}
+				.search_select {
+					// width: 138px;
+					height: 40px;
+				}
+				.search_input {
+					// width: 238px;
+					height: 40px;
+				}
+				/deep/.el-input__inner {
+					border-radius: 0;
+				}
+				.search_button {
+					width: 50px;
+					height: 40px;
+					border-radius: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-left: 6px;
+					.el-icon-search {
+						font-size: 19px;
+						color: #c9c9c9;
+					}
+				}
+			}
+		}
+		.content-main{
+			.more{
+				cursor: pointer;
+			}
+			.el_pagination {
+				display: flex;
+				justify-content: end;
+				margin-top: 20px;
+			}
+		}
+	}
+	.more-box{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.item{
+			width: 100%;
+			padding: 5px 0;
+			text-align: center;
+			cursor: pointer;
+		}
+	}
+	.dialogForm{
+		display: flex;
+		flex-wrap: wrap;
+		.el-select{
+			width: 100%;
+		}
+	}
+	.dialog-footer{
+		height: 40px;
+		display: flex;
+		justify-content: flex-end;
+	}
+	.message{
+		// padding: 0 20px;
+		margin: 0 20px 0px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		.box{
+			margin: 0 20px 0px 20px;
+		}
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.item{
+			display: flex;
+			align-items: center;
+			margin-bottom: 10px;
+			.label{
+				width: 80px;
+				text-align: end;
+				margin-right: 10px;
+			}
+		}
+	}
+	.history{
+		// padding: 0 20px;
+		margin: 0 20px 20px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		border-top: none;
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.el-collapse{
+			margin: 0 20px;
+			border: none !important;
+			margin-bottom: 20px;
+		}
+	}
+	.title-text{
+		margin: 0 20px;
+	}
+	.name-time{
+		// width: 327px;
+		height: 40px;
+		background: #F9F9F9;
+		display: flex;
+		align-items: center;
+		padding: 0 20px;
+		.time{
+			margin-left: 30px;
+		}
+	}
+    .form-title{
+        // width: 100%;
+        height: 40px;
+        background: #F9F9F9;
+        border-radius: 0px 0px 0px 0px;
+        border: 1px solid #D1D1D1;
+        display: flex;
+        align-items: center;
+        padding: 0 20px;
+        margin-bottom: 20px;
+    }
+	.status-box-wrapper{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.status-box{
+		width: 62px;
+		height: 25px;
+	}
+	.blue{
+		background: rgba(43, 142, 229, 0.2);
+		color: #2B8EE5;
+	}
+	.green{
+		background: rgba(30, 185, 76, 0.2);
+		color: #1EB94C;
+	}
+	.red{
+		background: rgba(225, 75, 51, 0.2);
+		color: #E14B33;
+	}
+	.grey{
+		background: rgba(151, 151, 151, 0.2);
+		color: #333333;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/opsVisualization/tuobu.vue b/src/views/opsVisualization/tuobu.vue
index 3e9841f..0e75377 100644
--- a/src/views/opsVisualization/tuobu.vue
+++ b/src/views/opsVisualization/tuobu.vue
@@ -22,7 +22,7 @@
 		<div class="center_jiedian_box">
 			<jiedian class="jiedian jiedian_1" :img="'jiedian_blue'" :text="'mqtt服务'" :left="'-33'"></jiedian>
 			<jiedian class="jiedian jiedian_2" :img="'jiedian_blue'" :text="'http服务'" :left="'-30'"></jiedian>
-			<jiedian class="jiedian jiedian_3" :img="'jiedian_blue'" :text="'modebus服务'" :left="'-30'"></jiedian>
+			<jiedian class="jiedian jiedian_3" :img="'jiedian_blue'" :text="'modBus服务'" :left="'-30'"></jiedian>
 		</div>
 		<img class="server_1_bottom_center_left" src="../../../public/img/tuobu/server_1_bottom_center.png" alt="">
 		<div class="bottom_jiedian_box_1">
diff --git a/vue.config.js b/vue.config.js
index 1e9646c..f123b3d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -65,12 +65,19 @@ module.exports = {
           "^/api": "/",
         },
       },
-      "/kgApi": {
+      "/monitor-system": {
         target: "http://192.168.1.5:8080",
         ws: true,
-        pathRewrite: {
-          "^/kgApi": "/",
-        },
+        // pathRewrite: {
+        //   "^/monitor-system": "/",
+        // },
+      },
+      "/monitor-business": {
+        target: "http://192.168.1.5:8080",
+        ws: true,
+        // pathRewrite: {
+        //   "^/monitor-system": "/",
+        // },
       },
     },
   },