From e7eb78c74a233f665a24e99d5a3bd847c46feee7 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 03 四月 2024 18:23:15 +0800
Subject: [PATCH] 1
---
src/views/monitor/log/error.vue | 149 ++++++-----
src/views/console/system/addUser.vue | 156 ++++++-----
src/views/monitor/log/usual.vue | 149 ++++++-----
src/views/console/system/user.vue | 133 ++++++---
src/views/monitor/log/api.vue | 14 -
src/views/console/soam/oss-system.vue | 171 ++++++++++--
6 files changed, 474 insertions(+), 298 deletions(-)
diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index 0c597e7..47b1265 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 18:27:53
+ * @LastEditTime: 2024-04-03 14:46:31
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -11,21 +11,21 @@
<el-tabs tab-position="left" style="height: 800px" class="demo-tabs">
<el-tab-pane label="鏂囦欢瀛樺偍">
<div class="tabTitle">鏂囦欢瀛樺偍</div>
- <el-form :model="ossForm" ref="ossForm" label-width="120px">
+ <el-form :model="ossForm" label-width="120px">
<el-row>
<el-col :span="24">
- <el-form-item label="endpoint" prop="endpoint">
+ <el-form-item label="endpoint">
<el-input v-model="ossForm.endpoint" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="acceskey" prop="acceskey">
- <el-input v-model="ossForm.acceskey" clearable></el-input>
+ <el-form-item label="acceskey">
+ <el-input v-model="ossForm.accessKey" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="secretkey" prop="secretkey">
- <el-input v-model="ossForm.secretkey" clearable></el-input>
+ <el-form-item label="secretkey">
+ <el-input v-model="ossForm.secretKey" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -39,8 +39,8 @@
<el-tab-pane label="搴旂敤璁剧疆">
<div class="tabTitle">搴旂敤璁剧疆</div>
<ul class="show-list">
- <li class="active">
- <div class="edit">缂栬緫</div>
+ <li :class="{active: active.isA}" @click="changeLi('isA')">
+ <div class="edit" @click="editBtn('isA')">缂栬緫</div>
<div class="logo">
<img src="http://116.63.155.153:83/api/static/images/cps.png">
</div>
@@ -49,8 +49,8 @@
<div class="domain">http://192.168.1.199</div>
</div>
</li>
- <li>
- <div class="edit">缂栬緫</div>
+ <li :class="{active: active.isB}" @click="changeLi('isB')">
+ <div class="edit" @click="editBtn('isB')">缂栬緫</div>
<div class="logo">
<img src="http://116.63.155.153:83/api/static/images/vision.png">
</div>
@@ -59,8 +59,8 @@
<div class="domain">http://192.168.1.199:31005</div>
</div>
</li>
- <li>
- <div class="edit">缂栬緫</div>
+ <li :class="{active: active.isC}" @click="changeLi('isC')">
+ <div class="edit" @click="editBtn('isC')">缂栬緫</div>
<div class="logo">
<img src="http://116.63.155.153:83/api/static/images/hmi.png">
</div>
@@ -73,25 +73,39 @@
<el-card class="system-content">
<template #header>
<div class="card-header">
- <span>搴旂敤璇︽儏</span>
+ <span v-if="!isEdit">搴旂敤璇︽儏</span>
+ <span v-if="isEdit">缂栬緫搴旂敤</span>
+ <div v-if="isEdit">
+ <el-button @click="cencelBtn" >鍙� 娑�</el-button>
+ <el-button type="primary" :loading="isSaveing" @click="sysSubmit">淇� 瀛�</el-button>
+ </div>
</div>
</template>
<el-form :model="searchData" abel-width="120px">
- <el-form-item label="绯荤粺灞曠ず">
- <el-switch v-model="searchData.value1" />
+ <el-form-item label="绯荤粺灞曠ず" v-if="!isEdit">
+ <el-switch v-model="searchData.isShow" disabled/>
</el-form-item>
- <el-form-item label="搴旂敤鍚嶇О">
- <div>{{searchData.value2}}</div>
+ <el-form-item label="绯荤粺灞曠ず" v-if="isEdit">
+ <el-switch v-model="searchData.isShow"/>
+ </el-form-item>
+ <el-form-item label="搴旂敤鍚嶇О" v-if="!isEdit">
+ <div>{{searchData.name}}</div>
+ </el-form-item>
+ <el-form-item label="搴旂敤鍚嶇О" v-if="isEdit">
+ <el-input v-model="searchData.name" placeholder="搴旂敤鍚嶇О" clearable></el-input>
</el-form-item>
<el-form-item label="搴旂敤鏍囪瘑">
- <div>{{searchData.value2}}</div>
+ <div>{{searchData.code}}</div>
</el-form-item>
- <el-form-item label="缃戦〉鍦板潃">
- <div>{{searchData.value2}}</div>
+ <el-form-item label="缃戦〉鍦板潃" v-if="!isEdit">
+ <div>{{searchData.domain}}</div>
+ </el-form-item>
+ <el-form-item label="缃戦〉鍦板潃" v-if="isEdit">
+ <el-input v-model="searchData.domain" placeholder="缃戦〉鍦板潃" clearable></el-input>
</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;">
+ <img :src="searchData.logo" style="width:66px;height:66px;">
</div>
</el-form-item>
</el-form>
@@ -106,15 +120,27 @@
name: "oss-main",
data(){
return {
+ isSaveing: false,
+ isEdit: false,
+ active: {
+ isA: true,
+ isB: false,
+ isC: false
+ },
searchData: {
- value1: false,
- value2: "HMI"
+ isShow: true,
+ name: "",
+ code: "",
+ domain: "",
+ logo: "",
+ backgroundUrl: ""
},
ossForm: {
endpoint: "",
- acceskey: "",
- secretkey: ""
- }
+ accessKey: "",
+ secretKey: ""
+ },
+ temData: []
}
},
components: {},
@@ -122,12 +148,87 @@
},
mounted(){
-
+ this.getOssUpdata(); //鏂囦欢瀛樺偍
+ this.setting(); //搴旂敤璁剧疆
},
methods: {
- ossUpdata(){
-
- }
+ cencelBtn() {
+ this.isEdit=false;
+ this.isSaveing = false;
+ },
+ sysSubmit() {
+ this.isSaveing = true;
+ var obj = {...this.searchData};
+ if(obj.isShow == true) {
+ obj.isShow = "1";
+ }else {
+ obj.isShow = "0";
+ }
+ this.$HTTP.put("/api/blade-system/application/update",obj).then(res=> {
+ if(res.code == 200) {
+ this.$message({
+ message: "鎿嶄綔鎴愬姛",
+ type: "success"
+ })
+ this.cencelBtn();
+ }
+ })
+ },
+ editBtn(name) {
+ this.isEdit = true;
+ },
+ setting() {
+ this.$HTTP.get("/api/blade-system/application/list").then(res=> {
+ if(res.code == 200) {
+ res.data.forEach(item=> {
+ if(item.isShow == "1") {
+ item.isShow = true;
+ }else {
+ item.isShow = false;
+ }
+ })
+ this.temData = res.data;
+ this.searchData = this.temData[0];
+ }
+ })
+ },
+ changeLi(name) {
+ for(var key in this.active) {
+ if(key === name) {
+ this.active[name] = true;
+ }else {
+ this.active[key] = false;
+ }
+ switch(name) {
+ case "isA":
+ this.searchData = this.temData[0];
+ break;
+ case "isB":
+ this.searchData = this.temData[1];
+ break;
+ case "isC":
+ this.searchData = this.temData[2];
+ break;
+ }
+ }
+ },
+ ossUpdata() {
+ this.$HTTP.post("/api/blade-resource/oss/update",this.ossForm).then(res=> {
+ if(res.code == 200) {
+ this.$message({
+ message: "鏇存柊鎴愬姛",
+ type: "success"
+ })
+ }
+ })
+ },
+ getOssUpdata(){
+ this.$HTTP.get("/api/blade-resource/oss/detail").then(res=> {
+ if(res.code == 200) {
+ this.ossForm = res.data;
+ }
+ })
+ }
}
}
</script>
@@ -208,10 +309,16 @@
}
.system-content .card-header{
border-bottom: 1px solid #ebeef5;
- padding: 6px 18px!important;
+ padding: 12px 18px!important;
+ position: relative;
}
.system-content .card-header span{
font-size:13px;
font-weight: 400px;
}
+.system-content .card-header > div {
+ position: absolute;
+ top: 6px;
+ right: 22px;
+}
</style>
diff --git a/src/views/console/system/addUser.vue b/src/views/console/system/addUser.vue
index dd9b703..9f5f8fd 100644
--- a/src/views/console/system/addUser.vue
+++ b/src/views/console/system/addUser.vue
@@ -3,46 +3,46 @@
<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
<el-col :span="12">
- <el-form-item label="璐﹀彿" prop="userName">
- <el-input v-model="form.userName" placeholder="宀椾綅缂栧彿" clearable></el-input>
+ <el-form-item label="璐﹀彿" prop="account">
+ <el-input v-model="form.account" placeholder="璐﹀彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐﹀彿鏄电О" prop="name">
- <el-input v-model="form.name" placeholder="宀椾綅" clearable></el-input>
+ <el-form-item label="璐﹀彿鏄电О" prop="realName">
+ <el-input v-model="form.realName" placeholder="璐﹀彿鏄电О" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀵嗙爜" prop="name">
- <el-input v-model="form.name" placeholder="宀椾綅" clearable></el-input>
+ <el-form-item label="瀵嗙爜" prop="password">
+ <el-input v-model="form.password" placeholder="瀵嗙爜" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵嬫満鍙�" prop="name">
- <el-input v-model="form.name" placeholder="宀椾綅" clearable></el-input>
+ <el-form-item label="鎵嬫満鍙�">
+ <el-input v-model="form.phone" placeholder="鎵嬫満鍙�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閭" prop="name">
- <el-input v-model="form.name" placeholder="宀椾綅" clearable></el-input>
+ <el-form-item label="閭">
+ <el-input v-model="form.email" placeholder="閭" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏宠仈鍛樺伐" prop="name">
- <el-input v-model="form.name" placeholder="宀椾綅" clearable></el-input>
+ <el-form-item label="鍏宠仈鍛樺伐">
+ <el-cascader v-model="form.employeeId" :options="employeeIdOptions" :props="{value: 'id',label: 'name'}" placeholder="宀椾綅" style="width: 100%" clearable @change="employeeIdChange"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺" prop="name">
- <el-select v-model="form.name" style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
+ <el-form-item label="鏁版嵁鏉冮檺" prop="deptId">
+ <el-select v-model="form.deptId" multiple style="width: 100%" @change="deptIdChange">
+ <el-option v-for="item in deptIdList" :key="item.id" :label="item.title" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵�灞炶鑹�" prop="name">
- <el-select v-model="form.name" style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
+ <el-form-item label="鎵�灞炶鑹�" prop="roleId">
+ <el-select v-model="form.roleId" multiple collapse-tags collapse-tags-tooltip :max-collapse-tags="3" style="width: 100%" @change="roleIdChange">
+ <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -60,7 +60,9 @@
emits: ['success', 'closed'],
data() {
return {
- value1: true,
+ deptIdList: [],
+ employeeIdOptions: [],
+ roleList: [],
mode: "add",
titleMap: {
add: '鏂板缓璐﹀彿',
@@ -71,49 +73,22 @@
isSaveing: false,
//琛ㄥ崟鏁版嵁
form: {
- id:"",
- userName: "",
- avatar: "",
- name: "",
- dept: "",
- group: []
+ account: "",
+ realName: "",
+ password: "",
+ phone: "",
+ email: "",
+ employeeId: "",
+ deptId: "",
+ roleId: ""
},
//楠岃瘉瑙勫垯
rules: {
- avatar:[
- {required: true, message: '璇蜂笂浼犲ご鍍�'}
- ],
- userName: [
- {required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�'}
- ],
- password: [
- {required: true, message: '璇疯緭鍏ョ櫥褰曞瘑鐮�'},
- {validator: (rule, value, callback) => {
- if (this.form.password2 !== '') {
- this.$refs.dialogForm.validateField('password2');
- }
- callback();
- }}
- ],
- password2: [
- {required: true, message: '璇峰啀娆¤緭鍏ュ瘑鐮�'},
- {validator: (rule, value, callback) => {
- if (value !== this.form.password) {
- callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
- }else{
- callback();
- }
- }}
- ],
- dept: [
- {required: true, message: '璇烽�夋嫨鎵�灞為儴闂�'}
- ],
- group: [
- {required: true, message: '璇烽�夋嫨鎵�灞炶鑹�', trigger: 'change'}
- ]
+ account:[{required: true, message: '璇疯緭鍏ヨ处鍙�'}],
+ realName:[{required: true, message: '璇疯緭鍏ユ樀绉�'}],
+ password:[{required: true, message: '璇疯緭鍏ュ瘑鐮�'}],
+ deptId:[{required: true, message: '璇烽�夋嫨鏁版嵁鏉冮檺', trigger: 'change'}],
+ roleId:[{required: true, message: '璇烽�夋嫨鎵�灞炶鑹�', trigger: 'change'}],
},
//鎵�闇�鏁版嵁閫夐」
groups: [],
@@ -130,10 +105,20 @@
}
},
mounted() {
- // this.getGroup()
- // this.getDept()
+ this.getRole();
+ this.getDeptIdList();
+ this.getEmployee();
},
methods: {
+ employeeIdChange(val) { //鍏宠仈鍛樺伐
+ val = val[val.length - 1];
+ },
+ roleIdChange(val) { //鏁版嵁鏉冮檺
+ this.form.roleIdStr = val.join(",");
+ },
+ deptIdChange(val) { //鏁版嵁鏉冮檺
+ this.form.deptIdStr = val.join(",");
+ },
//鏄剧ず
open(mode='add'){
this.mode = mode;
@@ -151,23 +136,52 @@
},
//琛ㄥ崟鎻愪氦鏂规硶
submit(){
+ var obj = Object.assign({},this.form);
+ obj.employeeId = obj.employeeIdStr;
+ obj.deptId = obj.deptIdStr;
+ obj.roleId = obj.roleIdStr;
+ delete obj.employeeIdStr;
+ delete obj.deptIdStr;
+ delete obj.roleIdStr;
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.isSaveing = true;
- var res = await this.$API.demo.post.post(this.form);
- this.isSaveing = false;
- if(res.code == 200){
- this.$emit('success', this.form, this.mode)
- this.visible = false;
- this.$message.success("鎿嶄綔鎴愬姛")
- }else{
- this.$alert(res.message, "鎻愮ず", {type: 'error'})
- }
+ //this.isSaveing = true;
+ this.$HTTP.post("/api/blade-user/submit",obj).then(res=> {
+ this.isSaveing = false;
+ if(res.code == 200) {
+ this.$emit('success', this.form, this.mode);
+ this.visible = false;
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }else {
+ this.$alert(res.message, "鎻愮ず", {type: 'error'});
+ }
+ })
}else{
return false;
}
})
},
+ getRole() {
+ this.$HTTP.get("/api/blade-system/role/list?roleAlias=&roleName=").then(res=> {
+ if(res.code == 200) {
+ this.roleList = res.data;
+ }
+ })
+ },
+ getDeptIdList() {
+ this.$HTTP.get("/api/blade-system/data-scope-manager/tree?tenantId=000000").then(res=> {
+ if(res.code == 200) {
+ this.deptIdList = res.data;
+ }
+ })
+ },
+ getEmployee() {
+ this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=").then(res=> {
+ if(res.code == 200) {
+ this.employeeIdOptions = res.data;
+ }
+ })
+ },
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
this.form.id = data.id
diff --git a/src/views/console/system/user.vue b/src/views/console/system/user.vue
index fa33479..49ca78a 100644
--- a/src/views/console/system/user.vue
+++ b/src/views/console/system/user.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 16:20:06
+ * @LastEditTime: 2024-04-03 18:22:26
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -11,22 +11,27 @@
<div class="user-top">
<div class="right-bottom">
<el-button type="primary" @click="addPerson">鏂板缓</el-button>
+ <el-button type="primary" @click="addPerson">瀵嗙爜閲嶇疆</el-button>
<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
</div>
<div>
- <el-input v-model="input" placeholder="璇疯緭鍏ュ唴瀹�" style="width: 180px;margin-right: 8px;"></el-input>
- <el-input v-model="input" placeholder="璇疯緭鍏ュ唴瀹�" style="width: 180px;margin-right: 8px;"></el-input>
- <el-button type="primary" @click="searchUser">鎼滅储</el-button>
+ <el-input v-model="searchData.account" placeholder="璐﹀彿" style="width: 180px;margin-right: 8px;" clearable></el-input>
+ <el-input v-model="searchData.realName" placeholder="璐﹀彿鏄电О" style="width: 180px;margin-right: 8px;" clearable></el-input>
+ <el-button type="primary" @click="searchclick">鎼滅储</el-button>
</div>
</div>
<div class="user-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="account" label="璐﹀彿"></el-table-column>
+ <el-table-column prop="realName" label="璐﹀彿鏄电О"></el-table-column>
+ <el-table-column prop="roleName" label="鎵�灞炶鑹�"></el-table-column>
+ <el-table-column prop="deptName" label="鏁版嵁鏉冮檺"></el-table-column>
+ <el-table-column prop="name" label="璐﹀彿鐘舵��">
+ <template #default="scope">
+ <el-switch v-model="scope.row.status" @click="changeStatus(scope.row)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
<template #default="scope">
<el-button type="text" size="small" @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
@@ -35,13 +40,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>
@@ -73,7 +79,7 @@
</div>
</template>
</el-dialog>
- <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
+ <save-dialog v-if="dialog.save" ref="saveDialog" @success="addUserSuccess" @closed="dialog.save=false"></save-dialog>
</template>
<script>
import saveDialog from './addUser'
@@ -81,6 +87,13 @@
name: "bakalaka",
data(){
return {
+ searchData: {
+ account: "",
+ realName: "",
+ current: "1",
+ size: "15"
+ },
+ total: 0,
dialogVisible: false,
isSaveing: false,
groups: [],
@@ -103,51 +116,78 @@
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.searchUser();
},
components: {
saveDialog
},
methods: {
+ addUserSuccess() {
+ this.searchclick();
+ },
+ changeStatus(row) {
+ row.status = !row.status;
+ var obj = {
+ enable: true,
+ id: row.id
+ }
+ var str = "";
+ if(row.status) {
+ obj.enable = false;
+ str = "鍋滅敤";
+ }else {
+ obj.status = true;
+ str = "鍚敤";
+ }
+ this.$confirm('纭畾瑕�'+str+row.account+'锛�','鎻愮ず', {
+ type: 'warning',
+ }).then(() => {
+ //const loading = this.$loading()
+ //loading.close()
+ this.$HTTP.post("/api/blade-user/changeStatus?"+this.$TOOL.qsStringify(obj)).then(res=> {
+ this.isSaveing = false;
+ if(res.code == 200) {
+ this.searchclick();
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }else {
+ this.$alert(res.message, "鎻愮ず", {type: 'error'});
+ }
+ })
+ }).catch(() => {
+ //鍙栨秷
+ })
+ },
table_unlock() {
this.dialogVisible = true;
},
- searchUser() {},
+ searchclick() {
+ this.searchData.current = "1";
+ this.searchData.size = "15";
+ this.searchUser();
+ },
+ searchUser() {
+ this.$HTTP.get("/api/blade-user/page",this.searchData).then(res=> {
+ if(res.code == 200) {
+ res.data.records.forEach(item=> {
+ if(item.status == "1") {
+ item.status = true;
+ }else {
+ item.status = false;
+ }
+ })
+ this.tableData = res.data.records;
+ this.total = res.data.total;
+ console.log(this.tableData)
+ }
+ })
+ },
departmentSubmit() {
this.departmentVisible=false; //閮ㄩ棬璋冩暣
},
@@ -185,9 +225,14 @@
},
handleSizeChange(val) {
console.log(`姣忛〉 ${val} 鏉);
+ this.searchData.current = "1";
+ this.searchData.size = val;
+ this.searchUser();
},
handleCurrentChange(val) {
console.log(`褰撳墠椤�: ${val}`);
+ this.searchData.current = val;
+ this.searchUser();
}
}
}
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 96e683d..d5f5228 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 17:38:39
+ * @LastEditTime: 2024-04-03 11:21:03
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -27,8 +27,6 @@
<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="鎿嶄綔">
@@ -70,16 +68,6 @@
<el-col :span="12">
<el-form-item label="杞欢鐜" center>
<span>{{viewData.env}}</span>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織绾у埆" center>
- <span></span>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織id" center>
- <span></span>
</el-form-item>
</el-col>
<el-col :span="12">
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index 0eea4a0..54ac2ee 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 17:38:39
+ * @LastEditTime: 2024-04-03 11:24:20
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -10,26 +10,25 @@
<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="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 +36,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 +52,47 @@
<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>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織绾у埆" center>
- <span>aaa</span>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織id" 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>{{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 +105,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 +129,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/error/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();
}
}
}
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 0eea4a0..d4787b2 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 17:38:39
+ * @LastEditTime: 2024-04-03 11:22:57
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -10,26 +10,25 @@
<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="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 +36,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 +52,47 @@
<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>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織绾у埆" center>
- <span>aaa</span>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏃ュ織id" 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>{{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 +105,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 +129,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/usual/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