Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
063e1485 by 任超
Options

style:区县接入

1 parent 6368c208
Expand all
Inline Side-by-side
Showing 11 changed files with 38 additions and 30 deletions
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "jg", 3 "THEME": "sb",
4 "SERVERAPI": "/bdcsjsb", 4 "SERVERAPI": "/bdcsjsb",
5 "MANAGEMENTAPI": "http: //192.168.2.236/management" 5 "MANAGEMENTAPI": "http: //192.168.2.236/management"
6 } 6 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-03-22 10:23:46 4 * @LastEditTime: 2023-03-22 10:23:46
5 --> 5 -->
6 <template> 6 <template>
7 <section class="app-main"> 7 <section>
8 <transition name="fade-transform" mode="out-in"> 8 <transition name="fade-transform" mode="out-in">
9 <router-view /> 9 <router-view />
10 </transition> 10 </transition>
...@@ -20,14 +20,3 @@ export default { ...@@ -20,14 +20,3 @@ export default {
20 } 20 }
21 } 21 }
22 </script> 22 </script>
23 <style lang="scss" scoped>
24 .app-main {
25 height: calc(100vh - 74px);
26 overflow-x: hidden;
27 box-sizing: border-box;
28 flex: 1;
29 width: 100%;
30 background: #EAEBF0;
31 padding: 15px;
32 }
33 </style>
......
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
35 }, 35 },
36 computed: { 36 computed: {
37 visitedViews () { 37 visitedViews () {
38 return this.$store.state.tagsView.visitedViews 38 return this.$store.state.tagsView.visitedViews.slice(1)
39 }, 39 },
40 routes () { 40 routes () {
41 return this.$store.state.permission.routes 41 return this.$store.state.permission.routes
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
199 box-sizing: border-box; 199 box-sizing: border-box;
200 padding-top: 3px; 200 padding-top: 3px;
201 box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); 201 box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
202 202 margin-bottom: 5px;
203 .tags-view-wrapper { 203 .tags-view-wrapper {
204 .tags-view-item { 204 .tags-view-item {
205 display: inline-block; 205 display: inline-block;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 16:05:15 4 * @LastEditTime: 2023-03-23 09:21:00
5 --> 5 -->
6 <template> 6 <template>
7 <div class="app-wrapper"> 7 <div class="app-wrapper">
8 <navbar /> 8 <navbar />
9 <div class="main-container"> 9 <div class="main-container">
10 <sidebar class="sidebar-container" /> 10 <sidebar class="sidebar-container" />
11 <app-main /> 11 <div class="app-main">
12 <tags-view v-if="needTagsView" />
13 <app-main />
14 </div>
12 </div> 15 </div>
13 </div> 16 </div>
14 </template> 17 </template>
...@@ -37,6 +40,17 @@ export default { ...@@ -37,6 +40,17 @@ export default {
37 } 40 }
38 } 41 }
39 </script> 42 </script>
43 <style lang="scss" scoped>
44 .app-main {
45 height: calc(100vh - 74px);
46 overflow-x: hidden;
47 box-sizing: border-box;
48 flex: 1;
49 width: 100%;
50 background: #EAEBF0;
51 padding: 10px;
52 }
53 </style>
40 <style lang="scss"> 54 <style lang="scss">
41 @import "~@/styles/mixin.scss"; 55 @import "~@/styles/mixin.scss";
42 @import "~@/styles/sbSidebar.scss"; 56 @import "~@/styles/sbSidebar.scss";
......
...@@ -33,7 +33,7 @@ export const constantRoutes = [ ...@@ -33,7 +33,7 @@ export const constantRoutes = [
33 { 33 {
34 path: '/', 34 path: '/',
35 component: Layout, 35 component: Layout,
36 redirect: '/jg?redirect=%2Fhome', 36 redirect: '/jg',
37 meta: { title: '首页' }, 37 meta: { title: '首页' },
38 children: [ 38 children: [
39 { 39 {
...@@ -59,7 +59,7 @@ export const asyncRoutes = [ ...@@ -59,7 +59,7 @@ export const asyncRoutes = [
59 path: 'index', 59 path: 'index',
60 component: () => import('@/views/jsbwcx/index'), 60 component: () => import('@/views/jsbwcx/index'),
61 name: 'jsbwcx', 61 name: 'jsbwcx',
62 meta: { title: '接收报文查询', icon: 'zsgl' } 62 meta: { title: '区县接入', icon: 'zsgl' }
63 } 63 }
64 ] 64 ]
65 }, 65 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 15:24:53 3 * @Date: 2023-03-09 15:24:53
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-21 16:05:39 5 * @LastEditTime: 2023-03-23 10:19:35
6 * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js 6 * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 */ 8 */
...@@ -25,7 +25,7 @@ const mutations = { ...@@ -25,7 +25,7 @@ const mutations = {
25 } 25 }
26 const actions = { 26 const actions = {
27 // 添加全部菜单 27 // 添加全部菜单
28 generateRoutes ({ commit }, getMenuInfo) { 28 generateRoutes ({ commit }, getMenuInfo) {
29 let Layout; 29 let Layout;
30 if (Vue.prototype.BASE_API.THEME == 'sb') { 30 if (Vue.prototype.BASE_API.THEME == 'sb') {
31 Layout = r => require.ensure([], () => r(require(`@/layout1`))) 31 Layout = r => require.ensure([], () => r(require(`@/layout1`)))
...@@ -40,6 +40,7 @@ const actions = { ...@@ -40,6 +40,7 @@ const actions = {
40 item.children = asyncRouter(item.children) 40 item.children = asyncRouter(item.children)
41 } 41 }
42 item.path = JSON.parse(item.metadata)?.path || '/' 42 item.path = JSON.parse(item.metadata)?.path || '/'
43 item.affix = JSON.parse(item.metadata)?.affix || false
43 if (!item.parentId) { 44 if (!item.parentId) {
44 item.component = Layout 45 item.component = Layout
45 } else { 46 } else {
...@@ -47,7 +48,8 @@ const actions = { ...@@ -47,7 +48,8 @@ const actions = {
47 } 48 }
48 item.meta = { 49 item.meta = {
49 title: item.name, 50 title: item.name,
50 icon: item.icon 51 icon: item.icon,
52 affix: item.affix
51 } 53 }
52 }) 54 })
53 return routers 55 return routers
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
6 min-width: 1280px; 6 min-width: 1280px;
7 box-sizing: border-box; 7 box-sizing: border-box;
8 overflow-x: hidden; 8 overflow-x: hidden;
9 padding: 2px;
10 9
11 &-header { 10 &-header {
12 width: 100%; 11 width: 100%;
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
20 &-content { 19 &-content {
21 width: 100%; 20 width: 100%;
22 box-sizing: border-box; 21 box-sizing: border-box;
23 margin-top: 15px; 22 margin-top: 10px;
24 background: #FFFFFF; 23 background: #FFFFFF;
25 border-radius: 4px; 24 border-radius: 4px;
26 background-size: 100% 100%; 25 background-size: 100% 100%;
...@@ -142,4 +141,4 @@ ...@@ -142,4 +141,4 @@
142 background-color: white; 141 background-color: white;
143 ; 142 ;
144 background-size: cover; 143 background-size: cover;
145 } 144 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,13 +4,15 @@ ...@@ -4,13 +4,15 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区" prop="qxdm"> 12 <el-form-item label="行政区" prop="qxdm">
13 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'"> 13 <el-select
14 v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm"
15 class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 16 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 17 </el-option>
16 </el-select> 18 </el-select>
...@@ -99,6 +101,7 @@ ...@@ -99,6 +101,7 @@
99 </template> 101 </template>
100 102
101 <script> 103 <script>
104 import Vue from 'vue'
102 // 接收报文查询 105 // 接收报文查询
103 // 引入表格头部数据 106 // 引入表格头部数据
104 import data from "./data"; 107 import data from "./data";
......
1 /* 1 /*
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-01-30 17:59:51 3 * @Date: 2023-01-30 17:59:51
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-21 18:34:17 5 * @LastEditTime: 2023-03-23 09:34:50
6 * @FilePath: \监管系统\js-web-jianguan\src\views\system\users\data\index.js 6 * @FilePath: \监管系统\js-web-jianguan\src\views\system\users\data\index.js
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 */ 8 */
...@@ -29,7 +29,8 @@ class data extends filter { ...@@ -29,7 +29,8 @@ class data extends filter {
29 }, 29 },
30 { 30 {
31 prop: "departmentName", 31 prop: "departmentName",
32 label: "组织机构" 32 label: "组织机构",
33 minWidth: 130
33 }, 34 },
34 { 35 {
35 prop: "telephone", 36 prop: "telephone",
......