04e25ae1 by 任超

style:样式的整改

1 parent acca3b99
Showing 49 changed files with 219 additions and 219 deletions
###
# @Description:
# @Autor: renchao
# @LastEditTime: 2023-03-02 15:44:12
# @LastEditTime: 2023-03-20 13:18:03
###
# just a flag
ENV = 'development'
......
{
"TITLE": "汉中市数据上报系统"
"TITLE": "汉中市数据上报系统",
"THEME": "jg"
}
\ No newline at end of file
......
<!--
* @Description: 引入配置文件
* @Autor: renchao
* @LastEditTime: 2023-03-15 17:11:59
* @LastEditTime: 2023-03-20 15:16:11
-->
<!DOCTYPE html>
<html>
......@@ -26,8 +26,6 @@
<script>
window.baseUrl = location.origin || location.protocol + '//' + location.host
// window.authorization = 'bearer AT-14-h4UlUGjPvgmrIgnDO-3QgMP0m4YJGQTR';
// window.authorization = 'bearer AT-223-c-Q86EHx75m7ig3EDf-SwMWl4U0AKn0b';
window.timeout = 5000
window.authorization = "bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6"
</script>
\ No newline at end of file
......
......@@ -55,57 +55,5 @@ export default {
</script>
<style lang="scss" scoped>
.breadcrumb {
width: 80%;
text-indent: 10px;
background: url("~@/image/breadcrumb.png") no-repeat;
background-size: 100% 100%;
line-height: 32px;
height: 32px;
padding-left: 35px;
margin: 8px 0 10px 6px;
color: #CEF8FF;
}
/deep/.el-icon-arrow-right {
width: 2px;
position: relative;
left: -10px;
color: #FFFFFF;
// background-color: rgb(155, 200, 200);
}
/deep/.el-breadcrumb__inner {
color: #CEF8FF !important;
}
.breadcrumb1366 {
padding: 10px 0 !important;
}
.isFullScreen {
width: calc(100% - 20px);
margin: 0 auto;
padding: 10px !important;
}
.cur-location {
font-size: 16px;
color: white;
line-height: 40px;
float: left;
img {
position: relative;
top: 3px;
margin-right: 4px;
}
}
.el-breadcrumb__inner a,
.el-breadcrumb__inner.is-link {
color: white;
cursor: text;
font-weight: normal;
}
</style>
......
......@@ -43,9 +43,6 @@ export default {
}
</script>
<style scoped lang='scss'>
@import '~@/styles/public.scss';
.result {
padding: 15px;
height: 100%;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-16 11:15:48
* @LastEditTime: 2023-03-20 14:22:35
-->
<template>
<div class="app-wrapper jgWrapper">
......
......@@ -21,10 +21,10 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from './Breadcrumb'
import defaultSettings from '@/settings'
export default {
import { mapGetters } from 'vuex'
import Breadcrumb from './Breadcrumb'
import defaultSettings from '@/settings'
export default {
components: {
Breadcrumb
},
......@@ -51,10 +51,12 @@
}
}
}
}
}
</script>
<style lang="scss" scoped>
.navbar-con {
@import "~@/styles/_handle.scss";
.navbar-con {
position: relative;
.logo {
......@@ -62,24 +64,26 @@
font-size: 26px;
font-weight: 700;
display: flex;
img {
width: 47px;
height: 47px;
}
h4 {
margin-left: 20px;
height: 50px;
line-height: 50px;
}
}
}
}
.NoticeBar {
.NoticeBar {
position: absolute;
bottom: 0;
}
}
.el-dropdown-menu {
.el-dropdown-menu {
padding: 0 !important;
border: 1px solid #ebeef5;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12);
......@@ -89,7 +93,6 @@
text-align: center;
margin-top: 0 !important;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #4a4a4a;
width: 140px;
......@@ -112,17 +115,19 @@
background: #f6f7f9;
color: #4a4a4a;
}
}
}
.navbar {
.navbar {
height: $headerHeight;
overflow: hidden;
position: relative;
background: linear-gradient(270deg, #ebf1ff 0%, #3d59c4 100%);
@include background_color("navbg");
display: flex;
align-items: center;
padding-right: 20px;
justify-content: space-between;
.header-logo {
width: 300px;
}
......@@ -240,5 +245,5 @@
}
}
}
}
}
</style>
......
/*
* @Author: yangwei
* @Date: 2023-01-16 09:10:12
* @LastEditors: yangwei
* @LastEditTime: 2023-03-16 09:33:27
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-03-20 13:11:42
* @FilePath: \bdcjg-web\src\main.js
* @Description:
*
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-15 11:17:28
* @LastEditTime: 2023-03-20 14:35:04
*/
import router from "./router";
import store from "./store";
......@@ -9,10 +9,14 @@ import { getMenuInfo } from "@/api/user";
import NProgress from "nprogress"; // progress bar
import "nprogress/nprogress.css"; // progress bar style
import getPageTitle from "@/utils/get-page-title";
import getTheme from "@/utils/theme";
import Cookies from "js-cookie";
NProgress.configure({ showSpinner: false }); // NProgress Configuration
NProgress.configure({ showSpinner: false });
router.beforeEach(async (to, from, next) => {
getTheme()
NProgress.start();
window.document.documentElement.setAttribute("data-theme", 'blue');
document.title = getPageTitle(to.meta.title);
let hasAddDict = store.state.dict.addDict;
let hasUser = store.state.user.hasUser;
......@@ -29,7 +33,7 @@ router.beforeEach(async (to, from, next) => {
//请求用户信息
if (!hasUser) {
store.dispatch("user/getUserInfo");
import("@/styles/public.scss");
// import("@/styles/public.scss");
}
if (hasAddRoute) {
next();
......
@import "./_themes.scss";
//遍历主题map
@mixin themeify {
@each $theme-name,
$theme-map in $themes {
//!global 把局部变量强升为全局变量
$theme-map: $theme-map !global;
//判断html的data-theme的属性值 #{}是sass的插值表达式
//& sass嵌套里的父容器标识 @content是混合器插槽,像vue的slot
[data-theme="#{$theme-name}"] & {
@content;
}
}
}
//声明一个根据Key获取颜色的function
@function themed($key) {
@return map-get($theme-map, $key);
}
//获取渐变背景
@mixin background($color) {
@include themeify {
background: themed($color) !important;
}
}
//获取背景颜色
@mixin background_color($color) {
@include themeify {
background-color: themed($color) !important;
}
}
//获取字体颜色
@mixin font_color($color) {
@include themeify {
color: themed($color)!important;
}
}
\ No newline at end of file
$themes: (blue: ( //背景
navbg: #3D59C4,
menuBg: #121F41,
menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
//字体
menuText: #A1A7C2,
menuActiveText: #FFFFFF
),
green: (
navbg: #0F8B80,
menuBg:#121A2E,
menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
//字体
menuText: #A1A7C2,
menuActiveText: #FFFFFF
)
)
\ No newline at end of file
@import './variables.scss';
@import './mixin.scss';
@import './transition.scss';
@import './element-ui.scss';
// @import './sidebar.scss';
// @import './element-ui.scss';
/* CSS 初始化 */
html,
body,
......@@ -137,8 +135,8 @@ ul li {
}
.mb-5 {
margin-bottom: 10px!important;
margin-top: 10px!important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
.pr-5 {
......@@ -150,8 +148,8 @@ ul li {
}
.mt-10 {
margin-top: 20px!important;
margin-bottom: 5px!important;
margin-top: 20px !important;
margin-bottom: 5px !important;
}
//flex 公共样式
......@@ -362,6 +360,7 @@ aside {
border-radius: 16px;
color: #0097FF;
}
.successColor:hover {
width: 64px;
height: 28px;
......@@ -369,6 +368,7 @@ aside {
border-radius: 16px;
color: #0097FF;
}
.configurationbtnColor {
width: 64px;
height: 28px;
......@@ -376,6 +376,7 @@ aside {
border-radius: 16px;
color: #b0e4dd;
}
.configurationbtnColor:hover {
width: 64px;
height: 28px;
......@@ -383,6 +384,7 @@ aside {
border-radius: 16px;
color: #b0e4dd;
}
.resetbtnColor {
width: 64px;
height: 28px;
......@@ -390,6 +392,7 @@ aside {
border-radius: 16px;
color: #A5CBDA;
}
.resetbtnColor:hover {
width: 64px;
height: 28px;
......@@ -397,6 +400,7 @@ aside {
border-radius: 16px;
color: #A5CBDA;
}
.movebtnColor {
width: 64px;
height: 28px;
......@@ -404,6 +408,7 @@ aside {
border-radius: 16px;
color: #0097FF;
}
.movebtnColor:hover {
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
......
@import '~@/styles/element-ui.scss';
.tableClass {
.el-table {
border: none !important;
......@@ -445,3 +447,51 @@
}
}
}
// 面包屑
.breadcrumb {
width: 80%;
text-indent: 10px;
background: url("~@/image/breadcrumb.png") no-repeat;
background-size: 100% 100%;
line-height: 32px;
height: 32px;
padding-left: 35px;
margin: 8px 0 10px 6px;
color: #CEF8FF;
}
.el-icon-arrow-right {
width: 2px;
position: relative;
left: -10px;
color: #FFFFFF;
}
.el-breadcrumb__inner {
color: #CEF8FF !important;
}
.breadcrumb1366 {
padding: 10px 0 !important;
}
.cur-location {
font-size: 16px;
color: white;
line-height: 40px;
float: left;
img {
position: relative;
top: 3px;
margin-right: 4px;
}
}
.el-breadcrumb__inner a,
.el-breadcrumb__inner.is-link {
color: white;
cursor: text;
font-weight: normal;
}
\ No newline at end of file
......
......@@ -340,5 +340,4 @@
word-break: break-all;
line-height: 20px;
flex: 1;
}
......
.scWrapper {
.main-container {
@import "~@/styles/_handle.scss";
.main-container {
width: 100%;
height: calc(100% - 74px);
transition: margin-left 0.28s;
display: flex;
}
}
.sidebar-container {
.sidebar-container {
transition: width 0.28s;
width: $sideBarWidth !important;
font-size: 0px;
margin-right: 15px;
background: #121F41;
@include background_color("menuBg");
.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out,
......@@ -58,7 +59,7 @@
// 有子级
.el-submenu__title {
padding-left: 10px !important;
color: $menuText;
@include font_color("menuText");
height: 42px;
background: linear-gradient(90deg, #013874 0%, #081B56 100%);
margin-bottom: 8px;
......@@ -77,14 +78,13 @@
// 没有子级
.submenu-title-noDropdown {
color: $menuText;
@include font_color("menuText");
padding-left: 20px;
margin-bottom: 8px;
background: linear-gradient(90deg, #013874 0%, #081B56 100%);
&:hover {
color: $menuActiveText !important;
background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
@include font_color("menuActiveText");
@include background("menuActive");
.svg-icon {
color: #1ea6f8 !important;
......@@ -98,8 +98,8 @@
.submenu-title-noDropdown.is-active,
.el-submenu__title.is-active {
color: $menuActiveText;
background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
@include background("menuActive");
@include font_color("menuActiveText");
.svg-icon {
color: #1ea6f8 !important;
......@@ -163,9 +163,9 @@
margin: 0 10px;
// border-radius: 6px;
}
}
}
.hideSidebar {
.hideSidebar {
.sidebar-container {
width: 54px !important;
}
......@@ -220,14 +220,14 @@
}
}
}
}
}
.el-menu--collapse .el-menu .el-submenu {
.el-menu--collapse .el-menu .el-submenu {
min-width: $sideBarWidth !important;
}
}
// mobile responsive
.mobile {
// mobile responsive
.mobile {
.main-container {
margin-left: 0px;
}
......@@ -244,15 +244,14 @@
transform: translate3d(-$sideBarWidth, 0, 0);
}
}
}
}
.withoutAnimation {
.withoutAnimation {
.main-container,
.sidebar-container {
transition: none;
}
}
}
// when menu collapsed
......@@ -275,11 +274,13 @@
border-bottom-right-radius: 8px;
font-weight: 600 !important;
font-size: 15px !important;
background-color: $menuHover !important;
@include background("menuActive");
// background-color: $menuHover !important;
color: $menuText !important;
&:hover {
background-color: $menuHover !important;
@include background("menuActive");
// background-color: $menuHover !important;
opacity: .9;
.svg-icon,
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-07 09:35:10
* @LastEditTime: 2023-03-20 15:12:38
*/
import Layout from '@/layout'
export default function filterAsyncRouter (routers) {
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-20 14:50:19
*/
import Vue from 'vue'
export default function getTheme (theme = Vue.prototype.BASE_API.THEME) {
const resultMap = {
'jg': function () {
import("@/styles/jgPublic.scss")
},
'sjsb': function () {
},
default: function () {
},
}
return resultMap[theme]() || resultMap.default()
}
......@@ -22,16 +22,6 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="5">
<el-form-item label="坐落">
<el-input v-model="form.ZL" placeholder="坐落"></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="5">
<el-form-item label="不动产权证号">
<el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="5">
<el-form-item label="权利人" label-width="80px">
<el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
......@@ -160,6 +150,3 @@ export default {
}
}
</script>
\ No newline at end of file
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -150,8 +150,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// 引入表单整体样式
// @import "~@/styles/public.scss";
</style>
......
......@@ -159,6 +159,3 @@
}
}
</script>
\ No newline at end of file
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -169,6 +169,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -135,6 +135,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -201,6 +201,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -151,6 +151,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -157,7 +157,4 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -164,6 +164,5 @@ export default {
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
@import "./index.scss";
</style>
......
......@@ -143,6 +143,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -148,6 +148,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -145,6 +145,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -158,7 +158,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// 引入表单整体样式
// @import "~@/styles/public.scss";
</style>
......
......@@ -150,6 +150,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -143,6 +143,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -321,8 +321,6 @@
};
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
.jktjDetail {
height: 100%;
display: flex;
......@@ -359,6 +357,4 @@
}
}
</style>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -286,8 +286,6 @@
};
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
.jktjDetail {
height: 100%;
display: flex;
......@@ -320,6 +318,3 @@
}
}
</style>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
......@@ -214,8 +214,6 @@
};
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
.jktjDetail {
height: 100%;
display: flex;
......@@ -248,6 +246,3 @@
}
}
</style>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-20 14:45:57
-->
<!--
功能:结果
作者:calliope
-->
......@@ -38,8 +43,6 @@ export default {
}
</script>
<style scoped lang='scss'>
@import '~@/styles/public.scss';
.result {
padding: 15px;
......
......@@ -99,17 +99,17 @@
</template>
<script>
// 接收报文查询
// 引入表格头部数据
import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
import { getReceiveDataReportPage } from "@/api/dataReport.js";
// 引入详情弹框
import dataDetails from "@/components/EditDialog";
//引入日期处理方法
import { timeFormat } from "@/utils/operation";
export default {
// 接收报文查询
// 引入表格头部数据
import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
import { getReceiveDataReportPage } from "@/api/dataReport.js";
// 引入详情弹框
import dataDetails from "@/components/EditDialog";
//引入日期处理方法
import { timeFormat } from "@/utils/operation";
export default {
name: "jsbwcx",
mixins: [tableMixin],
// 注册组件
......@@ -288,16 +288,11 @@
}
},
}
}
}
</script>
<style scoped lang="scss">
// 引入表单整体样式
// // @import "~@/styles/public.scss";
// 引入当前css
@import "./index.scss";
.lastdom:nth-child(3) {
.lastdom:nth-child(3) {
margin-bottom: 0px;
}
}
</style>
......
......@@ -170,10 +170,7 @@ export default {
}
</script>
<style scoped lang="scss">
// 引入表单整体样式
// @import "~@/styles/public.scss";
@import "../css/index.scss";
/deep/th.el-table__cell {
height: 0 !important;
}
......
......@@ -155,7 +155,6 @@ export default {
</script>
<style scoped lang="scss">
// 引入表单整体样式
// @import "~@/styles/public.scss";
@import "../css/index.scss";
/deep/.el-table thead.is-group th.el-table__cell {
......
......@@ -192,7 +192,6 @@ export default {
</script>
<style scoped lang="scss">
// 引入表单整体样式
// @import "~@/styles/public.scss";
@import "../css/index.scss";
/deep/.el-table thead.is-group th.el-table__cell {
......
......@@ -459,7 +459,6 @@ export default {
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
@import "~@/styles/dialogBox.scss";
......
......@@ -358,7 +358,6 @@ export default {
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
// @import "~@/styles/public.scss";
/deep/.el-radio {
margin-right: 5px !important;
......
......@@ -129,7 +129,6 @@ export default {
};
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
/deep/.dialogBox .dialog_title {
top: 0;
margin-left: 5px;
......
......@@ -68,7 +68,6 @@
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.information {
display: flex;
flex-direction: column;
......
......@@ -212,7 +212,6 @@
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
.btnColRight {
height: 30px;
.button {
......
......@@ -480,7 +480,6 @@
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
.btnColRight {
height: 30px;
.button {
......
......@@ -252,5 +252,4 @@ export default {
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
</style>
......
......@@ -199,6 +199,5 @@ export default {
};
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
@import "./index.scss";
</style>
......