admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 布局BUG修改

Browse Source
This commit is contained in:
kun 2023-10-08 10:50:55 +08:00
parent 68257d456b
commit f6aaeb008b
16 changed files with 129 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/LeftMenu/leftMenu.scss
View File

@ -85,7 +85,20 @@
.isActive {
background-color: #e1eeff;
border-left: 3px solid #0e7eff;
// position: relative;
}
// .isActive::before {
// position: absolute;
// top: 0px;
// bottom: 0;
// left: 0;
// width: 3px;
// height: 78px;
// content: "";
// background: #0e7eff;
// border-bottom-right-radius: 12px;
// border-top-right-radius: 12px;
// }
:deep(.btn-prev) {
border: 1px solid #e5e5e5;
}

13
src/components/LeftMenuPlus/leftMenu.scss
View File

@ -69,7 +69,20 @@
.isActive {
background-color: #e1eeff;
border-left: 3px solid #0e7eff;
// position: relative;
}
// .isActive::before {
// position: absolute;
// top: 0px;
// bottom: 0;
// left: 0;
// width: 3px;
// height: 78px;
// content: "";
// background: #0e7eff;
// border-bottom-right-radius: 12px;
// border-top-right-radius: 12px;
// }
:deep(.btn-prev) {
border: 1px solid #e5e5e5;
}

20
src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -65,8 +65,8 @@
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
>
<el-table-column type="index" label="序号" width="100" />
<el-table-column prop="singleId" label="*单体工程" width="200">
<el-table-column type="index" label="序号" />
<el-table-column prop="singleId" label="*单体工程">
<template #default="{ row }">
<el-select v-if="row.isEdit" style="width: 100%" v-model="row.singleId" clearable placeholder="请选择">
<el-option v-for="item in singleEngineerList" :key="item.singleId" :label="item.name" :value="item.singleId" />
@ -75,7 +75,7 @@
<span v-else>{{ row.singleProject || singleEngText(row.singleId) }}</span>
</template>
</el-table-column>
<el-table-column prop="planCheckDate" label="*计划验收时间" width="200">
<el-table-column prop="planCheckDate" label="*计划验收时间" width="160">
<template #default="{ row }">
<el-date-picker
v-if="row.isEdit"
@ -89,25 +89,25 @@
<span v-else>{{ row.planCheckDate }}</span>
</template>
</el-table-column>
<el-table-column prop="startFlag" label="*起始标识" width="200">
<el-table-column prop="startFlag" label="*起始标识">
<template #default="{ row }">
<el-input v-model="row.startFlag" v-if="row.isEdit" />
<span v-else>{{ row.startFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="endFlag" label="*截止标识" width="200">
<el-table-column prop="endFlag" label="*截止标识">
<template #default="{ row }">
<el-input v-model="row.endFlag" v-if="row.isEdit" />
<span v-else>{{ row.endFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="headPerson" label="*验收负责人" width="200">
<el-table-column prop="headPerson" label="*验收负责人">
<template #default="{ row }">
<el-input v-model="row.headPerson" v-if="row.isEdit" />
<span v-else>{{ row.headPerson }}</span>
</template>
</el-table-column>
<el-table-column prop="headPersonPhone" label="*负责人电话" width="200">
<el-table-column prop="headPersonPhone" label="*负责人电话">
<template #default="{ row, $index }">
<el-input v-model="row.headPersonPhone" v-if="row.isEdit" @blur="e => validatorPhone(e, $index)" />
<span v-else>{{ row.headPersonPhone }}</span>
@ -119,13 +119,13 @@
<span v-else>{{ row.type1 }}</span>
</template>
</el-table-column> -->
<el-table-column prop="remark" label="备注" width="200">
<el-table-column prop="remark" label="备注">
<template #default="{ row }">
<el-input v-model="row.remark" v-if="row.isEdit" />
<span v-else>{{ row.remark }}</span>
</template>
</el-table-column>
<el-table-column align="center" width="180" fixed="right" label="操作" v-if="title == '新增' || title == '重新发起'">
<el-table-column align="center" fixed="right" label="操作" v-if="title == '新增' || title == '重新发起'">
<template #default="scope">
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@ -170,7 +170,7 @@
:cell-style="{ height: '40px', textAlign: 'center' }"
>
<el-table-column type="index" label="序号" width="200" />
<el-table-column prop="annexName" label="*附件名称">
<el-table-column prop="annexName" label="*附件名称" width="900">
<template #default="{ row, $index }">
<span v-if="title != '新增' && title != '重新发起'">{{ row.annexName }}</span>
<el-input v-else class="test" v-model="row.annexName" />

8
src/views/enterprise/monthlyReport/index.vue
View File

@ -151,10 +151,6 @@ const columns: ColumnProps[] = [
prop: "createByName",
label: "填写人"
},
{
prop: "annexFile",
label: "附件"
},
{
prop: "createTime",
label: "创建时间",
@ -168,6 +164,10 @@ const columns: ColumnProps[] = [
}
}
},
{
prop: "annexFile",
label: "附件"
},
{ prop: "operation", align: "left", label: "操作", fixed: "right", width: 260 }
];
const submitForm = async (formEl: FormInstance | undefined, form: any) => {

5
src/views/goverment/dustManagement/index.scss
View File

@ -205,7 +205,12 @@
}
.leftMenu_item {
.middleSize {
display: inline-block;
width: 80%;
font-size: 12px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
img {
margin: 0 4px;

7
src/views/goverment/dustManagement/index.vue
View File

@ -17,10 +17,13 @@
(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
}}</span>
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<div style="width: 100%; margin-top: 5px; display: flex; align-items: center">
<img src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
<!-- <div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />
<span class="middleSize">今日报警次数：{{ data.todayAlarm }}</span>

18
src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -46,8 +46,8 @@
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
>
<el-table-column type="index" label="序号" width="100" />
<el-table-column prop="singleId" label="单体工程" width="200">
<el-table-column type="index" label="序号" />
<el-table-column prop="singleId" label="单体工程">
<template #default="{ row }">
<el-select v-if="row.isEdit" style="width: 100%" v-model="row.singleId" clearable placeholder="请选择">
<el-option v-for="item in singleEngineerList" :key="item.singleId" :label="item.name" :value="item.singleId" />
@ -56,7 +56,7 @@
<span v-else>{{ row.singleProject }}</span>
</template>
</el-table-column>
<el-table-column prop="planCheckDate" label="计划验收时间" width="200">
<el-table-column prop="planCheckDate" label="计划验收时间" width="160">
<template #default="{ row }">
<el-date-picker
v-if="row.isEdit"
@ -70,31 +70,31 @@
<span v-else>{{ row.planCheckDate }}</span>
</template>
</el-table-column>
<el-table-column prop="startFlag" label="起始标识" width="200">
<el-table-column prop="startFlag" label="起始标识">
<template #default="{ row }">
<el-input v-model="row.startFlag" v-if="row.isEdit" />
<span v-else>{{ row.startFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="endFlag" label="截止标识" width="200">
<el-table-column prop="endFlag" label="截止标识">
<template #default="{ row }">
<el-input v-model="row.endFlag" v-if="row.isEdit" />
<span v-else>{{ row.endFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="headPerson" label="验收负责人" width="200">
<el-table-column prop="headPerson" label="验收负责人">
<template #default="{ row }">
<el-input v-model="row.headPerson" v-if="row.isEdit" />
<span v-else>{{ row.headPerson }}</span>
</template>
</el-table-column>
<el-table-column prop="headPersonPhone" label="负责人电话" width="200">
<el-table-column prop="headPersonPhone" label="负责人电话">
<template #default="{ row, $index }">
<el-input v-model="row.headPersonPhone" v-if="row.isEdit" @blur="e => validatorPhone(e, $index)" />
<span v-else>{{ row.headPersonPhone }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="200">
<el-table-column prop="remark" label="备注">
<template #default="{ row }">
<el-input v-model="row.remark" v-if="row.isEdit" />
<span v-else>{{ row.remark }}</span>
@ -125,7 +125,7 @@
:cell-style="{ height: '40px', textAlign: 'center' }"
>
<el-table-column type="index" label="序号" width="200" />
<el-table-column prop="annexName" label="附件名称">
<el-table-column prop="annexName" label="*附件名称" width="900">
<template #default="{ row, $index }">
<span>{{ row.annexName }}</span>
</template>

6
src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue
View File

@ -88,11 +88,11 @@ const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
// 多级 prop
{ prop: "stage", label: "验收阶段", search: { el: "input" } },
{ prop: "stage", label: "验收阶段", search: { el: "input" }, width: 150 },
{ prop: "typeName", label: "类型" },
{ prop: "singleProject", label: "单体工程" },
{ prop: "planCheckDate", label: "计划验收日期", width: 150 },
{ prop: "singleProject", label: "单体工程", width: 200 },
{ prop: "planCheckDate", label: "计划验收日期", width: 120 },
{ prop: "startFlag", label: "起始标识" },
{ prop: "endFlag", label: "截止标识" },
{ prop: "headPerson", label: "验收负责人", width: 120 },

10
src/views/goverment/liftSupervision/operatingData/index.scss
View File

@ -21,6 +21,10 @@
// 页面的项目工程
.leftProject {
display: flex;
flex-direction: column;
justify-content: center;
height: 100%;
color: #333333;
border-radius: 8px;
@ -35,9 +39,9 @@
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: 8px;
}
.leftMenu_item {
margin-top: 20px;
.middleSize {
font-size: 12px;
}
@ -63,6 +67,9 @@
overflow-y: scroll;
border-radius: 8px;
:deep() {
.item {
height: 78px !important;
}
.content {
height: calc(100% - 150px);
}
@ -71,7 +78,6 @@
}
.monitor-data {
@include boxStyle;
flex: 1;
height: 100%;
.monitor-title {

8
src/views/goverment/monthlyReport/index.vue
View File

@ -118,10 +118,6 @@ const columns: ColumnProps[] = [
prop: "createByName",
label: "填写人"
},
{
prop: "annexFile",
label: "附件"
},
{
prop: "createTime",
label: "创建时间",
@ -135,6 +131,10 @@ const columns: ColumnProps[] = [
}
}
},
{
prop: "annexFile",
label: "附件"
},
{ prop: "operation", align: "left", label: "操作", fixed: "right", width: 260 }
];

8
src/views/goverment/towerCraneSupervision/operatingData/index.scss
View File

@ -22,7 +22,7 @@
.leftProject {
display: flex;
flex-direction: column;
justify-content: space-around;
justify-content: center;
height: 100%;
border-radius: 8px;
color: #333333;
@ -37,6 +37,7 @@
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: 8px;
}
.leftMenu_item {
.middleSize {
@ -63,6 +64,9 @@
overflow-y: scroll;
margin-right: 20px;
:deep() {
.item {
height: 78px !important;
}
.content {
height: calc(100% - 150px);
}
@ -73,7 +77,7 @@
@include boxStyle;
flex: 1;
height: 100%;
min-height: 600px;
// min-height: 600px;
overflow-y: scroll;
.monitor-title {
margin-top: 15px;

4
src/views/goverment/unmannedVideo/accessSituation/index.scss
View File

@ -136,6 +136,9 @@
border-radius: 50%;
}
.leftMenu {
:deep(.item) {
height: 78px !important;
}
// width: 290px;
// 页面的项目工程
.leftProject {
@ -151,6 +154,7 @@
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: 5px;
}
.leftMenu_item {
display: flex;

8
src/views/goverment/unmannedVideo/alarmRecord/index.scss
View File

@ -90,7 +90,11 @@
}
// 页面的项目工程
.leftProject {
.leftMenu {
:deep(.item) {
height: 78px !important;
}
.leftProject {
color: #333333;
.projectName {
display: block;
@ -102,6 +106,7 @@
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: 5px;
}
.leftMenu_item {
display: flex;
@ -119,6 +124,7 @@
color: #666666;
}
}
}
}
:deep(.el-form .el-form-item__content .el-range-editor) {
width: 200px;

1
src/views/goverment/unmannedVideo/alarmRecord/index.vue
View File

@ -7,6 +7,7 @@
@change-page="onCurChange"
@search="onSearchInput"
:pageable="pages"
class="leftMenu"
>
<!-- :change-color="changeColor" -->
<template #default="{ data }">

20
src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -65,8 +65,8 @@
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
>
<el-table-column type="index" label="序号" width="100" />
<el-table-column prop="singleId" label="*单体工程" width="200">
<el-table-column type="index" label="序号" />
<el-table-column prop="singleId" label="*单体工程">
<template #default="{ row }">
<el-select v-if="row.isEdit" style="width: 100%" v-model="row.singleId" clearable placeholder="请选择">
<el-option v-for="item in singleEngineerList" :key="item.singleId" :label="item.name" :value="item.singleId" />
@ -75,7 +75,7 @@
<span v-else>{{ row.singleProject || singleEngText(row.singleId) }}</span>
</template>
</el-table-column>
<el-table-column prop="planCheckDate" label="*计划验收时间" width="200">
<el-table-column prop="planCheckDate" label="*计划验收时间" width="160">
<template #default="{ row }">
<el-date-picker
v-if="row.isEdit"
@ -89,25 +89,25 @@
<span v-else>{{ row.planCheckDate }}</span>
</template>
</el-table-column>
<el-table-column prop="startFlag" label="*起始标识" width="200">
<el-table-column prop="startFlag" label="*起始标识">
<template #default="{ row }">
<el-input v-model="row.startFlag" v-if="row.isEdit" />
<span v-else>{{ row.startFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="endFlag" label="*截止标识" width="200">
<el-table-column prop="endFlag" label="*截止标识">
<template #default="{ row }">
<el-input v-model="row.endFlag" v-if="row.isEdit" />
<span v-else>{{ row.endFlag }}</span>
</template>
</el-table-column>
<el-table-column prop="headPerson" label="*验收负责人" width="200">
<el-table-column prop="headPerson" label="*验收负责人">
<template #default="{ row }">
<el-input v-model="row.headPerson" v-if="row.isEdit" />
<span v-else>{{ row.headPerson }}</span>
</template>
</el-table-column>
<el-table-column prop="headPersonPhone" label="*负责人电话" width="200">
<el-table-column prop="headPersonPhone" label="*负责人电话">
<template #default="{ row, $index }">
<el-input v-model="row.headPersonPhone" v-if="row.isEdit" @blur="e => validatorPhone(e, $index)" />
<span v-else>{{ row.headPersonPhone }}</span>
@ -119,13 +119,13 @@
<span v-else>{{ row.type1 }}</span>
</template>
</el-table-column> -->
<el-table-column prop="remark" label="备注" width="200">
<el-table-column prop="remark" label="备注">
<template #default="{ row }">
<el-input v-model="row.remark" v-if="row.isEdit" />
<span v-else>{{ row.remark }}</span>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" width="180" label="操作" v-if="title == '新增' || title == '重新发起'">
<el-table-column align="center" fixed="right" label="操作" v-if="title == '新增' || title == '重新发起'">
<template #default="scope">
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@ -170,7 +170,7 @@
:cell-style="{ height: '40px', textAlign: 'center' }"
>
<el-table-column type="index" label="序号" width="200" />
<el-table-column prop="annexName" label="*附件名称">
<el-table-column prop="annexName" label="*附件名称" width="900">
<template #default="{ row, $index }">
<span v-if="title != '新增' && title != '重新发起'">{{ row.annexName }}</span>
<el-input v-else class="test" v-model="row.annexName" />

8
src/views/project/monthlyReport/index.vue
View File

@ -153,10 +153,6 @@ const columns: ColumnProps[] = [
prop: "createByName",
label: "填写人"
},
{
prop: "annexFile",
label: "附件"
},
{
prop: "createTime",
label: "创建时间",
@ -170,6 +166,10 @@ const columns: ColumnProps[] = [
}
}
},
{
prop: "annexFile",
label: "附件"
},
{ prop: "operation", align: "left", label: "操作", fixed: "right", width: 260 }
];
const submitForm = async (formEl: FormInstance | undefined, form: any) => {