Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
c63c11ff by xiaomiao
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents b3e5ffef d21846df
Inline Side-by-side
Showing 12 changed files with 66 additions and 66 deletions
1 {
2 "TITLE": "汉中市数据上报系统"
3 }
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 这个是所有api的前缀配置文件 2 * @Description: 这个是所有api的前缀配置文件
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-01 15:35:44 4 * @LastEditTime: 2023-03-16 13:37:11
5 */ 5 */
6 export default { 6 export default {
7 TITLE: '汉中市数据上报系统',
8 SERVERAPI: '/bdcsjsb', //赵千 7 SERVERAPI: '/bdcsjsb', //赵千
9 MANAGEMENTAPI: 'http://192.168.2.236/management' 8 MANAGEMENTAPI: 'http://192.168.2.236/management'
10 } 9 }
......
1 import Vue from 'vue'
1 import request from '@/utils/request' 2 import request from '@/utils/request'
3 console.log(Vue.prototype, Vue.prototype.$BASE_API);
2 import SERVER from './config' 4 import SERVER from './config'
3 // 获取用户信息 5 // 获取用户信息
4 export function getUserInfo () { 6 export function getUserInfo () {
......
1 <template> 1 <template>
2 <Echart 2 <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart>
3 :options="options"
4 id="centreLeft1Chart"
5 :key="key"
6 height="1.0417rem"
7 width="80%"></Echart>
8 </template> 3 </template>
9 <script> 4 <script>
10 import Echart from "@/common/echart"; 5 import Echart from "@/common/echart";
11 export default { 6 export default {
12 components: { 7 components: {
13 Echart, 8 Echart,
14 }, 9 },
...@@ -26,7 +21,7 @@ ...@@ -26,7 +21,7 @@
26 watch: { 21 watch: {
27 cdata: { 22 cdata: {
28 handler (newData) { 23 handler (newData) {
29 console.log("newData", newData); 24
30 this.options = { 25 this.options = {
31 color: [ 26 color: [
32 "#37a2da", 27 "#37a2da",
...@@ -86,12 +81,12 @@ ...@@ -86,12 +81,12 @@
86 deep: true, 81 deep: true,
87 }, 82 },
88 }, 83 },
89 }; 84 };
90 </script> 85 </script>
91 86
92 <style lang="scss" scoped> 87 <style lang="scss" scoped>
93 #centreLeft1Chart { 88 #centreLeft1Chart {
94 margin-bottom: 0.0521rem; 89 margin-bottom: 0.0521rem;
95 margin-left: 0.3125rem; 90 margin-left: 0.3125rem;
96 } 91 }
97 </style> 92 </style>
......
...@@ -134,9 +134,8 @@ export default { ...@@ -134,9 +134,8 @@ export default {
134 @extend .xuanzhong; 134 @extend .xuanzhong;
135 } 135 }
136 136
137 /deep/.el-menu-item.is-active { 137 /deep/.el-menu-item .is-active {
138 @extend .xuanzhong; 138 @extend .xuanzhong;
139
140 } 139 }
141 140
142 .navbar { 141 .navbar {
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
9 </template> 9 </template>
10 10
11 <script> 11 <script>
12 import { mapGetters } from 'vuex' 12 import { mapGetters } from 'vuex'
13 import Logo from './Logo' 13 import Logo from './Logo'
14 import SidebarItem from './SidebarItem' 14 import SidebarItem from './SidebarItem'
15 import variables from '@/styles/variables.scss' 15 import variables from '@/styles/variables.scss'
16 import { asyncRoutes } from '@/router' 16 import { asyncRoutes } from '@/router'
17 export default { 17 export default {
18 components: { SidebarItem, Logo }, 18 components: { SidebarItem, Logo },
19 computed: { 19 computed: {
20 ...mapGetters(['permission_routes', 'sidebar']), 20 ...mapGetters(['permission_routes', 'sidebar']),
...@@ -34,15 +34,12 @@ ...@@ -34,15 +34,12 @@
34 asyncRoutes () { 34 asyncRoutes () {
35 return asyncRoutes.slice(0, 3) 35 return asyncRoutes.slice(0, 3)
36 } 36 }
37 },
38 mounted () {
39 console.log("permission_routes", this.permission_routes);
40 }
41 } 37 }
38 }
42 </script> 39 </script>
43 <style scoped lang="scss"> 40 <style scoped lang="scss">
44 .el-menu--horizontal { 41 .el-menu--horizontal {
45 display: flex; 42 display: flex;
46 background: none !important; 43 background: none !important;
47 } 44 }
48 </style> 45 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-10 14:59:43 4 * @LastEditTime: 2023-03-16 11:15:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="app-wrapper jgWrapper"> 7 <div class="app-wrapper jgWrapper">
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import { AppMain, Navbar, Sidebar, TagsView } from './components' 15 import { AppMain, Navbar, Sidebar, TagsView } from './components'
16 import ResizeMixin from './mixin/ResizeHandler' 16 import ResizeMixin from './mixin/ResizeHandler'
17 import { mapState } from 'vuex' 17 import { mapState } from 'vuex'
18 export default { 18 export default {
19 name: 'Layout', 19 name: 'Layout',
20 components: { 20 components: {
21 AppMain, 21 AppMain,
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 }, 25 },
26 created () { 26 created () {
27 this.$store.dispatch("products/setData", "BDCJGPT"); 27 this.$store.dispatch("products/setData", "BDCJGPT");
28 console.log("ZOULEJG");
29 }, 28 },
30 mixins: [ResizeMixin], 29 mixins: [ResizeMixin],
31 computed: { 30 computed: {
...@@ -35,15 +34,15 @@ ...@@ -35,15 +34,15 @@
35 fixedHeader: state => state.settings.fixedHeader 34 fixedHeader: state => state.settings.fixedHeader
36 }) 35 })
37 } 36 }
38 } 37 }
39 </script> 38 </script>
40 <style lang="scss"> 39 <style lang="scss">
41 @import "~@/styles/jgSidebar.scss"; 40 @import "~@/styles/jgSidebar.scss";
42 </style> 41 </style>
43 <style lang="scss" scoped> 42 <style lang="scss" scoped>
44 @import "~@/styles/mixin.scss"; 43 @import "~@/styles/mixin.scss";
45 44
46 .app-wrapper { 45 .app-wrapper {
47 @include clearfix; 46 @include clearfix;
48 position: relative; 47 position: relative;
49 height: 100%; 48 height: 100%;
...@@ -58,9 +57,9 @@ ...@@ -58,9 +57,9 @@
58 position: fixed; 57 position: fixed;
59 top: 0; 58 top: 0;
60 } 59 }
61 } 60 }
62 61
63 .appMain { 62 .appMain {
64 // min-width: 1280px; 63 // min-width: 1280px;
65 height: calc(100vh - 101px) !important; 64 height: calc(100vh - 101px) !important;
66 box-sizing: border-box; 65 box-sizing: border-box;
...@@ -68,5 +67,5 @@ ...@@ -68,5 +67,5 @@
68 .app-main { 67 .app-main {
69 height: 100%; 68 height: 100%;
70 } 69 }
71 } 70 }
72 </style> 71 </style>
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
13 </div> 13 </div>
14 </template> 14 </template>
15 <script> 15 <script>
16 import { AppMain, Navbar, Sidebar, TagsView } from './components' 16 import { AppMain, Navbar, Sidebar, TagsView } from './components'
17 import ResizeMixin from './mixin/ResizeHandler' 17 import ResizeMixin from './mixin/ResizeHandler'
18 import { mapState } from 'vuex' 18 import { mapState } from 'vuex'
19 export default { 19 export default {
20 name: 'Layout', 20 name: 'Layout',
21 components: { 21 components: {
22 AppMain, 22 AppMain,
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
27 mixins: [ResizeMixin], 27 mixins: [ResizeMixin],
28 created () { 28 created () {
29 this.$store.dispatch("products/setData", "BDCSBPT"); 29 this.$store.dispatch("products/setData", "BDCSBPT");
30 console.log("ZOULEJG");
31 }, 30 },
32 computed: { 31 computed: {
33 ...mapState({ 32 ...mapState({
...@@ -36,13 +35,13 @@ ...@@ -36,13 +35,13 @@
36 fixedHeader: state => state.settings.fixedHeader 35 fixedHeader: state => state.settings.fixedHeader
37 }) 36 })
38 } 37 }
39 } 38 }
40 </script> 39 </script>
41 <style lang="scss"> 40 <style lang="scss">
42 @import "~@/styles/mixin.scss"; 41 @import "~@/styles/mixin.scss";
43 @import "~@/styles/sbSidebar.scss"; 42 @import "~@/styles/sbSidebar.scss";
44 43
45 .app-wrapper { 44 .app-wrapper {
46 @include clearfix; 45 @include clearfix;
47 position: relative; 46 position: relative;
48 height: 100%; 47 height: 100%;
...@@ -54,9 +53,9 @@ ...@@ -54,9 +53,9 @@
54 position: fixed; 53 position: fixed;
55 top: 0; 54 top: 0;
56 } 55 }
57 } 56 }
58 57
59 .drawer-bg { 58 .drawer-bg {
60 background: #000; 59 background: #000;
61 opacity: 0.3; 60 opacity: 0.3;
62 width: 100%; 61 width: 100%;
...@@ -64,15 +63,15 @@ ...@@ -64,15 +63,15 @@
64 height: 100%; 63 height: 100%;
65 position: absolute; 64 position: absolute;
66 z-index: 999; 65 z-index: 999;
67 } 66 }
68 67
69 .fixed-header { 68 .fixed-header {
70 width: 100%; 69 width: 100%;
71 transition: width 0.28s; 70 transition: width 0.28s;
72 } 71 }
73 72
74 .el-dropdown-menu--small { 73 .el-dropdown-menu--small {
75 padding: 0; 74 padding: 0;
76 width: 5px; 75 width: 5px;
77 } 76 }
78 </style> 77 </style>
......
...@@ -16,7 +16,7 @@ import '@/styles/element-variables.scss' ...@@ -16,7 +16,7 @@ import '@/styles/element-variables.scss'
16 import '@/styles/index.scss' 16 import '@/styles/index.scss'
17 import Base from './base' // 全局组件引入 17 import Base from './base' // 全局组件引入
18 import mixin from '@/utils/mixin/theme.js' 18 import mixin from '@/utils/mixin/theme.js'
19 19 import axios from 'axios'
20 import dataV from '@jiaminghi/data-view'; 20 import dataV from '@jiaminghi/data-view';
21 import * as echarts from "echarts" 21 import * as echarts from "echarts"
22 22
...@@ -52,15 +52,21 @@ import './image/icons' // icon ...@@ -52,15 +52,21 @@ import './image/icons' // icon
52 import store from './store' 52 import store from './store'
53 import router from './router' 53 import router from './router'
54 import _ from 'lodash' 54 import _ from 'lodash'
55 import './permission' // permission control
56 Vue.use(Element, { size: 'small', zIndex: 1000 }) 55 Vue.use(Element, { size: 'small', zIndex: 1000 })
57 Vue.use(Base) 56 Vue.use(Base)
58 Vue.component('icon', Icon); 57 Vue.component('icon', Icon);
59 Vue.prototype.$echarts = echarts 58 Vue.prototype.$echarts = echarts
60 Vue.use(dataV) 59 Vue.use(dataV)
61 new Vue({ 60 axios.get("./config.json")
61 .then((res) => {
62 Vue.prototype.BASE_API = res.data
63 require('./permission')
64 new Vue({
62 el: '#app', 65 el: '#app',
63 router, 66 router,
64 store, 67 store,
65 render: h => h(App) 68 render: h => h(App)
66 }) 69 })
70
71 })
72
......
...@@ -521,6 +521,7 @@ table td { ...@@ -521,6 +521,7 @@ table td {
521 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover, 521 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
522 .el-select-dropdown__item:hover, 522 .el-select-dropdown__item:hover,
523 .el-select-dropdown__item.selected, 523 .el-select-dropdown__item.selected,
524 .el-menu--horizontal .el-menu .el-menu-item.is-active,
524 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus { 525 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
525 background: url("~@/image/xzslitembg.png") no-repeat; 526 background: url("~@/image/xzslitembg.png") no-repeat;
526 background-size: 100% 100%; 527 background-size: 100% 100%;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 17:14:42 4 * @LastEditTime: 2023-03-16 13:31:27
5 */ 5 */
6 // 获取浏览器便签标题 6 // 获取浏览器便签标题
7 import config from '/public/config' 7 import Vue from 'vue'
8 const title = config.TITLE 8 const title = Vue.prototype.BASE_API.TITLE
9 9
10 export default function getPageTitle (pageTitle) { 10 export default function getPageTitle (pageTitle) {
11 if (pageTitle) { 11 if (pageTitle) {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 14:08:59 4 * @LastEditTime: 2023-03-16 13:44:11
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -51,7 +51,7 @@ class data extends filter { ...@@ -51,7 +51,7 @@ class data extends filter {
51 { 51 {
52 prop: "bizMsgid", 52 prop: "bizMsgid",
53 label: "业务报文ID", 53 label: "业务报文ID",
54 minWidth: 100, 54 minWidth: 150,
55 }, 55 },
56 { 56 {
57 prop: "createdate", 57 prop: "createdate",
......