a4b488eb by renchao@pashanhoo.com

style:上报样式修改

2 parents 97f9e0db d0ddb155
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 200,
"echartTextColor": "#FFFFFF",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 160,
"echartTextColor": "#4A4A4A",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 200,
"echartTextColor": "#FFFFFF",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 160,
"echartTextColor": "#4A4A4A",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
<!--
* @Description: 引入配置文件
* @Autor: renchao
* @LastEditTime: 2023-05-06 16:26:39
* @LastEditTime: 2023-05-08 15:02:53
-->
<!DOCTYPE html>
<html>
......@@ -18,7 +18,7 @@
</title>
</head>
<script>
fetch('/config.json')
fetch('<%= BASE_URL %>config.json')
.then(response => response.json())
.then(config => {
window.config = config
......
/*
* @Description: 数据上报模块api文件
* @Autor: renchao
* @LastEditTime: 2023-04-27 13:52:53
* @LastEditTime: 2023-05-06 10:29:06
*/
/* 引入axios请求文件 */
import request from '@/utils/request'
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-23 17:19:52
* @LastEditTime: 2023-05-08 15:03:10
*/
import request from "@/utils/request";
// let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
// console.log(SERVER, 'SERVERSERVER');
export function loginIn (username, password) {
return request({
url: `${SERVER.MANAGEMENTAPI}/login?username=${username}&password=${password}`,
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-01-16 09:10:12
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-05-06 16:38:08
* @LastEditTime: 2023-05-08 15:03:06
* @FilePath: \bdcjg-web\src\main.js
* @Description:
*
......@@ -60,7 +60,8 @@ axios.get("./config.json")
.then((res) => {
Vue.prototype.BASE_API = res.data
localStorage.setItem('ApiUrl', JSON.stringify(res.data));
window.TITLE = res.data.TITLE
process.env.TITLE = res.data.TITLE
process.env.IPCONFIG = res.data.IPCONFIG
require('./permission')
new Vue({
el: '#app',
......
......@@ -420,7 +420,7 @@
.tab-pane-item {
line-height: 20px;
color: #02d9fd;
color: #FFFFFF;
p {
text-align: center;
......
......@@ -637,7 +637,7 @@
.tab-pane-item {
line-height: 20px;
color: #fff;
color: #FFFFFF;
p {
text-align: center;
......@@ -1016,4 +1016,4 @@
font-size: 20px;
color: #4162D8
}
}
}
\ No newline at end of file
......
/*
* @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器
* @Autor: renchao
* @LastEditTime: 2023-03-29 10:14:34
* @LastEditTime: 2023-04-27 17:09:51
*/
import Vue from 'vue'
import axios from "axios";
......@@ -85,12 +85,9 @@ function handleErrorData (status) {
},
});
}
}
break;
case 403:
Message.error("拒绝访问");
break;
case 404:
Message.error("很抱歉,资源未找到!");
break;
......
<template>
<!-- 修改登簿日志弹窗 -->
<!-- 修改登簿日志弹窗 -->
<el-dialog :close-on-click-modal="false" top="0" @close="closeDialog"
custom-class="dialogBox entryJournal commonDialog editDialogBox mainCenter" :visible.sync="dialogVisible" width="90%">
<div slot="title" class="dialog_title" ref="dialogTitle">
......@@ -188,277 +188,284 @@
<btn nativeType="cx" @click="submitForm">保 存</btn>
</div>
<div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
<btn nativeType="cx" @click="handleExtract">再次抽取</btn>
<btn nativeType="cx" @click="handleResubmit">重新上报</btn>
</div>
</el-dialog>
</template>
<script>
import { sbdata, sendThis } from './data/sbdata'
import { dbdata, sendThis1 } from './data/dbdata'
import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
import JsonEditor from "@/components/JsonEditor.vue";
import { judgeListComplete } from "@/utils/tools.js"
export default {
components: { JsonEditor },
data () {
return {
key: 0,
title: '',
dialogVisible: false,
titleName: 'sjmx',
titleName2: 'drdbxd',
dbBsm: '',
// 头部信息
accessLog: {
AREACODE: '',
AREANAME: '',
ACCESSDATE: '',
REMARK: ''
},
// 当日登薄信息记录数
import { sbdata, sendThis } from './data/sbdata'
import { dbdata, sendThis1 } from './data/dbdata'
import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
import JsonEditor from "@/components/JsonEditor.vue";
import { judgeListComplete } from "@/utils/tools.js"
export default {
components: { JsonEditor },
data () {
return {
key: 0,
title: '',
dialogVisible: false,
titleName: 'sjmx',
titleName2: 'drdbxd',
dbBsm: '',
// 头部信息
accessLog: {
AREACODE: '',
AREANAME: '',
ACCESSDATE: '',
REMARK: ''
},
// 当日登薄信息记录数
registerInfo: {
TOTALNUM: '', // 总数量
FIRSTREG: '', // 首次登记数量
TRANSFERREG: '', // 转移登记数量
CHANGEREG: '', // 变更登记数量
LOGOUTREG: '', // 注销登记数量
RIVISEREG: '', // 更正登记数量
DISSENTINGREG: '', // 异议登记数量
ADVANCEREG: '', // 预告登记数量
SEIZEREG: '', // 查封登记数量
EASEMENTREG: '', // 地役权登记数量
otherReg: '', // 其他登记数量
BUSINESSTYPECOUNT: '', // 业务类型总数
},
// 当日上报记录数
accessInfo: {
TOTALNUM: '', // 总数量
FIRSTREG: '', // 首次登记数量
TRANSFERREG: '', // 转移登记数量
CHANGEREG: '', // 变更登记数量
LOGOUTREG: '', // 注销登记数量
RIVISEREG: '', // 更正登记数量
DISSENTINGREG: '', // 异议登记数量
ADVANCEREG: '', // 预告登记数量
SEIZEREG: '', // 查封登记数量
EASEMENTREG: '', // 地役权登记数量
otherReg: '', // 其他登记数量
BUSINESSTYPECOUNT: '', // 业务类型总数
},
// 当日登薄详单
tableDBData: {
data: [],
column: dbdata.columns()
},
// 当日上报详单
tableSBData: {
data: [],
column: sbdata.columns()
},
// XML详情
resultInfo: '',
dataReport: {}
}
},
mounted () {
sendThis(this);
sendThis1(this);
},
watch: {
registerInfo: {
TOTALNUM: '', // 总数量
FIRSTREG: '', // 首次登记数量
TRANSFERREG: '', // 转移登记数量
CHANGEREG: '', // 变更登记数量
LOGOUTREG: '', // 注销登记数量
RIVISEREG: '', // 更正登记数量
DISSENTINGREG: '', // 异议登记数量
ADVANCEREG: '', // 预告登记数量
SEIZEREG: '', // 查封登记数量
EASEMENTREG: '', // 地役权登记数量
otherReg: '', // 其他登记数量
BUSINESSTYPECOUNT: '', // 业务类型总数
handler: function (newVal, oldVal) {
this.registerInfo.TOTALNUM = (newVal.FIRSTREG - 0) + (newVal.TRANSFERREG - 0) +
(newVal.CHANGEREG - 0) + (newVal.LOGOUTREG - 0) + (newVal.RIVISEREG - 0) + (newVal.DISSENTINGREG - 0)
+ (newVal.ADVANCEREG - 0) + (newVal.SEIZEREG - 0) + (newVal.otherReg - 0)
},
deep: true
},
// 当日上报记录数
accessInfo: {
TOTALNUM: '', // 总数量
FIRSTREG: '', // 首次登记数量
TRANSFERREG: '', // 转移登记数量
CHANGEREG: '', // 变更登记数量
LOGOUTREG: '', // 注销登记数量
RIVISEREG: '', // 更正登记数量
DISSENTINGREG: '', // 异议登记数量
ADVANCEREG: '', // 预告登记数量
SEIZEREG: '', // 查封登记数量
EASEMENTREG: '', // 地役权登记数量
otherReg: '', // 其他登记数量
BUSINESSTYPECOUNT: '', // 业务类型总数
},
// 当日登薄详单
tableDBData: {
data: [],
column: dbdata.columns()
},
// 当日上报详单
tableSBData: {
data: [],
column: sbdata.columns()
},
// XML详情
resultInfo: '',
dataReport: {}
}
},
mounted () {
sendThis(this);
sendThis1(this);
},
watch: {
registerInfo: {
handler: function (newVal, oldVal) {
this.registerInfo.TOTALNUM = (newVal.FIRSTREG - 0) + (newVal.TRANSFERREG - 0) +
(newVal.CHANGEREG - 0) + (newVal.LOGOUTREG - 0) + (newVal.RIVISEREG - 0) + (newVal.DISSENTINGREG - 0)
+ (newVal.ADVANCEREG - 0) + (newVal.SEIZEREG - 0) + (newVal.otherReg - 0)
},
deep: true
handler: function (newVal, oldVal) {
this.accessInfo.TOTALNUM = (newVal.FIRSTREG - 0) + (newVal.TRANSFERREG - 0) +
(newVal.CHANGEREG - 0) + (newVal.LOGOUTREG - 0) + (newVal.RIVISEREG - 0) + (newVal.DISSENTINGREG - 0)
+ (newVal.ADVANCEREG - 0) + (newVal.SEIZEREG - 0) + (newVal.otherReg - 0)
},
deep: true
}
},
accessInfo: {
handler: function (newVal, oldVal) {
this.accessInfo.TOTALNUM = (newVal.FIRSTREG - 0) + (newVal.TRANSFERREG - 0) +
(newVal.CHANGEREG - 0) + (newVal.LOGOUTREG - 0) + (newVal.RIVISEREG - 0) + (newVal.DISSENTINGREG - 0)
+ (newVal.ADVANCEREG - 0) + (newVal.SEIZEREG - 0) + (newVal.otherReg - 0)
methods: {
// 关闭弹框事件
closeDialog () {
this.dialogVisible = false;
},
deep: true
}
},
methods: {
// 关闭弹框事件
closeDialog () {
this.dialogVisible = false;
},
// 展示弹框
isShow (item) {
this.title = '登薄日志(' + item.ACCESSDATE + ')'
this.titleName = 'sjmx'
this.dialogVisible = true
this.dbBsm = item.dbBsm
this._getDetails(item.dbBsm)
},
/**
* @description: 获取列表接口
* @author: renchao
*/
_getDetails (data) {
getDetail(data).then(res => {
let { accessLog, registerInfo, accessInfo, accessList, registerList
} = res.result
this.accessLog = accessLog
this.resultInfo = accessLog.LOGSXML
this.registerInfo = registerInfo
this.accessInfo = accessInfo
this.tableDBData.data = _.cloneDeep(registerList)
this.tableSBData.data = _.cloneDeep(accessList)
this.tableDBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
this.tableSBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
// 展示弹框
isShow (item) {
this.title = '登薄日志(' + item.ACCESSDATE + ')'
this.titleName = 'sjmx'
this.dialogVisible = true
this.dbBsm = item.dbBsm
this._getDetails(item.dbBsm)
},
/**
* @description: 获取列表接口
* @author: renchao
*/
_getDetails (data) {
getDetail(data).then(res => {
let { accessLog, registerInfo, accessInfo, accessList, registerList
} = res.result
this.accessLog = accessLog
this.resultInfo = accessLog.LOGSXML
this.registerInfo = registerInfo
this.accessInfo = accessInfo
this.tableDBData.data = _.cloneDeep(registerList)
this.tableSBData.data = _.cloneDeep(accessList)
this.tableDBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
this.tableSBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
})
})
},
// 当日登薄详单
handleDBAdd () {
this.tableDBData.data.push({
YWH: '',
DJLX: '',
QLLX: '',
BDCDYH: '',
ZSZMH: '',
SFSB: '',
BWID: '',
BSM_DBLOG: this.accessLog.bsmDblog
})
this.tableDBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
},
handleDBMinus (row) {
this.$confirm('此操作将删除列表, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.tableDBData.data.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
},
// 当日登薄详单
handleDBAdd () {
this.tableDBData.data.push({
YWH: '',
DJLX: '',
QLLX: '',
BDCDYH: '',
ZSZMH: '',
SFSB: '',
BWID: '',
BSM_DBLOG: this.accessLog.bsmDblog
})
this.tableDBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
},
handleDBMinus (row) {
this.$confirm('此操作将删除列表, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.tableDBData.data.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
})
this.tableDBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
})
},
// 当日上报详单
handleSBAdd () {
this.tableSBData.data.push({
YWH: '',
BDCDYH: '',
BWID: '',
BSM_DBLOG: this.accessLog.bsmDblog
})
this.tableSBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
},
handleSBMinus (row) {
this.$confirm('此操作将删除列表, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.tableSBData.data.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
},
// 当日上报详单
handleSBAdd () {
this.tableSBData.data.push({
YWH: '',
BDCDYH: '',
BWID: '',
BSM_DBLOG: this.accessLog.bsmDblog
})
this.tableSBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
/**
* @description: 确定修改详情
* @param {*} function
* @author: renchao
*/
submitForm: _.debounce(function () {
let _this = this
if (_verify(this.tableDBData.data, '当日登薄详单列表必填') && _verify(this.tableSBData.data, '当日上报详单列表必填')) {
_editDetail()
}
function _verify (data, msg) {
let flag = true
if (!judgeListComplete(data)) {
_this.$message({
message: msg,
type: 'warning'
},
handleSBMinus (row) {
this.$confirm('此操作将删除列表, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.tableSBData.data.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
})
this.tableSBData.data.forEach((item, index) => {
this.$set(item, 'index', index)
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
flag = false
}
return flag
}
function _editDetail () {
edit({
accessLog: _this.accessLog, registerInfo: _this.registerInfo,
accessInfo: _this.accessInfo,
accessList: _this.tableSBData.data,
registerList: _this.tableDBData.data
}).then(res => {
if (res.code == 200) {
_this.$message({
message: '保存成功',
type: 'success'
})
_this._getDetails(_this.dbBsm)
}
})
}
}, 600),
/**
* @description: 登薄日志重新生成报文
* @param {*} function
* @author: renchao
*/
handleResubmit () {
let _this = this
this.$confirm('重新生成报文,是否上报省厅?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
createXml()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
function createXml () {
regenerateDbXml(_this.dbBsm).then(res => {
if (res.code == 200) {
},
/**
* @description: 确定修改详情
* @param {*} function
* @author: renchao
*/
submitForm: _.debounce(function () {
let _this = this
if (_verify(this.tableDBData.data, '当日登薄详单列表必填') && _verify(this.tableSBData.data, '当日上报详单列表必填')) {
_editDetail()
}
function _verify (data, msg) {
let flag = true
if (!judgeListComplete(data)) {
_this.$message({
message: '生成成功',
type: 'success'
message: msg,
type: 'warning'
})
_this.resultInfo = res.message
flag = false
}
return flag
}
function _editDetail () {
edit({
accessLog: _this.accessLog, registerInfo: _this.registerInfo,
accessInfo: _this.accessInfo,
accessList: _this.tableSBData.data,
registerList: _this.tableDBData.data
}).then(res => {
if (res.code == 200) {
_this.$message({
message: '保存成功',
type: 'success'
})
_this._getDetails(_this.dbBsm)
}
})
}
}, 600),
/**
* @description: 登薄再次抽取
* @param {*} function
* @author: renchao
*/
handleExtract () { },
/**
* @description: 登薄日志重新生成报文
* @param {*} function
* @author: renchao
*/
handleResubmit () {
let _this = this
this.$confirm('重新生成报文,是否上报省厅?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
createXml()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消上报报文'
})
})
function createXml () {
regenerateDbXml(_this.dbBsm).then(res => {
if (res.code == 200) {
_this.$message({
message: '生成成功',
type: 'success'
})
_this.resultInfo = res.message
}
})
}
}
}
}
}
</script>
......