明树Git Lab

Commit 25bbac44 authored by yangyajing's avatar yangyajing

浮点数计算

parent 6aa0ed17
Pipeline #104458 passed with stage
in 13 seconds
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</el-header> </el-header>
<el-container> <el-container class="container-main">
<!-- 侧边Aside --> <!-- 侧边Aside -->
<el-aside width="220px" class="city-aside"> <el-aside width="220px" class="city-aside">
<left-menu></left-menu> <left-menu></left-menu>
...@@ -86,6 +86,12 @@ const handleLogout = () => { ...@@ -86,6 +86,12 @@ const handleLogout = () => {
.smart-city-container { .smart-city-container {
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
display: flex;
flex-direction: column;
.container-main{
flex: 1;
height: 0;
}
} }
/* 选中菜单项样式 */ /* 选中菜单项样式 */
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
> >
<template v-for="item in menuList"> <template v-for="item in menuList">
<template v-if="item.children && item.children.length"> <template v-if="item.children && item.children.length">
<left-menu-item :key="item.id" :menuItem="item"></left-menu-item> <left-menu-item :key="item.id?.toString()" :menuItem="item"></left-menu-item>
</template> </template>
<template v-else> <template v-else>
<el-menu-item :key="item.id" :index="item.url"> <el-menu-item :key="item.id?.toString()" :index="item.url">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</el-menu-item> </el-menu-item>
</template> </template>
......
<template> <template>
<el-sub-menu :index="menuItem.id"> <el-sub-menu :index="menuItem.id?.toString()">
<template #title> <template #title>
<span>{{ menuItem.name }}</span> <span>{{ menuItem.name }}</span>
</template> </template>
......
.tab-content{ .manage-container{
th{ display: flex;
// text-align: center; flex-direction: column;
} }
.manage-header{
background: rgba(255, 255, 255, 0.9);
border-radius: 8px;
padding: 12px 20px 0;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
}
.manage-content{
flex: 1;
height: 0;
} }
\ No newline at end of file
This diff is collapsed.
<template> <template>
<div class="user-manage" v-loading="loading"> <div class="manage-container user-manage" v-loading="loading">
<!-- <div class="search-form"> <div class="manage-header">
<commonForm <div class="header-left">
v-model="searchForm" <el-form :inline="true" :model="searchForm">
:config="searchConfig" <el-form-item label="关键字查询">
:items="searchItems" <el-input v-model="searchForm.name" clearable />
@submit="handleSearch" </el-form-item>
@reset="handleReset" <el-form-item>
/> <el-button type="primary" @click="handleSearch">查询</el-button>
</div> --> </el-form-item>
<div class="table-container"> </el-form>
</div>
<div class="header-right">
<el-form>
<el-form-item>
<el-button type="primary" @click="handleAdd">新增用户</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="manage-content table-container">
<common-table <common-table
:autoHeight="true" :autoHeight="true"
:maxRows="10" :maxRows="10"
:rowHeight="40"
:data="tableData" :data="tableData"
:columns="tableColumns" :columns="tableColumns"
:total="total" :total="total"
...@@ -24,22 +33,6 @@ ...@@ -24,22 +33,6 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-page-change="handleCurrentPageChange" @current-page-change="handleCurrentPageChange"
> >
<template #header-left>
<commonForm
v-model="searchForm"
:config="searchConfig"
:items="searchItems"
@submit="handleSearch"
@reset="handleReset"
/>
</template>
<template #header-actions>
<el-button type="primary" @click="handleAdd">
<!-- <el-icon><Plus /></el-icon> -->
新增
</el-button>
</template>
<template #enable="{ row }"> <template #enable="{ row }">
<el-switch <el-switch
:model-value="row.enable === 0 ? true : false" :model-value="row.enable === 0 ? true : false"
...@@ -530,6 +523,7 @@ onMounted(() => { ...@@ -530,6 +523,7 @@ onMounted(() => {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@import "@/styles/manage.less";
.user-manage { .user-manage {
padding: 8px 8px 20px 8px; padding: 8px 8px 20px 8px;
background: rgba(157, 188, 218, 0.1); background: rgba(157, 188, 218, 0.1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment