政务端工作台样式修改、企业端首页样式修改、登录页样式修改

master
吕天方 8 months ago
parent ce5f99695c
commit c709a76189

@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "1.0.202408070944",
"version": "1.0.202408091105",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",

@ -1915,17 +1915,17 @@
height: 815px;
.col-left-box {
margin-right: 10px;
// display: grid;
// grid-template-columns: 1fr;
// row-gap: 10px;
// height: 100%;
display: flex;
flex-direction: column;
.appropriate-analyse-box {
.change-August-eight-th-style-row {
height: 50%;
margin-bottom: 10px;
display: flex;
}
.appropriate-analyse-box, .promote-analyse-box {
.change-August-eight-th-style {
margin-right: 10px;
}
.appropriate-analyse-box, .promote-analyse-box,.bottombox-right-box {
height: calc(50% - 5px);
// width: 100%;
// flex: 1;
background-color: #F5F8FA;
// height: 100%;
@ -1949,6 +1949,53 @@
color: #383838;
}
}
//
.brandPublicity-box {
padding: 20px 0;
height: 100%;
.promoteProject-box-wai-box {
height: calc(100% - 20px);
overflow-y: auto;
display: grid;
grid-template-columns: 1fr;
row-gap: 15px;
}
.promoteProject-box-div {
background: #FFFFFF;
padding: 18px 14px;
.promoteProject-top {
.span-one {
font-family: AlibabaPuHuiTiM;
font-size: 16px;
color: #1890FF;
font-style: normal;
text-decoration-line: underline;
text-transform: none;
}
}
.promoteProject-bottom {
margin-top: 16px;
display: flex;
justify-content: space-between;
.promoteProject-bottom-left {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-two {
font-family: AlibabaPuHuiTiM;
}
}
.promoteProject-bottom-right {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-three {
font-family: ArialB;
}
}
}
}
}
.capital-appropriate-analyse-box {
height: 400px;
#echartsFour {
@ -2038,6 +2085,9 @@
}
}
}
.appropriate-analyse-box,.bottombox-right-box {
height: calc(100% - 5px);
}
}
.col-right-box {
background-color: #F5F8FA;
@ -2165,89 +2215,11 @@
}
}
}
.main-row-three-bottombox {
display: flex;
height: 370px;
margin-top: 10px;
.bottombox-left-box {
margin-right: 10px;
}
.bottombox-left-box,.bottombox-right-box {
background-color: #F5F8FA;
height: 100%;
padding: 20px 20px 10px;
border-radius: 10px;
display: flex;
flex-direction: column;
.box-header {
display: flex;
align-items: center;
.garden {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: #0086FF;
margin-right: 10px;
}
.box-header-title {
font-family: AlibabaPuHuiTiB;
font-size: 16px;
color: #383838;
}
}
.featureProject-box,.brandPublicity-box {
// flex: 1;
padding: 20px 0;
height: calc(100% - 20px);
overflow-y: auto;
// height: calc(100% - 95px);
.promoteProject-box-wai-box {
// height: calc(100% - 105px);
// overflow-y: auto;
display: grid;
grid-template-columns: 1fr;
row-gap: 15px;
}
.promoteProject-box-div {
background: #FFFFFF;
padding: 14px;
position: relative;
.promoteProject-top {
.span-one {
font-family: AlibabaPuHuiTiM;
font-size: 16px;
color: #1890FF;
font-style: normal;
text-decoration-line: underline;
text-transform: none;
}
}
.promoteProject-bottom {
margin-top: 16px;
display: flex;
justify-content: space-between;
width: 85%;
.promoteProject-bottom-left {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-two {
font-family: AlibabaPuHuiTiM;
}
}
.promoteProject-bottom-right {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-three {
font-family: ArialB;
}
}
}
}
}
}
}
// .main-row-three-bottombox {
// display: flex;
// height: 370px;
// margin-top: 10px;
// }
}
}
}
@ -2259,6 +2231,88 @@
box-sizing: border-box;
}
}
// /
.bottombox-left-box {
margin-right: 10px;
}
.bottombox-left-box {
background-color: #F5F8FA;
height: 100%;
padding: 20px 20px 10px;
border-radius: 10px;
display: flex;
flex-direction: column;
.box-header {
display: flex;
align-items: center;
.garden {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: #0086FF;
margin-right: 10px;
}
.box-header-title {
font-family: AlibabaPuHuiTiB;
font-size: 16px;
color: #383838;
}
}
.featureProject-box {
// flex: 1;
padding: 20px 0;
height: 100%;
// height: calc(100% - 95px);
.promoteProject-box-wai-box {
height: calc(100% - 20px);
overflow-y: auto;
// height: calc(100% - 105px);
// overflow-y: auto;
display: grid;
grid-template-columns: 1fr;
row-gap: 15px;
}
.promoteProject-box-div {
background: #FFFFFF;
padding: 14px;
position: relative;
.promoteProject-top {
.span-one {
font-family: AlibabaPuHuiTiM;
font-size: 16px;
color: #1890FF;
font-style: normal;
text-decoration-line: underline;
text-transform: none;
}
}
.promoteProject-bottom {
margin-top: 16px;
display: flex;
justify-content: space-between;
width: 85%;
.promoteProject-bottom-left {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-two {
font-family: AlibabaPuHuiTiM;
}
}
.promoteProject-bottom-right {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #666666;
.span-three {
font-family: ArialB;
}
}
}
}
}
}
//
.home-box {
height: 100%;

@ -177,7 +177,7 @@ const user = {
}).catch(error => {
reject(error)
})
} else if(state.userType == "01") {
} else if(state.token && state.clientToken) {
return new Promise((resolve, reject) => {
enterpriseLogout({clienttoken: state.clientToken}).then(()=>{
commit('SET_CLIENTTOKEN', '')

@ -98,7 +98,8 @@
<!-- 第一个卡片 -->
<el-card shadow="always" v-for="(item,index) in cardData" :key="index">
<div slot="header" class="clearfix">
<span>{{ item.servicesType == 1 ? '生产性服务业' : item.servicesType == 2 ? '生活性服务业' : item.servicesType == 3 ? '新兴服务业' : item.servicesType == 4 ? '限上批零住餐' : '' }}</span>
<!-- <span>{{ item.servicesType == 1 ? '生产性服务业' : item.servicesType == 2 ? '生活性服务业' : item.servicesType == 3 ? '新兴服务业' : item.servicesType == 4 ? '限上批零住餐' : '' }}</span> -->
<span>{{ item.servicesType == 1 ? '生产性服务业' : item.servicesType == 2 ? '生活性服务业' : item.servicesType == 3 ? '规上服务业' : item.servicesType == 4 ? '限上批零住餐' : '' }}</span>
</div>
<div class="card-items">
<div class="card-item-left">

@ -101,7 +101,7 @@
</el-col>
<el-col :span="8" class="home-main-right">
<el-row type="flex" class="main-two-row">
<el-col :span="24" class="work-main-left" style="height: 64.5%;">
<el-col :span="24" class="work-main-left" style="height: 49.5%;">
<div class="main-left">
<div class="left-header">
<div class="left-header-titleS">
@ -160,7 +160,7 @@
</div>
</div>
</el-col>
<el-col :span="24" class="work-main-right" style="height: 34.5%;">
<el-col :span="24" class="work-main-right" style="height: 49.5%;">
<div class="main-right" id="task-box">
<div class="right-header" id="task-header">
<div class="right-header-box">

@ -11,7 +11,8 @@
<el-tab-pane label="企业用户登录" name="01"></el-tab-pane>
<el-tab-pane label="政务用户登录" name="02"></el-tab-pane>
</el-tabs>
<el-form-item prop="username" v-show="userType == '02'">
<!-- v-show="userType == '02'" -->
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
type="text"
@ -25,7 +26,7 @@
/>
</el-input>
</el-form-item>
<el-form-item prop="password" v-show="userType == '02'">
<el-form-item prop="password">
<el-input
v-model="loginForm.password"
type="password"
@ -40,7 +41,7 @@
/>
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled && userType == '02'">
<el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="loginForm.code"
auto-complete="off"
@ -60,11 +61,10 @@
</el-form-item>
<el-checkbox
v-model="loginForm.rememberMe"
v-show="userType == '02'"
style="margin: 0px 0px 25px 0px"
>记住密码</el-checkbox
>
<el-form-item style="width: 100%" v-if="userType == '02'">
<el-form-item style="width: 100%">
<el-button
:loading="loading"
size="medium"
@ -78,11 +78,20 @@
<el-button
size="medium"
type="primary"
v-if="userType == '02'"
style="width: 100%;margin-left: 0;margin-top: 20px;"
@click.native.prevent="changeHttp"
>
<span>政务通统一身份认证登录</span>
<!-- <span v-else> ...</span> -->
</el-button>
<el-button
size="medium"
type="primary"
v-if="userType == '01'"
style="width: 100%;margin-left: 0;margin-top: 20px;"
@click.native.prevent="changeHttp"
>
<span>企业统一身份认证登录</span>
</el-button>
<div style="float: right" v-if="register">
<router-link class="link-type" :to="'/register'"
@ -90,7 +99,7 @@
>
</div>
</el-form-item>
<el-form-item style="width: 100%" v-else class="enterBtnLogin">
<!-- <el-form-item style="width: 100%" class="enterBtnLogin">
<div class="wai-box">
<el-button
:loading="loading"
@ -103,7 +112,7 @@
<span v-else> ...</span>
</el-button>
</div>
</el-form-item>
</el-form-item> -->
</el-form>
<!-- 底部 -->
<!-- <div class="el-login-footer">
@ -160,14 +169,14 @@ export default {
},
},
created() {
// this.getCode();
this.getCode();
this.getCookie();
},
methods: {
handleClick(tab){
if(tab.index == "1") {
this.getCode();
}
// if(tab.index == "1") {
// this.getCode();
// }
},
getCode() {
getCodeImg().then((res) => {
@ -191,45 +200,45 @@ export default {
};
},
handleLogin() {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
Cookies.set("rememberMe", this.loginForm.rememberMe, {
expires: 30,
});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove("rememberMe");
}
this.$store
.dispatch("Login", {...this.loginForm,userType:this.userType})
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
// if(this.userType == "02") {
this.getCode();
// }
}
});
}
});
},
changeHttp(){
if(this.userType == '01') {
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
} else {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
Cookies.set("rememberMe", this.loginForm.rememberMe, {
expires: 30,
});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove("rememberMe");
}
this.$store
.dispatch("Login", {...this.loginForm,userType:this.userType})
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
if(this.userType == "02") {
this.getCode();
}
}
});
}
});
location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
}
},
changeHttp(){
location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
},
},
};
</script>

@ -40,7 +40,7 @@
/>
</el-input>
</el-form-item>
<el-form-item prop="code">
<el-form-item prop="code" v-if="false">
<el-input
v-model="loginForm.code"
auto-complete="off"
@ -144,7 +144,7 @@ export default {
},
},
created() {
this.getCode();
// this.getCode();
this.getCookie();
},
methods: {
@ -198,9 +198,9 @@ export default {
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
// if (this.captchaEnabled) {
// this.getCode();
// }
});
}
});
@ -241,7 +241,7 @@ export default {
border-radius: 6px;
background: #ffffff;
width: 400px;
height: 380px;
height: 330px;
padding: 25px 25px 5px 25px;
box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
.el-input {

@ -39,6 +39,14 @@ export default {
projectName:"产业活动名称",
enterprice:"省级",
time:"2023-02-11",
},{
projectName:"产业活动名称",
enterprice:"省级",
time:"2023-02-11",
},{
projectName:"产业活动名称",
enterprice:"省级",
time:"2023-02-11",
},
]
}

@ -6,13 +6,14 @@
import * as echarts from "echarts";
export default {
data() {
let colors = ['#EE462A','#FF8929', '#FFBB00', '#5CBC69', '#00AEFF']
// '#EE462A','#FF8929',
let colors = ['#FFBB00', '#5CBC69', '#00AEFF']
let datas = [
{ value: 300, proportion: 16, name: '制造业服务化奖励', label:{color:"#EE462A"}},
{ value: 500, proportion: 16, name: '鼓励社会信用体系建设', label:{color:"#FF8929"}},
{ value: 400, proportion: 36, name: '产业提升和品牌建设奖励', label:{color:"#FFBB00"}},
{ value: 500, proportion: 16, name: '经营奖励', label:{color:"#5CBC69"}},
{ value: 200, proportion: 16, name: '一事一议', label:{color:"#00AEFF"}},
// { value: 300, proportion: 16, name: '', label:{color:"#EE462A"}},
// { value: 500, proportion: 16, name: '', label:{color:"#FF8929"}},
{ value: 400, proportion: 36, name: '区级总部', label:{color:"#FFBB00"}},
{ value: 500, proportion: 16, name: '市级服务业领军', label:{color:"#5CBC69"}},
{ value: 200, proportion: 16, name: '其他', label:{color:"#00AEFF"}},
];
//
let itemStyle = {
@ -30,32 +31,11 @@ export default {
sum: 5000,
option: {
color:colors,
// grid: {
// top: "0%",
// left: "5%",
// right: "80%",
// bottom: "8%", //leftright
// },
// title: {
// text: "",
// subtext: 800,
// textStyle: {
// color: "#65FDFD",
// fontSize: 32,
// // align: 'center'
// },
// subtextStyle: {
// fontSize: 36,
// color: "#ffc20e",
// fontWeight: "bold"
// },
// x: "center",
// y: "center",
// },
legend: {
bottom: '32%',
right: '2%',
orient: 'vertical',
bottom: '2%',
right: '0%',
left: '0%',
orient: 'horizontal',
data: datas,
icon: 'square',
itemWith: 14,
@ -85,7 +65,7 @@ export default {
type: "pie",
zlevel: 3,
radius: ["40%", "55%"],
center: ["35%", "50%"],
center: ["50%", "50%"],
itemStyle: itemStyle,
emphasis: {
scale: true,
@ -142,7 +122,7 @@ export default {
name: "阴影圈",
type: "pie",
radius: ["0%", "35%"],
center: ["35%", "50%"],
center: ["50%", "50%"],
hoverAnimation: false,
label: {
normal: {

@ -188,7 +188,7 @@
</div>
<div class="industry-main">
<el-row class="main-row-three-topbox">
<el-col :span="8" class="industry-top-left-box" id="zhijinyindao-qingkuang">
<!-- <el-col :span="8" class="industry-top-left-box" id="zhijinyindao-qingkuang">
<div class="box-header" id="zhijinyindao-header-id">
<span class="garden"></span>
<span class="box-header-title">资金引导情况分析</span>
@ -196,7 +196,7 @@
<div class="capitalCondition-box">
<table-two></table-two>
</div>
</el-col>
</el-col> -->
<el-col :span="8" class="industry-top-middle-box" id="zhijinbofu-qingkaung">
<div class="box-header" id="zhijinbofu-header-id">
<span class="garden"></span>
@ -206,6 +206,15 @@
<table-three></table-three>
</div>
</el-col>
<el-col :span="8" class="bottombox-left-box">
<div class="box-header">
<span class="garden"></span>
<span class="box-header-title">重点及特色项目</span>
</div>
<div class="featureProject-box">
<TableSeven></TableSeven>
</div>
</el-col>
<el-col :span="8" class="industry-top-right-box">
<div class="box-header">
<span class="garden"></span>
@ -218,15 +227,28 @@
</el-row>
<el-row class="main-row-three-minddlebox">
<el-col :span="12" class="col-left-box">
<div class="appropriate-analyse-box">
<div class="box-header">
<span class="garden"></span>
<span class="box-header-title">资金拨付情况分析</span>
</div>
<div class="capital-appropriate-analyse-box">
<echartDataFour></echartDataFour>
</div>
</div>
<el-row class="change-August-eight-th-style-row">
<el-col :span="12" class="change-August-eight-th-style">
<div class="appropriate-analyse-box">
<div class="box-header">
<span class="garden"></span>
<span class="box-header-title">资金拨付情况分析</span>
</div>
<div class="capital-appropriate-analyse-box">
<echartDataFour></echartDataFour>
</div>
</div>
</el-col>
<el-col :span="12" class="bottombox-right-box">
<div class="box-header">
<span class="garden"></span>
<span class="box-header-title">产业品牌打造宣传</span>
</div>
<div class="brandPublicity-box">
<TableEight></TableEight>
</div>
</el-col>
</el-row>
<div class="promote-analyse-box">
<div class="box-header">
<span class="garden"></span>
@ -262,7 +284,7 @@
</div>
</el-col>
</el-row>
<el-row class="main-row-three-bottombox">
<!-- <el-row class="main-row-three-bottombox">
<el-col :span="12" class="bottombox-left-box">
<div class="box-header">
<span class="garden"></span>
@ -281,7 +303,7 @@
<TableEight></TableEight>
</div>
</el-col>
</el-row>
</el-row> -->
</div>
</el-row>
</main>
@ -295,8 +317,11 @@
<div>{{ info.alertContent }}</div>
</div>
</el-dialog>
<!-- 行业纵深弹框 -->
<collectDialog ref="collectDialog" />
<!-- 智能提醒弹框 -->
<zhinengtixing ref="zhinengtixing" @changeIsRead="govRemind()" />
<!-- 待办任务弹框 -->
<daibanrenwu ref="daibanrenwu" />
</div>
<homeIndex v-else-if="userType == '01'" />

Loading…
Cancel
Save