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

+{
+  "TITLE": "汉中市数据上报系统"
+}
\ No newline at end of file

 /*
  * @Description: 这个是所有api的前缀配置文件
  * @Autor: renchao
- * @LastEditTime: 2023-03-01 15:35:44
+ * @LastEditTime: 2023-03-16 13:37:11
  */
 export default {
-  TITLE: '汉中市数据上报系统',
   SERVERAPI: '/bdcsjsb', //赵千
   MANAGEMENTAPI: 'http://192.168.2.236/management'
 }

+import Vue from 'vue'
 import request from '@/utils/request'
+console.log(Vue.prototype, Vue.prototype.$BASE_API);
 import SERVER from './config'
 // 获取用户信息
 export function getUserInfo () {

 <template>
-  <Echart
-    :options="options"
-    id="centreLeft1Chart"
-    :key="key"
-    height="1.0417rem"
-    width="80%"></Echart>
+  <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart>
 </template>
 <script>
-  import Echart from "@/common/echart";
-  export default {
+import Echart from "@/common/echart";
+export default {
   components: {
     Echart,
   },
@@ -26,7 +21,7 @@
   watch: {
     cdata: {
       handler (newData) {
-          console.log("newData", newData);
+
         this.options = {
           color: [
             "#37a2da",
@@ -86,12 +81,12 @@
       deep: true,
     },
   },
-  };
+};
 </script>
 
 <style lang="scss" scoped>
-  #centreLeft1Chart {
+#centreLeft1Chart {
   margin-bottom: 0.0521rem;
   margin-left: 0.3125rem;
-  }
+}
 </style>

@@ -134,9 +134,8 @@ export default {
   @extend .xuanzhong;
 }
 
-/deep/.el-menu-item.is-active {
+/deep/.el-menu-item .is-active {
   @extend .xuanzhong;
-
 }
 
 .navbar {

@@ -9,12 +9,12 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import Logo from './Logo'
-  import SidebarItem from './SidebarItem'
-  import variables from '@/styles/variables.scss'
-  import { asyncRoutes } from '@/router'
-  export default {
+import { mapGetters } from 'vuex'
+import Logo from './Logo'
+import SidebarItem from './SidebarItem'
+import variables from '@/styles/variables.scss'
+import { asyncRoutes } from '@/router'
+export default {
   components: { SidebarItem, Logo },
   computed: {
     ...mapGetters(['permission_routes', 'sidebar']),
@@ -34,15 +34,12 @@
     asyncRoutes () {
       return asyncRoutes.slice(0, 3)
     }
-    },
-    mounted () {
-      console.log("permission_routes", this.permission_routes);
-    }
   }
+}
 </script>
 <style scoped lang="scss">
-  .el-menu--horizontal {
+.el-menu--horizontal {
   display: flex;
   background: none !important;
-  }
+}
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-10 14:59:43
+ * @LastEditTime: 2023-03-16 11:15:48
 -->
 <template>
   <div class="app-wrapper jgWrapper">
@@ -12,10 +12,10 @@
   </div>
 </template>
 <script>
-  import { AppMain, Navbar, Sidebar, TagsView } from './components'
-  import ResizeMixin from './mixin/ResizeHandler'
-  import { mapState } from 'vuex'
-  export default {
+import { AppMain, Navbar, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+export default {
   name: 'Layout',
   components: {
     AppMain,
@@ -25,7 +25,6 @@
   },
   created () {
     this.$store.dispatch("products/setData", "BDCJGPT");
-          console.log("ZOULEJG");
   },
   mixins: [ResizeMixin],
   computed: {
@@ -35,15 +34,15 @@
       fixedHeader: state => state.settings.fixedHeader
     })
   }
-  }
+}
 </script>
 <style lang="scss">
-  @import "~@/styles/jgSidebar.scss";
+@import "~@/styles/jgSidebar.scss";
 </style>
 <style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
+@import "~@/styles/mixin.scss";
 
-  .app-wrapper {
+.app-wrapper {
   @include clearfix;
   position: relative;
   height: 100%;
@@ -58,9 +57,9 @@
     position: fixed;
     top: 0;
   }
-  }
+}
 
-  .appMain {
+.appMain {
   // min-width: 1280px;
   height: calc(100vh - 101px) !important;
   box-sizing: border-box;
@@ -68,5 +67,5 @@
   .app-main {
     height: 100%;
   }
-  }
+}
 </style>

@@ -13,10 +13,10 @@
   </div>
 </template>
 <script>
-  import { AppMain, Navbar, Sidebar, TagsView } from './components'
-  import ResizeMixin from './mixin/ResizeHandler'
-  import { mapState } from 'vuex'
-  export default {
+import { AppMain, Navbar, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+export default {
   name: 'Layout',
   components: {
     AppMain,
@@ -27,7 +27,6 @@
   mixins: [ResizeMixin],
   created () {
     this.$store.dispatch("products/setData", "BDCSBPT");
-      console.log("ZOULEJG");
   },
   computed: {
     ...mapState({
@@ -36,13 +35,13 @@
       fixedHeader: state => state.settings.fixedHeader
     })
   }
-  }
+}
 </script>
 <style lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/sbSidebar.scss";
+@import "~@/styles/mixin.scss";
+@import "~@/styles/sbSidebar.scss";
 
-  .app-wrapper {
+.app-wrapper {
   @include clearfix;
   position: relative;
   height: 100%;
@@ -54,9 +53,9 @@
     position: fixed;
     top: 0;
   }
-  }
+}
 
-  .drawer-bg {
+.drawer-bg {
   background: #000;
   opacity: 0.3;
   width: 100%;
@@ -64,15 +63,15 @@
   height: 100%;
   position: absolute;
   z-index: 999;
-  }
+}
 
-  .fixed-header {
+.fixed-header {
   width: 100%;
   transition: width 0.28s;
-  }
+}
 
-  .el-dropdown-menu--small {
+.el-dropdown-menu--small {
   padding: 0;
   width: 5px;
-  }
+}
 </style>

@@ -16,7 +16,7 @@ import '@/styles/element-variables.scss'
 import '@/styles/index.scss'
 import Base from './base' // 全局组件引入
 import mixin from '@/utils/mixin/theme.js'
-
+import axios from 'axios'
 import dataV from '@jiaminghi/data-view';
 import * as echarts from "echarts"
 
@@ -52,15 +52,21 @@ import './image/icons' // icon
 import store from './store'
 import router from './router'
 import _ from 'lodash'
-import './permission' // permission control
 Vue.use(Element, { size: 'small', zIndex: 1000 })
 Vue.use(Base)
 Vue.component('icon', Icon);
 Vue.prototype.$echarts = echarts
 Vue.use(dataV)
-new Vue({
+axios.get("./config.json")
+    .then((res) => {
+        Vue.prototype.BASE_API = res.data
+        require('./permission')
+        new Vue({
             el: '#app',
             router,
             store,
             render: h => h(App)
-})
+        })
+
+    })
+

@@ -521,6 +521,7 @@ table td {
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
 .el-select-dropdown__item:hover,
 .el-select-dropdown__item.selected,
+.el-menu--horizontal .el-menu .el-menu-item.is-active,
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
   background: url("~@/image/xzslitembg.png") no-repeat;
   background-size: 100% 100%;

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-15 17:14:42
+ * @LastEditTime: 2023-03-16 13:31:27
  */
 // 获取浏览器便签标题
-import config from '/public/config'
-const title = config.TITLE
+import Vue from 'vue'
+const title = Vue.prototype.BASE_API.TITLE
 
 export default function getPageTitle (pageTitle) {
   if (pageTitle) {

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-15 14:08:59
+ * @LastEditTime: 2023-03-16 13:44:11
  */
 import filter from '@/utils/filter.js'
 class data extends filter {
@@ -51,7 +51,7 @@ class data extends filter {
       {
         prop: "bizMsgid",
         label: "业务报文ID",
-        minWidth: 100,
+        minWidth: 150,
       },
       {
         prop: "createdate",