Skip to content

bdc / bdcjg-web

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

Merge branch 'master' into dev

2 parents c2475abd 2129e5a8
Inline Side-by-side
Showing 11 changed files with 219 additions and 151 deletions
......@@ -4,9 +4,9 @@
* @LastEditors: yangwei
* @LastEditTime: 2023-03-14 10:45:11
* @FilePath: \bdcjg-web\src\api\authorityManage.js
* @Description:
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
* @Description:
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
*/
import { getParams } from './util'
......@@ -79,6 +79,7 @@ export const roleAuthority = (id, permissionDtos) => {
// 获取父级菜单
// id是系统id
export const getParentMenuListAction = (id) => {
let conditionGroup = {}
if (id && id !== '') {
......
......@@ -1265,3 +1265,61 @@
}
}
}
// 配置参数
.configuration {
color: white;
margin-top: 6vh;
.el-dialog {
background-color: #031a46 !important;
border: 1px solid #5f82c7;
.el-dialog__header {
.el-dialog__title {
color: white !important;
}
.el-dialog__headerbtn {
top: 20px;
}
}
/deep/ .jsoneditor-vue {
height: 100%;
}
.fullScreen {
position: absolute;
right: 4%;
top: 17%;
cursor: pointer;
color: #fff;
}
/deep/ .jsoneditor-modes {
display: none !important;
}
/deep/.jsoneditor-poweredBy {
display: none !important;
}
.jsoneditor-menu {
background-color: #031a46 !important;
border-bottom: 1px solid #9c9e9f !important;
}
.jsoneditor {
border: 1px solid #9c9e9f !important;
}
.el-collapse {
border: 0;
}
.el-collapse-item__header {
height: 44px;
}
}
}
......
......@@ -172,7 +172,7 @@
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: white;
color: #4162D8
}
.el-dialog__header {
......@@ -270,7 +270,7 @@
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: white;
color: #4162D8
}
.el-dialog__header {
......@@ -450,7 +450,7 @@
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: white;
color: #4162D8
}
.el-dialog__body {
......@@ -693,9 +693,11 @@
// 人员管理角色管理菜单管理修改新增弹框样式
.PersonnelDialog {
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: white;
color: #4162D8
}
.el-dialog__header {
......@@ -958,6 +960,69 @@
.el-dialog__headerbtn .el-dialog__close {
font-size: 20px;
color: white;
color: #4162D8
}
}
// 配置参数
.configuration {
color: white;
margin-top: 6vh;
.el-dialog {
background-color: #ffffff !important;
.el-dialog__header {
@include background("navbg");
.el-dialog__title {
color: white !important;
}
.el-dialog__headerbtn {
top: 20px;
.el-dialog__close {
color: #4162D8
}
}
}
/deep/ .jsoneditor-vue {
height: 100%;
}
.fullScreen {
position: absolute;
right: 4%;
top: 17%;
cursor: pointer;
color: #4162D8
}
/deep/ .jsoneditor-modes {
display: none !important;
}
/deep/.jsoneditor-poweredBy {
display: none !important;
}
.jsoneditor-menu {
@include background("navbg");
border-bottom: 1px solid #9c9e9f !important;
}
.jsoneditor {
border: 1px solid #9c9e9f !important;
}
.el-collapse {
border: 0;
}
.el-collapse-item__header {
height: 44px;
}
}
}
......
......@@ -2,6 +2,7 @@
<div class="Cfdj from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="80px">
<!-- 判断进入监管还是上报系统 -->
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
</el-form-item>
......
......@@ -2,6 +2,7 @@
<div class="dyaq from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="120px">
<!-- 判断进入监管还是上报系统 -->
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
......
......@@ -2,6 +2,7 @@
<div class="from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="150px">
<!-- 判断进入监管还是上报系统 -->
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
</el-form-item>
......@@ -87,82 +88,82 @@
</template>
<script>
// 地役权登记
import data from "./data"
import qlfQlDyiq from '@/api/qlfQlDyiq'
import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/TreeSelect.vue'
export default {
name: "dyiq",
mixins: [tableMixin],
components: {
treeSelect
},
data () {
return {
form: {
XZQDM: '',
QSZT: '',
ZL: '',
BDCQZH: '',
QLR: '',
BDCDYH: '',
// 供役地不动产单元号
GYDBDCDYH: '',
// 需役地不动产单元号
XYDBDCDYH: '',
ZJH: '',
currentPage: 1
},
tableData: {
columns: [{
label: '序号',
type: 'index',
width: '50',
index: this.indexMethod,
}].concat(data.columns()).concat([
{
label: "操作",
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
</el-button>
</div>
)
// 地役权登记
import data from "./data"
import qlfQlDyiq from '@/api/qlfQlDyiq'
import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/TreeSelect.vue'
export default {
name: "dyiq",
mixins: [tableMixin],
components: {
treeSelect
},
data () {
return {
form: {
XZQDM: '',
QSZT: '',
ZL: '',
BDCQZH: '',
QLR: '',
BDCDYH: '',
// 供役地不动产单元号
GYDBDCDYH: '',
// 需役地不动产单元号
XYDBDCDYH: '',
ZJH: '',
currentPage: 1
},
tableData: {
columns: [{
label: '序号',
type: 'index',
width: '50',
index: this.indexMethod,
}].concat(data.columns()).concat([
{
label: "操作",
width: 80,
render: (h, scope) => {
return (
<div>
<el-button
type="text"
class='btnColor'
onClick={() => { this.handleEdit(scope.row) }}
>
详情
</el-button>
</div>
)
}
}
}
]),
data: []
},
pageData: {
total: 0,
pageSize: 15,
current: 1,
]),
data: []
},
pageData: {
total: 0,
pageSize: 15,
current: 1,
}
}
}
},
methods: {
async featchData () {
try {
this.form = Object.assign(this.form, this.formData)
let { result: { list, total, pages: pageSize, pageNum: current }
} = await qlfQlDyiq.getQlfQlDyiqList(this.form)
this.tableData.data = list
this.pageData = {
pageSize,
current,
total
},
methods: {
async featchData () {
try {
this.form = Object.assign(this.form, this.formData)
let { result: { list, total, pages: pageSize, pageNum: current }
} = await qlfQlDyiq.getQlfQlDyiqList(this.form)
this.tableData.data = list
this.pageData = {
pageSize,
current,
total
}
} catch (error) {
}
} catch (error) {
}
}
}
}
</script>
......
......@@ -5,6 +5,7 @@
<div class="from-clues-header">
<el-form ref="ruleForm" :model="form" label-width="80px">
<el-form-item v-if="BASE_API.THEME=='jg'">
<!-- 判断进入监管还是上报系统 -->
<Breadcrumb />
</el-form-item>
<el-row>
......
......@@ -4,6 +4,7 @@
<!-- 头部搜索 -->
<div class="from-clues-header">
<el-form ref="ruleForm" :model="form" label-width="100px">
<!-- 判断进入监管还是上报系统 -->
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
</el-form-item>
......
......@@ -2,6 +2,7 @@
<div class="from-clues">
<div class="from-clues-header">
<el-form ref="ruleForm" :model="form" label-width="100px">
<!-- 判断进入监管还是上报系统 -->
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
</el-form-item>
......@@ -38,7 +39,7 @@
</div>
<div class="from-clues-content">
<lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata"
row-key="dictid">
</lb-table>
</div>
......
......@@ -29,14 +29,9 @@
</el-tooltip>
<template slot="footer">
<div class="dialog-footer flex flex-pack-center">
<el-button
type="primary"
class="confirmBtn"
@click="onJsonSave">保存</el-button>
<el-button
type="primary"
class="cancelBtn"
@click="cancel">关闭</el-button>
<btn nativeType="cx" @click="onJsonSave">保存</btn>
<btn nativeType="cx" @click="cancel">关闭</btn>
</div>
</template>
</el-dialog>
......@@ -137,49 +132,4 @@
.icon {
color: #349af3;
}
/deep/ .jsoneditor-vue {
height: 100%;
}
.fullScreen {
position: absolute;
right: 5%;
top: 20%;
cursor: pointer;
color: #fff;
}
/deep/ .jsoneditor-modes {
display: none !important;
}
/deep/.jsoneditor-poweredBy {
display: none !important;
}
.jsoneditor-menu {
background-color: #9c9e9f !important;
border-bottom: 1px solid #9c9e9f !important;
}
.jsoneditor {
border: 1px solid #9c9e9f !important;
}
.el-collapse {
border: 0;
}
.el-collapse-item__header {
height: 44px;
}
.configuration {
color: white;
margin-top: 6vh;
/deep/.el-dialog {
background-color: #031a46 !important;
border: 1px solid #5f82c7;
.el-dialog__header {
.el-dialog__title {
color: white !important;
}
.el-dialog__headerbtn {
top: 20px;
}
}
}
}
</style>
......
......@@ -11,7 +11,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="图标:" label-width="54px">
<el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" />
<el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -51,28 +51,26 @@
<el-col :span="24">
<el-form-item label="配置参数:" label-width="124px" class="form-item-mb0">
<!-- 配置参数 -->
<JsonEditor :result-infos="form.metadata" @getJsonString="getJsonString" />
<JsonEditor class="JsonEditors" :result-infos="form.metadata" @getJsonString="getJsonString" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 图标列表 -->
<IconList ref="iconList" @iconName="getIconName" />
<!-- <IconList ref="iconList" @iconName="getIconName" /> -->
</div>
</dialogBox>
</template>
<script>
import { getParentMenuListAction } from '@/api/authorityManage'
import IconList from '../../../components/IconList'
import JsonEditor from '@/components/JsonEditors'
import JsonEditor from './JsonEditors/index.vue'
import { validateCode } from '@/utils/validate';
import { api, httpAction } from '@/api/manageApi'
export default {
name: 'MenuModal',
components: {
JsonEditor,
IconList,
},
props: {
value: { type: Boolean, default: false },
......@@ -151,16 +149,6 @@
}
})
},
// 选择图标
getIconName (data) {
this.form.icon = data;
},
getIconList () {
this.$refs.iconList.show(true)
},
getIconName (data) {
this.form.icon = data
},
// 配置参数
getJsonString (data) {
this.form.metadata = data
......@@ -208,7 +196,7 @@
message: res.message,
showClose: true
})
close()
this.close()
this.$emit('ok')
} else {
......