Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
8 changed files
with
218 additions
and
51 deletions
src/components/Breadcrumb/index.vue
0 → 100644
1 | <template> | ||
2 | <div class="breadcrumb"> | ||
3 | <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right"> | ||
4 | <transition-group name="breadcrumb"> | ||
5 | <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> | ||
6 | <span | ||
7 | v-if=" | ||
8 | item.redirect === 'noRedirect' || index == levelList.length - 1 | ||
9 | " | ||
10 | class="no-redirect" | ||
11 | >{{ item.meta.title }}</span | ||
12 | > | ||
13 | <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> | ||
14 | </el-breadcrumb-item> | ||
15 | </transition-group> | ||
16 | </el-breadcrumb> | ||
17 | </div> | ||
18 | </template> | ||
19 | |||
20 | <script> | ||
21 | import pathToRegexp from "path-to-regexp"; | ||
22 | |||
23 | export default { | ||
24 | data() { | ||
25 | return { | ||
26 | levelList: null, | ||
27 | }; | ||
28 | }, | ||
29 | watch: { | ||
30 | $route() { | ||
31 | this.getBreadcrumb(); | ||
32 | }, | ||
33 | }, | ||
34 | created() { | ||
35 | this.getBreadcrumb(); | ||
36 | }, | ||
37 | methods: { | ||
38 | getBreadcrumb() { | ||
39 | // only show routes with meta.title | ||
40 | let matched = this.$route.matched.filter( | ||
41 | (item) => item.meta && item.meta.title | ||
42 | ); | ||
43 | this.levelList = matched.filter( | ||
44 | (item) => item.meta && item.meta.title | ||
45 | ); | ||
46 | }, | ||
47 | isDashboard(route) { | ||
48 | const name = route && route.name; | ||
49 | if (!name) { | ||
50 | return false; | ||
51 | } | ||
52 | return ( | ||
53 | name.trim().toLocaleLowerCase() === "Dashboard".toLocaleLowerCase() | ||
54 | ); | ||
55 | }, | ||
56 | pathCompile(path) { | ||
57 | const { params } = this.$route; | ||
58 | var toPath = pathToRegexp.compile(path); | ||
59 | return toPath(params); | ||
60 | }, | ||
61 | handleLink(item) { | ||
62 | // const { redirect, path } = item; | ||
63 | // if (redirect) { | ||
64 | // this.$router.push(redirect); | ||
65 | // return; | ||
66 | // } | ||
67 | // this.$router.push(path); | ||
68 | }, | ||
69 | }, | ||
70 | }; | ||
71 | </script> | ||
72 | |||
73 | <style lang="scss" scoped> | ||
74 | .breadcrumb { | ||
75 | margin: 15px auto 0; | ||
76 | box-sizing: border-box; | ||
77 | text-indent: 16px; | ||
78 | } | ||
79 | .breadcrumb1366 { | ||
80 | padding: 10px 0 !important; | ||
81 | } | ||
82 | .isFullScreen{ | ||
83 | width: calc(100% - 20px); | ||
84 | margin: 0 auto; | ||
85 | padding: 10px!important; | ||
86 | } | ||
87 | .cur-location { | ||
88 | font-size: 16px; | ||
89 | color: white; | ||
90 | line-height: 40px; | ||
91 | float: left; | ||
92 | img { | ||
93 | position: relative; | ||
94 | top: 3px; | ||
95 | margin-right: 4px; | ||
96 | } | ||
97 | } | ||
98 | .app-breadcrumb.el-breadcrumb { | ||
99 | display: inline-block; | ||
100 | font-size: 14px; | ||
101 | // line-height: 40px; | ||
102 | .no-redirect { | ||
103 | color: white; | ||
104 | cursor: text; | ||
105 | } | ||
106 | } | ||
107 | .el-breadcrumb__inner a, | ||
108 | .el-breadcrumb__inner.is-link { | ||
109 | color: white; | ||
110 | cursor: text; | ||
111 | font-weight: normal; | ||
112 | } | ||
113 | // .el-breadcrumb__inner a:hover, | ||
114 | // .el-breadcrumb__inner.is-link:hover { | ||
115 | // text-decoration: underline; | ||
116 | // } | ||
117 | </style> |
1 | <template> | 1 | <template> |
2 | <section class="app-main"> | 2 | <section class="app-main"> |
3 | <!-- <Breadcrumb v-if="judgeRoute()" /> --> | ||
3 | <transition name="fade-transform" mode="out-in"> | 4 | <transition name="fade-transform" mode="out-in"> |
4 | <router-view /> | 5 | <router-view /> |
5 | </transition> | 6 | </transition> |
6 | </section> | 7 | </section> |
7 | </template> | 8 | </template> |
8 | <script> | 9 | <script> |
10 | import Breadcrumb from "@/components/Breadcrumb/index"; | ||
9 | export default { | 11 | export default { |
10 | name: 'AppMain', | 12 | name: 'AppMain', |
13 | components: { | ||
14 | Breadcrumb | ||
15 | }, | ||
16 | methods: { | ||
17 | judgeRoute(){ | ||
18 | if (this.$route.path == '/home' || this.$route.path.indexOf('jsbwcx') > -1) { | ||
19 | return false | ||
20 | }else{ | ||
21 | return true | ||
22 | } | ||
23 | } | ||
24 | }, | ||
11 | computed: { | 25 | computed: { |
12 | key () { | 26 | key () { |
13 | return this.$route.path | 27 | return this.$route.path | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="navbar-con"> | 2 | <div class="navbar-con"> |
3 | <div class="navbar"> | 3 | <div class="navbar"> |
4 | <div class="title">{{ dicData['sysCode'][0].DNAME }}</div> | 4 | <div class="title">{{ dicData['sysCode'] && dicData['sysCode'][0].DNAME }}</div> |
5 | <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div> | 5 | <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div> |
6 | <div class="sidebarLeft"> | 6 | <div class="sidebarLeft"> |
7 | <sidebarLeft /> | 7 | <sidebarLeft /> | ... | ... |
... | @@ -92,6 +92,7 @@ export const asyncRoutes = [ | ... | @@ -92,6 +92,7 @@ export const asyncRoutes = [ |
92 | { | 92 | { |
93 | path: '/jktj', | 93 | path: '/jktj', |
94 | component: Layout, | 94 | component: Layout, |
95 | meta: { title: '统计监控', icon: 'sqcx'}, | ||
95 | children: [ | 96 | children: [ |
96 | { | 97 | { |
97 | path: 'ywltj', | 98 | path: 'ywltj', |
... | @@ -176,7 +177,7 @@ export const asyncRoutes = [ | ... | @@ -176,7 +177,7 @@ export const asyncRoutes = [ |
176 | { | 177 | { |
177 | path: '/busineInfo', | 178 | path: '/busineInfo', |
178 | component: Layout, | 179 | component: Layout, |
179 | meta: { title: '接入业务信息', icon: 'sqcx', breadcrumb: false }, | 180 | meta: { title: '不动产数据', icon: 'sqcx'}, |
180 | redirect: '/busineInfo/landOwnership', | 181 | redirect: '/busineInfo/landOwnership', |
181 | alwaysShow: true, | 182 | alwaysShow: true, |
182 | name: 'busineInfo', | 183 | name: 'busineInfo', |
... | @@ -277,7 +278,7 @@ export const asyncRoutes = [ | ... | @@ -277,7 +278,7 @@ export const asyncRoutes = [ |
277 | { | 278 | { |
278 | path: '/system', | 279 | path: '/system', |
279 | component: Layout, | 280 | component: Layout, |
280 | meta: { title: '系统管理', icon: 'sqcx', breadcrumb: false }, | 281 | meta: { title: '运维中心', icon: 'sqcx', breadcrumb: false }, |
281 | redirect: '/system/dictionaries', | 282 | redirect: '/system/dictionaries', |
282 | alwaysShow: true, | 283 | alwaysShow: true, |
283 | name: 'system', | 284 | name: 'system', | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="dyiq from-clues"> | 2 | <div class="dyiq from-clues"> |
3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
4 | <el-form ref="form" :model="form" label-width="80px"> | 4 | <el-form ref="form" :model="form" label-width="90px"> |
5 | <el-row> | 5 | <el-row> |
6 | <el-col :span="5"> | 6 | <el-col :span="6"> |
7 | <el-form-item label="业务号"> | 7 | <el-form-item label="行政区"> |
8 | <el-input v-model="form.YWH" placeholder="业务号"></el-input> | 8 | <el-input v-model="form.xzq" placeholder="行政区"></el-input> |
9 | </el-form-item> | 9 | </el-form-item> |
10 | </el-col> | 10 | </el-col> |
11 | |||
11 | <el-col :span="6"> | 12 | <el-col :span="6"> |
12 | <el-form-item label="供役地不动产单元号" label-width="150px"> | 13 | <el-form-item label="权属状态"> |
13 | <el-input v-model="form.GYDBDCDYH" placeholder="供役地不动产单元号"></el-input> | 14 | <el-select v-model="form.qszt" class="width100" clearable placeholder="请选择权属状态"> |
15 | <el-option v-for="item in qsztOptions" :key="item.value" :label="item.label" :value="item.value"> | ||
16 | </el-option> | ||
17 | </el-select> | ||
14 | </el-form-item> | 18 | </el-form-item> |
15 | </el-col> | 19 | </el-col> |
20 | |||
16 | <el-col :span="6"> | 21 | <el-col :span="6"> |
17 | <el-form-item label="需役地不动产单元号" label-width="150px"> | 22 | <el-form-item label="坐落"> |
18 | <el-input v-model="form.XYDBDCDYH" placeholder="需役地不动产单元号"></el-input> | 23 | <el-input v-model="form.zl" placeholder="坐落"></el-input> |
24 | </el-form-item> | ||
25 | </el-col> | ||
26 | <el-col :span="6"> | ||
27 | <el-form-item label="不动产权证号" label-width="120px"> | ||
28 | <el-input v-model="form.bdcqzh" placeholder="不动产权证号"></el-input> | ||
29 | </el-form-item> | ||
30 | </el-col> | ||
31 | |||
32 | </el-row> | ||
33 | <el-row> | ||
34 | <el-col :span="6"> | ||
35 | <el-form-item label="权利人"> | ||
36 | <el-input v-model="form.xzq" placeholder="权利人"></el-input> | ||
19 | </el-form-item> | 37 | </el-form-item> |
20 | </el-col> | 38 | </el-col> |
21 | <el-col :span="4" class="from-clues-search-button"> | 39 | <el-col :span="4" class="from-clues-search-button"> |
22 | <el-button type="primary" @click="handleSubmit">查询结果</el-button> | 40 | <el-button type="primary" @click="handleSubmit">查询</el-button> |
23 | </el-col> | 41 | </el-col> |
24 | </el-row> | 42 | </el-row> |
43 | |||
25 | </el-form> | 44 | </el-form> |
26 | </div> | 45 | </div> |
27 | <div class="from-clues-content"> | 46 | <div class="from-clues-content"> |
... | @@ -56,11 +75,13 @@ export default { | ... | @@ -56,11 +75,13 @@ export default { |
56 | data () { | 75 | data () { |
57 | return { | 76 | return { |
58 | form: { | 77 | form: { |
59 | YWH: '', | 78 | xzq: '', |
60 | GYDBDCDYH: '', | 79 | qszt: '', |
61 | XYDBDCDYH: '', | 80 | zl: '', |
81 | bdcqzh: '', | ||
62 | currentPage: 1 | 82 | currentPage: 1 |
63 | }, | 83 | }, |
84 | qsztOptions: [], | ||
64 | tableData: { | 85 | tableData: { |
65 | columns: [{ | 86 | columns: [{ |
66 | label: '序号', | 87 | label: '序号', | ... | ... |
... | @@ -12,11 +12,9 @@ class data extends filter { | ... | @@ -12,11 +12,9 @@ class data extends filter { |
12 | render: (h, scope) => { | 12 | render: (h, scope) => { |
13 | return ( | 13 | return ( |
14 | <div> | 14 | <div> |
15 | { | 15 | <span class='adopt' v-show={scope.row.receiveState == 0}>未效验</span> |
16 | scope.row.receiveState | 16 | <span class='adopt' v-show={scope.row.receiveState == 1}>效验成功</span> |
17 | ? <span class='adopt'>通过</span> | 17 | <span class='warehousing' v-show={scope.row.receiveState == 2}>效验失败</span> |
18 | : <span class='warehousing'>不通过</span> | ||
19 | } | ||
20 | </div> | 18 | </div> |
21 | ) | 19 | ) |
22 | } | 20 | } |
... | @@ -28,11 +26,9 @@ class data extends filter { | ... | @@ -28,11 +26,9 @@ class data extends filter { |
28 | render: (h, scope) => { | 26 | render: (h, scope) => { |
29 | return ( | 27 | return ( |
30 | <div> | 28 | <div> |
31 | { | 29 | <span class='fail' v-show={scope.row.storageState == 0}>未入库</span> |
32 | scope.row.storageState | 30 | <span class='success' v-show={scope.row.storageState == 1}>已入库</span> |
33 | ? <span class='success'>成功</span> | 31 | <span class='fail' v-show={scope.row.storageState == 2}>入库失败</span> |
34 | : <span class='fail'>失败</span> | ||
35 | } | ||
36 | </div> | 32 | </div> |
37 | ) | 33 | ) |
38 | } | 34 | } | ... | ... |
1 | import filter from '@/utils/filter.js' | 1 | import filter from '@/utils/filter.js' |
2 | let vm = null | ||
3 | const sendThis = (_this) => { | ||
4 | vm = _this | ||
5 | } | ||
2 | class data extends filter { | 6 | class data extends filter { |
3 | constructor() { | 7 | constructor() { |
4 | super() | 8 | super() |
5 | } | 9 | } |
6 | columns () { | 10 | columns () { |
7 | return [ | 11 | return [ |
12 | { | ||
13 | label: '序号', | ||
14 | type: 'index', | ||
15 | width: '50', | ||
16 | render: (h, scope) => { | ||
17 | return ( | ||
18 | <div> | ||
19 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
20 | </div> | ||
21 | ) | ||
22 | } | ||
23 | }, | ||
24 | { | ||
25 | label: '汇交状态', | ||
26 | render: (h, scope) => { | ||
27 | return ( | ||
28 | <div> | ||
29 | <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span> | ||
30 | <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span> | ||
31 | <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报失败</span> | ||
32 | <span v-show={scope.row.exchangeState == 3} class='adopt'>上报成功响应成功</span> | ||
33 | <span v-show={scope.row.exchangeState == 4} class='warehousing'>响应失败</span> | ||
34 | </div> | ||
35 | ) | ||
36 | } | ||
37 | }, | ||
8 | { | 38 | { |
9 | prop: "areacode", | 39 | prop: "areacode", |
10 | label: "行政区代码", | 40 | label: "行政区代码", |
... | @@ -39,24 +69,17 @@ class data extends filter { | ... | @@ -39,24 +69,17 @@ class data extends filter { |
39 | { | 69 | { |
40 | prop: "rectypeName", | 70 | prop: "rectypeName", |
41 | label: "业务名称", | 71 | label: "业务名称", |
42 | }, | 72 | }, |
43 | { | 73 | { |
44 | prop: "uploadtime", | 74 | prop: "uploadtime", |
45 | label: "汇交时间", | 75 | label: "汇交时间", |
46 | }, | 76 | } |
47 | { | ||
48 | label: '汇交状态', | ||
49 | render: (h, scope) => { | ||
50 | return ( | ||
51 | <div> | ||
52 | { | ||
53 | scope.row.exchangeState == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span> | ||
54 | } | ||
55 | </div> | ||
56 | ) | ||
57 | } | ||
58 | }, | ||
59 | ] | 77 | ] |
60 | } | 78 | } |
61 | } | 79 | } |
62 | export default new data() | 80 | let datas = new data() |
81 | export { | ||
82 | datas, | ||
83 | sendThis | ||
84 | } | ||
85 | ... | ... |
... | @@ -81,7 +81,7 @@ | ... | @@ -81,7 +81,7 @@ |
81 | <script> | 81 | <script> |
82 | // 上报报文查询 | 82 | // 上报报文查询 |
83 | // 引入表头数据 | 83 | // 引入表头数据 |
84 | import data from "./data"; | 84 | import { datas, sendThis } from "./data"; |
85 | // 引入表格混入方法 | 85 | // 引入表格混入方法 |
86 | import table from "@/utils/mixin/table"; | 86 | import table from "@/utils/mixin/table"; |
87 | // 引入详情弹框 | 87 | // 引入详情弹框 |
... | @@ -130,15 +130,7 @@ export default { | ... | @@ -130,15 +130,7 @@ export default { |
130 | // table数据 | 130 | // table数据 |
131 | tableData: { | 131 | tableData: { |
132 | // 表头数据 | 132 | // 表头数据 |
133 | columns: [ | 133 | columns: datas.columns() |
134 | { | ||
135 | label: "序号", | ||
136 | type: "index", | ||
137 | width: "50", | ||
138 | index: this.indexMethod, | ||
139 | }, | ||
140 | ] | ||
141 | .concat(data.columns()) | ||
142 | .concat([ | 134 | .concat([ |
143 | { | 135 | { |
144 | label: "操作", | 136 | label: "操作", |
... | @@ -185,6 +177,9 @@ export default { | ... | @@ -185,6 +177,9 @@ export default { |
185 | title: '' | 177 | title: '' |
186 | }; | 178 | }; |
187 | }, | 179 | }, |
180 | mounted () { | ||
181 | sendThis(this); | ||
182 | }, | ||
188 | methods: { | 183 | methods: { |
189 | // 重置表单 | 184 | // 重置表单 |
190 | resetForm () { | 185 | resetForm () { | ... | ... |
-
Please register or sign in to post a comment