Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
dc92f2eb by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents bd01f54b 4902817c
Inline Side-by-side
Showing 12 changed files with 172 additions and 137 deletions
<!--
* @Author: xiaomiao 1158771342@qq.com
* @Date: 2023-03-09 15:24:53
* @LastEditors: xiaomiao 1158771342@qq.com
* @LastEditTime: 2023-04-03 09:04:26
* @FilePath: \上报\bdcjg-web\src\components\Button.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<el-button class="button" :class="nativeType" @click.prevent="handleClick" :type="nativeType">
<el-button class="button" :disabled="disableds" :class="nativeType" @click.prevent="handleClick" :type="nativeType">
<slot></slot>
</el-button>
</template>
......@@ -11,6 +19,10 @@
type: String,
default: 'cx'
},
disableds: {
type: Boolean,
default: false
}
},
methods: {
handleClick (evt) {
......@@ -20,5 +32,4 @@
};
</script>
<style scoped lang="scss">
</style>
......
......@@ -200,7 +200,7 @@ export default {
border-bottom: 1px solid #d8dce5;
box-sizing: border-box;
padding-top: 7px;
margin-bottom: 7px;
margin-bottom: 10px;
border-radius: 4px;
.tags-view-wrapper {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-28 10:14:20
* @LastEditTime: 2023-04-03 10:12:39
-->
<template>
<div class="app-wrapper">
......@@ -74,7 +74,7 @@ export default {
}
.app-content {
overflow-x: hidden;
overflow: hidden;
box-sizing: border-box;
flex: 1;
width: 100%;
......
......@@ -431,79 +431,6 @@ aside {
border-radius: 16px;
color: #B06974;
}
// 通过 入库 样式
.adopt,
.success {
color: #00FAA8;
position: relative;
}
.warehousing {
color: #FFCA57;
position: relative;
}
.fail {
color: #F56C6C;
position: relative;
}
.adopt::before {
position: absolute;
content: '';
display: block;
width: 8px;
height: 8px;
left: -15px;
top: 5px;
background: #00FAA8;
border-radius: 50%;
border: 2px solid rgba(0, 0, 0, 0.2);
}
.warehousing::before {
position: absolute;
content: '';
display: block;
width: 8px;
height: 8px;
left: -15px;
top: 4px;
background: #FF9933;
border-radius: 50%;
border: 2px solid rgba(0, 0, 0, 0.2);
}
// 成功 失败
.success::before {
position: absolute;
content: '√';
display: block;
width: 0;
height: 8px;
left: -10px;
top: 2px;
background: #00FAA8;
color: #00FAA8;
}
.fail {
color: #FF7962;
position: relative;
}
.fail::before {
position: absolute;
content: '!';
display: block;
width: 0;
height: 8px;
left: -10px;
top: 2px;
background: #FF7962;
color: #FF7962;
}
// 引入字体
@font-face {
......
......@@ -63,8 +63,6 @@
// 查询表单样式
.from-clues {
height: 100%;
width: 100%;
// min-width: 1280px;
......@@ -95,7 +93,7 @@
.el-input__inner {
background: #07388B;
border-radius: 2px;
color: #7A7A7A !important;
color: #E3F1FF !important;
border: 1px solid #6BC1FC;
}
......@@ -232,6 +230,80 @@
color: #FFFFFF;
}
// 通过 入库 样式
.adopt,
.success {
color: #00FAA8;
position: relative;
}
.warehousing {
color: #FFCA57;
position: relative;
}
.fail {
color: #F56C6C;
position: relative;
}
.adopt::before {
position: absolute;
content: '';
display: block;
width: 8px;
height: 8px;
left: -15px;
top: 5px;
background: #00FAA8;
border-radius: 50%;
border: 2px solid rgba(0, 0, 0, 0.2);
}
.warehousing::before {
position: absolute;
content: '';
display: block;
width: 8px;
height: 8px;
left: -15px;
top: 4px;
background: #FF9933;
border-radius: 50%;
border: 2px solid rgba(0, 0, 0, 0.2);
}
// 成功 失败
.success::before {
position: absolute;
content: '√';
display: block;
width: 0;
height: 8px;
left: -10px;
top: 2px;
background: #00FAA8;
color: #00FAA8;
}
.fail {
color: #FF7962;
position: relative;
}
.fail::before {
position: absolute;
content: '!';
display: block;
width: 0;
height: 8px;
left: -10px;
top: 2px;
background: #FF7962;
color: #FF7962;
}
//*****end*通用表单查询条件，列表样式******//
.el-range-separator {
......@@ -262,6 +334,19 @@
.btnColRight {
box-sizing: border-box;
text-align: right;
.is-disabled,
.is-disabled:hover,
.is-disabled:focus {
cursor: wait;
background: url("../image/btn.png") no-repeat 0 0;
background-size: cover;
}
}
......@@ -441,6 +526,7 @@
}
// 按钮样式
.cx {
background: url("../image/btn.png") no-repeat 0 -34px;
background-size: cover;
......
......@@ -69,6 +69,23 @@
height: calc(100vh - 230px);
}
// 通过 入库 样式
.adopt,
.success {
color: #0A852A;
position: relative;
}
.warehousing {
color: #FFCA57;
position: relative;
}
.fail {
color: #AB0C0C;
position: relative;
}
/* --------------进度条美化---------------- */
::-webkit-scrollbar {
width: 7px;
......@@ -191,25 +208,6 @@
}
// 面包屑
// .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;
}
.el-breadcrumb__inner {
color: #CEF8FF !important;
}
......@@ -693,8 +691,6 @@
// 人员管理角色管理菜单管理修改新增弹框样式
.PersonnelDialog {
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: #4162D8
......@@ -789,13 +785,13 @@
height: calc(100% - 58px);
display: flex;
flex-direction: column;
.from-clues-content {
flex: 1;
height: 100%;
}
}
// 修改基本信息界面样式
.informationbase {
margin: 0.1875rem 1.0417rem;
......
......@@ -113,6 +113,7 @@
@include font_color("submenuColor");
border-right: 5px solid #36CEB6;
box-sizing: border-box;
.svg-icon {
color: #1ea6f8 !important;
}
......@@ -366,7 +367,7 @@
}
.el-menu-item span {
white-space: nowrap !important;
// white-space: nowrap !important;
word-break: break-all;
line-height: 20px;
flex: 1;
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-31 09:57:20
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -35,7 +32,7 @@ class data extends filter {
{
label: "业务号",
prop: "ywh",
minWidth: 150,
minWidth: 120,
},
{
label: "不动产单元号",
......
......@@ -55,9 +55,9 @@
<script>
import columnar from "@/components/Echart/Columnar";
import work from "@/api/work";
export default {
import columnar from "@/components/Echart/Columnar";
import work from "@/api/work";
export default {
data () {
return {
// 日均接入量
......@@ -113,11 +113,11 @@ export default {
});
},
},
};
};
</script>
<style lang="scss" scoped>
.leftcard {
.leftcard {
width: 30%;
display: flex;
height: calc(100vh - 114px);
......@@ -216,10 +216,12 @@ export default {
content: "";
width: 0.0052rem;
height: 0.4688rem;
background: linear-gradient(180deg,
background: linear-gradient(
180deg,
#091b4c 0%,
#47b5e0 56%,
#091b4c 100%);
#091b4c 100%
);
}
.cardcontent-right {
......@@ -238,18 +240,26 @@ export default {
}
p {
width: 1.25rem;
margin-bottom: 0.0417rem;
span:nth-child(1) {
text-align: right;
display: inline-block;
width: 45%;
margin-right: 0.0781rem;
}
span:nth-child(2) {
text-align: left;
display: inline-block;
width: 45%;
font-size: 20px;
font-weight: 900;
}
}
}
}
}
}
</style>
......
......@@ -57,7 +57,7 @@
let res = await work.getdjywltotal(p);
res.result.map((item, index) => {
this.config.data.push([index, item.AREACODE, item.ywtotal])
this.config.data.push([index + 1, item.AREACODE, item.ywtotal])
});
......
......@@ -25,7 +25,7 @@
<el-form-item>
<btn nativeType="cz" @click="handleResetForm">重置</btn>
<btn nativeType="cx" @click="featchDataSelf">查询</btn>
<btn nativeType="cx" @click="handlesetExport2Excel(downTitle)">导出</btn>
<btn nativeType="cx" :disableds="disableds" @click="handlesetExport2Excel(downTitle)">导出</btn>
</el-form-item>
</el-col>
</el-row>
......@@ -45,17 +45,17 @@
</template>
<script>
// 接入质量评价表
// 引入表格头部数据
import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
// 导出excel表格
import downLbTable from '@/components/DownLbTable'
// 获取时间
import { getCurrentDate, setExport2Excel } from "@/utils/tools";
import { dataReceiveQuality } from "@/api/statistics.js";
export default {
// 接入质量评价表
// 引入表格头部数据
import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
// 导出excel表格
import downLbTable from '@/components/DownLbTable'
// 获取时间
import { getCurrentDate, setExport2Excel } from "@/utils/tools";
import { dataReceiveQuality } from "@/api/statistics.js";
export default {
name: "jsbwcx",
components: {
downLbTable
......@@ -63,6 +63,7 @@ export default {
mixins: [tableMixin],
data () {
return {
pickerOptionsStart: {
disabledDate: (time) => {
let endDateVal = this.form.endTime;
......@@ -114,7 +115,8 @@ export default {
data: []
},
// 导出表格标题
downTitle: ''
downTitle: '',
disableds: false,
}
},
watch: {
......@@ -151,6 +153,11 @@ export default {
}
},
handlesetExport2Excel (val) {
this.disableds = true
setTimeout(() => {
this.disableds = false
}, 1000);
setExport2Excel(val)
},
// 初始化数据
......@@ -167,13 +174,13 @@ export default {
this.featchDataSelf()
}
}
}
}
</script>
<style scoped lang="scss">
@import "../css/index.scss";
@import "../css/index.scss";
/deep/th.el-table__cell {
/deep/th.el-table__cell {
height: 0 !important;
}
}
</style>
......
......@@ -7,7 +7,7 @@
</el-form-item>
<el-row class="mb-5">
<el-col :span="4">
<el-form-item label="菜单名称" prop="rolesName">
<el-form-item label="角色名称" prop="rolesName">
<el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="角色名称"></el-input>
</el-form-item>
</el-col>
......