style:路由修改

@@ -2,18 +2,6 @@ import request from '@/utils/request'
 import SERVER from './config'
 import SERVER from './config'
 
 
 /* 
 /* 
-业务办理-选择单元-查询宗地基本信息
-*/
-export function selectZdjbxx (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
-        method: 'post',
-        data
-    })
-}
-
-
-/* 
 业务办理-选择单元-查询建设用地、宅基地信息
 业务办理-选择单元-查询建设用地、宅基地信息
 */
 */
 export function selectJsydQlxx (data) {
 export function selectJsydQlxx (data) {
@@ -24,29 +12,6 @@ export function selectJsydQlxx (data) {
     })
     })
 }
 }
 
 
-/* 
-业务办理-选择单元-查询自然幢信息
-*/
-export function selectZrz (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
-        method: 'post',
-        data
-    })
-}
-
-/* 
-业务办理-选择单元-查询户信息
-*/
-export function selectH (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
-        method: 'post',
-        data
-    })
-}
-
-
 // 获取自然幢下其他户
 // 获取自然幢下其他户
 export function selectOtherH (data) {
 export function selectOtherH (data) {
     return request({
     return request({
@@ -67,17 +32,6 @@ export function selectOtherH (data) {
 //         showLoading: true
 //         showLoading: true
 //     })
 //     })
 // }
 // }
-
-/* 
-业务办理-选择权利信息-根据条件进行列表查询
-*/
-export function selectQlxx (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
-        method: 'post',
-        data
-    })
-}
 /* 
 /* 
 业务办理-选择抵押权信息-根据条件进行列表查询
 业务办理-选择抵押权信息-根据条件进行列表查询
 */
 */
@@ -117,11 +71,3 @@ export function choiceBdcdy (data) {
     })
     })
 }
 }
 
 
-// 业务办理-选择农用地信息-根据条件进行列表查询
-export function selectNydsyqQlxx (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectNydsyqQlxx',
-        method: 'post',
-        data
-    })
-}
\ No newline at end of file

@@ -164,7 +164,7 @@ export function selectOtherH (data) {
 }
 }
 
 
 // 认领任务
 // 认领任务
-export function claimTask (bsmSlsq,bestepid) {
+export function claimTask (bsmSlsq, bestepid) {
     return request({
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
         url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
         method: 'get',
         method: 'get',
@@ -172,9 +172,50 @@ export function claimTask (bsmSlsq,bestepid) {
 }
 }
 
 
 // 取消认领任务
 // 取消认领任务
-export function unClaimTask (bsmSlsq,bestepid) {
+export function unClaimTask (bsmSlsq, bestepid) {
     return request({
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
         url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
         method: 'get',
         method: 'get',
     })
     })
 }
 }
+
+// 业务办理-选择农用地信息-根据条件进行列表查询
+export function selectNydsyqQlxx (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectNydsyqQlxx',
+        method: 'post',
+        data
+    })
+}
+
+/* 
+业务办理-选择单元-查询宗地基本信息
+*/
+export function selectZdjbxx (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
+        method: 'post',
+        data
+    })
+}
+/* 
+业务办理-选择单元-查询自然幢信息
+*/
+export function selectZrz (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
+        method: 'post',
+        data
+    })
+}
+
+/* 
+业务办理-选择单元-查询户信息
+*/
+export function selectH (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

@@ -39,6 +39,13 @@ service.interceptors.response.use(
          *  如果请求不成功，就在拦截器这里统一处理（组件的代码就不用关注错误的情况了）
          *  如果请求不成功，就在拦截器这里统一处理（组件的代码就不用关注错误的情况了）
          */
          */
         if (response.status == 200) {
         if (response.status == 200) {
+            if (response.data.code == 500) {
+                Message({
+                    message: response.data.message,
+                    type: 'error',
+                    duration: 5 * 1000
+                })
+            }
             return response.data;
             return response.data;
         } else {
         } else {
             handleErrorData(response.data);
             handleErrorData(response.data);

@@ -58,6 +58,7 @@
       width: 75%;
       width: 75%;
     }
     }
 
 
+
     ul {
     ul {
       li {
       li {
         line-height: 36px;
         line-height: 36px;
@@ -77,6 +78,8 @@
   .home-right {
   .home-right {
     padding-left: 4px;
     padding-left: 4px;
     width: 30%;
     width: 30%;
+    display: flex;
+    flex-direction: column;
 
 
     .list-title {
     .list-title {
       overflow: hidden;
       overflow: hidden;
@@ -84,6 +87,16 @@
       white-space: nowrap;
       white-space: nowrap;
     }
     }
 
 
+    #loginTime {
+      height: 100%;
+      padding-bottom: 90px;
+    }
+
+    .dynamicInfo {
+      flex: 1;
+      height: 100%;
+    }
+
     ul {
     ul {
       li {
       li {
         line-height: 36px;
         line-height: 36px;

@@ -81,19 +81,19 @@
       </el-card>
       </el-card>
     </div>
     </div>
     <div class="home-right">
     <div class="home-right">
-      <el-card shadow="hover" style="height:345px">
+      <el-card shadow="hover">
         <div slot="header" class="flexst">
         <div slot="header" class="flexst">
           <h5 class="title">用户登录时间</h5>
           <h5 class="title">用户登录时间</h5>
         </div>
         </div>
         <div id="loginTime"></div>
         <div id="loginTime"></div>
       </el-card>
       </el-card>
-      <el-card class="marginTop10" shadow="hover" style="height:395px">
+      <el-card class="marginTop10" shadow="hover">
         <div slot="header" class="flexst">
         <div slot="header" class="flexst">
           <h5 class="title">动态信息</h5>
           <h5 class="title">动态信息</h5>
           <i class="el-icon-s-unfold pointer"></i>
           <i class="el-icon-s-unfold pointer"></i>
         </div>
         </div>
         <ul>
         <ul>
-          <li v-for="(item, index) in doneList" :key="index" class="flexst">
+          <li v-for="(item, index) in doneList" :key="index" class="flexst dynamicInfo">
             <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
             <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
             <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
             <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
           </li>
           </li>
@@ -295,7 +295,7 @@ export default {
       chart.source(data, {
       chart.source(data, {
         percent: {
         percent: {
           formatter: function formatter (val) {
           formatter: function formatter (val) {
-            val = val * 100 + '%';
+            val = val * 100 + '小时';
             return val;
             return val;
           }
           }
         }
         }
@@ -312,7 +312,7 @@ export default {
           shadowColor: 'rgba(0, 0, 0, .45)'
           shadowColor: 'rgba(0, 0, 0, .45)'
         }
         }
       }).tooltip('item*percent', function (item, percent) {
       }).tooltip('item*percent', function (item, percent) {
-        percent = percent * 100 + '%';
+        percent = percent * 100 + '小时';
         return {
         return {
           name: item,
           name: item,
           value: percent
           value: percent

@@ -73,7 +73,7 @@ import searchBox from '../components/search.vue'
 import table from "@/utils/mixin/table"
 import table from "@/utils/mixin/table"
 import searchMin from "../components/mixin/index"
 import searchMin from "../components/mixin/index"
 import { datas, sendThis } from "./dbxdata"
 import { datas, sendThis } from "./dbxdata"
-import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl.js"
+import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl"
 export default {
 export default {
   name: "dbx",
   name: "dbx",
   components: { searchBox },
   components: { searchBox },

@@ -74,7 +74,7 @@ import { mapGetters } from 'vuex'
 import searchMin from "../components/mixin/index"
 import searchMin from "../components/mixin/index"
 import table from "@/utils/mixin/table"
 import table from "@/utils/mixin/table"
 import { datas, sendThis } from "./ybxdata"
 import { datas, sendThis } from "./ybxdata"
-import { searchTaskDone } from "@/api/ywbl.js"
+import { searchTaskDone } from "@/api/ywbl"
 import searchBox from '../components/search.vue'
 import searchBox from '../components/search.vue'
 export default {
 export default {
   name: "ybx",
   name: "ybx",

@@ -72,8 +72,7 @@
 import { datas, sendThis } from "../javascript/fwsyq.js";
 import { datas, sendThis } from "../javascript/fwsyq.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
-import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH } from "@/api/ywbl.js";
-import { selectZrz, selectH } from "@/api/selectQlxx.js";
+import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectH } from "@/api/ywbl.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {

@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import jump from "../components/mixin/jump";
-import { startBusinessFlow } from "@/api/ywbl.js";
-import { selectZdjbxx } from "@/api/selectQlxx.js";
+import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {

@@ -58,8 +58,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import jump from "../components/mixin/jump";
-import { startBusinessFlow } from "@/api/ywbl.js";
-import { selectJsydQlxx } from "@/api/selectQlxx.js";
+import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {

@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/nydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import jump from "../components/mixin/jump";
-import { startBusinessFlow } from "@/api/ywbl.js";
-import { selectZdjbxx } from "@/api/selectQlxx.js";
+import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {

@@ -44,8 +44,7 @@ import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import jump from "../components/mixin/jump";
-import { startBusinessFlow } from "@/api/ywbl.js";
-import { selectNydsyqQlxx } from "@/api/selectQlxx.js";
+import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {