Skip to content

bdc / bdcjg-web

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

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

2 parents bfa807e7 89ea6006
Inline Side-by-side
Showing 52 changed files with 477 additions and 360 deletions
<!--
功能：结果
作者：calliope
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 11:09:01
-->
<template>
<div class='result'>
<div class="result-con" style="margin-bottom: 15px;">
<p>响应xml</p>
<el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
</el-input>
</div>
<div class="result-con" style="margin-top: 15px;">
<p>错误信息</p>
<el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
</el-input>
</div>
</div>
</template>
<script>
import { getReceiveDataReportResult } from "@/api/dataReport.js";
......@@ -40,22 +45,40 @@ export default {
<style scoped lang='scss'>
@import '~@/styles/public.scss';
.result {
padding: 15px;
height: 100%;
p {
color: #ffffff;
line-height: 26px;
font-size: 18px;
}
/deep/.el-textarea__inner {
min-height: 30vh !important;
background-color: #08346F !important;
height: 30vh !important;
color: #ffffff;
border: none !important;
color: #ffffff;
}
&-con {
background: #04275B;
border-radius: 2px;
padding: 10px;
box-sizing: border-box;
p {
color: #2997E8;
font-size: 14px;
position: relative;
padding-left: 10px;
}
p::before {
position: absolute;
content: '';
width: 3px;
height: 10px;
background-color: #2997E8;
left: 0;
top: 3px;
}
}
}
</style>
......
......@@ -341,20 +341,39 @@ export default {
/deep/.el-dialog__body {
display: flex;
flex-direction: column;
padding-bottom: 25px;
padding-bottom: 30px;
}
/deep/ .el-tabs {
color: #CEF8FF;
}
.d-center {
z-index: 1000;
}
.sjmx {
display: flex;
flex-direction: column;
height: 49vh;
/deep/.el-tabs__item {
height: 50px;
padding-top: 6px;
}
}
.result {
flex: 1;
height: 100%;
}
.editDialogBox-con {
flex: 1;
height: 100%;
overflow-y: hidden;
}
/deep/.el-tabs__item {
color: #CEF8FF !important;
......@@ -427,9 +446,7 @@ export default {
overflow-y: auto;
overflow-x: hidden;
padding-right: 1px;
margin-bottom: 10px;
border-top: none;
height: 44vh;
}
/deep/.editDialogBox {
......@@ -439,7 +456,7 @@ export default {
.el-dialog__header {
display: flex;
margin-bottom: 15px;
margin-bottom: 10px;
}
.dialog_footer {
......
......@@ -61,7 +61,7 @@
}
.appMain {
min-width: 1290px;
// min-width: 1280px;
height: calc(100vh - 101px) !important;
box-sizing: border-box;
......
......@@ -2,13 +2,13 @@
overflow: hidden;
background: url("~@/image/dialogBg.png") no-repeat !important;
background-size: 100% 100% !important;
min-height: 90vh;
// min-height: 90vh;
.dialog_title {
display: flex;
position: relative;
font-size: 24px;
top: -11px;
font-size: 22px;
top: -10px;
width: 38%;
height: 40px;
margin-left: 28px;
......@@ -68,8 +68,9 @@
}
.regularHeight {
height: 80vh;
display: flex;
flex: 1;
height: 100%;
flex-direction: column;
.editDialogBox-con,
......@@ -97,7 +98,6 @@
color: #B5D6DC;
border-radius: 2px;
border: 1px solid #224C7C;
margin: 5px;
span {
display: inline-block;
......@@ -147,7 +147,6 @@
.el-dialog__header {
color: #FFFFFF;
// background: #074487;
height: 46px !important;
width: 97%;
margin: 0 auto;
......@@ -157,6 +156,7 @@
.el-dialog__body {
padding-top: 0;
padding-bottom: 0;
// height: 95vh;
}
.el-dialog__headerbtn {
......
......@@ -232,19 +232,21 @@ table td {
}
// table 固定列样式
tr:hover {
background: #063160 !important;
box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
}
// tr:hover {
// background: #063160 !important;
// box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
// }
// .el-table__fixed-right-patch {
// background-color: #073781
// }
.el-table__fixed-right-patch {
background-color: #073781;
.el-table__fixed-right {
background-color: #073781
}
.el-table__fixed-right {
box-shadow: inset 0px 0px 20px 0px #5BE7FF !important;
border-left: 3px solid #142e54;
background-color: #1f2c3a;
.el-table__fixed::before,
.el-table__fixed-right::before {
display: none;
}
// 表格样式
......
......@@ -336,6 +336,15 @@ aside {
color: $yellow;
}
// 操作按钮样式
.btnColor {
color: #8DEAF9;
}
.successColor {
color:#67C23A
}
// 通过 入库 样式
.adopt,
.success {
......@@ -409,10 +418,9 @@ aside {
background: #FF7962;
color: #FF7962;
}
// 引入字体
@font-face {
font-family:AliBold;
src:url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf')
font-family: AliBold;
src: url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf')
}
\ No newline at end of file
......
......@@ -340,4 +340,5 @@
word-break: break-all;
line-height: 20px;
flex: 1;
}
\ No newline at end of file
......
......@@ -48,7 +48,7 @@
.from-clues {
height: 100%;
width: 100%;
min-width: 1280px;
// min-width: 1280px;
box-sizing: border-box;
overflow-x: hidden;
padding: 2px;
......@@ -407,7 +407,7 @@
.el-dialog__header {
display: flex;
margin-bottom: 15px;
margin-bottom: 10px;
}
.el-dialog__footer {
......
......@@ -336,7 +336,7 @@
}
.el-menu-item span {
white-space: normal;
white-space: nowrap !important;
word-break: break-all;
line-height: 20px;
flex: 1;
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:11:50
*/
/**
* 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
*/
......@@ -57,17 +62,17 @@ service.interceptors.response.use(
}
);
//对错误信息的处理函数
function handleErrorData(status) {
function handleErrorData (status) {
switch (status) {
case 401:
Message.error("由于长时间未操作，请重新登录!");
router.replace({
path: "/login/jg",
query: {
redirect: router.history.current.fullPath,
},
});
break;
// case 401:
// Message.error("由于长时间未操作，请重新登录!");
// router.replace({
// path: "/login/jg",
// query: {
// redirect: router.history.current.fullPath,
// },
// });
// break;
case 403:
Message.error("拒绝访问");
break;
......
......@@ -172,9 +172,15 @@ export function setExport2Excel (exportName) {
wrapText: 1,
indent: 0,
wrap_text: true
},
border: { // 设置边框
top: { style: 'thin' },
bottom: { style: 'thin' },
left: { style: 'thin' },
right: { style: 'thin' }
}
}
} else if (key.indexOf('!') === -1 && wb[key].v) {
} else if (key.indexOf('!') === -1) {
wb[key].s = {
font: {//字体设置
sz: 13,
......@@ -210,6 +216,7 @@ function addRangeBorder (range, ws) {
range.forEach(item => {
let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r);
let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c);
console.log(startColNumber);
const test = ws[arr[startRowNumber] + (startColNumber + 1)];
for (let col = startColNumber; col <= endColNumber; col++) {
for (let row = startRowNumber; row <= endRowNumber; row++) {
......
......@@ -29,11 +29,13 @@ class data extends filter {
},
{
label: "业务号",
prop: "ywh"
prop: "ywh",
minWidth: 150,
},
{
label: "不动产单元号",
prop: "bdcdyh"
prop: "bdcdyh",
minWidth: 150,
},
// {
// label: "不动产产权证号",
......@@ -41,19 +43,23 @@ class data extends filter {
// },
{
label: "查封机关",
prop: "cfjg"
prop: "cfjg",
minWidth: 150,
},
{
label: "查封文号",
prop: "cfwh"
prop: "cfwh",
minWidth: 130,
},
{
label: "解封机关",
prop: "jfjg"
prop: "jfjg",
width: 150,
},
{
label: "解封文号",
prop: "jfwh"
prop: "jfwh",
minWidth: 130,
},
{
......
......@@ -120,11 +120,12 @@ export default {
return (
<div>
<el-button
type="primary"
size="mini"
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
)
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:22:01
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -34,12 +39,12 @@ class data extends filter {
{
label: "不动产单元号",
prop: "bdcdyh",
width: 150,
minWidth: 150,
},
{
label: "不动产权证号",
prop: "bdcdjzmh",
width: 150,
minWidth: 160,
},
{
label: "抵押类型",
......
......@@ -113,11 +113,13 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
size="mini"
onClick={() => { this.handleEdit(scope.row) }}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
)
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:23:47
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -7,16 +12,18 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.xzq, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
},
{
label: "权属状态",
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -31,17 +38,18 @@ class data extends filter {
},
{
label: "供役地不动产单元号",
width: 150,
minWidth: 150,
prop: "GYDBDCDYH"
},
{
label: "需役地不动产单元号",
width: 150,
minWidth: 150,
prop: "XYDBDCDYH"
},
{
label: "不动产产权证号",
prop: "bdcqzh"
prop: "bdcqzh",
minWidth: 150,
},
{
label: "权利类型",
......@@ -59,11 +67,13 @@ class data extends filter {
},
{
label: "登记时间",
prop: "DJSJ"
prop: "DJSJ",
width: 140,
},
{
label: "登记机构",
prop: "DJJG"
prop: "DJJG",
minWidth: 150,
}
]
}
......
......@@ -116,16 +116,17 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
size="mini"
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
)
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:25:09
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -33,11 +38,13 @@ class data extends filter {
},
{
label: "不动产单元号",
prop: "bdcdyh"
prop: "bdcdyh",
minWidth: 150,
},
{
label: "不动产权证号",
prop: "bdcqzh"
prop: "bdcqzh",
minWidth: 150,
},
{
label: "权利人",
......@@ -86,7 +93,8 @@ class data extends filter {
},
{
label: "登记机构",
prop: "djjg"
prop: "djjg",
minWidth: 150,
}
]
}
......
......@@ -104,17 +104,19 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 90,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:25:56
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -8,7 +13,7 @@ class data extends filter {
{
label: "业务号",
prop: "ywh",
width: 150
minWidth: 150,
},
// {
// label: "权利类型",
......
......@@ -77,12 +77,14 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -34,12 +34,12 @@ class data extends filter {
{
label: "不动产单元号",
prop: "bdcdyh",
width: 150
minWidth: 150,
},
{
label: "不动产权证号",
prop: "bdcqzh",
width: 150
minWidth: 150,
},
{
label: "权利人",
......
......@@ -109,12 +109,14 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -7,6 +7,7 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -28,19 +29,17 @@ class data extends filter {
{
label: "业务号",
prop: "YWH",
width: 150
},
{
label: "业务号",
prop: "BDCDYH"
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH"
prop: "BDCQZH",
minWidth: 150,
},
{
label: "建筑物名称",
......
......@@ -100,17 +100,19 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -7,10 +7,11 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.XZQ, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
......@@ -20,7 +21,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span>
<span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
</div>
)
},
......@@ -28,19 +29,17 @@ class data extends filter {
{
label: "业务号",
prop: "YWH",
width: 150
},
{
label: "业务号",
prop: "BDCDYH"
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH"
prop: "BDCQZH",
minWidth: 150,
},
{
label: "海岛名称",
......
......@@ -101,17 +101,19 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -11,7 +11,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.QXDM, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
......@@ -22,7 +22,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.QSZT, 'A22')}</span>
<span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
</div>
)
},
......@@ -52,17 +52,17 @@ class data extends filter {
{
label: "业务号",
prop: "YWH",
width: 95
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH",
width: 150,
minWidth: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH",
width: 150,
minWidth: 150,
},
{
label: "权利人",
......
......@@ -103,12 +103,14 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:33:35
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -8,35 +13,40 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.XZQ, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
},
{
label: "权属状态",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span>
<span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
</div>
)
},
},
{
label: "业务号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH"
prop: "BDCQZH",
minWidth: 150,
},
{
label: "权利人",
......
......@@ -95,17 +95,19 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -7,20 +7,22 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.XZQ, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
},
{
label: "权属状态",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span>
<span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
</div>
)
},
......@@ -28,11 +30,7 @@ class data extends filter {
{
label: "业务号",
prop: "YWH",
width: 150
},
{
label: "业务号",
prop: "BDCDYH"
width: 150,
},
{
label: "不动产单元号",
......
......@@ -100,17 +100,19 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
/*
* @Description: ,
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:35:00
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -30,15 +35,17 @@ class data extends filter {
{
label: "业务号",
prop: "ywh",
width: 80,
minWidth: 150,
},
{
label: "不动产单元号",
prop: "bdcdyh"
prop: "bdcdyh",
minWidth: 150,
},
{
label: "不动产权证号",
prop: "bdcqzh"
prop: "bdcqzh",
minWidth: 150,
},
{
label: "权利人",
......
......@@ -101,12 +101,14 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -108,16 +108,17 @@ export default {
}].concat(data.columns()).concat([
{
label: "操作",
width: 170,
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
size="mini"
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
)
......
......@@ -7,16 +7,18 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.xzq, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
},
{
label: "权属状态",
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -27,15 +29,18 @@ class data extends filter {
},
{
label: "业务号",
prop: "ywh"
prop: "ywh",
minWidth: 150,
},
{
label: "不动产单元号",
prop: "bdcdyh"
prop: "bdcdyh",
minWidth: 150,
},
{
label: "不动产产权证号",
prop: "bdcqzh"
prop: "bdcqzh",
minWidth: 150,
},
{
label: "权利人",
......
......@@ -101,11 +101,12 @@ export default {
return (
<div>
<el-button
type="primary"
size="mini"
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
)
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:37:10
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -8,10 +13,11 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.QXDM, 'A20')}</span>
<span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
</div>
)
},
......@@ -28,11 +34,13 @@ class data extends filter {
// },
{
label: "业务号",
prop: "YWH"
prop: "YWH",
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产权证号",
......
......@@ -102,12 +102,14 @@ export default {
return (
<div>
<el-button
type="primary"
type="text"
class='btnColor'
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
<i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
);
......
......@@ -199,6 +199,8 @@
width: 60%;
flex-direction: column;
position: relative;
flex: 1;
height: 100%;
li {
font-size: 0.1042rem;
}
......@@ -222,6 +224,7 @@
.cardcontent-right {
flex: 1;
width: 100%;
height: 100%;
flex-direction: column;
font-size: 0.09977rem;
......
......@@ -78,6 +78,7 @@ export default {
endTime: timeFormat(new Date(), true),
qxdm: "",
},
interval: 50
};
},
mounted () {
......@@ -100,6 +101,10 @@ export default {
this.form.qxdm
);
this.chartData = res;
console.log(this.chartData);
let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure }))
this.interval = Math.ceil(maxData / 10)
//行政区代码过滤
res.length > 0 &&
res.forEach((item) => {
......@@ -191,7 +196,7 @@ export default {
color: "#fff",
fontSize: "16",
},
interval: 50,
interval: this.interval,
axisLabel: {
formatter: "{value}",
textStyle: {
......
......@@ -56,7 +56,7 @@ class data extends filter {
{
prop: "recflowid",
label: "业务流水号",
width: 95,
width: 100,
},
{
prop: "estatenum",
......@@ -70,6 +70,7 @@ class data extends filter {
},
{
prop: "rectypeName",
minWidth: 240,
label: "业务名称",
render: (h, scope) => {
return (
......
......@@ -193,7 +193,7 @@ export default {
scope.row.receiveState == 2 ?
<el-button
type="text"
style="color:#67C23A"
class='successColor'
onClick={() => {
this.handleDetails(scope.row);
}}
......@@ -203,6 +203,7 @@ export default {
</el-button> :
<el-button
type="text"
class='btnColor'
onClick={() => {
this.handleDetails(scope.row);
}}
......
......@@ -166,13 +166,13 @@
</el-tabs>
<!-- 当日登薄详单 -->
<div class="from-clues-content" v-show="titleName2 == 'drdbxd'">
<lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
<lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
:data="tableDBData.data">
</lb-table>
</div>
<!-- 当日上报详单 -->
<div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
<lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
<lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
:data="tableSBData.data">
</lb-table>
</div>
......@@ -467,10 +467,26 @@ export default {
margin: 0;
}
/deep/.el-dialog {
display: flex;
flex-direction: column;
}
/deep/.el-dialog__body {
display: flex;
flex-direction: column;
padding-bottom: 30px;
height: 100%;
flex: 1;
position: relative;
}
.regularHeight {
height: 77vh;
display: flex;
flex-direction: column;
flex: 1;
height: 100%;
margin-bottom: 5px;
.editDialogBox-con,
.JsonEditor {
......@@ -478,6 +494,12 @@ export default {
}
}
.d-center {}
.dialog_title {
top: -13px
}
/deep/.el-tabs__item {
color: #CEF8FF !important;
......@@ -516,6 +538,7 @@ export default {
.editDialogBox-box {
position: relative;
top: 10px;
height: 100%;
}
.dialog-from {
......@@ -546,7 +569,7 @@ export default {
}
&_title {
font-size: 18px;
font-size: 14px;
color: #d7eaee;
margin: 3px 0;
}
......
......@@ -22,7 +22,7 @@ class data {
{
prop: "UPLOADTIME",
label: "汇交日期",
width: '150',
width: '140',
},
{
prop: "AREANAME",
......@@ -31,7 +31,7 @@ class data {
{
prop: "ACCESSDATE",
label: "日期",
width: '150',
width: '140',
},
{
prop: "type",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:39:14
*/
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
......@@ -51,6 +56,7 @@ class data extends filter {
{
prop: "estatenum",
label: "不动产单元号",
width: 150,
},
{
prop: "rectype",
......@@ -60,6 +66,7 @@ class data extends filter {
{
prop: "rectypeName",
label: "业务名称",
minWidth: 240,
},
{
prop: "exchangeDate",
......
......@@ -84,7 +84,7 @@
},
mounted () {
if (this.userInfo) {
this.getUserdata(this.userInfo)
this.getUserdata(this.userInfo.id)
}
this.sexList = [
{
......@@ -105,8 +105,8 @@
]
},
methods: {
getUserdata (p) {
getAction(`${api.users}/${p.id}`).then((res) => {
getUserdata (id) {
getAction(`${api.users}/${id}`).then((res) => {
if (res.status === 1) {
this.form = res.content
} else {
......@@ -135,7 +135,6 @@
<style scoped lang="scss">
.user-info {
margin: 0.1875rem 1.0417rem;
background: #ffffff;
overflow-y: auto;
.form-wrapper {
padding: 0px 120px 0px;
......@@ -156,7 +155,7 @@
}
.bottom-wrapper {
padding: 0px 120px 0px;
text-align: right;
text-align: center;
}
}
</style>
......
<!--
* @Author: xiaomiao 1158771342@qq.com
* @Date: 2023-03-08 15:30:43
* @LastEditors: xiaomiao 1158771342@qq.com
* @LastEditTime: 2023-03-08 16:33:50
* @FilePath: \监管系统\js-web-jianguan\src\views\system\information copy\index.vue
* @LastEditors: yangwei
* @LastEditTime: 2023-03-13 17:19:46
* @FilePath: \bdcjg-web\src\views\system\information\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
......@@ -15,8 +15,18 @@
</el-form-item>
<el-row class="mb-5">
<el-col :span="3" class="btnColRight">
<btn nativeType="cx" @click="information">基本信息</btn>
<btn nativeType="cx" @click="password">修改密码</btn>
<!-- <btn nativeType="cx" @click="information"
>基本信息</btn
>
<btn nativeType="cx" :class="isshow ? '' : ''" @click="password"
>修改密码</btn
> -->
<button @click="information" :class="isshow ? 'button choosed' : 'button'">
基本信息
</button>
<button @click="password" :class="isshow ? 'button' : 'button choosed'">
修改密码
</button>
</el-col>
</el-row>
</el-form>
......@@ -30,45 +40,59 @@
</div>
</template>
<script>
import "@/utils/flexible.js";
import BaseSet from "./base-set.vue";
import PasswordEdit from "./password-edit.vue";
export default {
import "@/utils/flexible.js";
import BaseSet from "./base-set.vue";
import PasswordEdit from "./password-edit.vue";
export default {
components: {
BaseSet,
PasswordEdit,
},
data () {
data() {
return {
isshow: true,
};
},
computed: {
userData () {
userData() {
return this.$store.state.user.userInfo;
},
},
watch: {},
created () { },
mounted () {
},
created() {},
mounted() {},
methods: {
information () {
information() {
this.isshow = true;
},
password () {
password() {
this.isshow = false;
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.information {
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.information {
display: flex;
flex-direction: column;
.btnColRight {
.button {
width: 76px;
height: 32px;
color: #ffffff;
margin: 0 5px;
cursor: pointer;
border: 0;
background: url('../../../image/btn.png') no-repeat 0 0;
background-size: cover;
}
.choosed{
background: url('../../../image/btn.png') no-repeat 0 -34px;
}
}
/deep/.content {
.el-input__inner {
background: none;
......@@ -76,10 +100,9 @@
.user-info {
background: none;
}
.boxin {
height: 79%;
}
}
.boxin {
flex: 1;
}
}
</style>
......
......@@ -6,27 +6,31 @@
label-width="100px"
:model="form"
class="form-wrapper"
:rules="rules">
:rules="rules"
>
<el-form-item label="旧密码:" prop="oldPassword">
<el-input
v-model="form.oldPassword"
clearable
type="password"
show-password />
show-password
/>
</el-form-item>
<el-form-item label="新密码:" prop="newPassword">
<el-input
v-model="form.newPassword"
clearable
type="password"
show-password />
show-password
/>
</el-form-item>
<el-form-item label="确认密码:" prop="confirmPassword">
<el-input
v-model="form.confirmPassword"
clearable
type="password"
show-password />
show-password
/>
</el-form-item>
</el-form>
<div class="bottom-wrapper">
......@@ -37,83 +41,81 @@
</template>
<script>
import { updateUserPassword } from "@/api/personnelManage";
export default {
import { updateUserPassword } from "@/api/personnelManage";
export default {
props: {
userInfo: {
type: Object,
default: null
}
default: null,
},
},
data () {
data() {
return {
form: {},
sexList: [],
userId: '',
userId: "",
rules: {
oldPassword: [
{ required: true, message: '旧密码不能为空', trigger: 'blur' }
{ required: true, message: "旧密码不能为空", trigger: "blur" },
],
newPassword: [
{ required: true, message: '新密码不能为空', trigger: 'blur' }
{ required: true, message: "新密码不能为空", trigger: "blur" },
],
confirmPassword: [
{ required: true, message: '确认密码不能为空', trigger: 'blur' },
{ validator: this.validatorConfirmPassword, trigger: 'blur' }
]
}
}
{ required: true, message: "确认密码不能为空", trigger: "blur" },
{ validator: this.validatorConfirmPassword, trigger: "blur" },
],
},
};
},
computed: {},
watch: {
userInfo: {
handler: function (val) {
if (val) {
this.getid(val)
}
this.getid(val);
}
}
},
mounted () {
},
},
mounted() {
if (this.userInfo) {
this.getid(this.userInfo)
this.getid(this.userInfo);
}
},
methods: {
getid (val) {
this.userId = val.id
getid(val) {
this.userId = val.id;
},
validatorConfirmPassword (rule, value, callback) {
const { newPassword } = this.form
validatorConfirmPassword(rule, value, callback) {
const { newPassword } = this.form;
if (value !== newPassword) {
callback('两次输入密码不一致')
callback("两次输入密码不一致");
} else {
callback()
callback();
}
},
updatePassword () {
updatePassword() {
this.$refs.form.validate((valid) => {
if (valid) {
const params = Object.assign({}, this.form, { id: this.userId })
const params = Object.assign({}, this.form, { id: this.userId });
updateUserPassword(params).then((res) => {
if (res.status === 1) {
this.$message.success({ message: res.message, showClose: true })
this.$message.success({ message: res.message, showClose: true });
} else {
this.$message.error({ message: res.message, showClose: true })
}
})
}
})
}
this.$message.error({ message: res.message, showClose: true });
}
});
}
});
},
},
};
</script>
<style scoped lang="scss">
.user-info {
.user-info {
margin: 36px 200px;
background: #ffffff;
overflow-y: auto;
.form-wrapper {
padding: 24px 120px 0px;
......@@ -132,7 +134,7 @@
}
.bottom-wrapper {
padding: 32px 120px 24px;
text-align: right;
}
text-align: center;
}
}
</style>
......
<template>
<div>
<Dialog class="modifydialog" :title="title" :show.sync="visible" :width="'767px'" @close="close()">
<template slot="content">
<dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" v-model="myValue">
<div class="modifydialog-con">
<el-form ref="form" :model="form" :rules="rules">
<el-row :gutter="24">
<el-col :span="12">
......@@ -51,33 +50,22 @@
</el-col>
</el-row>
</el-form>
</template>
<template slot="footer">
<el-button class="cancel-button" @click="close()">取消</el-button>
<el-button type="primary" @click="submitForm()">保存</el-button>
</template>
</Dialog>
<!-- 图标列表 -->
<IconList ref="iconList" @iconName="getIconName" />
</div>
</dialogBox>
</template>
<script>
import Dialog from "@/components/Dialog/";
import { getParentMenuListAction } from '@/api/authorityManage'
import JsonEditor from '@/components/JsonEditors'
import IconList from '@/components/IconList'
import { validateCode } from '@/utils/validate';
import { api, httpAction } from '@/api/manageApi'
export default {
import { getParentMenuListAction } from '@/api/authorityManage'
import JsonEditor from '@/components/JsonEditors'
import { validateCode } from '@/utils/validate';
import { api, httpAction } from '@/api/manageApi'
export default {
name: 'MenuModal',
components: {
IconList,
JsonEditor,
Dialog
},
props: {
value: { type: Boolean, default: false },
productId: {
type: String,
default: ''
......@@ -85,6 +73,7 @@
},
data () {
return {
myValue: this.value,
form: {
icon: '',
code: ''
......@@ -126,8 +115,11 @@
}
}
},
created () { },
mounted () { },
watch: {
value (val) {
this.myValue = val
}
},
methods: {
// 获取父级菜单
getParentMenuList (id) {
......@@ -162,7 +154,6 @@
// 新增菜单
add () {
this.getParentMenuList(this.productId)
this.visible = true
this.type = 0
this.form.jumpMode = 1
},
......@@ -176,7 +167,6 @@
this.getParentMenuList(this.productId)
})
}
this.visible = true
},
// 选择上级菜单
handleChange (value) {
......@@ -230,8 +220,12 @@
this.visible = false
}
}
}
}
</script>
<style scoped lang="scss">
// @import "~@/styles/public.scss";
.modifydialog {
&-con {
background: #031A46;
}
}
</style>
\ No newline at end of file
......
......@@ -17,27 +17,27 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
</lb-table>
</div>
<edit-dialog ref="dialogForm" :product-id="productId" :resource-category-id="resourceCategoryId"
<edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
@ok="reloadTableData" />
<!-- <authorizationdiglog ref="rolesForm" /> -->
</div>
</template>
<script>
// 定时任务
import data from "./data";
import { deleteAction, getAction, api } from "@/api/manageApi";
import EditDialog from "./edit-dialog.vue";
import { mapGetters } from "vuex";
import { getMenuInfo } from "@/api/user";
import {
// 定时任务
import data from "./data";
import { deleteAction, getAction, api } from "@/api/manageApi";
import EditDialog from "./edit-dialog.vue";
import { mapGetters } from "vuex";
import { getMenuInfo } from "@/api/user";
import {
getUuid,
judgeSort,
realMove,
findParents,
removeTreeListItem,
} from "@/utils/operation";
// import authorizationdiglog from "./authorizationdiglog.vue";
export default {
} from "@/utils/operation";
// import authorizationdiglog from "./authorizationdiglog.vue";
export default {
name: "menus",
components: {
EditDialog,
......@@ -45,6 +45,7 @@
},
data () {
return {
isDialog: false,
tablelistData: [],
resourceCategoryId: "",
taskData: null,
......@@ -147,113 +148,22 @@
this.productId = res.content[0].id;
this.getAuthorityList(res.content[0].id, res.content[0].code)
this.selectedSubsystemCode = res.content[0].code
// let queryOptions = {
// conditionGroup: {
// conditions: [
// {
// property: "productId",
// value: this.productId,
// operator: "EQ",
// },
// ],
// queryRelation: "AND",
// },
// orderBys: [{ property: "sort", direction: "desc" }],
// };
// if (!this.tableUrl) {
// console.log("请设置tableUrl属性为接口地址!");
// return;
// }
// if (this.queryOptions !== "") {
// this.queryParam.queryOptions = JSON.stringify(queryOptions);
// }
// 查询系统菜单
// getAction(this.tableUrl, this.queryParam)
// .then((res) => {
// if (res.status === 1) {
// this.loading = false;
// // this.menutablelistData = res.content;
// console.log("res.content菜单", res.content);
// } else {
// this.$message.error({ message: res.message, showClose: true });
// this.loading = false;
// }
// })
// .catch((error) => {
// console.log("er", error);
// this.loading = false;
// });
})
.catch((error) => {
console.log("er", error);
});
// const queryOptionsid = {
// conditionGroup: {
// queryRelation: "AND",
// conditions: [
// {
// property: "code",
// value: sessionStorage.getItem("products"),
// operator: "EQ",
// },
// ],
// },
// };
// const params = {
// queryOptions: queryOptionsid,
// };
// // 获取系统id
// getAction(this.meumurlid, params)
// .then((res) => {
// this.productId = res.content[0].id;
// let queryOptions = {
// conditionGroup: {
// conditions: [
// {
// property: "productId",
// value: this.productId,
// operator: "EQ",
// },
// ],
// queryRelation: "AND",
// },
// orderBys: [{ property: "sort", direction: "desc" }],
// };
// if (!this.tableUrl) {
// console.log("请设置tableUrl属性为接口地址!");
// return;
// }
// if (this.queryOptions !== "") {
// this.queryParam.queryOptions = JSON.stringify(queryOptions);
// }
// // 查询系统菜单
// getAction(this.tableUrl, this.queryParam)
// .then((res) => {
// if (res.status === 1) {
// this.loading = false;
// this.tablelistData = res.content;
// } else {
// this.$message.error({ message: res.message, showClose: true });
// this.loading = false;
// }
// })
// .catch((error) => {
// console.log("er", error);
// this.loading = false;
// });
// })
// .catch((error) => {
// console.log("er", error);
// });
})
},
// 新增菜单
handleAdd () {
this.isDialog = true
this.$refs.dialogForm.add();
this.$refs.dialogForm.title = "添加";
},
// 修改
handleEdit (record) {
this.isDialog = true
this.$refs.dialogForm.edit(record);
this.$refs.dialogForm.title = "修改";
},
......@@ -302,17 +212,17 @@
this.getTableList()
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
.btnColRight {
// @import "~@/styles/public.scss";
.btnColRight {
margin-top: 20px;
}
}
/deep/.el-table__expand-icon {
/deep/.el-table__expand-icon {
color: #fff;
}
}
</style>
......