dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.30

Browse Source
This commit is contained in:
ds 2024-10-30 14:31:39 +08:00
parent fa5ddf6a0b
commit 77d0a4b118
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -51,6 +51,9 @@ export default {
}, },
methods: { methods: {
goback(){
this.$router.go(-1)
},
// 查询菜单树结构 // 查询菜单树结构
getMenuTreeselect() { getMenuTreeselect() {
// merchantId 代表deptType // merchantId 代表deptType
@ -311,7 +314,11 @@ export default {
</script> </script>
<template> <template>
<div class="container"> <div>
<div class="top-box">
<span style="cursor: pointer; text-indent: 20px;" @click="goback()">当前位置：机构管理 / 角色信息 / 新增角色</span>
</div>
<div class="container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px">
<div class="top-box"> <div class="top-box">
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">--> <!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
@ -410,6 +417,8 @@ export default {
</div> </div>
</el-form> </el-form>
</div> </div>
</div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
@ -420,15 +429,17 @@ export default {
background: #f4f5f9; background: #f4f5f9;
} }
.top-box { .top-box{
width: 100%; width: 100%;
background: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
background: #FFFFFF; font-weight: 400;
box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5); font-size: 14px;
border-radius: 10px 10px 10px 10px; color: #999;
padding-left: 25px;
} }
.demo-ruleForm { .demo-ruleForm {

2
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -284,7 +284,7 @@ export default {
start.setMinutes(0) start.setMinutes(0)
start.setSeconds(0) start.setSeconds(0)
start.setMilliseconds(0) start.setMilliseconds(0)
this.value2 = [start,new Date()]; this.value2 = [parseTime(start),parseTime(new Date())];
} else if (this.timeList[index]=='近一周'){ } else if (this.timeList[index]=='近一周'){
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000) let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)

9
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="card-change" style="min-height: 500px; margin-left: 20px; margin-top: 20px; margin-right: 20px;" shadow="never">
<div class="card-change" > <div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input <el-input
@ -374,5 +374,10 @@ export default {
width: 98px; width: 98px;
height: 98px; height: 98px;
} }
</style> </style>