Skip to content

bdc / bdcjg-web

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

style:区县接入

1 parent 6368c208
Inline Side-by-side
Showing 11 changed files with 77 additions and 71 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 <div class="app-main">
12 <tags-view v-if="needTagsView" />
11 <app-main /> 13 <app-main />
12 </div> 14 </div>
13 </div> 15 </div>
16 </div>
14 </template> 17 </template>
15 <script> 18 <script>
16 import { AppMain, Navbar, Sidebar, TagsView } from './components' 19 import { AppMain, Navbar, Sidebar, TagsView } from './components'
...@@ -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 */
...@@ -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%;
......
...@@ -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";
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
23 </template> 23 </template>
24 24
25 <script> 25 <script>
26 import { loginIn } from "@/api/login.js"; 26 import { loginIn } from "@/api/login.js";
27 import { api, getAction } from "@/api/manageApi"; 27 import { api, getAction } from "@/api/manageApi";
28 export default { 28 export default {
29 name: "Login", 29 name: "Login",
30 data () { 30 data () {
31 return { 31 return {
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
96 //存储token 96 //存储token
97 localStorage.setItem("token", `Bearer ${res.content}`); 97 localStorage.setItem("token", `Bearer ${res.content}`);
98 //登录成功后需判断有无重定向，没有重定向则跳转首页 98 //登录成功后需判断有无重定向，没有重定向则跳转首页
99 this.$router.replace(this.$route.query.redirect || "/"); 99 console.log(this.$route.query.redirect);
100 this.$router.replace(this.$route.query.redirect || "/home");
100 } else { 101 } else {
101 //错误处理 102 //错误处理
102 } 103 }
...@@ -109,11 +110,11 @@ ...@@ -109,11 +110,11 @@
109 }, 110 },
110 }, 111 },
111 components: {}, 112 components: {},
112 }; 113 };
113 </script> 114 </script>
114 <style scoped lang="scss"> 115 <style scoped lang="scss">
115 .username, 116 .username,
116 .password { 117 .password {
117 position: relative; 118 position: relative;
118 119
119 &:before { 120 &:before {
...@@ -132,17 +133,17 @@ ...@@ -132,17 +133,17 @@
132 border: 1px solid rgba(11, 161, 248, 0.4); 133 border: 1px solid rgba(11, 161, 248, 0.4);
133 background-color: rgba(6, 135, 205, 0.3) !important; 134 background-color: rgba(6, 135, 205, 0.3) !important;
134 } 135 }
135 } 136 }
136 137
137 .username::before { 138 .username::before {
138 background-image: url(../../image/username.png); 139 background-image: url(../../image/username.png);
139 } 140 }
140 141
141 .password::before { 142 .password::before {
142 background-image: url(../../image/password.png); 143 background-image: url(../../image/password.png);
143 } 144 }
144 145
145 .bg { 146 .bg {
146 width: 100%; 147 width: 100%;
147 height: 100%; 148 height: 100%;
148 min-width: 1440px; 149 min-width: 1440px;
...@@ -151,6 +152,7 @@ ...@@ -151,6 +152,7 @@
151 background-size: 100% 100%; 152 background-size: 100% 100%;
152 overflow: hidden; 153 overflow: hidden;
153 position: relative; 154 position: relative;
155
154 .login-logo { 156 .login-logo {
155 background: url(../../image/loginLogo.png) no-repeat; 157 background: url(../../image/loginLogo.png) no-repeat;
156 background-size: 100% 100%; 158 background-size: 100% 100%;
...@@ -160,9 +162,9 @@ ...@@ -160,9 +162,9 @@
160 top: 25%; 162 top: 25%;
161 left: 19%; 163 left: 19%;
162 } 164 }
163 } 165 }
164 166
165 .login-inner-bg { 167 .login-inner-bg {
166 background: url(../../image/loginBg.png) no-repeat; 168 background: url(../../image/loginBg.png) no-repeat;
167 width: 20.6%; 169 width: 20.6%;
168 height: 43%; 170 height: 43%;
...@@ -185,14 +187,12 @@ ...@@ -185,14 +187,12 @@
185 position: absolute; 187 position: absolute;
186 right: 0; 188 right: 0;
187 top: -70px; 189 top: -70px;
188 background-image: linear-gradient( 190 background-image: linear-gradient(180deg,
189 180deg,
190 rgba(99, 163, 255, 1) 0, 191 rgba(99, 163, 255, 1) 0,
191 rgba(99, 163, 255, 1) 0, 192 rgba(99, 163, 255, 1) 0,
192 rgba(182, 220, 255, 1) 49.731445%, 193 rgba(182, 220, 255, 1) 49.731445%,
193 rgba(114, 190, 255, 1) 100%, 194 rgba(114, 190, 255, 1) 100%,
194 rgba(114, 190, 255, 1) 100% 195 rgba(114, 190, 255, 1) 100%);
195 );
196 overflow-wrap: break-word; 196 overflow-wrap: break-word;
197 color: rgba(255, 255, 255, 1); 197 color: rgba(255, 255, 255, 1);
198 font-size: 36px; 198 font-size: 36px;
...@@ -200,9 +200,9 @@ ...@@ -200,9 +200,9 @@
200 -webkit-background-clip: text; 200 -webkit-background-clip: text;
201 -webkit-text-fill-color: transparent; 201 -webkit-text-fill-color: transparent;
202 } 202 }
203 } 203 }
204 204
205 .login { 205 .login {
206 .user_style { 206 .user_style {
207 h3 { 207 h3 {
208 color: #fff; 208 color: #fff;
...@@ -227,9 +227,9 @@ ...@@ -227,9 +227,9 @@
227 cursor: pointer; 227 cursor: pointer;
228 background-color: #2d8cf0; 228 background-color: #2d8cf0;
229 } 229 }
230 } 230 }
231 231
232 .login #loginform { 232 .login #loginform {
233 .el-form-item { 233 .el-form-item {
234 margin-bottom: 24px !important; 234 margin-bottom: 24px !important;
235 } 235 }
...@@ -252,13 +252,14 @@ ...@@ -252,13 +252,14 @@
252 .el-checkbox__label { 252 .el-checkbox__label {
253 color: #fff; 253 color: #fff;
254 } 254 }
255 } 255 }
256 256
257 .inputUser .ivu-input { 257 .inputUser .ivu-input {
258 padding: 6px 24px !important; 258 padding: 6px 24px !important;
259 border: 1px solid #9f9f9f !important; 259 border: 1px solid #9f9f9f !important;
260 } 260 }
261 tr.hover-row > td.el-table__cell { 261
262 tr.hover-row>td.el-table__cell {
262 background-color: transparent !important; 263 background-color: transparent !important;
263 } 264 }
264 </style> 265 </style>
......
...@@ -11,12 +11,7 @@ ...@@ -11,12 +11,7 @@
11 </el-col> 11 </el-col>
12 <el-col :span="12"> 12 <el-col :span="12">
13 <el-form-item label="图标:" label-width="54px"> 13 <el-form-item label="图标:" label-width="54px">
14 <el-input 14 <el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" />
15 v-model="form.icon"
16 placeholder="请选择图标"
17 :prefix-icon="form.icon"
18 clearable
19 @focus="getIconList" />
20 </el-form-item> 15 </el-form-item>
21 </el-col> 16 </el-col>
22 </el-row> 17 </el-row>
...@@ -68,12 +63,12 @@ ...@@ -68,12 +63,12 @@
68 </template> 63 </template>
69 64
70 <script> 65 <script>
71 import { getParentMenuListAction } from '@/api/authorityManage' 66 import { getParentMenuListAction } from '@/api/authorityManage'
72 import IconList from '../../../components/IconList' 67 import IconList from '../../../components/IconList'
73 import JsonEditor from '@/components/JsonEditors' 68 import JsonEditor from '@/components/JsonEditors'
74 import { validateCode } from '@/utils/validate'; 69 import { validateCode } from '@/utils/validate';
75 import { api, httpAction } from '@/api/manageApi' 70 import { api, httpAction } from '@/api/manageApi'
76 export default { 71 export default {
77 name: 'MenuModal', 72 name: 'MenuModal',
78 components: { 73 components: {
79 JsonEditor, 74 JsonEditor,
...@@ -206,7 +201,6 @@ ...@@ -206,7 +201,6 @@
206 method = 'put' 201 method = 'put'
207 url = `${this.dataUrl}/${formData.id}` 202 url = `${this.dataUrl}/${formData.id}`
208 } 203 }
209 debugger
210 httpAction(url, formData, method) 204 httpAction(url, formData, method)
211 .then((res) => { 205 .then((res) => {
212 if (res.status === 1) { 206 if (res.status === 1) {
...@@ -239,13 +233,14 @@ ...@@ -239,13 +233,14 @@
239 this.$emit('input', false) 233 this.$emit('input', false)
240 } 234 }
241 } 235 }
242 } 236 }
243 </script> 237 </script>
244 <style scoped lang="scss"> 238 <style scoped lang="scss">
245 .modifydialog { 239 .modifydialog {
246 &-con { 240 &-con {
247 background: #031a46; 241 background: #031a46;
248 } 242 }
243
249 /deep/.el-dialog__header { 244 /deep/.el-dialog__header {
250 .dialog_title { 245 .dialog_title {
251 display: -webkit-box; 246 display: -webkit-box;
...@@ -260,14 +255,16 @@ ...@@ -260,14 +255,16 @@
260 -ms-flex-pack: center; 255 -ms-flex-pack: center;
261 justify-content: center; 256 justify-content: center;
262 white-space: nowrap; 257 white-space: nowrap;
258
263 b { 259 b {
264 font-size: 16px; 260 font-size: 16px;
265 } 261 }
266 } 262 }
263
267 .el-dialog__headerbtn { 264 .el-dialog__headerbtn {
268 right: 20px !important; 265 right: 20px !important;
269 top: 23px !important; 266 top: 23px !important;
270 } 267 }
271 } 268 }
272 } 269 }
273 </style> 270 </style>
......
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",
......