Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
9216222f by 任超
Options

Merge branch 'master' into dev

2 parents 63b2dfc8 24811f05
Inline Side-by-side
Showing 33 changed files with 190 additions and 71 deletions
......@@ -36,6 +36,16 @@ class work {
}
})
}
// 新建国有房屋信息
async addhousetotal (code) {
return request({
url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
method: 'get',
params: {
code: code
}
})
}
// 地图区县成功失败统计，code区县编码，汉中为：A20
async submitViews (code) {
return request({
......
......@@ -69,6 +69,7 @@ export default {
position: relative;
left: -10px;
color: #FFFFFF;
// background-color: rgb(155, 200, 200);
}
/deep/.el-breadcrumb__inner {
......
......@@ -27,8 +27,8 @@ export default {
grid: {
// 让图表占满容器
top: "20%",
left: "18%",
right: "10%",
left: "12%",
right: "5%",
bottom: "16%",
},
xAxis: {
......
......@@ -104,8 +104,8 @@ export default {
map: '汉中市',
itemStyle: {
normal: {//阴影
areaColor: '#02D9FD ',
shadowColor: '#01271F',
areaColor: '#5689FD ',
shadowColor: '#21371d',
borderWidth: 0,
shadowOffsetX: 2,
shadowOffsetY: 25
......@@ -125,17 +125,17 @@ export default {
areaColor: 'rgba(19,54,162,.5)',
borderColor: 'rgba(0,242,252,.5)',
borderWidth: 2,
shadowBlur: 7,
borderColor: 'rgba(19,54,162,.1)',
shadowBlur: 1,
borderColor: 'rgb(155, 200, 200)',
shadowColor: '#44f2fc',
},
emphasis: {
areaColor: '#4f7fff',
borderColor: 'rgba(0,242,252,.5)',
borderWidth: 2,
shadowBlur: 10,
shadowColor: '#00f2fc',
},
// emphasis: {
// areaColor: '#4f7fff',
// borderColor: 'rgba(0,242,252,.5)',
// borderWidth: 2,
// shadowBlur: 10,
// shadowColor: '#00f2fc',
// },
},
label: {
formatter: params => {
......
......@@ -37,7 +37,6 @@ export default {
let res = await work.getdjywltotal(p);
// 遍历修改数组键，作为echars图表的参数
res.result.map((item) => {
return (
this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
......
......@@ -28,6 +28,16 @@ let mixin = {
this.formData.pageSize = val
this.featchData()
},
handleSearch () {
this.form.currentPage = 1
this.tableData.data = []
if (this.featchData) {
this.featchData()
}
if (this.queryClick) {
this.queryClick()
}
},
handleCurrentChange (val) {
this.form.currentPage = val
this.featchData()
......
......@@ -68,7 +68,7 @@
<el-col :span="4" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -58,7 +58,7 @@
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -63,7 +63,7 @@
<el-col :span="4" class="btnColRight">
<el-form-item>
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-form-item>
</el-col>
</el-row>
......
......@@ -55,7 +55,7 @@
</el-col>
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -27,7 +27,7 @@
</el-col>
<el-col :span="9" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -55,7 +55,7 @@
</el-col>
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -52,7 +52,7 @@
</el-col>
<el-col :span="6" class="btnColRight mt-10">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -52,7 +52,7 @@
</el-col>
<el-col :span="6" class="btnColRight mt-10">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -50,7 +50,7 @@
</el-col>
<el-col :span="12" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -47,7 +47,7 @@
</el-col>
<el-col :span="12" class="btnColRight mt-10">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
......
......@@ -52,7 +52,7 @@
</el-col>
<el-col :span="6" class="btnColRight mt-10">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -49,7 +49,7 @@
</el-col>
<el-col :span="12" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -58,7 +58,7 @@
</el-col>
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -48,7 +48,7 @@
</el-col>
<el-col :span="19" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -52,7 +52,7 @@
</el-col>
<el-col :span="18" class="btnColRight mt-10">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -119,7 +119,7 @@ export default {
<style lang="scss" scoped>
.leftcard {
width: 32%;
height: calc(100% -0.5729rem);
height: calc(100% -110px);
display: flex;
flex-direction: column;
......@@ -179,19 +179,21 @@ export default {
.qxjr {
background: url("~@/image/jrl3.png");
background-size: 100% 100%;
}
.sthj {
background: url("~@/image/jh.png");
background-size: 100% 100%;
}
p {
margin: 0 .0156rem .0521rem .0156rem;
font-weight: 700;
width: .125rem;
height: .1875rem;
font-size: .1563rem;
font-size: .1667rem;
width: .195rem;
height: .2475rem;
font-size: .1863rem;
font-size: .1867rem;
}
}
......@@ -202,6 +204,7 @@ export default {
// padding: 35px 20px 20px 20px;
box-sizing: border-box;
color: #e3f1ff;
margin-top: .1263rem;
.cardcontent-left {
width: 60%;
......
......@@ -3,7 +3,8 @@
<div class="card1 cardCon d-center">
<div class="cardhead">新建国有房屋信息</div>
<div class="cardcontent" style="margin-top: .3646rem">
<dv-scroll-board :config="config" class="board" />
<dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
<div v-else="config.data.length==0" class="nodata">暂无数据</div>
</div>
</div>
<div class="card2 cardCon mt-10">
......@@ -20,6 +21,7 @@
<script>
import columnarsmat from "@/components/Echart/Columnarsmat";
import Rose from "@/components/Echart/Rose";
import work from "@/api/work";
export default {
data () {
return {
......@@ -28,24 +30,34 @@ export default {
oddRowBGC: '#154295',
evenRowBGC: '#154295',
header: ['序号', '用途', '性质', '面积'],
data: [
['住宅', '自建房', '转移登记', '73.94'],
['商业服务', '市场化商品房', '转移登记', '1067.14'],
['住宅', '成本售价房', '转移登记', '601.47'],
['住宅', '市场化商品房', '转移登记', '38111.37'],
['住宅', '移民搬迁安置房', '转移登记', '104.16'],
['办公', '自建房', '转移登记', '14913.86'],
['柴房', '市场化商品房', '转移登记', '615.55'],
['住宅', '经济适用住房', '转移登记', '173.17'],
['车库/车位', '市场化商品房', '转移登记', '105.27'],
['住宅', '房改房', '转移登记', '372.4']
]
data: [],
key:0
}
}
},
components: { columnarsmat, Rose },
mounted () {
this.addhousetotal();
// scroll(tableref.value.$refs.bodyWrapper);//设置滚动
},
methods: {
async addhousetotal () {
try {
let {result:res}= await work.addhousetotal();
console.log("resultssssssssssss",res);
res.map((item,index) => {
console.log("item",item);
console.log("index",index);
return (
this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
)
});
console.log("this.config.data",this.config.data);
} catch (error) {
console.log("error",error);
}
}
}
}
</script>
......@@ -77,6 +89,13 @@ export default {
height: 100%;
display: -webkit-box;
overflow: hidden;
.nodata{
font-size: .1042rem;
color: #02D9FD;
font-weight: bold;
margin:auto;
margin-top: 120px;
}
}
.cardCon {
......@@ -94,8 +113,8 @@ export default {
.board {
width: 90%;
margin: 0 auto;
height: .7031rem;
margin-top: .2083rem;
height: 1.1031rem;
margin-top: .0521rem;
}
}
......
......@@ -57,7 +57,7 @@ import efficient from "@/api/efficient";
import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
export default {
name: "jktj",
data () {
data() {
return {
// 开始日期限制
pickerOptionsStart: {
......@@ -83,7 +83,7 @@ export default {
pieChartsData: [],
};
},
created () {},
created() {},
mounted() {
this.getProcessCounts();
},
......@@ -91,11 +91,11 @@ export default {
...mapGetters(["dicData"]),
},
methods: {
endTimeChange(val){
this.form.endTime = timeFormat(new Date(val),true)
endTimeChange(val) {
this.form.endTime = timeFormat(new Date(val), true);
},
//查询各区县办件数量
async getProcessCounts () {
async getProcessCounts() {
this.pieChartsData = [];
let { result: res } = await efficient.getProcessCounts(
this.form.startTime,
......@@ -113,14 +113,15 @@ export default {
groupId: item.recType,
});
});
res.length && this.$nextTick(() => {
res.length &&
this.$nextTick(() => {
// 初始化图表
this.echartInit();
this.barChartInit(res[0].recType);
});
},
// 重置
resetForm () {
resetForm() {
this.form = {
startTime: getFirstDayOfSeason(),
endTime: timeFormat(new Date(), true),
......@@ -128,7 +129,7 @@ export default {
this.getProcessCounts();
},
//玫瑰图初始化
echartInit () {
echartInit() {
let _this = this;
// 基于准备好的dom，初始化echarts实例
let myChart = this.$echarts.init(document.getElementById("myChart"));
......@@ -189,7 +190,7 @@ export default {
});
},
//柱图初始化
async barChartInit (recType) {
async barChartInit(recType) {
//请求recType对应业务的各区县数据
let { result: res } = await efficient.getProcessDays(
recType,
......@@ -274,19 +275,46 @@ export default {
series: [
{
type: "bar",
barMaxWidth: '60',
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: "60",
name: "最短用时",
data: dealArr.map((item) => item.minDay),
},
{
type: "bar",
barMaxWidth: '60',
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: "60",
name: "平均用时",
data: dealArr.map((item) => item.avgDay),
},
{
type: "bar",
barMaxWidth: '60',
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: "60",
name: "最长用时",
data: dealArr.map((item) => item.maxDay),
},
......
......@@ -246,6 +246,15 @@ export default {
{
name: "成功",
type: "bar",
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: '60',
data: this.chartData.map((item) => {
return item.success;
......@@ -254,6 +263,15 @@ export default {
{
name: "失败",
type: "bar",
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: '60',
data: this.chartData.map((item) => {
return item.failure;
......@@ -261,6 +279,15 @@ export default {
},
{
name: "成功率",
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
type: "line",
barMaxWidth: '60',
yAxisIndex: 1,
......
......@@ -210,9 +210,18 @@ export default {
],
series: [
{
data: chartArr.map(item=>item.counts),
type: "bar",
//显示数值
itemStyle: {
normal: {
label: {
show: true, //开启显示
position: "top", //在上方显示
},
},
},
barMaxWidth: '60',
data: chartArr.map(item=>item.counts),
},
],
});
......
......@@ -80,7 +80,7 @@
<el-col :span="6" class="btnColRight">
<el-form-item>
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="featchData">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
<btn nativeType="cx">存量导入</btn>
</el-form-item>
</el-col>
......
......@@ -32,7 +32,7 @@
<!-- 操作按钮 -->
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="queryClick">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -62,7 +62,7 @@ class data extends filter {
label: "业务名称",
},
{
prop: "uploadtime",
prop: "exchangeDate",
label: "汇交时间",
width: 140,
}
......
......@@ -64,7 +64,7 @@
<!-- 操作按钮 -->
<el-col :span="6" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="queryClick">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......
......@@ -19,8 +19,7 @@
</el-col>
<!-- 操作按钮 -->
<el-col :span="12" class="btnColRight">
<btn nativeType="cx" @click="queryClick">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
<btn nativeType="cx" @click="handleRefresh">刷新缓存</btn>
</el-col>
</el-row>
......@@ -83,12 +82,16 @@ export default {
// 初始化数据
queryClick () {
getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
// this.$endLoading();
let { records, total } = res.result
this.tableData.data = records ? records : []
this.tableData.total = total ? total : 0
})
},
handleSearch () {
this.pageData.currentPage = 1
this.tableData.data = []
this.queryClick()
},
handleRefresh () {
this.$confirm('是否确认刷新', '提示', {
confirmButtonText: '确定',
......
......@@ -12,7 +12,7 @@
</el-form-item>
</el-col>
<el-col :span="18" class="btnColRight">
<btn nativeType="cx" @click="handleSubmit">搜索</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
<btn nativeType="cx" @click="handleAdd">新增</btn>
</el-col>
</el-row>
......@@ -112,6 +112,11 @@ export default {
this.taskData = null
this.$refs.task.isShow()
},
handleSearch () {
this.form.currentPage = 1
this.tableData.data = []
this.queryClick()
},
async featchData () {
try {
this.form = Object.assign(this.form, this.formData)
......
......@@ -25,7 +25,7 @@
<!-- 操作按钮 -->
<el-col :span="6" class="btnColRight">
<btn nativeType="cx" @click="handleUpdateDic">刷新缓存</btn>
<btn nativeType="cx" @click="handleSubmit">查询</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
......@@ -134,6 +134,11 @@ export default {
this.$refs.msg.messageShow();
}
},
handleSearch () {
this.form.currentPage = 1
this.tableData.data = []
this.featchData()
},
async handleEdit (index, row) {
try {
let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB);
......