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

Merge branch 'zhipeng_dev' into 'shenzhen-dev'

Browse Source 
feat: 样式修复

See merge request !9
This commit is contained in:
Jane 2023-05-23 17:50:28 +08:00
commit 0d2ba27351
19 changed files with 110 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -6,7 +6,7 @@
"author": "SpicyBoy <848130454@qq.com>", "author": "SpicyBoy <848130454@qq.com>",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vite --mode development", "dev": "vite --mode production",
"serve": "vite", "serve": "vite",
"build:dev": "vue-tsc --noEmit && vite build --mode development", "build:dev": "vue-tsc --noEmit && vite build --mode development",
"build:test": "vue-tsc --noEmit && vite build --mode test", "build:test": "vue-tsc --noEmit && vite build --mode test",

23
src/layouts/LayoutClassic/index.vue
View File

@ -27,6 +27,7 @@
:unique-opened="true" :unique-opened="true"
background-color="#ffffff" background-color="#ffffff"
text-color="#333333 " text-color="#333333 "
style="--el-menu-hover-bg-color: #fff"
> >
<SubMenu :menuList="menuList" /> <SubMenu :menuList="menuList" />
</el-menu> </el-menu>
@ -87,15 +88,19 @@ const goHome = () => {
.el-menu-item { .el-menu-item {
&.is-active { &.is-active {
// background: var(--el-color-primary-light-9); // background: var(--el-color-primary-light-9);
&::before { // &::before {
position: absolute; // position: absolute;
top: 12px; // top: 12px;
bottom: 0; // bottom: 0;
right: 0; // right: 0;
width: 4px; // width: 4px;
height: 38px; // height: 38px;
content: ""; // content: "";
background: var(--el-color-primary); // background: var(--el-color-primary);
// }
border-right: 4px solid #008bff;
&.is:hover {
background-color: #fff;
} }
} }
} }

3
src/styles/element.scss
View File

@ -29,6 +29,7 @@
// border: 1px solid var(--el-border-color-light); // border: 1px solid var(--el-border-color-light);
border-radius: 8px; border-radius: 8px;
// box-shadow: 0 0 12px rgb(0 0 0 / 5%); // box-shadow: 0 0 12px rgb(0 0 0 / 5%);
height: 56px;
} }
// * 不需要 card 卡片样式（在组件内使用 proTable 会使用到） // * 不需要 card 卡片样式（在组件内使用 proTable 会使用到）
@ -93,7 +94,7 @@
// table-search 表格搜索样式 // table-search 表格搜索样式
.table-search { .table-search {
padding: 18px 18px 0; padding: 12px 0 12px 36px;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 8px; border-radius: 8px;
.el-form { .el-form {

9
src/views/enterprise/AIwarning/accessSituation/index.scss
View File

@ -32,15 +32,14 @@
height: 56px; height: 56px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 8px; border-radius: 8px;
height: 56px;
// display: flex;
// // justify-content: center;
// align-items: center;
} }
.form { .form {
padding: 16px 0 0 36px; padding: 6px 0 0 36px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 8px; border-radius: 8px;
line-height: 48px;
margin-top: 10px;
} }
.imgPage { .imgPage {
box-sizing: border-box; box-sizing: border-box;

58
src/views/enterprise/AIwarning/accessSituation/index.vue
View File

@ -43,40 +43,34 @@
</LeftMenu> </LeftMenu>
<div class="right_container"> <div class="right_container">
<!-- <div class="form_div"> --> <div class="form_div">
<el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef"> <el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef">
<el-form-item label="监控名称"> <el-form-item label="监控名称">
<el-select class="select" v-model="form.code" placeholder="请输入"> <el-select class="select" v-model="form.code" placeholder="请输入">
<el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="form.createTime" v-model="form.createTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@change="onDatePicker" @change="onDatePicker"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handSearch">查询</el-button> <el-button type="primary" @click="handSearch">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- </div> --> </div>
<div class="imgPage"> <div class="imgPage">
<div class="imgTable"> <div class="imgTable">
<div <div class="img_item" v-for="item in questList.records" @click="onShowImg(item)" :key="item.id" v-if="qusLength.length">
class="img_item"
v-for="item in questList.records"
@click="onShowImg(item)"
:key="item.id"
v-if="questList.records.length"
>
<el-image style="width: 100%; height: 182px" :src="item.image" fit="fill" /> <el-image style="width: 100%; height: 182px" :src="item.image" fit="fill" />
<div class="page_text flx-justify-column"> <div class="page_text flx-justify-column">
<div class="img_title">{{ item.typeName }}</div> <div class="img_title">{{ item.typeName }}</div>
@ -158,6 +152,7 @@ const visible = ref(false);
// 搜索用的工程sn // 搜索用的工程sn
const searchSn = ref(""); const searchSn = ref("");
const qusLength = ref([]);
// 项目或者工程名字 // 项目或者工程名字
const searchName = ref<string>(""); const searchName = ref<string>("");
@ -332,6 +327,7 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
pageSize: pageable.value.pageSize pageSize: pageable.value.pageSize
}); });
questList.value = res.result; questList.value = res.result;
qusLength.value = res.result.records;
pageable.value.total = +res.result.total; pageable.value.total = +res.result.total;
searchSn.value = (params as ResAiEngineerPage).engineeringSn; searchSn.value = (params as ResAiEngineerPage).engineeringSn;
searchName.value = (params as ResAiEngineerPage).engineeringName; searchName.value = (params as ResAiEngineerPage).engineeringName;

2
src/views/enterprise/notice/myReceive/index.vue
View File

@ -61,7 +61,7 @@
<el-table-column prop="readTime" label="查看时间" /> <el-table-column prop="readTime" label="查看时间" />
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" v-else @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>

4
src/views/enterprise/userManagement/roleManage/index.vue
View File

@ -36,8 +36,8 @@
<el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree> <el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree>
</el-scrollbar> </el-scrollbar>
<template #footer> <template #footer>
<div style="flex: auto"> <div class="flx-center">
<el-button @click="cacel">取消</el-button> <el-button style="margin-right: 60px" @click="cacel">取消</el-button>
<el-button type="primary" @click="confirm">保存并关闭</el-button> <el-button type="primary" @click="confirm">保存并关闭</el-button>
</div> </div>
</template> </template>

2
src/views/goverment/notice/myReceive/index.vue
View File

@ -61,7 +61,7 @@
<el-table-column prop="readTime" label="查看时间" /> <el-table-column prop="readTime" label="查看时间" />
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" v-else @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>

10
src/views/goverment/notice/newNotification/index.scss
View File

@ -2,10 +2,10 @@
.topCard { .topCard {
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 8px; border-radius: 8px;
height: 68px; height: 56px;
.noticeForm { // .noticeForm {
margin-top: 6px; // margin-bottom: 18px;
} // }
} }
.content { .content {
display: flex; display: flex;
@ -15,11 +15,13 @@
padding: 26px 36px 0 0; padding: 26px 36px 0 0;
width: 60%; width: 60%;
background-color: #fff; background-color: #fff;
border-radius: 8px;
} }
.right-content { .right-content {
margin-left: 20px; margin-left: 20px;
background-color: #fff; background-color: #fff;
flex: 1; flex: 1;
border-radius: 8px;
padding-left: 20px; padding-left: 20px;
.book-content { .book-content {
margin: 20px 0; margin: 20px 0;

4
src/views/goverment/notice/newNotification/index.vue
View File

@ -15,7 +15,7 @@
<el-form :model="leftForm" label-width="100"> <el-form :model="leftForm" label-width="100">
<el-form-item label="收件人"> <el-form-item label="收件人">
<div class="tag-input"> <div class="tag-input">
<el-tag class="m-4" v-for="item in tags" closable :key="item" @close="handleClose(item)">{{ <el-tag class="m-4" v-for="item in tags" :key="item" @close="handleClose(item)">{{
item.realName || item.enterpriseName || item.projectName || item.acceptName item.realName || item.enterpriseName || item.projectName || item.acceptName
}}</el-tag> }}</el-tag>
</div> </div>
@ -338,7 +338,7 @@ onUnmounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./index.scss"; @import "./index.scss";
:deep(.el-card__body) { :deep(.el-card__body) {
padding: 12px 0 6px 36px; padding: 12px 0 0px 36px;
} }
.test :deep(.el-input__wrapper) { .test :deep(.el-input__wrapper) {
box-shadow: 0 0 0 0; box-shadow: 0 0 0 0;

8
src/views/goverment/userManagement/departmentManage/index.scss
View File

@ -4,17 +4,19 @@
.base-box { .base-box {
// height: calc(100% + 20px); // height: calc(100% + 20px);
flex: 1; flex: 1;
margin: 10px 10px 0 10px; margin: 20px 10px 0 10px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 12px; border-radius: 12px;
} }
.protable { .protable {
// flex: 1; // flex: 1;
padding: 10px; padding: 10px;
height: calc(100% - 164px); height: calc(100% - 134px);
} }
:deep(.el-card) { :deep(.el-card) {
margin: 2px 10px 10px; margin: 2px 10px 0px;
border: none; border: none;
border-radius: 8px; border-radius: 8px;
height: 56px;
// padding-bottom: 6px;
} }

4
src/views/goverment/userManagement/roleManage/index.vue
View File

@ -37,8 +37,8 @@
<el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree> <el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree>
</el-scrollbar> </el-scrollbar>
<template #footer> <template #footer>
<div style="flex: auto"> <div class="flx-center">
<el-button @click="cacel">取消</el-button> <el-button style="margin-right: 60px" @click="cacel">取消</el-button>
<el-button type="primary" @click="confirm">保存并关闭</el-button> <el-button type="primary" @click="confirm">保存并关闭</el-button>
</div> </div>
</template> </template>

2
src/views/jxjview/menumanage/index.vue
View File

@ -731,7 +731,7 @@ onMounted(async () => {
margin-bottom: 20px; margin-bottom: 20px;
} }
:deep(.el-card__body) { :deep(.el-card__body) {
padding: 18px 0 18px 36px; padding: 12px 0 12px 36px;
} }
:deep(.el-select--default) { :deep(.el-select--default) {
width: 100%; width: 100%;

18
src/views/project/AIwarning/accessSituation/index.scss
View File

@ -4,12 +4,6 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.form {
// height: 46px;
padding: 20px 0 0 36px;
background-color: #ffffff;
border-radius: 8px;
}
.imgPage { .imgPage {
box-sizing: border-box; box-sizing: border-box;
flex: 1; flex: 1;
@ -157,3 +151,15 @@
color: #8c939d; color: #8c939d;
text-align: center; text-align: center;
} }
.form-top {
height: 56px;
border-radius: 8px;
background-color: #fff;
.form {
// height: 46px;
padding: 0px 0 0 36px;
background-color: #ffffff;
margin-top: 14px;
border-radius: 8px;
}
}

46
src/views/project/AIwarning/accessSituation/index.vue
View File

@ -1,28 +1,30 @@
<!-- 项目的报警记录 --> <!-- 项目的报警记录 -->
<template> <template>
<div class="table-box"> <div class="table-box">
<el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef"> <div class="form-top">
<el-form-item label="监控名称"> <el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef">
<el-select clearable class="select" v-model="form.code" placeholder="请输入"> <el-form-item label="监控名称">
<el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" /> <el-select clearable class="select" v-model="form.code" placeholder="请输入">
</el-select> <el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" />
</el-form-item> </el-select>
<el-form-item label="创建时间"> </el-form-item>
<el-date-picker <el-form-item label="创建时间">
v-model="form.createTime" <el-date-picker
type="daterange" v-model="form.createTime"
range-separator="至" type="daterange"
start-placeholder="开始日期" range-separator="至"
end-placeholder="结束日期" start-placeholder="开始日期"
format="YYYY-MM-DD" end-placeholder="结束日期"
value-format="YYYY-MM-DD" format="YYYY-MM-DD"
@change="onDatePicker" value-format="YYYY-MM-DD"
/> @change="onDatePicker"
</el-form-item> />
<el-form-item> </el-form-item>
<el-button type="primary" @click="handSearch">查询</el-button> <el-form-item>
</el-form-item> <el-button type="primary" @click="handSearch">查询</el-button>
</el-form> </el-form-item>
</el-form>
</div>
<div class="imgPage"> <div class="imgPage">
<div class="imgTable" v-if="qusLength.length"> <div class="imgTable" v-if="qusLength.length">

2
src/views/project/notice/myReceive/index.vue
View File

@ -61,7 +61,7 @@
<el-table-column prop="readTime" label="查看时间" /> <el-table-column prop="readTime" label="查看时间" />
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" v-else @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>

1
src/views/project/supervision/ProjectSupervision/index.scss
View File

@ -7,6 +7,7 @@
// padding: 2% 4%; // padding: 2% 4%;
margin: 0 auto; margin: 0 auto;
background-color: #ffffff; background-color: #ffffff;
border-radius: 8px;
.common { .common {
padding-bottom: 30px; padding-bottom: 30px;
margin-top: 3%; margin-top: 3%;

4
src/views/project/supervision/ProjectSupervision/overview.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="overview"> <div class="overview">
<!-- <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules" class="form" size="default"> --> <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules" class="form" size="default">
<el-form ref="ruleFormRef" :model="form" label-width="150px" class="form" size="default"> <!-- <el-form ref="ruleFormRef" :model="form" label-width="150px" class="form" size="default"> -->
<el-form-item label="项目名称:" prop="projectName"> <el-form-item label="项目名称:" prop="projectName">
<el-input placeholder="请输入" v-model="form.projectName" disabled /> <el-input placeholder="请输入" v-model="form.projectName" disabled />
</el-form-item> </el-form-item>

4
src/views/project/userManagement/roleManage/index.vue
View File

@ -36,8 +36,8 @@
<el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree> <el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree>
</el-scrollbar> </el-scrollbar>
<template #footer> <template #footer>
<div style="flex: auto"> <div class="flx-center">
<el-button @click="cacel">取消</el-button> <el-button style="margin-right: 60px" @click="cacel">取消</el-button>
<el-button type="primary" @click="confirm">保存并关闭</el-button> <el-button type="primary" @click="confirm">保存并关闭</el-button>
</div> </div>
</template> </template>