From b93f3583e419f277993f93fa8bc17c72302b3bc9 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 02 四月 2024 23:34:52 +0800
Subject: [PATCH] 1
---
src/views/monitor/log/api.vue | 143 ++++++++++++++++++++---------------
src/views/console/system/SubitemAddDict.vue | 13 ++
src/views/console/system/allocationDialog.vue | 28 ++++++-
src/views/console/system/addDict.vue | 8 +
4 files changed, 125 insertions(+), 67 deletions(-)
diff --git a/src/views/console/system/SubitemAddDict.vue b/src/views/console/system/SubitemAddDict.vue
index 88805b3..789fc7c 100644
--- a/src/views/console/system/SubitemAddDict.vue
+++ b/src/views/console/system/SubitemAddDict.vue
@@ -78,7 +78,7 @@
code: "",
dictValue: "",
sort: "",
- isSealed: "",
+ isSealed: false,
remark: "",
parentId: "",
dictKey: "",
@@ -173,8 +173,17 @@
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
+ //console.log(data.code,data.parentId,data)
this.addAllocationForm.code = data.code;
- this.addAllocationForm.parentId = data.parentId;
+ this.addAllocationForm.parentId = data.id;
+ if(data.mode == "edit" || data.mode == "show") {
+ if(data.isSealed == "1") {
+ data.isSealed = true;
+ }else {
+ data.isSealed = false;
+ }
+ Object.assign(this.addAllocationForm, data);
+ }
this.showDict(); //鑾峰彇鎵�鏈夊瓧鍏�
}
}
diff --git a/src/views/console/system/addDict.vue b/src/views/console/system/addDict.vue
index 2102c89..b684540 100644
--- a/src/views/console/system/addDict.vue
+++ b/src/views/console/system/addDict.vue
@@ -55,7 +55,7 @@
code: "",
dictValue: "",
sort: "",
- isSealed: "0",
+ isSealed: false,
remark: "",
dictKey: "-1",
$isSealed: "鍚�"
@@ -130,7 +130,13 @@
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
+ console.log(data)
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
+ if(data.isSealed == "1") {
+ data.isSealed = true;
+ }else {
+ data.isSealed = false;
+ }
Object.assign(this.addDictForm, data);
}
}
diff --git a/src/views/console/system/allocationDialog.vue b/src/views/console/system/allocationDialog.vue
index bed3421..408a24d 100644
--- a/src/views/console/system/allocationDialog.vue
+++ b/src/views/console/system/allocationDialog.vue
@@ -70,6 +70,7 @@
emits: ['success', 'closed'],
data(){
return {
+ oldRow: {},
selection: [],
mode: "edit",
visible: false,
@@ -127,7 +128,19 @@
},
//瀛楀吀閰嶇疆
table_allocation(row) {
- this.addAllocation();
+ this.addAllocation(row,"subitem");
+ },
+ showDict() {
+ this.$HTTP.get("/api/blade-system/dict/tree?code=DICT").then(res=> {
+ if(res.code == 200) {
+ res.data.forEach(item=> {
+ if(item.id == this.addAllocationForm.parentId) {
+ this.addAllocationForm.$parentId = item.title;
+ }
+ })
+ this.parentData = res.data;
+ }
+ })
},
//鍒犻櫎
table_del(row) {
@@ -146,14 +159,19 @@
})
},
//娣诲姞
- addAllocation(){
- this.dialog.allocation = true
+ addAllocation(row,type){
+ this.dialog.allocation = true;
this.$nextTick(() => {
- this.$refs.SubitemAddDict.open('edit').setData(this.allocationTableData[0])
+ if(type == "subitem") { //娣诲姞瀛愰」
+ this.$refs.SubitemAddDict.open('edit').setData(row)
+ }else {
+ this.$refs.SubitemAddDict.open('edit').setData(this.oldRow)
+ }
})
},
table_edit(row){
this.dialog.allocation = true
+ row.mode = "edit";
this.$nextTick(() => {
this.$refs.SubitemAddDict.open('edit').setData(row)
})
@@ -161,6 +179,7 @@
//鏌ョ湅
table_show(row){
this.dialog.allocation = true
+ row.mode = "show";
this.$nextTick(() => {
this.$refs.SubitemAddDict.open('show').setData(row)
})
@@ -209,6 +228,7 @@
setData(row){
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
this.searchData.parentId = row.id;
+ this.oldRow = row;
this.searchBtn();
},
//鏄剧ず
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 0eea4a0..96e683d 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -10,26 +10,27 @@
<div class="api-main">
<el-form :inline="true" :model="searchData" abel-width="120px">
<el-form-item label="鏈嶅姟id">
- <el-input v-model="searchData.test" placeholder="鏈嶅姟id" clearable />
+ <el-input v-model="searchData.serviceId" placeholder="鏈嶅姟id" clearable />
</el-form-item>
<el-form-item label="鏈嶅姟host">
- <el-input v-model="searchData.test" placeholder="鏈嶅姟host" clearable />
+ <el-input v-model="searchData.serverHost" placeholder="鏈嶅姟host" clearable />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="searchBtn">鎼滅储</el-button>
- <el-button @click="searchBtn">娓呯┖</el-button>
+ <el-button type="primary" @click="searchclick">鎼滅储</el-button>
+ <el-button @click="searchClearBtn">娓呯┖</el-button>
</el-form-item>
</el-form>
<div>
<div class="api-table">
<el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef">
- <el-table-column prop="date" label="鏈嶅姟id"></el-table-column>
- <el-table-column prop="name" label="鏈嶅姟host"></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="鏃ュ織id"></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="serviceId" label="鏈嶅姟id"></el-table-column>
+ <el-table-column prop="serverHost" label="鏈嶅姟host"></el-table-column>
+ <el-table-column prop="serverIp" label="鏈嶅姟ip"></el-table-column>
+ <el-table-column prop="env" label="杞欢鐜"></el-table-column>
+ <el-table-column prop="" label="鏃ュ織绾у埆"></el-table-column>
+ <el-table-column prop="" label="鏃ュ織id"></el-table-column>
+ <el-table-column prop="requestUri" label="璇锋眰鎺ュ彛"></el-table-column>
+ <el-table-column prop="createTime" label="鏃ュ織鏃堕棿"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
<template #default="scope">
<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">鏌ョ湅</el-button>
@@ -37,13 +38,14 @@
</el-table-column>
</el-table>
<el-pagination
+ style="margin-top: 12px;"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-sizes="[15, 50, 100]"
+ :page-size="15"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="total">
</el-pagination>
</div>
</div>
@@ -52,57 +54,57 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟id" center>
- <span>aaa</span>
+ <span>{{viewData.serviceId}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏈嶅姟host" center>
- <span>aaa</span>
+ <span>{{viewData.serverHost}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏈嶅姟ip" center>
- <span>aaa</span>
+ <span>{{viewData.serverIp}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="杞欢鐜" center>
- <span>aaa</span>
+ <span>{{viewData.env}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏃ュ織绾у埆" center>
- <span>aaa</span>
+ <span></span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏃ュ織id" center>
- <span>aaa</span>
+ <span></span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="璇锋眰鎺ュ彛" center>
- <span>aaa</span>
+ <span>{{viewData.requestUri}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏃ュ織鏃堕棿" center>
- <span>aaa</span>
+ <span>{{viewData.createTime}}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="鐢ㄦ埛浠ｇ悊" center>
- <span>aaa</span>
+ <span>{{viewData.userAgent}}</span>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鏃ュ織绠＄悊" center>
- <span>aaa</span>
+ <el-form-item label="鏃ュ織鏁版嵁" center>
+ <span></span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="璇锋眰鏁版嵁" center>
- <span>aaa</span>
+ <span>{{viewData.params}}</span>
</el-form-item>
</el-col>
</el-row>
@@ -115,10 +117,22 @@
name: "allocation",
data(){
return {
- viewData: {},
+ viewData: {
+ serviceId: "",
+ serverHost: "",
+ serverIp: "",
+ env: "",
+ requestUri: "",
+ createTime: "",
+ userAgent: "",
+ params: ""
+ },
drawer: false,
searchData: {
- test: ""
+ serviceId: "",
+ serverHost: "",
+ current: "1",
+ size: "15"
},
dialog: {
save: false,
@@ -127,57 +141,66 @@
leftActive: true,
input: '',
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.searchBtn();
},
methods: {
handleClose() {
this.drawer = false;
},
- searchBtn() {},
+ searchClearBtn() {
+ this.searchData = {
+ code: "",
+ dictValue: "",
+ current: "1",
+ size: "15"
+ }
+ this.searchBtn();
+ },
+ searchclick() {
+ this.searchData.current = "1";
+ this.searchData.size = "15";
+ this.searchBtn();
+ },
+ searchBtn() {
+ this.$HTTP.get("/api/blade-log/api/list",this.searchData).then(res=> {
+ if(res.code == 200) {
+ this.tableData = res.data.records;
+ this.total = res.data.total;
+ }
+ })
+ },
//鏌ョ湅
table_show(row){
- this.drawer = true;
+ this.$HTTP.get("/api/blade-log/api/detail?id="+row.id).then(res=> {
+ if(res.code == 200) {
+ this.viewData = res.data;
+ this.drawer = true;
+ }
+ })
},
handleSizeChange(val) {
console.log(`姣忛〉 ${val} 鏉);
},
handleCurrentChange(val) {
console.log(`褰撳墠椤�: ${val}`);
+ },
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉);
+ this.searchData.current = "1";
+ this.searchData.size = val;
+ this.searchBtn();
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.searchData.current = val;
+ this.searchBtn();
}
}
}
--
Gitblit v1.9.3