Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
bc1ccfa8 by 任超
Options

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

2 parents bb779b90 539f1163
Inline Side-by-side
Showing 5 changed files with 129 additions and 110 deletions
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from './config'
3 3
4 // 区县上报分页
5 export function getAreaReportPage (data) {
6 return request({
7 url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getAreaReportPage',
8 method: 'post',
9 data
10 })
11 }
12
4 // 数据上报分页 13 // 数据上报分页
5 export function getDataReportPage (data) { 14 export function getDataReportPage (data) {
6 return request({ 15 return request({
...@@ -13,7 +22,7 @@ export function getDataReportPage (data) { ...@@ -13,7 +22,7 @@ export function getDataReportPage (data) {
13 // 数据上报分页 22 // 数据上报分页
14 export function getDetail (params) { 23 export function getDetail (params) {
15 return request({ 24 return request({
16 url: SERVER.SERVERAPI + '/sjsb/DataReport/getDetail', 25 url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getDetail',
17 method: 'get', 26 method: 'get',
18 params 27 params
19 }) 28 })
......
...@@ -40,9 +40,9 @@ export default { ...@@ -40,9 +40,9 @@ export default {
40 right: "1%", 40 right: "1%",
41 }, 41 },
42 grid: { 42 grid: {
43 left: "3%", 43 left: "5%",
44 right: "6%", 44 right: "7%",
45 bottom: "8%", 45 bottom: "10%",
46 containLabel: true, 46 containLabel: true,
47 }, 47 },
48 xAxis: { 48 xAxis: {
...@@ -81,18 +81,13 @@ export default { ...@@ -81,18 +81,13 @@ export default {
81 name: "成功", 81 name: "成功",
82 type: "bar", 82 type: "bar",
83 stack: "总量", 83 stack: "总量",
84 barWidth: 30, 84 barWidth: 20,
85 itemStyle: { 85 itemStyle: {
86 normal: { 86 normal: {
87 color: "#6601FF", 87 color: "#6601FF",
88 }, 88 },
89 }, 89 },
90 label: { 90
91 normal: {
92 show: true,
93 position: "insideRight",
94 },
95 },
96 z: 10, 91 z: 10,
97 data: newData.barData, 92 data: newData.barData,
98 }, 93 },
...@@ -105,15 +100,6 @@ export default { ...@@ -105,15 +100,6 @@ export default {
105 color: "#00F0FF", 100 color: "#00F0FF",
106 }, 101 },
107 }, 102 },
108 label: {
109 normal: {
110 show: true,
111 position: "insideRight",
112 textStyle: {
113 color: "#6601FF",
114 },
115 },
116 },
117 z: 5, 103 z: 5,
118 data: newData.lineData, 104 data: newData.lineData,
119 }, 105 },
......
...@@ -78,9 +78,10 @@ export default { ...@@ -78,9 +78,10 @@ export default {
78 line-height: 70px; 78 line-height: 70px;
79 font-size: 40px; 79 font-size: 40px;
80 text-align: center; 80 text-align: center;
81 color:rgb(246, 246, 229);
81 } 82 }
82 p:nth-child(2) { 83 p:nth-child(2) {
83 color: rgb(180, 178, 178); 84 color: rgb(223, 213, 81);
84 } 85 }
85 } 86 }
86 .text2 { 87 .text2 {
......
...@@ -3,31 +3,46 @@ class data extends filter { ...@@ -3,31 +3,46 @@ class data extends filter {
3 constructor() { 3 constructor() {
4 super() 4 super()
5 } 5 }
6 columns () { 6 columns() {
7 return [ 7 return [
8 { 8 {
9 prop: "areacode", 9 prop: "areacode",
10 label: "行政区代码", 10 label: "行政区代码",
11 width: 100,
11 }, 12 },
12 { 13 {
13 prop: "areaname", 14 prop: "areaName",
14 label: "行政区名称", 15 label: "行政区名称",
16 width: 100,
15 }, 17 },
16 { 18 {
17 prop: "bdcdyh", 19 prop: "bizMsgid",
20 label: "业务报文ID",
21 },
22 {
23 prop: "createdate",
24 label: "创建时间",
25 },
26 {
27 prop: "recflowid",
28 label: "业务流水号",
29 },
30 {
31 prop: "estatenum",
18 label: "不动产单元号", 32 label: "不动产单元号",
33 width: 240,
19 }, 34 },
20 { 35 {
21 prop: "ywmc", 36 prop: "rectype",
22 label: "业务名称", 37 label: "业务编码",
23 }, 38 },
24 { 39 {
25 prop: "czsj", 40 prop: "rectypeName",
26 label: "操作时间", 41 label: "业务名称",
27 }, 42 },
28 { 43 {
29 prop: "czsj", 44 prop: "createdate",
30 label: "操作时间", 45 label: "接收时间",
31 }, 46 },
32 { 47 {
33 prop: 'jcjg', 48 prop: 'jcjg',
......
...@@ -80,102 +80,93 @@ ...@@ -80,102 +80,93 @@
80 <script> 80 <script>
81 // 接收报文查询 81 // 接收报文查询
82 // 引入表格头部数据 82 // 引入表格头部数据
83 import data from "./data" 83 import data from "./data";
84 // 引入table混入方法 84 // 引入table混入方法
85 import tableMixin from '@/mixins/tableMixin.js' 85 import tableMixin from "@/mixins/tableMixin.js";
86 import { getDataReportPage } from "@/api/sbbwcx.js";
86 export default { 87 export default {
87 name: "jsbwcx", 88 name: "jsbwcx",
88 mixins: [tableMixin], 89 mixins: [tableMixin],
89 data () { 90 data() {
90 return { 91 return {
91 // 开始结束日期限制 92 // 开始结束日期限制
92 pickerOptionsStart: { 93 pickerOptionsStart: {
93 disabledDate: (time) => { 94 disabledDate: (time) => {
94 if (this.form.endTime) { 95 if (this.form.endTime) {
95 return ( 96 return time.getTime() >= new Date(this.form.endTime).getTime();
96 time.getTime() >= new Date(this.form.endTime).getTime()
97 );
98 } 97 }
99 } 98 },
100 }, 99 },
101 // 结束日期限制 100 // 结束日期限制
102 pickerOptionsEnd: { 101 pickerOptionsEnd: {
103 disabledDate: (time) => { 102 disabledDate: (time) => {
104 if (this.form.startTime) { 103 if (this.form.startTime) {
105 return ( 104 return time.getTime() <= new Date(this.form.startTime).getTime();
106 time.getTime() <= new Date(this.form.startTime).getTime()
107 );
108 } 105 }
109 } 106 },
110 }, 107 },
111 // 表格数据 108 // 表格数据
112 form: { 109 form: {
113 pcode: '', // 行政区 110 pcode: "", // 行政区
114 startTime: '',// 开始日期 111 startTime: "", // 开始日期
115 endTime: '',// 结束日期 112 endTime: "", // 结束日期
116 bdcdyh: '',// 不动产单元号 113 bdcdyh: "", // 不动产单元号
117 ywmc: '',// 业务名称 114 ywmc: "", // 业务名称
118 jcjg: '', // 检查结果 115 jcjg: "", // 检查结果
119 rkjg: '', //入库结果 116 rkjg: "", //入库结果
120 currentPage: 1 117 currentPage: 1,
121 }, 118 },
122 // 校验规则 119 // 校验规则
123 rules: { 120 rules: {
124 pcode: [ 121 pcode: [{ required: true, message: "请选择行政区", trigger: "change" }],
125 { required: true, message: '请选择行政区', trigger: 'change' }
126 ],
127 startTime: [ 122 startTime: [
128 { required: true, message: '请选择开始日期', trigger: 'change' } 123 { required: true, message: "请选择开始日期", trigger: "change" },
129 ], 124 ],
130 endTime: [ 125 endTime: [
131 { required: true, message: '请选择结束日期', trigger: 'change' } 126 { required: true, message: "请选择结束日期", trigger: "change" },
132 ], 127 ],
133 bdcdyh: [ 128 bdcdyh: [
134 { required: true, message: '不动产单元号', trigger: 'change' } 129 { required: true, message: "不动产单元号", trigger: "change" },
135 ],
136 ywmc: [
137 { required: true, message: '业务名称', trigger: 'change' }
138 ],
139 jcjg: [
140 { required: true, message: '检查结果', trigger: 'change' }
141 ],
142 rkjg: [
143 { required: true, message: '入库结果', trigger: 'change' }
144 ], 130 ],
131 ywmc: [{ required: true, message: "业务名称", trigger: "change" }],
132 jcjg: [{ required: true, message: "检查结果", trigger: "change" }],
133 rkjg: [{ required: true, message: "入库结果", trigger: "change" }],
145 }, 134 },
146 // 表格数据 135 // 表格数据
147 tableData: { 136 tableData: {
148 // 表格头部 137 // 表格头部
149 columns: [{ 138 columns: [
150 label: '序号',
151 type: 'index',
152 width: '50',
153 index: this.indexMethod,
154 }].concat(data.columns()).concat([
155 { 139 {
156 label: "操作", 140 label: "序号",
157 width: '160', 141 type: "index",
158 render: (h, scope) => { 142 width: "50",
159 return ( 143 index: this.indexMethod,
160 <div> 144 },
161 <el-button 145 ]
162 type="primary" 146 .concat(data.columns())
163 onClick={() => { this.handleEdit(scope.row) }} 147 .concat([
164 > 148 {
165 详情 149 label: "操作",
166 </el-button> 150 width: "160",
167 <el-button 151 render: (h, scope) => {
168 type="primary" 152 return (
169 > 153 <div>
170 结果 154 <el-button
171 </el-button> 155 type="primary"
172 </div> 156 onClick={() => {
173 ) 157 this.handleEdit(scope.row);
174 } 158 }}
175 } 159 >
176 ]), 160 详情
161 </el-button>
162 <el-button type="primary">结果</el-button>
163 </div>
164 );
165 },
166 },
167 ]),
177 // 表格列表数据 168 // 表格列表数据
178 data: [{ jcjg: 1 }] 169 data: [{ jcjg: 1 }],
179 }, 170 },
180 // 分页 171 // 分页
181 pageData: { 172 pageData: {
...@@ -188,37 +179,54 @@ export default { ...@@ -188,37 +179,54 @@ export default {
188 // 行政区 179 // 行政区
189 xzqOptions: [ 180 xzqOptions: [
190 { 181 {
191 value: '632321', 182 value: "632321",
192 label: '同仁县' 183 label: "同仁县",
193 }, 184 },
194 { 185 {
195 value: '632322', 186 value: "632322",
196 label: '尖扎县' 187 label: "尖扎县",
197 }, 188 },
198 { 189 {
199 value: '632323', 190 value: "632323",
200 label: '泽库县' 191 label: "泽库县",
201 }, 192 },
202 { 193 {
203 value: '632324', 194 value: "632324",
204 label: '河南县' 195 label: "河南县",
205 } 196 },
206 ] 197 ],
207 } 198 };
208 }, 199 },
209 methods: { 200 methods: {
201 // 初始化数据
202 queryClick() {
203 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
204 if (res.code === 200) {
205 let { total, records } = res.result;
206 this.tableData.total = total;
207 this.tableData.data = records ? records : [];
208 }
209 });
210 },
210 // 重置 211 // 重置
211 resetForm () { 212 resetForm() {
212 this.$refs.ruleForm.resetFields(); 213 this.$refs.ruleForm.resetFields();
213 }, 214 },
214 featchData () { 215 featchData() {
216 this.queryClick();
215 }, 217 },
216 // 详情 218 // 详情
217 handleEdit () { 219 handleEdit() {
218 this.$popupDialog('业务报文', 'components/JsonEditor/index', {}, '50%', '320px') 220 this.$popupDialog(
219 } 221 "业务报文",
220 } 222 "components/JsonEditor/index",
221 } 223 {},
224 "50%",
225 "320px"
226 );
227 },
228 },
229 };
222 </script> 230 </script>
223 <style scoped lang="scss"> 231 <style scoped lang="scss">
224 // 引入表单整体样式 232 // 引入表单整体样式
......