b9bb4571 by yuanbo

Merge remote-tracking branch 'origin/dev' into dev

2 parents 0355303c da7a03df
/*
* @Description: 业务办理
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:13:24
* @LastEditTime: 2023-07-19 14:53:41
*/
import request from '@/utils/request'
......@@ -17,8 +17,6 @@ export function getCollectBiz () {
method: 'post'
})
}
/**
* @description: 业务办理-获取左侧菜单
* @author: renchao
......@@ -29,12 +27,11 @@ export function getleftMenu () {
method: 'post'
})
}
/**
* @description: 登记簿补录
* @author: renchao
*/
export function getRepairBiz () {
export function getRepairBiz () {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getRepairBiz',
method: 'post'
......@@ -50,7 +47,7 @@ export function getTogetherBiz () {
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getTogetherBiz',
method: 'post'
})
}
}
/**
* @description: 业务办理-获取下个节点内容
......
// 封装axios请求
import axios from "axios";
// 创建axios的对象
const instance = axios.create({
baseURL: "http://192.168.2.235/management/rest/users",
})
export const getusername = (data) => instance({
url: '', // 请求地址
method: 'get',
params:{
queryOptions: {
conditionGroup: {
conditions: [
{
property: "loginName",
value:data,
operator: "IN",
},
],
queryRelation: "AND",
},
orderBys:[{"property":"sort","direction":"desc"}]
},
},
})
/*
* @Description: 楼盘表查询
* @Autor: renchao
* @LastEditTime: 2023-07-12 13:26:37
* @LastEditTime: 2023-07-19 15:00:43
*/
import request from "@/utils/request";
let SERVER = window.config
? window.config
: JSON.parse(localStorage.getItem("ApiUrl"));
const url = SERVER.SERVERAPI + "/rest/zhcx/lpcx/";
//
/**
* @description:楼盘查询- 根据条件进行列表查询
* @param {*} data
* @author: renchao
*/
export function getLpZrz(data) {
export function getLpZrz (data) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpZrz",
method: "post",
......@@ -27,7 +26,7 @@ export function getLpZrz(data) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpb(zrzbsm) {
export function getLpb (zrzbsm) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
......@@ -38,7 +37,7 @@ export function getLpb(zrzbsm) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpbFwytAndQlxz(zrzbsm) {
export function getLpbFwytAndQlxz (zrzbsm) {
return request({
url:
"service-lpb/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=0&zrzbsm=" +
......@@ -51,7 +50,7 @@ export function getLpbFwytAndQlxz(zrzbsm) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpbQsxtj(zrzbsm) {
export function getLpbQsxtj (zrzbsm) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpbQsxtj?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
......@@ -65,7 +64,7 @@ export function getLpbQsxtj(zrzbsm) {
* scyclx 实测预测类型 0预测,1实测
* @return {*}
*/
export function getLpbTj(zrzbsm) {
export function getLpbTj (zrzbsm) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpbTj?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
......
......@@ -17,8 +17,6 @@ export function getErrorLogList (data) {
data
})
}
/**
* @description: 系统监控 -获取操作日志列表
* @param {*} data
......@@ -31,7 +29,6 @@ export function getOperationLogList (data) {
data
})
}
/**
* @description: 系统监控 -主机监控
* @author: renchao
......
/*
* @Description: 业务申请
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:13:24
* @LastEditTime: 2023-07-19 14:52:03
*/
import request from '@/utils/request'
......@@ -132,11 +132,11 @@ export function selectDz (data) {
data
})
}
/**
* @description: 业务办理-选择单元-查询户信息
* @author: renchao
*/
/*
业务办理-选择单元-查询户信息
*/
export function selectH (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:01:08
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:01:40
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:03:14
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:03:56
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:04:07
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:04:15
-->
<template>
<div class="djxxTable">
<div class="tableBox">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:04:26
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -10,8 +15,7 @@
placeholder="请输入编号"
v-model="queryForm.jklx"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -20,8 +24,7 @@
placeholder="请输入编号"
v-model="queryForm.dyzt"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -33,8 +36,7 @@
placeholder="请输入IP"
v-model="queryForm.fwip"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -53,14 +55,13 @@
placeholder="请输入url"
v-model="queryForm.qqdz"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="请求头数据">
......@@ -69,8 +70,7 @@
placeholder="请输入请求头数据"
v-model="queryForm.qqtsj"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -83,8 +83,7 @@
placeholder="请输入参数"
v-model="queryForm.rcsj"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -98,8 +97,7 @@
placeholder="调用描述"
v-model="queryForm.dyms"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -113,8 +111,7 @@
placeholder="返回数据"
v-model="queryForm.fhsj"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -137,7 +134,7 @@
<script>
export default {
export default {
data () {
return {
......@@ -155,8 +152,8 @@ export default {
}
},
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:04:38
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -10,8 +15,7 @@
placeholder="请输入编号"
v-model="queryForm.jklx"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -20,8 +24,7 @@
placeholder="请输入编号"
v-model="queryForm.dyzt"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -33,8 +36,7 @@
placeholder="请输入IP"
v-model="queryForm.fwip"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -53,14 +55,13 @@
placeholder="请输入url"
v-model="queryForm.qqdz"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="请求头数据">
......@@ -69,8 +70,7 @@
placeholder="请输入请求头数据"
v-model="queryForm.qqtsj"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -83,8 +83,7 @@
placeholder="请输入参数"
v-model="queryForm.rcsj"
class="width500px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -98,8 +97,7 @@
placeholder="调用描述"
v-model="queryForm.dyms"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -113,8 +111,7 @@
placeholder="返回数据"
v-model="queryForm.fhsj"
class="width200px"
clearable
></el-input>
clearable></el-input>
</el-form-item>
</el-col>
......@@ -137,7 +134,7 @@
<script>
export default {
export default {
data () {
return {
......@@ -155,8 +152,8 @@ export default {
}
},
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:09:11
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -6,12 +11,12 @@
<el-row>
<el-col :span="5">
<el-form-item label="个性化配置">
<el-input ></el-input>
<el-input></el-input>
</el-form-item>
</el-col>
<el-col :span="19" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" >查询</el-button>
<el-button type="primary" native-type="submit">查询</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -19,12 +24,12 @@
</div>
<!-- 表格 -->
</div>
</template>
</template>
<script>
import table from "@/utils/mixin/table";
export default {
name: "gxhpz",
components: { },
components: {},
mixins: [table],
mounted () {
},
......@@ -40,5 +45,5 @@
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
</style>
</style>
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:09:29
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -31,11 +36,11 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { sysSqywmbszSearch } from '@/api/sysSqywmbsz'
import table from "@/utils/mixin/table"
import { datas, sendThis } from "./qtjfjmb"
export default {
import { mapGetters } from 'vuex'
import { sysSqywmbszSearch } from '@/api/sysSqywmbsz'
import table from "@/utils/mixin/table"
import { datas, sendThis } from "./qtjfjmb"
export default {
name: "qtjfjmb",
mixins: [table],
mounted () {
......@@ -73,8 +78,8 @@ export default {
this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%')
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
<!--
功能:登记情形设定
* @Description: 登记情形设定
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:09:47
-->
<template>
<div>
......@@ -22,9 +24,9 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { upward, down } from '@/utils/operation'
export default {
import { mapGetters } from 'vuex'
import { upward, down } from '@/utils/operation'
export default {
props: {
ruleForm: {
type: Object, default: {}
......@@ -223,8 +225,7 @@ export default {
down(index, this.tableData)
},
}
}
}
</script>
<style scoped lang='scss'>
</style>
\ No newline at end of file
......
<!--
功能:登记情形设定
* @Description: 功能:登记情形设定
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:10:04
-->
<template>
<div class='djqxsd'>
......@@ -22,8 +24,8 @@
</div>
</template>
<script>
import { upward, down } from '@/utils/operation'
export default {
import { upward, down } from '@/utils/operation'
export default {
props: {
ruleForm: {
type: Object, default: () => {
......@@ -241,14 +243,14 @@ export default {
this.key++
}
}
}
}
</script>
<style lang='scss' scoped>
.djqxsd {
.djqxsd {
.repeat {
.el-input__inner {
border-color: red !important;
}
}
}
}
</style>
\ No newline at end of file
......
<!--
功能:单元状态设定
* @Description: 单元状态设定
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:10:44
-->
<template>
<div class='该组件名称'>
......@@ -48,7 +50,7 @@
</div>
</template>
<script>
export default {
export default {
props: {
ruleForm: {
type: Object, default: {}
......@@ -103,19 +105,19 @@ export default {
})
}
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
@import "~@/styles/mixin.scss";
.dyztsd-title {
.dyztsd-title {
@include flex;
align-items: center;
justify-content: space-between;
padding-left: 20px;
}
}
.qlxx-list {
.qlxx-list {
@include flex;
flex-wrap: wrap;
padding-left: 20px;
......@@ -124,9 +126,9 @@ export default {
width: 33%;
margin-bottom: 15px;
}
}
}
.screen-list {
.screen-list {
@include flex;
align-items: center;
flex-wrap: wrap;
......@@ -151,5 +153,5 @@ export default {
li:nth-child(odd) {
border-right: 1px solid $borderColor;
}
}
}
</style>
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:10:56
-->
<template>
<dialogBox title="申请业务规则配置" @submitForm="submitForm" @closeDialog="closeDialog" v-model="myValue"
:btnDisabled="btnDisabled">
......@@ -123,12 +128,12 @@
</dialogBox>
</template>
<script>
import { uploadUrl } from '@/api/file'
import djqxsd from './djqxsd.vue'
import clgzsd from './clgzsd.vue'
import dyztsd from './dyztsd.vue'
import { getSqdjywDetail, saveSqdjyw } from '@/api/sysSqdjyw'
export default {
import { uploadUrl } from '@/api/file'
import djqxsd from './djqxsd.vue'
import clgzsd from './clgzsd.vue'
import dyztsd from './dyztsd.vue'
import { getSqdjywDetail, saveSqdjyw } from '@/api/sysSqdjyw'
export default {
components: {
djqxsd,
clgzsd,
......@@ -314,25 +319,25 @@ export default {
}
}
}
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/mixin.scss";
/deep/.el-radio {
/deep/.el-radio {
margin-right: 0;
}
}
/deep/.el-radio__label {
/deep/.el-radio__label {
padding-left: 2px;
}
}
.active {
.active {
background: $light-blue !important;
color: #fff;
}
}
.edit-title-list {
.edit-title-list {
@include flex;
li {
......@@ -348,9 +353,9 @@ export default {
@extend .active;
}
}
}
}
.sqywgz-edit {
.sqywgz-edit {
@include flex;
width: 100%;
height: 563px;
......@@ -358,11 +363,9 @@ export default {
&-left {
width: 26px;
li {
@include flex-center;
background-color: #E4E7ED;
background-color: #e4e7ed;
border-bottom-right-radius: 5px;
padding: 15px;
cursor: pointer;
......@@ -383,5 +386,5 @@ export default {
flex: 1;
width: 100%;
}
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:11:05
-->
<template>
<div>
<ul class="edit-title-list" v-if="djlxList.length > 0">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:11:20
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -36,12 +41,12 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import editDialog from "./components/editDialog.vue";
import componentDialog from "./sqywDetail.vue";
import { datas, sendThis } from "./sqywgzdata";
import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js";
export default {
import table from "@/utils/mixin/table";
import editDialog from "./components/editDialog.vue";
import componentDialog from "./sqywDetail.vue";
import { datas, sendThis } from "./sqywgzdata";
import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js";
export default {
name: "djbcx",
components: {
editDialog,
......@@ -93,8 +98,8 @@ export default {
this.$popupDialog(row.nodename, "system/sqywgz/sqywDetail", this.sqqlRule, '80%')
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -34,6 +34,7 @@ export default {
},
//切换选项卡内容组件
getFromRouter (tabname) {
console.log(tabname, 'tabnametabnametabnametabnametabname');
//根据tabname获取选中的表单 此操作为了获取后端返回的表单对象,使用里面的是否可操作的属性
for (let item of this.tabList) {
if (item.value === tabname) {
......
<!--
功能:高级搜索
作者:calliope
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:08:17
-->
<template>
<dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue"
......@@ -42,10 +43,10 @@
</template>
<script>
export default {
export default {
props: {
value: { type: Boolean, default: false },
advancedForm:{type: Object, default: "" }
advancedForm: { type: Object, default: "" }
},
data () {
return {
......@@ -62,8 +63,8 @@ export default {
value (val) {
this.myValue = val
},
advancedForm(){
this.ruleForm={...this.advancedForm}
advancedForm () {
this.ruleForm = { ...this.advancedForm }
}
},
......@@ -74,7 +75,7 @@ export default {
},
resetForm () {
this.$refs['ruleForm'].resetFields()
this.ruleForm={
this.ruleForm = {
sqywmc: '',
qlrmc: '',
ywrmc: '',
......@@ -88,17 +89,17 @@ export default {
}
}
}
}
</script>
<style scoped lang='scss'>
@import '~@/styles/public.scss';
@import "~@/styles/public.scss";
.search-btn {
.search-btn {
padding: 0 20px 20px 20px;
text-align: right;
}
}
/deep/.el-icon-date {
/deep/.el-icon-date {
display: none;
}
}
</style>
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-07-14 11:16:12
* @LastEditTime: 2023-07-19 14:43:59
-->
<template>
<div class="slxx">
......@@ -268,7 +268,6 @@
this.ruleForm.ywrList = _.cloneDeep(val);
},
onSubmit () {
console.log("this.ruleForm",);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-13 16:31:05
* @LastEditTime: 2023-07-19 14:38:31
-->
<template>
<div class="from-clues">
......@@ -114,7 +114,7 @@
class="loadingtext"
@sort-change="handleSort"
:current-page.sync="pageData.currentPage"
:heightNum="295"
:heightNum="305"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 13:59:35
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -89,12 +94,12 @@
</div>
</template>
<script>
import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./djbcxdata";
import { getDjbBysearch } from "@/api/search.js";
import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./djbcxdata";
import { getDjbBysearch } from "@/api/search.js";
export default {
export default {
name: "djbcx",
mixins: [table],
mounted () {
......@@ -181,16 +186,16 @@ export default {
// },
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
.icon-circle {
.icon-circle {
position: relative;
}
}
.icon-circle::before {
.icon-circle::before {
content: "";
width: 4px;
height: 4px;
......@@ -198,5 +203,5 @@ export default {
background: #000;
top: 0px;
left: 0px;
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 13:59:55
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:00:03
-->
<template>
<div class="from-clues">
<!-- 楼盘查询 -->
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:07:38
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......