From dbd652f9f0e297a0adc06abbef3a30fb9ec10df4 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期六, 30 三月 2024 21:50:37 +0800
Subject: [PATCH] 1

---
 src/views/console/soam/oss-system.vue |   66 +++++++++++++++-
 src/views/console/system/menu.vue     |  139 ++++++++++++++++++++--------------
 2 files changed, 142 insertions(+), 63 deletions(-)

diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index 1120d5e..0c597e7 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -49,12 +49,53 @@
 							<div class="domain">http://192.168.1.199</div>
 						</div>
 					</li>
-					<li>2</li>
-					<li>3</li>
+					<li>
+						<div class="edit">缂栬緫</div>
+						<div class="logo">
+							<img src="http://116.63.155.153:83/api/static/images/vision.png">
+						</div>
+						<div class="content">
+							<div class="name">澶у睆</div>
+							<div class="domain">http://192.168.1.199:31005</div>
+						</div>
+					</li>
+					<li>
+						<div class="edit">缂栬緫</div>
+						<div class="logo">
+							<img src="http://116.63.155.153:83/api/static/images/hmi.png">
+						</div>
+						<div class="content">
+							<div class="name">HMI</div>
+							<div class="domain"></div>
+						</div>
+					</li>
 				</ul>
-				<el-form label-width="80px">
-					
-				</el-form>
+				<el-card class="system-content">
+				    <template #header>
+				      <div class="card-header">
+				        <span>搴旂敤璇︽儏</span>
+				      </div>
+				    </template>
+				    <el-form :model="searchData" abel-width="120px">
+						<el-form-item label="绯荤粺灞曠ず">
+							<el-switch v-model="searchData.value1" />
+						</el-form-item>
+						<el-form-item label="搴旂敤鍚嶇О">
+							<div>{{searchData.value2}}</div>
+						</el-form-item>
+						<el-form-item label="搴旂敤鏍囪瘑">
+							<div>{{searchData.value2}}</div>
+						</el-form-item>
+						<el-form-item label="缃戦〉鍦板潃">
+							<div>{{searchData.value2}}</div>
+						</el-form-item>
+						<el-form-item label="涓婁紶鍥炬爣">
+							<div>
+								<img src="http://116.63.155.153:83/api/static/images/hmi.png" style="width:66px;height:66px;">
+							</div>
+						</el-form-item>
+					</el-form>
+				 </el-card>
 			</el-tab-pane>
 		</el-tabs>
 	</div>
@@ -65,6 +106,10 @@
 		name: "oss-main",
 		data(){
 			return {
+				searchData: {
+					value1: false,
+					value2: "HMI"
+				},
 				ossForm: {
 					endpoint: "",
 					acceskey: "",
@@ -158,4 +203,15 @@
     word-wrap: break-word;
     word-break: break-all;
 }
+.system-content /deep/ .el-card__header{
+	padding: 0px;
+}
+.system-content .card-header{
+	border-bottom: 1px solid #ebeef5;
+	padding: 6px 18px!important;
+}
+.system-content .card-header span{
+	font-size:13px;
+	font-weight: 400px;
+}
 </style>
diff --git a/src/views/console/system/menu.vue b/src/views/console/system/menu.vue
index 70d16c3..f561906 100644
--- a/src/views/console/system/menu.vue
+++ b/src/views/console/system/menu.vue
@@ -8,23 +8,37 @@
 -->
 <template>
 	<div class="dict-main">
-		<el-form :inline="true" :model="searchData" abel-width="120px">
-			<el-form-item label="鑿滃崟鍚嶇О">
-				<el-input v-model="searchData.test" placeholder="鑿滃崟鍚嶇О" clearable />
-			</el-form-item>
-			<el-form-item label="鑿滃崟缂栧彿">
-				<el-input v-model="searchData.test" placeholder="鑿滃崟缂栧彿" clearable />
-			</el-form-item>
-			<el-form-item label="鑿滃崟鍒悕">
-				<el-input v-model="searchData.test" placeholder="鑿滃崟鍒悕" clearable />
-			</el-form-item>
-			<el-form-item label="鎵�灞炲簲鐢�">
-				<el-input v-model="searchData.test" placeholder="鎵�灞炲簲鐢�" clearable />
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" @click="searchBtn">鎼滅储</el-button>
-				<el-button @click="searchBtn">娓呯┖</el-button>
-			</el-form-item>
+		<el-form :inline="true" :model="searchData" abel-width="80px">
+			<el-row>
+				<el-col :span="6">
+					<el-form-item label="鑿滃崟鍚嶇О">
+						<el-input v-model="searchData.name" placeholder="鑿滃崟鍚嶇О" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="鑿滃崟缂栧彿">
+						<el-input v-model="searchData.code" placeholder="鑿滃崟缂栧彿" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="鑿滃崟鍒悕">
+						<el-input v-model="searchData.alias" placeholder="鑿滃崟鍒悕" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="鎵�灞炲簲鐢�">
+						<el-select v-model="searchData.belongApplication" style="width: 100%">
+							<el-option v-for="item in applicationList" :key="item.code" :label="item.name" :value="item.code"/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item>
+						<el-button type="primary" @click="searchBtn">鎼滅储</el-button>
+						<el-button @click="clearSearch">娓呯┖</el-button>
+					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
 		<div>
 			<div class="dict-Btn">
@@ -36,15 +50,23 @@
 			<div class="dict-table">
 				<el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
 					<el-table-column type="selection" width="55" />
-					<el-table-column prop="date" label="鑿滃崟鍚嶇О"></el-table-column>
-					<el-table-column prop="name" label="璺敱鍦板潃"></el-table-column>
-					<el-table-column prop="name" label="鑿滃崟鍥炬爣"></el-table-column>
-					<el-table-column prop="name" label="鑿滃崟缂栧彿"></el-table-column>
-					<el-table-column prop="name" label="鑿滃崟鍒悕"></el-table-column>
-					<el-table-column prop="name" label="鏂扮獥鍙�"></el-table-column>
-					<el-table-column prop="name" label="鍚敤缂撳瓨"></el-table-column>
-					<el-table-column prop="name" label="鎵�灞炲簲鐢�"></el-table-column>
-					<el-table-column prop="name" label="鑿滃崟鎺掑簭"></el-table-column>
+					<el-table-column prop="name" label="鑿滃崟鍚嶇О"></el-table-column>
+					<el-table-column prop="path" label="璺敱鍦板潃"></el-table-column>
+					<el-table-column prop="source" label="鑿滃崟鍥炬爣"></el-table-column>
+					<el-table-column prop="code" label="鑿滃崟缂栧彿"></el-table-column>
+					<el-table-column prop="alias" label="鑿滃崟鍒悕"></el-table-column>
+					<el-table-column prop="isOpen" label="鏂扮獥鍙�">
+						<template #default="scope">
+							<div>{{scope.row.isOpen == 0?"鏄�":"鍚�"}}</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="keepAlive" label="鍚敤缂撳瓨">
+						<template #default="scope">
+							<div>{{scope.row.keepAlive == 1?"鏄�":"鍚�"}}</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="belongApplication" label="鎵�灞炲簲鐢�"></el-table-column>
+					<el-table-column prop="sort" label="鑿滃崟鎺掑簭"></el-table-column>
 					<el-table-column fixed="right" label="鎿嶄綔" width="200">
 						<template #default="scope">
 							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">鏌ョ湅</el-button>
@@ -75,8 +97,12 @@
 		name: "allocation",
 		data(){
 			return {
+				applicationList: [],
 				searchData: {
-					test: ""
+					name: "",
+					code: "",
+					alias: "",
+					belongApplication: ""
 				},
 				dialog: {
 					save: false,
@@ -89,48 +115,45 @@
 					label: '榛勯噾绯�'
 				}],
 				input3: '',
-				tableData: [{
-					date: '2016-05-02',
-					name: '鐜嬪皬铏�',
-					province: '涓婃捣',
-					city: '鏅檧鍖�',
-					address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
-					zip: 200333
-					}, {
-					date: '2016-05-04',
-					name: '鐜嬪皬铏�',
-					province: '涓婃捣',
-					city: '鏅檧鍖�',
-					address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�',
-					zip: 200333
-					}, {
-					date: '2016-05-01',
-					name: '鐜嬪皬铏�',
-					province: '涓婃捣',
-					city: '鏅檧鍖�',
-					address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
-					zip: 200333
-					}, {
-					date: '2016-05-03',
-					name: '鐜嬪皬铏�',
-					province: '涓婃捣',
-					city: '鏅檧鍖�',
-					address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�',
-					zip: 200333
-				}]
+				tableData: []
 			}
 		},
 		created(){
 			
 		},
 		mounted(){
-			
+			this.getApplicationList();
+			this.searchBtn();
 		},
 		components: {
 			saveDialog
 		},
 		methods: {
-			searchBtn() {},
+			clearSearch() {
+				this.searchData= {
+					name: "",
+					code: "",
+					alias: "",
+					belongApplication: ""
+				}
+				this.searchBtn();
+			},
+			getApplicationList() {
+				this.$HTTP.get("/api/blade-system/application/list").then(res=> {
+					if(res.code == 200) {
+						this.applicationList = res.data;
+					}
+				})
+			},
+			searchBtn() {
+				this.searchData.parentId="";
+				this.$HTTP.get("/api/blade-system/menu/lazy-list",this.searchData).then(res=> {
+					if(res.code == 200) {
+						console.log(res.data,111)
+						this.tableData = res.data;
+					}
+				})
+			},
 			//瀛楀吀閰嶇疆
 			table_allocation(row) {
 				this.dialog.allocation = true;

--
Gitblit v1.9.3