Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
b4f4b2bd by xiaomiao
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 439a52a1 e1d1004e
Expand all
Inline Side-by-side
Showing 20 changed files with 361 additions and 251 deletions
/*
* @Description: 统计率
* @Autor: renchao
* @LastEditTime: 2023-03-01 15:37:49
*/
/* 引入请求文件 */
import request from '@/utils/request'
/* 引入配置文件 */
import SERVER from './config'
class business {
/*
成功率统计
startDate:开始日期
endDate:结束日期
*/
async getSuucessRate(startDate,endDate,qxdm) {
/**
* @description: 成功率统计
* @param {*} startDate
* @param {*} endDate
* @param {*} qxdm
* @author: renchao
*/
async getSuucessRate (startDate, endDate, qxdm) {
return request({
url: SERVER.SERVERAPI + '/rest/statistics/Business/sf',
method: 'get',
params: {
startDate:startDate,
endDate:endDate,
qxdm:qxdm
startDate: startDate,
endDate: endDate,
qxdm: qxdm
}
})
}
......
/*
* @Description: 这个是所有api的前缀配置文件
* @Autor: renchao
* @LastEditTime: 2023-03-01 15:35:44
*/
export default {
// SERVERAPI: '/service-bdcsjsb-th', //浩浩
// SERVERAPI: '/service-bdcsjsb-zz',
......
/*
* @Description: 数据上报模块api文件
* @Autor: renchao
* @LastEditTime: 2023-03-01 16:33:08
*/
/* 引入axios请求文件 */
import request from '@/utils/request'
/* 引入配置 */
import SERVER from './config'
const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/'
// 区县上报分页
/**
* @description: 区县上报根据业务id获取xml
* @param {*} bizMsgid
* @author: renchao
*/
export function getXml (bizMsgid) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getXml',
url: urlHeader + 'getXml',
method: 'get',
params: {
businessId: bizMsgid
......@@ -12,58 +24,89 @@ export function getXml (bizMsgid) {
})
}
// 区县上报分页
/**
* @description: 区县上报分页
* @param {*} data
* @author: renchao
*/
export function getAreaReportPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getAreaReportPage',
url: urlHeader + 'getAreaReportPage',
method: 'post',
data
})
}
// 接入数据上报分页
/**
* @description: 接入数据上报分页
* @author: renchao
*/
export function getReceiveDataReportPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportPage',
url: urlHeader + 'getReceiveDataReportPage',
method: 'post',
data
})
}
// 数据上报分页
/**
* @description: 数据上报分页
* @author: renchao
*/
export function getDataReportPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getDataReportPage',
url: urlHeader + 'getDataReportPage',
method: 'post',
data
})
}
// 查询数据上报详情tabs选项卡
/**
* @description: 查询数据上报详情tabs选项卡
* @author: renchao
*/
export function getTabsDetail (params) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getTabsDetail',
url: urlHeader + 'getTabsDetail',
method: 'get',
params
})
}
// 查询数据上报详情
/**
* @description: 查询数据上报详情
* @author: renchao
*/
export function getReportDetail (params) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReportDetail',
url: urlHeader + 'getReportDetail',
method: 'get',
params
})
}
// 结果
/**
* @description: 获取数据上报结果
* @param {*} bsmReport
* @author: renchao
*/
export function getReceiveDataReportResult (bsmReport) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportResult',
url: urlHeader + 'getReceiveDataReportResult',
method: 'get',
params: {
bsmReport: bsmReport
}
})
}
/**
* @description: 重新上报
* @param {*} bsmReport
* @author: renchao
*/
export function restartGenerateXml (bsmReport) {
return request({
url: urlHeader + 'restartGenerateXml?bsmReport=' + bsmReport,
method: 'post'
})
}
\ No newline at end of file
......
/*
* @Description: 登薄日志
* @Autor: renchao
* @LastEditTime: 2023-03-01 17:09:38
*/
/* 引入请求文件 */
import request from '@/utils/request'
/* 引入配置文件 */
import SERVER from './config'
const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/RecordLog/'
// 登簿日志分页
/**
* @description: 登簿日志分页
* @author: renchao
*/
export function getRecordLogPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sjsb/RecordLog/getRecordLogPage',
url: urlHeader + 'getRecordLogPage',
method: 'post',
data
})
}
/**
* @description: 获取详情明细
* @param {*} dbBsm
* @author: renchao
*/
export function getDetail (dbBsm) {
return request({
url: urlHeader + 'getDetail',
method: 'get',
params: {
dbBsm: dbBsm
}
})
}
......
......@@ -2,7 +2,7 @@
<div class="naturalBuilding itemForm">
<el-form :model="naturalForm" :rules="rules" ref="formList" label-width="115px" :key="key">
<div v-for="(item, index) in naturalForm.naturalList" :key="index" class="naturalBuilding-item">
<p class="naturalBuilding-name">自然幢{{ index + 1 }}</p>
<p class="naturalBuilding-name obligee-item-name">自然幢{{ index + 1 }}</p>
<div class="naturalBuilding-list">
<el-row>
<el-col :span="8">
......@@ -330,7 +330,7 @@ export default {
default: "",
},
},
data() {
data () {
return {
naturalForm: {
naturalList: [
......@@ -366,7 +366,7 @@ export default {
};
},
methods: {
async featchData() {
async featchData () {
try {
let { result: res } = await kttFwZrz.getKttFwZrzById(this.bsmSjsb);
this.naturalForm.naturalList = res;
......@@ -375,7 +375,7 @@ export default {
this.$refs.msg.messageShow();
}
},
handleUpdateForm() {
handleUpdateForm () {
return new Promise(async (resolve) => {
try {
let res = await kttFwZrz.updateKttFwZrz(this.naturalForm.naturalList);
......
......@@ -42,6 +42,7 @@ export default {
.result {
padding: 15px;
height: 100%;
p {
color: #ffffff;
......@@ -50,7 +51,7 @@ export default {
}
/deep/.el-textarea__inner {
min-height: 33vh !important;
min-height: 30vh !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
......
<template>
<div>
<el-input type="textarea" :rows="6" :disabled="$store.state.business.Edit" placeholder="配置参数" v-model="resultInfo">
</el-input>
<div class="d-center" v-if="!$store.state.business.Edit">
<btn nativeType="cx" @click="submitForm">重新上报</btn>
</div>
</div>
<el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
</el-input>
</template>
<script>
// 引入json编译器
......@@ -15,26 +10,15 @@ export default {
type: String,
default: ''
}
},
data () {
return {
myValue: this.value,
}
},
methods: {
onJsonChange (value) {
},
onJsonSave (value) {
}
}
}
</script>
<style scoped lang="scss">
/* jsoneditor右上角默认有一个链接,加css去掉了 */
/deep/.el-textarea__inner {
min-height: 70vh !important;
height: 67vh !important;
border: none !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
......
......@@ -18,6 +18,9 @@ const actions = {
getUserInfo ({ commit }) {
return new Promise(async (resolve) => {
let { result: res } = await getUserInfo();
// require.ensure([], function (require) {
// require("@/assets/sass/smart-lift/index.scss");
// });
commit("SET_USERINFO", res);
resolve(true);
});
......
......@@ -2,7 +2,7 @@
overflow: hidden;
background: url("~@/image/dialogBg.png") no-repeat !important;
background-size: 100% 100% !important;
min-height: 89vh;
min-height: 90vh;
.dialog_title {
display: flex;
......@@ -56,7 +56,19 @@
box-shadow: inset 0px 0px 12px 0px #02D9FD;
border-radius: 2px;
border: 1px solid #6BC1FC;
margin: 0 18px 15px 18px;
margin: 0 18px 10px 18px;
}
}
.regularHeight {
height: 80vh;
display: flex;
flex-direction: column;
.editDialogBox-con,
.JsonEditor {
flex: 1;
height: 100%;
}
}
......@@ -105,7 +117,7 @@
}
/deep/.el-textarea__inner {
border: 1px solid #224C7C !important;
border: 1px solid #224C7C;
margin: 0 0 10px 0 !important;
width: 100% !important;
color: #dadde3 !important;
......
.tableClass {
/deep/.el-table {
border: none !important;
border-radius: 0 !important;
background-color: rgba(0, 0, 0, 0);
/deep/.el-table {
border: none !important;
border-radius: 0 !important;
background-color: rgba(0, 0, 0, 0);
.el-table__header-wrapper {
border-right: none;
.el-table__header-wrapper {
border-right: none;
}
}
.el-table__row .cell {
color: #8DEAF9 !important;
font-weight: 100 !important;
}
.el-table__row .cell {
color: #8DEAF9 !important;
font-weight: 100 !important;
}
.el-table__row {
background: rgba(0, 0, 0, 0) !important;
}
.el-table__row {
background: rgba(0, 0, 0, 0) !important;
}
thead {
background: #073781;
border-radius: 2px;
height: 42px;
& th {
//inherit：规定应该从父元素继承 background-color 属性的设置。
//transparent：默认。背景颜色为透明。
// background-color: inherit !important;
background-color: transparent;
color: #02D9FD;
}
& tr {
// background-color: inherit !important;
background-color: transparent;
}
}
thead {
background: #073781;
border-radius: 2px;
height: 42px;
& th {
//inherit：规定应该从父元素继承 background-color 属性的设置。
//transparent：默认。背景颜色为透明。
// background-color: inherit !important;
background-color: transparent;
color: #02D9FD;
}
& tr {
// background-color: inherit !important;
background-color: transparent;
}
}
}
}
//*****start*通用表单查询条件，列表样式******//
.from-clues {
height: 100%;
height: 100%;
width: 100%;
min-width: 1280px;
box-sizing: border-box;
overflow-x: hidden;
padding: 2px;
&-header {
width: 100%;
min-width: 1280px;
padding: 5px 30px 20px 24px;
box-sizing: border-box;
overflow-x: hidden;
padding: 2px;
&-header {
width: 100%;
padding: 5px 30px 20px 24px;
box-sizing: border-box;
background: url("~@/image/formHeader.png") no-repeat;
background-size: 100% 100%;
margin-top: 15px;
/deep/.el-form-item__label {
color: #E3F1FF;
}
background: url("~@/image/formHeader.png") no-repeat;
background-size: 100% 100%;
margin-top: 15px;
/deep/.el-input__inner {
background: #07388B;
border-radius: 2px;
color: #CEF8FF;
border: 1px solid #6BC1FC;
}
/deep/.el-form-item__label {
color: #E3F1FF;
}
.advanced-search {
display: flex;
font-size: 12px;
flex-wrap: wrap;
padding-top: 5px;
height: 30px;
span {
display: flex;
align-items: center;
}
/deep/.el-input__inner {
background: #07388B;
border-radius: 2px;
color: #CEF8FF;
border: 1px solid #6BC1FC;
}
}
i {
color: $light-blue;
margin-left: 5px;
cursor: pointer;
}
.advanced-search {
display: flex;
font-size: 12px;
flex-wrap: wrap;
padding-top: 5px;
height: 30px;
ul {
display: flex;
align-items: center;
li {
color: $light-blue;
border: 1px solid $light-blue;
border-radius: 10px;
padding: 2px 8px;
line-height: 16px;
}
}
span {
display: flex;
align-items: center;
}
.clean-btn {
margin-left: 10px;
}
i {
color: $light-blue;
margin-left: 5px;
cursor: pointer;
}
&-content {
width: 100%;
box-sizing: border-box;
margin-top: 15px;
background: url("~@/image/formContent.png") no-repeat;
background-size: 100% 100%;
padding: 22px 42px 20px;
//修改表头的背景颜色横向渐变色
@extend .tableClass;
/deep/.el-pagination__total {
color: #FFFFFF;
}
ul {
display: flex;
align-items: center;
li {
color: $light-blue;
border: 1px solid $light-blue;
border-radius: 10px;
padding: 2px 8px;
line-height: 16px;
}
}
.bgc {
box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
background-color: rgba(0, 0, 0, 0);
}
.clean-btn {
margin-left: 10px;
}
}
/deep/ .el-pagination {
.el-input__inner {
color: #FFFFFF;
border: none;
@extend .bgc;
}
.el-pager li:not(.disabled).active {
box-shadow: inset 0px 0px 12px 0px #02D9FD;
border-radius: 1px;
border: 1px solid #02D9FD;
background-color: rgba(0, 0, 0, 0);
}
.el-pager li {
@extend .bgc;
color: #FFFFFF;
}
}
&-content {
width: 100%;
box-sizing: border-box;
margin-top: 15px;
background: url("~@/image/formContent.png") no-repeat;
background-size: 100% 100%;
padding: 22px 42px 20px;
//修改表头的背景颜色横向渐变色
@extend .tableClass;
/deep/.btn-next,
/deep/.btn-prev {
@extend .bgc;
color: #FFFFFF;
}
/deep/.el-pagination__total {
color: #FFFFFF;
}
.bgc {
box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
background-color: rgba(0, 0, 0, 0);
}
.el-form--inline .el-form-item {
width: auto;
margin-right: 0px;
/deep/ .el-pagination {
.el-input__inner {
color: #FFFFFF;
border: none;
@extend .bgc;
}
.el-form-item__content {
width: auto;
}
.el-pager li:not(.disabled).active {
box-shadow: inset 0px 0px 12px 0px #02D9FD;
border-radius: 1px;
border: 1px solid #02D9FD;
background-color: rgba(0, 0, 0, 0);
}
.el-pager li {
@extend .bgc;
color: #FFFFFF;
}
}
/deep/.btn-next,
/deep/.btn-prev {
@extend .bgc;
color: #FFFFFF;
}
}
.el-form-item--small.el-form-item {
margin-bottom: 0px;
.el-form--inline .el-form-item {
width: auto;
margin-right: 0px;
.el-form-item__content {
width: auto;
}
}
.el-form-item--small.el-form-item {
margin-bottom: 0px;
}
}
//*****end*通用表单查询条件，列表样式******//
/deep/.el-range-separator {
line-height: 28px !important;
line-height: 28px !important;
}
.width200px {
width: 200px;
width: 200px;
}
.width300px {
width: 300px;
width: 300px;
}
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
// 搜索框按钮的位置
.btnColRight {
box-sizing: border-box;
text-align: right;
box-sizing: border-box;
text-align: right;
}
// 修改弹框样式
.modifydialog{
.modifydialog {
/deep/.el-dialog__header {
text-align: center;
margin-bottom: 10px;
.el-dialog__title {
color: white;
}
......@@ -212,29 +214,36 @@
/deep/.el-form-item__label {
color: white;
}
/deep/.el-input__inner {
background-color: #07388b;
}
/deep/.el-input__inner {
background: #07388b;
border-radius: 2px;
border: 1px solid #6bc1fc;
}
/deep/.el-textarea__inner {
background: #07388b;
color: #fff;
}
/deep/.el-form-item__label {
color: #fff;
}
/deep/.el-dialog__headerbtn {
position: absolute;
top: 22px;
right: 30px;
}
/deep/.el-dialog__header {
text-align: center;
margin-bottom: 10px;
.el-dialog__title {
color: white;
}
......@@ -242,7 +251,7 @@
}
// 角色配置
.roleconfiguration{
.roleconfiguration {
/deep/.el-dialog__body {
display: flex;
flex-direction: column;
......@@ -328,7 +337,6 @@
}
.edit-content {
height: 450px;
overflow-y: auto;
overflow-x: hidden;
padding-right: 1px;
......@@ -401,6 +409,7 @@
display: flex;
margin-bottom: 15px;
}
.el-dialog__footer {
padding-right: 40px;
}
......@@ -414,12 +423,15 @@
.el-dialog__wrapper {
overflow: hidden;
}
/deep/.el-table {
background: none;
th.el-table__cell {
background-color: #073781;
color: #02d9fd;
}
tr {
background: none;
......@@ -429,5 +441,4 @@
}
}
}
}
\ No newline at end of file
......
......@@ -118,6 +118,7 @@
},
data () {
return {
pickerOptionsStart: {
disabledDate: (time) => {
let endDateVal = this.form.receiveEndTime;
......
......@@ -4,38 +4,16 @@
<h2>{{ productName }}</h2>
<div class="user_style">
<h3>欢迎登录</h3>
<el-form
:model="user"
:rules="rules"
ref="user"
id="loginform"
class="demo-ruleForm"
>
<el-form :model="user" :rules="rules" ref="user" id="loginform" class="demo-ruleForm">
<el-form-item prop="account">
<el-input
class="username"
v-model="user.account"
placeholder="请输入用户名"
></el-input>
<el-input class="username" v-model="user.account" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
type="password"
class="password"
v-model="user.password"
placeholder="请输入密码"
></el-input>
<el-input type="password" class="password" @keyup.native="login('user')" v-model="user.password"
placeholder="请输入密码"></el-input>
</el-form-item>
<!-- <el-form-item>
<el-checkbox
label="记住用户名"
@change="checkUserName"
></el-checkbox>
</el-form-item> -->
<el-form-item class="login-btn">
<el-button type="primary" style="width: 100%" @click="login('user')"
>登录</el-button
>
<el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button>
</el-form-item>
</el-form>
</div>
......@@ -48,7 +26,7 @@ import { loginIn } from "@/api/login.js";
import { api, getAction } from "@/api/manageApi";
export default {
name: "Login",
data() {
data () {
return {
user: {
account: "",
......@@ -62,7 +40,7 @@ export default {
},
};
},
created() {
created () {
const params = {};
const queryOptions = {
conditionGroup: {
......@@ -87,7 +65,7 @@ export default {
}
});
},
mounted() {
mounted () {
// this.checkUserName();
},
methods: {
......@@ -106,7 +84,7 @@ export default {
this.user.account = localStorage.getItem("accountId");
}
},
login(user) {
login (user) {
var self = this;
this.$refs[user].validate((valid) => {
if (valid) {
......@@ -135,6 +113,7 @@ export default {
.username,
.password {
position: relative;
&:before {
content: "";
display: block;
......@@ -145,18 +124,22 @@ export default {
top: 7px;
background-size: 100% 100%;
}
/deep/ .el-input__inner {
text-indent: 24px;
border: 1px solid rgba(11, 161, 248, 0.4);
background-color: rgba(6, 135, 205, 0.3) !important;
}
}
.username::before {
background-image: url(../../image/username.png);
}
.password::before {
background-image: url(../../image/password.png);
}
.bg {
width: 100%;
height: 100%;
......@@ -180,6 +163,7 @@ export default {
background-size: 100% 100%;
box-sizing: border-box;
padding: 56px;
h2 {
width: 100%;
font-size: 36px;
......@@ -190,14 +174,12 @@ export default {
position: absolute;
right: 0;
top: -70px;
background-image: linear-gradient(
180deg,
rgba(99, 163, 255, 1) 0,
rgba(99, 163, 255, 1) 0,
rgba(182, 220, 255, 1) 49.731445%,
rgba(114, 190, 255, 1) 100%,
rgba(114, 190, 255, 1) 100%
);
background-image: linear-gradient(180deg,
rgba(99, 163, 255, 1) 0,
rgba(99, 163, 255, 1) 0,
rgba(182, 220, 255, 1) 49.731445%,
rgba(114, 190, 255, 1) 100%,
rgba(114, 190, 255, 1) 100%);
overflow-wrap: break-word;
color: rgba(255, 255, 255, 1);
font-size: 36px;
......@@ -206,6 +188,7 @@ export default {
-webkit-text-fill-color: transparent;
}
}
.login {
.user_style {
h3 {
......@@ -217,6 +200,7 @@ export default {
font-weight: 400;
}
}
.btn {
width: 100%;
height: 6vh;
......@@ -225,6 +209,7 @@ export default {
font-size: 1.4vw;
color: #ffffff;
}
.btn:hover {
cursor: pointer;
background-color: #2d8cf0;
......@@ -235,18 +220,22 @@ export default {
.el-form-item {
margin-bottom: 24px !important;
}
.login-btn {
margin-top: 40px !important;
}
.el-button {
font-size: 18px;
background: #0d8cc0 !important;
color: #ffffff !important;
cursor: pointer !important;
}
.el-input__inner {
width: 100% !important;
}
.el-checkbox__label {
color: #fff;
}
......
......@@ -51,7 +51,7 @@ import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
// 导出excel表格
import downLbTable from '@/components/downLbTable'
import downLbTable from '@/components/DownLbTable'
// 获取时间
import { getCurrentDate, setExport2Excel } from "@/utils/tools";
export default {
......
......@@ -51,7 +51,7 @@ import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
// 导出excel表格
import downLbTable from '@/components/downLbTable'
import downLbTable from '@/components/DownLbTable'
// 获取时间
import { getCurrentDate, setExport2Excel } from "@/utils/tools";
export default {
......
......@@ -49,7 +49,7 @@ import data from "./data";
// 引入table混入方法
import tableMixin from "@/mixins/tableMixin.js";
// 导出excel表格
import downLbTable from '@/components/downLbTable'
import downLbTable from '@/components/DownLbTable'
// 获取时间
import { getCurrentDate, setExport2Excel } from "@/utils/tools";
export default {
......
......@@ -50,7 +50,7 @@ export default {
}
/deep/.el-textarea__inner {
min-height: 33vh !important;
min-height: 27vh !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
......
......@@ -6,6 +6,31 @@ class data {
columns () {
return [
{
width: "70",
renderHeader: (h, scope) => {
return (
<div>
<i
class="el-icon-plus"
onClick={() => {
vm.handleSBAdd();
}}
style="cursor:pointer;color:#409EFF"
></i>
</div>
);
},
render: (h, scope) => {
return <i
class="el-icon-minus"
onClick={() => {
vm.handleSBMinus(scope.row);
}}
style="cursor:pointer;color:#409EFF"
></i>
},
},
{
prop: 'ywh',
label: '业务号',
render: (h, scope) => {
......
......@@ -147,6 +147,9 @@ export default {
this.$refs.editLog.isShow(row);
this.$store.dispatch('business/setReportLogEdit')
}
},
destroyed () {
this.$store.dispatch('business/setEdit')
}
}
</script>
......