Skip to content

F
founder_vue
Commit 14dd7087 by liyuhang19990520
Options

Merge branch 'sn_snzz' of http://47.92.108.28/changchao/founder_vue into sn_snzz

parents 8e533f4e fb94ad94
Showing with 131 additions and 122 deletions
src/views/Home.vue
......@@ -105,23 +105,14 @@ export default {
}
.el-aside {
background-color: #D3DCE6;
color: #333;
text-align: center;
line-height: 200px;
}
.el-main {
background-color: #E9EEF3;
color: #333;
/*text-align: center;*/
}
/*.el-menu-vertical-demo:not(.el-menu--collapse) {*/
/* width: 200px;*/
/* min-height: 400px;*/
/*}*/
}
.contentBoX{
display: flex;
......
src/views/tjstzxt/index.scss
......@@ -14,11 +14,22 @@
margin-left: 35px;
}
}
.tjstzxt_top_one {
height: 450px;
margin: 20px 20px;
background-color: #ccc;
padding: 0 20px;
margin: 8px 0px;
background: #ffffff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.18);
opacity: 1;
border-radius: 4px;
.ajtj_title {
font-size: 20px;
font-weight: 600;
color: #000;
.pTitle {
padding: 10px 20px;
}
}
}
.tj_wrap{height:calc(100% - 13px);position: relative;top:-37px;}
......
src/views/tjstzxt/index.vue
......@@ -72,6 +72,7 @@ export default {
},
mounted() {
let self = this
self.getData()
self.mdjfhjlInit()
self.mdjflyInit()
self.mdjfczqkInit()
......@@ -108,41 +109,6 @@ export default {
self.mdjfhjlRender(x)
}
})
// post('/OTHER/statics/mdjfStatics',{params}).then(res=>{
// debugger
// })
// self
// .requestPost(JSON.stringify(self.formData), '/OTHER/statics/mdjfStatics')
// .then((response) => {
// debugger
// if (response.data.success) {
// let resData = response.data.data.data
// let x = []
// resData.forEach((item) => {
// item.value = item.num
// if (
// item.value != '0' &&
// item.value != '' &&
// item.value != null &&
// item.name != ''
// ) {
// x.push({
// name: item.name,
// value: item.num,
// code: item.code
// })
// }
// })
// self.mdjfhjlRender(x)
// } else {
// self.$message({
// type: 'error',
// message: response.data.message
// })
// this.mdjfhjlLoading = false
// }
// })
},
// 矛盾纠纷化解率图表绘制
mdjfhjlRender(x) {
......@@ -341,7 +307,6 @@ export default {
},
// 矛盾纠纷处置情况
mdjfczqkInit() {
debugger
let self = this
this.mdjfczqkLoading = true
let params = {
......@@ -354,7 +319,7 @@ export default {
let resData = res.data
let x = [],
y = []
resData.forEach((item, index) => {
resData.forEach((item) => {
x.push(item.label)
y.push(item.value)
})
......@@ -464,17 +429,21 @@ export default {
name: '',
type: 'bar',
data: y,
barWidth: 6,
barWidth: 20,
itemStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0,
color: '#853D00'
// color: '#853D00'
// color: '#8d8882'
color: '#2d025e'
}, {
offset: 1,
color: '#FDCC00'
// color: '#FDCC00'
// color: '#f4d141'
color: '#db8a6f'
}]),
barBorderRadius: 12,
barBorderRadius: 6,
label: {
show: false, //开启显示
position: 'top', //在上方显示
......@@ -492,7 +461,6 @@ export default {
},
// 矛盾纠纷类别
mdjflbInit() {
debugger
let self = this
this.mdjflbLoading = true
let params = {
......@@ -615,17 +583,21 @@ export default {
name: '',
type: 'bar',
data: y,
barWidth: 6,
barWidth: 20,
itemStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0,
color: '#853D00'
// color: '#853D00'
color: '#2f4074'
// color: '#0F8FFC'
}, {
offset: 1,
color: '#FDCC00'
// color: '#FDCC00'
color: '#d0cce3'
// color: 'rgba(15,143,252,.4)'
}]),
barBorderRadius: 12,
barBorderRadius: 6,
label: {
show: false, //开启显示
position: 'top', //在上方显示
......@@ -640,6 +612,17 @@ export default {
]
})
this.mdjflbLoading = false
},
getData(){
debugger
axios.post('/spjkyjshyy/queryShyj',{
"yjlx":1,
"page":1,
"pageSize":5
}).then(res=>{
console.log(res)
debugger
})
}
}
}
......
src/views/wssqzxt/index.scss
......@@ -19,6 +19,30 @@
margin-left: 35px;
}
}
.paneDiv {
background: #ffffff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.18);
opacity: 1;
border-radius: 4px;
margin: 8px 0;
padding: 0 20px;
padding-bottom: 14px;
position: relative;
.el-pagination {
margin-top: 15px;
}
/deep/ .el-pagination__sizes {
top: 12px;
right: 152px;
width: 110px;
}
/deep/ .has-gutter {
.cell {
font-size: 14px;
color: #000;
}
}
}
.flTtitle{
font-size:16px;
font-weight: bold;
......
src/views/wssqzxt/index.vue
......@@ -7,77 +7,77 @@
</div>
<!-- 查询表单 -->
<SearchForm :formProps="formProps" :form="formData"></SearchForm>
<el-row style="width:98%;">
<el-col :span="24">
<span class="flTtitle"><span class="border"></span>查询结果</span>
<!--可配置化图标-->
<div
style="vertical-align: middle;height:30px;line-height: 30px;text-align: right;font-size:12px;display: inline-block;width: calc(100% - 115px);">
<el-row style="background-color: #fff;padding: 10px;margin-bottom: 2px;box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.18);">
<el-col :span="24">
<span class="flTtitle"><span class="border"></span>查询结果</span>
<!--可配置化图标-->
<div
style="vertical-align: middle;height:30px;line-height: 30px;text-align: right;font-size:12px;display: inline-block;width: calc(100% - 115px);">
<span class="total"
style="vertical-align: middle">
共有 <span style="color: #f22;">{{ tableDataLength }}</span>
条查询结果，共 <span style="color: #f22;">{{tPage}}</span> 页
</span>
<div class="inline">
<el-button plain
class="zdybtn export"
size="small"
@click="add"><i class="fa fa-external-link"
aria-hidden="true"
style="margin-right:5px;"></i>新增
</el-button>
<div class="inline">
<el-button plain
size="small"
type="primary"
@click="add">新增
</el-button>
</div>
</div>
</div>
</el-col>
</el-row>
</el-col>
</el-row>
<div class="paneDiv">
<!--表格-->
<el-table id="ajzbQuery"
stripe
v-loading="tableLoading"
element-loading-text="拼命加载中"
ref="itsmDataTable1"
tooltip-effect="dark"
max-height="550"
style="width: 99%; margin: 0 auto"
width="100%"
size="small"
:data="bztjDataList">
<el-table-column
align="center"
v-for="columnTitle in bztjFormThead"
:prop="columnTitle.prop"
:key="columnTitle.label"
:label="columnTitle.label"
:width="columnTitle.width">
</el-table-column>
<el-table-column align="center"
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="text"
size="small"
@click="downloadContent(scope.row)">下载
</el-button>
<el-button type="text"
size="small"
@click="edit(scope.row)">修改
</el-button>
<el-button type="text" size="small" @click="remove(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<!--分页-->
<el-pagination background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage1"
:page-sizes="[10, 20, 50, 100]"
:page-size="page_size"
layout="sizes,prev, pager, next"
:total="tableData.length"
v-if="pageShow">
</el-pagination>
<el-table id="ajzbQuery"
stripe
v-loading="tableLoading"
element-loading-text="拼命加载中"
ref="itsmDataTable1"
tooltip-effect="dark"
max-height="550"
style="margin: 0 auto"
width="100%"
size="small"
:data="bztjDataList">
<el-table-column
align="center"
v-for="columnTitle in bztjFormThead"
:prop="columnTitle.prop"
:key="columnTitle.label"
:label="columnTitle.label"
:width="columnTitle.width">
</el-table-column>
<el-table-column align="center"
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="text"
size="small"
@click="downloadContent(scope.row)">下载
</el-button>
<el-button type="text"
size="small"
@click="edit(scope.row)">修改
</el-button>
<el-button type="text" size="small" @click="remove(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<!--分页-->
<el-pagination background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage1"
:page-sizes="[10, 20, 50, 100]"
:page-size="page_size"
layout="sizes,prev, pager, next"
:total="tableData.length"
v-if="pageShow">
</el-pagination>
</div>
</div>
<el-dialog :title="title"
custom-class="tztgClass"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment