fix: BUG修改

This commit is contained in:
kun 2023-09-13 14:44:44 +08:00
parent b8758f6dc0
commit 895a7fe82f
10 changed files with 226 additions and 192 deletions

View File

@ -2,9 +2,9 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# VITE_API_URL = 'http://192.168.34.155:6688' VITE_API_URL = 'http://192.168.34.155:6688'
VITE_WPAPI_URL = "http://182.90.224.147:8081" VITE_WPAPI_URL = "http://182.90.224.147:8081"
VITE_API_URL = "http://182.90.224.147:6688" # VITE_API_URL = "http://182.90.224.147:6688"
# 上传 # 上传
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

View File

@ -1,4 +1,5 @@
<template> <template>
<div class="main-box">
<div class="gantt-box"> <div class="gantt-box">
<div class="header"> <div class="header">
<div class="left-content"> <div class="left-content">
@ -115,6 +116,7 @@
</engineeringEngDrawer> </engineeringEngDrawer>
<allEngineering @click="engVisable = true" /> <allEngineering @click="engVisable = true" />
</div> </div>
</div>
</template> </template>
<script setup lang="tsx" name="ProjectSupervisionRecord"> <script setup lang="tsx" name="ProjectSupervisionRecord">
@ -490,6 +492,9 @@ const dateList = computed(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.main-box {
overflow-x: scroll;
}
.gantt-box { .gantt-box {
box-sizing: border-box; box-sizing: border-box;
min-width: 1120px; min-width: 1120px;

View File

@ -550,7 +550,9 @@ onMounted(() => {
.table-box { .table-box {
height: 100%; height: 100%;
position: relative; position: relative;
overflow-x: scroll;
.search-select { .search-select {
min-width: 1470px;
box-shadow: none; box-shadow: none;
:deep() { :deep() {
.el-card { .el-card {
@ -564,11 +566,12 @@ onMounted(() => {
:deep(.el-card__body) { :deep(.el-card__body) {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; // flex-wrap: wrap;
} }
} }
} }
.statistics-table { .statistics-table {
min-width: 1430px;
height: calc(100% - 100px); height: calc(100% - 100px);
box-shadow: none; box-shadow: none;
margin-top: 20px; margin-top: 20px;

View File

@ -342,6 +342,7 @@ onMounted(async () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.table-box { .table-box {
overflow-x: scroll;
.echart-all { .echart-all {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

View File

@ -604,6 +604,9 @@ watch(
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.main-box {
overflow-x: scroll;
}
.leftMenu { .leftMenu {
width: 300px; width: 300px;
border-radius: 8px; border-radius: 8px;

View File

@ -3,6 +3,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x: scroll;
.leftMenu { .leftMenu {
width: 300px; width: 300px;
border-radius: 8px; border-radius: 8px;
@ -48,6 +49,7 @@
position: relative; position: relative;
margin-left: 20px; margin-left: 20px;
.search-select { .search-select {
min-width: 1470px;
box-shadow: none; box-shadow: none;
:deep() { :deep() {
.el-card { .el-card {
@ -62,7 +64,7 @@
:deep(.el-card__body) { :deep(.el-card__body) {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; // flex-wrap: wrap;
} }
span { span {
color: var(--el-menu-text-color); color: var(--el-menu-text-color);
@ -70,6 +72,7 @@
} }
} }
.statistics-table { .statistics-table {
min-width: 1430px;
height: calc(100% - 100px); height: calc(100% - 100px);
background-color: var(--el-menu-bg-color); background-color: var(--el-menu-bg-color);
box-shadow: none; box-shadow: none;

View File

@ -13,13 +13,22 @@
padding: 10px; padding: 10px;
height: calc(100% - 150px); height: calc(100% - 150px);
} }
:deep(.el-card) { .tab-card {
:deep() {
.el-card {
margin: 2px 10px 10px; margin: 2px 10px 10px;
border: none; border: none;
border-radius: 8px; border-radius: 8px;
height: 56px; height: 56px;
// padding-bottom: 6px; }
} .el-button {
:deep(.el-card__body) { font-size: 14px;
padding: 12px 0 0 36px; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #333333;
}
}
} }
// :deep(.el-card__body) {
// padding: 12px 0 0 36px;
// }

View File

@ -9,10 +9,12 @@
</template> </template>
</TreeFilter> </TreeFilter>
<div class="table-box"> <div class="table-box">
<div class="tab-card">
<el-card shadow="never"> <el-card shadow="never">
<el-button :class="showPage == false ? 'blueText' : ''" @click="showPage = false" link>基本信息</el-button> <el-button :class="showPage == false ? 'blueText' : ''" @click="showPage = false" link>基本信息</el-button>
<el-button :class="showPage == true ? 'blueText' : ''" @click="showPage = true" link>用户管理</el-button> <el-button :class="showPage == true ? 'blueText' : ''" @click="showPage = true" link>用户管理</el-button>
</el-card> </el-card>
</div>
<div class="base-box" v-show="!showPage"> <div class="base-box" v-show="!showPage">
<el-form style="padding: 10% 30%" :model="baseFrom" ref="ruleFormRef" label-width="150px"> <el-form style="padding: 10% 30%" :model="baseFrom" ref="ruleFormRef" label-width="150px">
<el-form-item label="上级部门:" prop="parentId"> <el-form-item label="上级部门:" prop="parentId">

View File

@ -1,4 +1,5 @@
<template> <template>
<div class="main-box">
<div class="gantt-box"> <div class="gantt-box">
<div class="header"> <div class="header">
<div class="left-content"> <div class="left-content">
@ -117,6 +118,7 @@
</engineeringEngDrawer> </engineeringEngDrawer>
<allEngineering @click="engVisable = true" /> <allEngineering @click="engVisable = true" />
</div> </div>
</div>
</template> </template>
<script setup lang="tsx" name="ProjectSupervisionRecord"> <script setup lang="tsx" name="ProjectSupervisionRecord">
@ -523,6 +525,9 @@ const dateList = computed(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.main-box {
overflow-x: scroll;
}
.gantt-box { .gantt-box {
box-sizing: border-box; box-sizing: border-box;
min-width: 1120px; min-width: 1120px;

View File

@ -587,7 +587,9 @@ onMounted(() => {
.table-box { .table-box {
height: 100%; height: 100%;
position: relative; position: relative;
overflow-x: scroll;
.search-select { .search-select {
min-width: 1470px;
box-shadow: none; box-shadow: none;
:deep() { :deep() {
.el-card { .el-card {
@ -601,11 +603,12 @@ onMounted(() => {
:deep(.el-card__body) { :deep(.el-card__body) {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; // flex-wrap: wrap;
} }
} }
} }
.statistics-table { .statistics-table {
min-width: 1430px;
height: calc(100% - 100px); height: calc(100% - 100px);
box-shadow: none; box-shadow: none;
margin-top: 20px; margin-top: 20px;