From 6ad52bf9f4824b72dcce9547356fcba4b3b145ba Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 25 Jun 2025 17:03:47 +0800
Subject: [PATCH] feat:样式布局调整
---
src/components/basic-container/main.vue | 40 ++
src/views/device/fly.vue | 303 ++++++++-----------
src/components/basic-main-content/main.vue | 49 +++
src/main.js | 6
src/page/index/index.vue | 50 +-
src/views/device/index.vue | 80 +++-
src/views/monitor/log/api.vue | 113 +++----
src/views/resource/attach.vue | 221 ++++++--------
src/views/device/airport.vue | 11
src/styles/common.scss | 19
10 files changed, 462 insertions(+), 430 deletions(-)
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index 6a357d5..051d2fe 100644
--- a/src/components/basic-container/main.vue
+++ b/src/components/basic-container/main.vue
@@ -1,3 +1,13 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-06-14 15:19:16
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-06-25 16:56:30
+ * @FilePath : \src\components\basic-container\main.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-06-14 15:19:16
+-->
<template>
<div class="basic-container" :style="styleName" :class="{ 'basic-container--block': block }">
<el-card class="basic-container__card">
@@ -23,25 +33,41 @@
},
},
computed: {
- styleName() {
+ styleName () {
return {
borderRadius: `${this.radius}px`,
background: this.background,
- };
+ }
},
},
-};
+}
</script>
<style lang="scss">
.basic-container {
- padding: 0 10px;
- box-sizing: border-box;
+ height: 0;
+ flex: 1;
+
+ padding: 10px;
+ // box-sizing: border-box;
// height: 100%;
- .basic-container__card{
+ .basic-container__card {
height: 100% !important;
- overflow: auto;
+ overflow: hidden;
+
+ .el-card__body {
+ display: flex;
+ flex-direction: column;
+ height: 100% !important;
+ overflow: hidden;
+ box-sizing: border-box;
+
+ &>div {
+ height: 0;
+ flex: 1;
+ }
+ }
}
&--block {
diff --git a/src/components/basic-main-content/main.vue b/src/components/basic-main-content/main.vue
new file mode 100644
index 0000000..935e758
--- /dev/null
+++ b/src/components/basic-main-content/main.vue
@@ -0,0 +1,49 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-06-14 15:19:16
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-06-25 16:37:40
+ * @FilePath : \src\components\basic-main-content\main.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-06-14 15:19:16
+-->
+<template>
+ <div class="basic-main-content">
+ <slot></slot>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'basicMainContent',
+ props: {
+ radius: {
+ type: [String, Number],
+ default: 10,
+ },
+ background: {
+ type: String,
+ },
+ block: {
+ type: Boolean,
+ default: false,
+ },
+ },
+ computed: {
+ styleName () {
+ return {
+ borderRadius: `${this.radius}px`,
+ background: this.background,
+ }
+ },
+ },
+}
+</script>
+
+<style lang="scss" scoped>
+.basic-main-content {
+ height: 0;
+ flex: 1;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index e24d589..58ae120 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,8 @@
import avueUeditor from 'avue-plugin-ueditor'
import basicBlock from 'components/basic-block/main.vue'
import basicContainer from 'components/basic-container/main.vue'
+import basicMainContent from 'components/basic-main-content/main.vue'
+
import thirdRegister from './components/third-register/main.vue'
import NfDesignBase from '@saber/nf-design-base-elp'
import flowDesign from './components/flow-design/main.vue'
@@ -49,7 +51,7 @@
window.DC = Object.create(DC)
import { onResize } from '@/utils/rem'
onResize()
-const { VITE_APP_BASE,VITE_APP_CESIUM_TOKEN } = import.meta.env
+const { VITE_APP_BASE, VITE_APP_CESIUM_TOKEN } = import.meta.env
window.CESIUM_BASE_URL = `${VITE_APP_BASE}/cesiumPu`
Cesium.Ion.defaultAccessToken = VITE_APP_CESIUM_TOKEN
@@ -86,6 +88,8 @@
app.component(key, component)
}
app.component('basicContainer', basicContainer)
+app.component('basicMainContent', basicMainContent)
+
app.component('basicBlock', basicBlock)
app.component('thirdRegister', thirdRegister)
app.component('flowDesign', flowDesign)
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index c925305..65ec8cd 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -13,9 +13,9 @@
<div class="tags-box">
<tags />
</div>
- <search class="avue-view" v-show="isSearch"></search>
+ <search class="main-avue-view-container" v-show="isSearch"></search>
<!-- 主体视图层 -->
- <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
+ <div class="main-avue-view-container" v-show="!isSearch" v-if="isRefresh">
<router-view #="{ Component }">
<keep-alive :include="$store.getters.tagsKeep">
<component :is="Component" />
@@ -29,15 +29,15 @@
</template>
<script>
-import index from '@/mixins/index';
-import wechat from './wechat.vue';
+import index from '@/mixins/index'
+import wechat from './wechat.vue'
//import { validatenull } from 'utils/validate';
-import { mapGetters } from 'vuex';
-import tags from './tags.vue';
-import search from './search.vue';
-import logo from './logo.vue';
-import top from './top/index.vue';
-import sidebar from './sidebar/index.vue';
+import { mapGetters } from 'vuex'
+import tags from './tags.vue'
+import search from './search.vue'
+import logo from './logo.vue'
+import top from './top/index.vue'
+import sidebar from './sidebar/index.vue'
export default {
mixins: [index],
@@ -50,10 +50,10 @@
wechat,
},
name: 'index',
- provide() {
+ provide () {
return {
index: this,
- };
+ }
},
computed: {
...mapGetters([
@@ -65,27 +65,27 @@
'menu',
'setting',
]),
- validSidebar() {
+ validSidebar () {
return !(
(this.$route.meta || {}).menu === false || (this.$route.query || {}).menu === 'false'
- );
+ )
},
},
props: [],
methods: {
//打开菜单
- openMenu(item = {}) {
+ openMenu (item = {}) {
this.$store.dispatch('GetMenu', item.id).then(data => {
if (data.length !== 0) {
this.$router.$avueRouter.formatRoutes(data, true)
// 获取url里面的redirect
- const redirect = decodeURIComponent(this.$route.query.redirect || '');
- if (redirect){
- console.log('redirect',redirect);
- const [path, queryString] = redirect.split('?');
- const query = queryString ? Object.fromEntries(new URLSearchParams(queryString)) : {};
- this.$router.push({ path,query})
+ const redirect = decodeURIComponent(this.$route.query.redirect || '')
+ if (redirect) {
+ console.log('redirect', redirect)
+ const [path, queryString] = redirect.split('?')
+ const query = queryString ? Object.fromEntries(new URLSearchParams(queryString)) : {}
+ this.$router.push({ path, query })
}
}
//当点击顶部菜单后默认打开第一个菜单
@@ -109,15 +109,13 @@
}, itemActive.meta)
});
}*/
- });
+ })
},
},
-};
+}
</script>
<style lang="scss" scoped>
-:deep(.basic-container){
-height: none !important;}
// #avue-view{
// :deep(){
// .avue-crud__body{
@@ -129,7 +127,7 @@
// }
// }
-.tags-box{
+.tags-box {
background: transparent;
padding: 0 10px;
--el-color-primary: rgba(20, 65, 255, 1);
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 488a42d..732d3c2 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -20,9 +20,9 @@
.avue-layout {
display: flex;
- height: 1080px;
- width: 1920px;
- background: url("@/assets/images/layoutBg.png") no-repeat center / 100% 100%;
+ width: 100%;
+ height: 100%;
+ background: url("@/assets/images/layoutBg.png") no-repeat center / 100% 100%;
overflow: hidden;
&--horizontal {
@@ -85,9 +85,12 @@
margin-bottom: 0;
}
-.avue-view {
- width: 100%;
- box-sizing: border-box;
+.main-avue-view-container {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
}
.avue-footer {
@@ -155,7 +158,7 @@
}
}
-.ztzf-cesium{
+.ztzf-cesium {
.cesium-viewer {
height: 100%;
overflow: hidden;
@@ -179,4 +182,4 @@
.cesium-viewer-bottom {
display: none;
}
-}
+}
\ No newline at end of file
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index e10e4f0..8122b80 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-main-content>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud" @row-del="rowDel"
v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@@ -123,7 +123,7 @@
<DockControlPanel v-if="remoteDebuggingShow" :sn="curDeviceInfo.device_sn" :deviceInfo="curDeviceInfo">
</DockControlPanel>
</el-drawer>
- </basic-container>
+ </basic-main-content>
</template>
<script>
@@ -191,8 +191,7 @@
option: {
lazy: true,
tree: true,
- // height: '400',
- calcHeight: 32,
+
dialogWidth: 1050,
tip: false,
searchShow: true,
@@ -205,6 +204,10 @@
addBtn: false,
dialogClickModal: false,
grid: false,
+
+ height: 'auto',
+ calcHeight: 180,
+
column: [
{
label: '设备型号',
diff --git a/src/views/device/fly.vue b/src/views/device/fly.vue
index 2fd28b2..eb7fdb0 100644
--- a/src/views/device/fly.vue
+++ b/src/views/device/fly.vue
@@ -1,34 +1,13 @@
<template>
- <basic-container>
- <avue-crud
- id="device"
- :option="option"
- :table-loading="loading"
- :data="data"
- :page="page"
- @update:page="handlePageChange"
- ref="crud"
- @row-del="rowDel"
- v-model="form"
- :permission="permissionList"
- @row-update="rowUpdate"
- @row-save="rowSave"
- :before-open="beforeOpen"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- >
+ <basic-main-content>
+ <avue-crud id="device" :option="option" :table-loading="loading" :data="data" :page="page"
+ @update:page="handlePageChange" ref="crud" @row-del="rowDel" v-model="form" :permission="permissionList"
+ @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen" @search-change="searchChange"
+ @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+ @size-change="sizeChange" @refresh-change="refreshChange">
<template #menu-left>
- <el-button
- type="danger"
- icon="el-icon-delete"
- plain
- v-if="permission.workspace_delete"
- @click="handleDelete"
- >删 除
+ <el-button type="danger" icon="el-icon-delete" plain v-if="permission.workspace_delete" @click="handleDelete">删
+ 除
</el-button>
</template>
<template #dept_name="{ row }">
@@ -37,7 +16,7 @@
<template #status="{ row }">
<div v-if="row.status == true" class="onlineStatus">
<div class="onlineStatus-dot"></div>
- <span class="online" >在线</span>
+ <span class="online">在线</span>
</div>
<div v-if="row.status == false" class="onlineStatus">
<div class="onlineStatus-dot1"></div>
@@ -45,13 +24,8 @@
</div>
</template>
<template #menu="scope">
- <el-button
- type="primary"
- text
- icon="el-icon-setting"
- v-if="permission.operate_password_set"
- @click.stop="handleOperatePassword(scope.row, scope.index)"
- >操控密码设置
+ <el-button type="primary" text icon="el-icon-setting" v-if="permission.operate_password_set"
+ @click.stop="handleOperatePassword(scope.row, scope.index)">操控密码设置
</el-button>
<!-- <el-button
type="primary"
@@ -64,28 +38,12 @@
</template>
</avue-crud>
<el-dialog title="操控密码设置" append-to-body v-model="operatePasswordSetBox" width="455px">
- <el-form
- :model="passwordForm"
- ref="passwordForm"
- label-width="80px"
- :rules="rules"
- v-loading="loadingForm"
- >
+ <el-form :model="passwordForm" ref="passwordForm" label-width="80px" :rules="rules" v-loading="loadingForm">
<el-form-item label="密码" prop="password">
- <el-input
- type="password"
- v-model="passwordForm.password"
- placeholder="请输入密码"
- show-password
- ></el-input>
+ <el-input type="password" v-model="passwordForm.password" placeholder="请输入密码" show-password></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="password2">
- <el-input
- type="password"
- v-model="passwordForm.password2"
- placeholder="请输入确认密码"
- show-password
- ></el-input>
+ <el-input type="password" v-model="passwordForm.password2" placeholder="请输入确认密码" show-password></el-input>
</el-form-item>
</el-form>
<template #footer>
@@ -98,7 +56,7 @@
<el-dialog title="操控密码查看" append-to-body v-model="operatePasswordViewBox" width="455px">
<el-input v-model="operate_password" disabled></el-input>
</el-dialog>
- </basic-container>
+ </basic-main-content>
</template>
<script>
@@ -110,27 +68,27 @@
getDetail,
getOperatePassword,
operatePasswordUpdate,
-} from '@/api/device/device';
-import { mapGetters } from 'vuex';
+} from '@/api/device/device'
+import { mapGetters } from 'vuex'
export default {
- data() {
+ data () {
const validatePass = (rule, value, callback) => {
if (value === '') {
- callback(new Error('请输入密码'));
+ callback(new Error('请输入密码'))
} else {
- callback();
+ callback()
}
- };
+ }
const validatePass2 = (rule, value, callback) => {
if (value === '') {
- callback(new Error('请再次输入密码'));
+ callback(new Error('请再次输入密码'))
} else if (value !== this.passwordForm.password) {
- callback(new Error('两次输入密码不一致!'));
+ callback(new Error('两次输入密码不一致!'))
} else {
- callback();
+ callback()
}
- };
+ }
return {
loadingForm: false,
rules: {
@@ -155,8 +113,6 @@
},
selectionList: [],
option: {
- // height: '460',
- // calcHeight: 32,
// dialogWidth: 950,
tip: false,
searchShow: true,
@@ -169,6 +125,10 @@
excelBtn: false,
dialogClickModal: false,
grid: false,
+
+ height: 'auto',
+ calcHeight: 180,
+
column: [
{
label: '设备型号',
@@ -331,144 +291,144 @@
],
},
data: [],
- };
+ }
},
computed: {
...mapGetters(['permission']),
- permissionList() {
+ permissionList () {
return {
addBtn: this.validData(this.permission.fly_add, true),
viewBtn: this.validData(this.permission.fly_view, true),
delBtn: this.validData(this.permission.fly_delete, true),
editBtn: this.validData(this.permission.fly_edit, true),
- };
+ }
},
- ids() {
- let ids = [];
+ ids () {
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
methods: {
// 设置无人机操作密码
- setOperatePasswordConfirm() {
- var that = this;
+ setOperatePasswordConfirm () {
+ var that = this
this.$refs.passwordForm.validate(valid => {
if (valid) {
- this.loadingForm = true;
+ this.loadingForm = true
const data = {
id: this.passwordForm.id,
operate_password: this.passwordForm.password,
- };
+ }
// 提交
operatePasswordUpdate(data).then(res => {
- this.loadingForm = false;
- this.operatePasswordSetBox = false;
- that.passwordForm = {};
- this.onLoad(this.page);
+ this.loadingForm = false
+ this.operatePasswordSetBox = false
+ that.passwordForm = {}
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
} else {
- console.log('error submit!!');
- return false;
+ console.log('error submit!!')
+ return false
}
- });
+ })
},
// 操作密码设置
- handleOperatePassword(row) {
- this.operatePasswordSetBox = true;
- this.passwordForm.id = row.id;
+ handleOperatePassword (row) {
+ this.operatePasswordSetBox = true
+ this.passwordForm.id = row.id
},
- viewOperatePassword(row) {
- this.operatePasswordViewBox = true;
+ viewOperatePassword (row) {
+ this.operatePasswordViewBox = true
// 查询密码
getOperatePassword(row.id).then(res => {
- this.operate_password = res.data.data;
- });
+ this.operate_password = res.data.data
+ })
},
- init() {
+ init () {
(this.page = {
pageSize: 10,
currentPage: 1,
total: 0,
}),
- this.onLoad(this.page);
+ this.onLoad(this.page)
},
- rowSave(row, done, loading) {
+ rowSave (row, done, loading) {
add(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
- rowUpdate(row, index, done, loading) {
+ rowUpdate (row, index, done, loading) {
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
- rowDel(row) {
+ rowDel (row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
},
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- selectionChange(list) {
- this.selectionList = list;
+ selectionChange (list) {
+ this.selectionList = list
},
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
- handleDelete() {
+ handleDelete () {
if (this.selectionList.length === 0) {
- this.$message.warning('请选择至少一条数据');
- return;
+ this.$message.warning('请选择至少一条数据')
+ return
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
@@ -476,67 +436,67 @@
type: 'warning',
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
- beforeOpen(done, type) {
+ beforeOpen (done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
+ this.form = res.data.data
+ })
}
- done();
+ done()
},
- handlePageChange(val) {
- this.page = val;
- this.onLoad(this.page);
+ handlePageChange (val) {
+ this.page = val
+ this.onLoad(this.page)
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- this.onLoad(this.page);
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ this.onLoad(this.page)
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- this.page.currentPage = 1;
- this.onLoad(this.page);
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ this.page.currentPage = 1
+ this.onLoad(this.page)
},
- refreshChange() {
- this.onLoad(this.page, this.query);
+ refreshChange () {
+ this.onLoad(this.page, this.query)
},
- onLoad(page, params = {}) {
- const { releaseTimeRange } = this.query;
+ onLoad (page, params = {}) {
+ const { releaseTimeRange } = this.query
let values = {
...params,
...this.query,
- };
+ }
if (releaseTimeRange) {
values = {
...values,
releaseTime_datege: releaseTimeRange[0],
releaseTime_datelt: releaseTimeRange[1],
- };
- values.releaseTimeRange = null;
+ }
+ values.releaseTimeRange = null
}
- values['domain'] = 0;
- this.loading = true;
+ values['domain'] = 0
+ this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
},
},
-};
+}
</script>
<style lang="scss" scoped>
@@ -544,25 +504,30 @@
height: 655px !important;
overflow: auto;
}
+
.online {
margin-left: 5px;
}
+
.onlineStatus1 {
display: flex;
flex-direction: column;
align-items: center;
}
+
.onlineStatus {
display: flex;
flex-direction: row;
align-items: center;
}
+
.onlineStatus-dot {
width: 15px;
height: 15px;
background-color: #40cb8b;
border-radius: 50%;
}
+
.onlineStatus-dot1 {
width: 15px;
height: 15px;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 35f066c..d9ef307 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -1,12 +1,12 @@
<!--
- * @Author: shuishen 1109946754@qq.com
- * @Date: 2024-09-09 11:40:40
- * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-09-09 12:02:50
- * @FilePath: \drone-web-manage\src\views\device\index.vue
- * @Description:
- *
- * Copyright (c) 2024 by shuishen, All Rights Reserved.
+ * @Author : yuan
+ * @Date : 2025-04-27 21:01:20
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-06-25 16:23:45
+ * @FilePath : \src\views\device\index.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-04-27 21:01:20
-->
<template>
<basic-container>
@@ -22,47 +22,75 @@
</template>
<script>
-import { mapGetters } from 'vuex';
-import airport from './airport.vue';
-import fly from './fly.vue';
+import { mapGetters } from 'vuex'
+import airport from './airport.vue'
+import fly from './fly.vue'
export default {
components: { airport, fly },
- data() {
+ data () {
return {
activeName: '1',
form: {},
query: {},
loading: true,
data: [],
- };
+ }
},
computed: {
...mapGetters(['permission']),
- permissionList() {
- return {};
+ permissionList () {
+ return {}
},
- ids() {
- let ids = [];
+ ids () {
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
- created(){
+ created () {
// 默认打开机场页面
},
methods: {
- handleClick(tab, event) {
+ handleClick (tab, event) {
if (tab.index == 1) {
- this.$refs.fly.init();
+ this.$refs.fly.init()
}
if (tab.index == 0) {
- this.$refs.airport.init();
+ this.$refs.airport.init()
}
},
},
-};
+}
</script>
-<style></style>
+<style lang="scss" scoped>
+::v-deep(.el-tabs) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+
+ .el-tabs__header {
+ order: 1;
+ }
+
+ .el-tabs__content {
+ order: 2;
+ }
+
+ .el-tabs__content {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .el-tab-pane {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ }
+ }
+}
+</style>
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 5e74765..a8e6a22 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -1,31 +1,19 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model:page="page"
- @search-change="searchChange"
- @search-reset="searchReset"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
+ <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ :permission="permissionList" :before-open="beforeOpen" v-model:page="page" @search-change="searchChange"
+ @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
</avue-crud>
</basic-container>
</template>
<script>
-import { getApiList, getApiLogs } from '@/api/logs';
-import { mapGetters } from 'vuex';
+import { getApiList, getApiLogs } from '@/api/logs'
+import { mapGetters } from 'vuex'
export default {
- data() {
+ data () {
return {
form: {},
selectionList: [],
@@ -50,6 +38,10 @@
delBtn: false,
menuWidth: 120,
dialogType: 'drawer',
+
+ height: 'auto',
+ calcHeight: 0,
+
column: [
{
label: '操作名称',
@@ -120,14 +112,14 @@
label: '操作时间',
prop: 'daterange',
type: 'daterange',
- search:true,
+ search: true,
searchRange: true,
- searchSpan:6,
+ searchSpan: 6,
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
- viewDisplay:false,
+ viewDisplay: false,
hide: true,
rules: [
{
@@ -145,78 +137,69 @@
],
},
data: [],
- };
+ }
},
computed: {
...mapGetters(['permission']),
- permissionList() {
+ permissionList () {
return {
viewBtn: this.validData(this.permission.log_api_view, false),
- };
+ }
},
},
methods: {
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
},
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- beforeOpen(done, type) {
+ beforeOpen (done, type) {
if (['edit', 'view'].includes(type)) {
getApiLogs(this.form.id).then(res => {
- this.form = res.data.data;
- });
+ this.form = res.data.data
+ })
}
- done();
+ done()
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
},
- refreshChange() {
- this.onLoad(this.page, this.query);
+ refreshChange () {
+ this.onLoad(this.page, this.query)
},
- onLoad(page, params = {}) {
- const { daterange } = this.query;
+ onLoad (page, params = {}) {
+ const { daterange } = this.query
let values = {
...params,
...this.query,
- };
+ }
if (daterange) {
values = {
...values,
startTime: daterange[0],
endTime: daterange[1],
- };
- values.daterange = null;
+ }
+ values.daterange = null
}
- this.loading = true;
+ this.loading = true
getApiList(page.currentPage, page.pageSize, values).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- });
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ })
},
},
-};
+}
</script>
-<style scoped lang="scss">
- :deep(){
- .avue-crud__body{
- .el-form{
- height: 745px;
- overflow: auto;
- }
- }
- }
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 3b1ed06..2448af1 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -1,49 +1,18 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- v-model:page="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
+ <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" :permission="permissionList"
+ :before-open="beforeOpen" v-model="form" ref="crud" @row-del="rowDel" @search-change="searchChange"
+ @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
- <el-button
- type="primary"
- plain
- v-if="permission.attach_upload"
- icon="el-icon-upload"
- @click="handleUpload"
- >上 传
+ <el-button type="primary" plain v-if="permission.attach_upload" icon="el-icon-upload" @click="handleUpload">上 传
</el-button>
- <el-button
- type="danger"
- icon="el-icon-delete"
- plain
- v-if="permission.attach_delete"
- @click="handleDelete"
- >删 除
+ <el-button type="danger" icon="el-icon-delete" plain v-if="permission.attach_delete" @click="handleDelete">删 除
</el-button>
</template>
<template #menu="scope">
- <el-button
- type="primary"
- text
- icon="el-icon-download"
- v-if="permission.attach_download"
- @click="handleDownload(scope.row)"
- >下载
+ <el-button type="primary" text icon="el-icon-download" v-if="permission.attach_download"
+ @click="handleDownload(scope.row)">下载
</el-button>
</template>
<template #attachSize="{ row }">
@@ -58,12 +27,12 @@
</template>
<script>
-import { getList, getDetail, removeAttachAndData } from '@/api/resource/attach';
-import { mapGetters } from 'vuex';
-import func from '@/utils/func';
+import { getList, getDetail, removeAttachAndData } from '@/api/resource/attach'
+import { mapGetters } from 'vuex'
+import func from '@/utils/func'
export default {
- data() {
+ data () {
return {
form: {},
query: {},
@@ -85,6 +54,10 @@
// grid: true,
selection: true,
dialogClickModal: false,
+
+ height: 'auto',
+ calcHeight: 0,
+
column: [
{
label: '附件地址',
@@ -112,7 +85,7 @@
label: '附件名称',
prop: 'name',
search: true,
- searchSpan:4,
+ searchSpan: 4,
rules: [
{
required: true,
@@ -125,7 +98,7 @@
label: '附件原名',
prop: 'originalName',
search: true,
- searchSpan:4,
+ searchSpan: 4,
rules: [
{
required: true,
@@ -138,8 +111,8 @@
label: '附件拓展名',
prop: 'extension',
search: true,
- searchSpan:4,
- searchLabelWidth:95,
+ searchSpan: 4,
+ searchLabelWidth: 95,
rules: [
{
required: true,
@@ -168,14 +141,14 @@
label: '创建日期',
prop: 'daterange',
type: 'daterange',
- search:true,
+ search: true,
searchRange: true,
- searchSpan:6,
+ searchSpan: 6,
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
- viewDisplay:false,
+ viewDisplay: false,
hide: true,
rules: [
{
@@ -207,63 +180,63 @@
},
],
},
- };
+ }
},
computed: {
- func() {
- return func;
+ func () {
+ return func
},
...mapGetters(['permission']),
- permissionList() {
+ permissionList () {
return {
addBtn: false,
editBtn: false,
viewBtn: false,
delBtn: this.validData(this.permission.attach_delete, false),
- };
+ }
},
- ids() {
- let ids = [];
+ ids () {
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
methods: {
- handleUpload() {
- this.attachBox = true;
+ handleUpload () {
+ this.attachBox = true
},
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.attachBox = false;
- this.refreshChange();
- done();
+ uploadAfter (res, done, loading, column) {
+ window.console.log(column)
+ this.attachBox = false
+ this.refreshChange()
+ done()
},
- handleDownload(row) {
- window.open(`${row.link}`);
+ handleDownload (row) {
+ window.open(`${row.link}`)
},
- rowDel(row) {
+ rowDel (row) {
this.$confirm('确定将选择数据及对应的文件删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- return removeAttachAndData(row.id);
+ return removeAttachAndData(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
- handleDelete() {
+ handleDelete () {
if (this.selectionList.length === 0) {
- this.$message.warning('请选择至少一条数据');
- return;
+ this.$message.warning('请选择至少一条数据')
+ return
}
this.$confirm('确定将选择数据及对应的文件删除?', {
confirmButtonText: '确定',
@@ -271,85 +244,85 @@
type: 'warning',
})
.then(() => {
- return removeAttachAndData(this.ids);
+ return removeAttachAndData(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
- beforeOpen(done, type) {
+ beforeOpen (done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
+ this.form = res.data.data
+ })
}
- done();
+ done()
},
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
},
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- selectionChange(list) {
- this.selectionList = list;
+ selectionChange (list) {
+ this.selectionList = list
},
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
},
- refreshChange() {
- this.onLoad(this.page, this.query);
+ refreshChange () {
+ this.onLoad(this.page, this.query)
},
- onLoad(page, params = {}) {
- const { daterange } = this.query;
+ onLoad (page, params = {}) {
+ const { daterange } = this.query
let values = {
...params,
...this.query,
- };
+ }
if (daterange) {
values = {
...values,
startTime: daterange[0],
endTime: daterange[1],
- };
- values.daterange = null;
+ }
+ values.daterange = null
}
- this.loading = true;
+ this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
},
},
-};
+}
</script>
<style scoped lang="scss">
- :deep(){
- .avue-crud__body{
- .el-form{
- height: 745px;
- overflow: auto;
- }
+:deep() {
+ .avue-crud__body {
+ .el-form {
+ height: 745px;
+ overflow: auto;
}
}
+}
</style>
--
Gitblit v1.9.3