bf5db9e8 by 任超

style:路由修改

1 parent 4b496d79
...@@ -2,18 +2,6 @@ import request from '@/utils/request' ...@@ -2,18 +2,6 @@ import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from './config'
3 3
4 /* 4 /*
5 业务办理-选择单元-查询宗地基本信息
6 */
7 export function selectZdjbxx (data) {
8 return request({
9 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
10 method: 'post',
11 data
12 })
13 }
14
15
16 /*
17 业务办理-选择单元-查询建设用地、宅基地信息 5 业务办理-选择单元-查询建设用地、宅基地信息
18 */ 6 */
19 export function selectJsydQlxx (data) { 7 export function selectJsydQlxx (data) {
...@@ -24,29 +12,6 @@ export function selectJsydQlxx (data) { ...@@ -24,29 +12,6 @@ export function selectJsydQlxx (data) {
24 }) 12 })
25 } 13 }
26 14
27 /*
28 业务办理-选择单元-查询自然幢信息
29 */
30 export function selectZrz (data) {
31 return request({
32 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
33 method: 'post',
34 data
35 })
36 }
37
38 /*
39 业务办理-选择单元-查询户信息
40 */
41 export function selectH (data) {
42 return request({
43 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
44 method: 'post',
45 data
46 })
47 }
48
49
50 // 获取自然幢下其他户 15 // 获取自然幢下其他户
51 export function selectOtherH (data) { 16 export function selectOtherH (data) {
52 return request({ 17 return request({
...@@ -67,17 +32,6 @@ export function selectOtherH (data) { ...@@ -67,17 +32,6 @@ export function selectOtherH (data) {
67 // showLoading: true 32 // showLoading: true
68 // }) 33 // })
69 // } 34 // }
70
71 /*
72 业务办理-选择权利信息-根据条件进行列表查询
73 */
74 export function selectQlxx (data) {
75 return request({
76 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
77 method: 'post',
78 data
79 })
80 }
81 /* 35 /*
82 业务办理-选择抵押权信息-根据条件进行列表查询 36 业务办理-选择抵押权信息-根据条件进行列表查询
83 */ 37 */
...@@ -117,11 +71,3 @@ export function choiceBdcdy (data) { ...@@ -117,11 +71,3 @@ export function choiceBdcdy (data) {
117 }) 71 })
118 } 72 }
119 73
120 // 业务办理-选择农用地信息-根据条件进行列表查询
121 export function selectNydsyqQlxx (data) {
122 return request({
123 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectNydsyqQlxx',
124 method: 'post',
125 data
126 })
127 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -164,7 +164,7 @@ export function selectOtherH (data) { ...@@ -164,7 +164,7 @@ export function selectOtherH (data) {
164 } 164 }
165 165
166 // 认领任务 166 // 认领任务
167 export function claimTask (bsmSlsq,bestepid) { 167 export function claimTask (bsmSlsq, bestepid) {
168 return request({ 168 return request({
169 url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid, 169 url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
170 method: 'get', 170 method: 'get',
...@@ -172,9 +172,50 @@ export function claimTask (bsmSlsq,bestepid) { ...@@ -172,9 +172,50 @@ export function claimTask (bsmSlsq,bestepid) {
172 } 172 }
173 173
174 // 取消认领任务 174 // 取消认领任务
175 export function unClaimTask (bsmSlsq,bestepid) { 175 export function unClaimTask (bsmSlsq, bestepid) {
176 return request({ 176 return request({
177 url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid, 177 url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
178 method: 'get', 178 method: 'get',
179 }) 179 })
180 }
181
182 // 业务办理-选择农用地信息-根据条件进行列表查询
183 export function selectNydsyqQlxx (data) {
184 return request({
185 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectNydsyqQlxx',
186 method: 'post',
187 data
188 })
189 }
190
191 /*
192 业务办理-选择单元-查询宗地基本信息
193 */
194 export function selectZdjbxx (data) {
195 return request({
196 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
197 method: 'post',
198 data
199 })
200 }
201 /*
202 业务办理-选择单元-查询自然幢信息
203 */
204 export function selectZrz (data) {
205 return request({
206 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
207 method: 'post',
208 data
209 })
210 }
211
212 /*
213 业务办理-选择单元-查询户信息
214 */
215 export function selectH (data) {
216 return request({
217 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
218 method: 'post',
219 data
220 })
180 } 221 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -34,11 +34,18 @@ service.interceptors.request.use( ...@@ -34,11 +34,18 @@ service.interceptors.request.use(
34 service.interceptors.response.use( 34 service.interceptors.response.use(
35 response => { 35 response => {
36 /** 36 /**
37 * 对响应数据判断: 37 * 对响应数据判断:
38 * 如果成功返回数据,就通过return把数据返出去 38 * 如果成功返回数据,就通过return把数据返出去
39 * 如果请求不成功,就在拦截器这里统一处理(组件的代码就不用关注错误的情况了) 39 * 如果请求不成功,就在拦截器这里统一处理(组件的代码就不用关注错误的情况了)
40 */ 40 */
41 if (response.status == 200) { 41 if (response.status == 200) {
42 if (response.data.code == 500) {
43 Message({
44 message: response.data.message,
45 type: 'error',
46 duration: 5 * 1000
47 })
48 }
42 return response.data; 49 return response.data;
43 } else { 50 } else {
44 handleErrorData(response.data); 51 handleErrorData(response.data);
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
58 width: 75%; 58 width: 75%;
59 } 59 }
60 60
61
61 ul { 62 ul {
62 li { 63 li {
63 line-height: 36px; 64 line-height: 36px;
...@@ -77,6 +78,8 @@ ...@@ -77,6 +78,8 @@
77 .home-right { 78 .home-right {
78 padding-left: 4px; 79 padding-left: 4px;
79 width: 30%; 80 width: 30%;
81 display: flex;
82 flex-direction: column;
80 83
81 .list-title { 84 .list-title {
82 overflow: hidden; 85 overflow: hidden;
...@@ -84,6 +87,16 @@ ...@@ -84,6 +87,16 @@
84 white-space: nowrap; 87 white-space: nowrap;
85 } 88 }
86 89
90 #loginTime {
91 height: 100%;
92 padding-bottom: 90px;
93 }
94
95 .dynamicInfo {
96 flex: 1;
97 height: 100%;
98 }
99
87 ul { 100 ul {
88 li { 101 li {
89 line-height: 36px; 102 line-height: 36px;
......
...@@ -81,19 +81,19 @@ ...@@ -81,19 +81,19 @@
81 </el-card> 81 </el-card>
82 </div> 82 </div>
83 <div class="home-right"> 83 <div class="home-right">
84 <el-card shadow="hover" style="height:345px"> 84 <el-card shadow="hover">
85 <div slot="header" class="flexst"> 85 <div slot="header" class="flexst">
86 <h5 class="title">用户登录时间</h5> 86 <h5 class="title">用户登录时间</h5>
87 </div> 87 </div>
88 <div id="loginTime"></div> 88 <div id="loginTime"></div>
89 </el-card> 89 </el-card>
90 <el-card class="marginTop10" shadow="hover" style="height:395px"> 90 <el-card class="marginTop10" shadow="hover">
91 <div slot="header" class="flexst"> 91 <div slot="header" class="flexst">
92 <h5 class="title">动态信息</h5> 92 <h5 class="title">动态信息</h5>
93 <i class="el-icon-s-unfold pointer"></i> 93 <i class="el-icon-s-unfold pointer"></i>
94 </div> 94 </div>
95 <ul> 95 <ul>
96 <li v-for="(item, index) in doneList" :key="index" class="flexst"> 96 <li v-for="(item, index) in doneList" :key="index" class="flexst dynamicInfo">
97 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p> 97 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
98 <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p> 98 <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
99 </li> 99 </li>
...@@ -295,7 +295,7 @@ export default { ...@@ -295,7 +295,7 @@ export default {
295 chart.source(data, { 295 chart.source(data, {
296 percent: { 296 percent: {
297 formatter: function formatter (val) { 297 formatter: function formatter (val) {
298 val = val * 100 + '%'; 298 val = val * 100 + '小时';
299 return val; 299 return val;
300 } 300 }
301 } 301 }
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
312 shadowColor: 'rgba(0, 0, 0, .45)' 312 shadowColor: 'rgba(0, 0, 0, .45)'
313 } 313 }
314 }).tooltip('item*percent', function (item, percent) { 314 }).tooltip('item*percent', function (item, percent) {
315 percent = percent * 100 + '%'; 315 percent = percent * 100 + '小时';
316 return { 316 return {
317 name: item, 317 name: item,
318 value: percent 318 value: percent
......
...@@ -73,7 +73,7 @@ import searchBox from '../components/search.vue' ...@@ -73,7 +73,7 @@ import searchBox from '../components/search.vue'
73 import table from "@/utils/mixin/table" 73 import table from "@/utils/mixin/table"
74 import searchMin from "../components/mixin/index" 74 import searchMin from "../components/mixin/index"
75 import { datas, sendThis } from "./dbxdata" 75 import { datas, sendThis } from "./dbxdata"
76 import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl.js" 76 import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl"
77 export default { 77 export default {
78 name: "dbx", 78 name: "dbx",
79 components: { searchBox }, 79 components: { searchBox },
......
...@@ -74,7 +74,7 @@ import { mapGetters } from 'vuex' ...@@ -74,7 +74,7 @@ import { mapGetters } from 'vuex'
74 import searchMin from "../components/mixin/index" 74 import searchMin from "../components/mixin/index"
75 import table from "@/utils/mixin/table" 75 import table from "@/utils/mixin/table"
76 import { datas, sendThis } from "./ybxdata" 76 import { datas, sendThis } from "./ybxdata"
77 import { searchTaskDone } from "@/api/ywbl.js" 77 import { searchTaskDone } from "@/api/ywbl"
78 import searchBox from '../components/search.vue' 78 import searchBox from '../components/search.vue'
79 export default { 79 export default {
80 name: "ybx", 80 name: "ybx",
......
...@@ -72,8 +72,7 @@ ...@@ -72,8 +72,7 @@
72 import { datas, sendThis } from "../javascript/fwsyq.js"; 72 import { datas, sendThis } from "../javascript/fwsyq.js";
73 import table from "@/utils/mixin/table"; 73 import table from "@/utils/mixin/table";
74 import jump from "@/views/ywbl/ywsq/components/mixin/jump"; 74 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
75 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH } from "@/api/ywbl.js"; 75 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectH } from "@/api/ywbl.js";
76 import { selectZrz, selectH } from "@/api/selectQlxx.js";
77 export default { 76 export default {
78 mixins: [table, jump], 77 mixins: [table, jump],
79 props: { 78 props: {
......
...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq100.js"; ...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq100.js";
44 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 44 import { defaultParameters } from "../javascript/publicDefaultPar.js";
45 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
46 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { startBusinessFlow } from "@/api/ywbl.js"; 47 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
48 import { selectZdjbxx } from "@/api/selectQlxx.js";
49 export default { 48 export default {
50 mixins: [table, jump], 49 mixins: [table, jump],
51 props: { 50 props: {
......
...@@ -58,8 +58,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js"; ...@@ -58,8 +58,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js";
58 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 58 import { defaultParameters } from "../javascript/publicDefaultPar.js";
59 import table from "@/utils/mixin/table"; 59 import table from "@/utils/mixin/table";
60 import jump from "../components/mixin/jump"; 60 import jump from "../components/mixin/jump";
61 import { startBusinessFlow } from "@/api/ywbl.js"; 61 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
62 import { selectJsydQlxx } from "@/api/selectQlxx.js";
63 export default { 62 export default {
64 mixins: [table, jump], 63 mixins: [table, jump],
65 props: { 64 props: {
......
...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/nydsyq100.js"; ...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/nydsyq100.js";
44 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 44 import { defaultParameters } from "../javascript/publicDefaultPar.js";
45 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
46 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { startBusinessFlow } from "@/api/ywbl.js"; 47 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
48 import { selectZdjbxx } from "@/api/selectQlxx.js";
49 export default { 48 export default {
50 mixins: [table, jump], 49 mixins: [table, jump],
51 props: { 50 props: {
......
...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js"; ...@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js";
44 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 44 import { defaultParameters } from "../javascript/publicDefaultPar.js";
45 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
46 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { startBusinessFlow } from "@/api/ywbl.js"; 47 import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js";
48 import { selectNydsyqQlxx } from "@/api/selectQlxx.js";
49 export default { 48 export default {
50 mixins: [table, jump], 49 mixins: [table, jump],
51 props: { 50 props: {
......