style:区县接入

 {
   "TITLE": "汉中市数据上报系统",
-  "THEME": "jg",
+  "THEME": "sb",
   "SERVERAPI": "/bdcsjsb",
   "MANAGEMENTAPI": "http: //192.168.2.236/management"
 }
\ No newline at end of file

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-03-22 10:23:46
 -->
 <template>
-  <section class="app-main">
+  <section>
     <transition name="fade-transform" mode="out-in">
       <router-view />
     </transition>
@@ -20,14 +20,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-.app-main {
-  height: calc(100vh - 74px);
-  overflow-x: hidden;
-  box-sizing: border-box;
-  flex: 1;
-  width: 100%;
-  background: #EAEBF0;
-  padding: 15px;
-}
-</style>

@@ -35,7 +35,7 @@ export default {
   },
   computed: {
     visitedViews () {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews.slice(1)
     },
     routes () {
       return this.$store.state.permission.routes
@@ -199,7 +199,7 @@ export default {
   box-sizing: border-box;
   padding-top: 3px;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-
+  margin-bottom: 5px;
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-20 16:05:15
+ * @LastEditTime: 2023-03-23 09:21:00
 -->
 <template>
   <div class="app-wrapper">
     <navbar />
     <div class="main-container">
       <sidebar class="sidebar-container" />
+      <div class="app-main">
+        <tags-view v-if="needTagsView" />
         <app-main />
       </div>
     </div>
+  </div>
 </template>
 <script>
 import { AppMain, Navbar, Sidebar, TagsView } from './components'
@@ -37,6 +40,17 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.app-main {
+  height: calc(100vh - 74px);
+  overflow-x: hidden;
+  box-sizing: border-box;
+  flex: 1;
+  width: 100%;
+  background: #EAEBF0;
+  padding: 10px;
+}
+</style>
 <style lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/sbSidebar.scss";

@@ -33,7 +33,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/jg?redirect=%2Fhome',
+    redirect: '/jg',
     meta: { title: '首页' },
     children: [
       {
@@ -59,7 +59,7 @@ export const asyncRoutes = [
         path: 'index',
         component: () => import('@/views/jsbwcx/index'),
         name: 'jsbwcx',
-        meta: { title: '接收报文查询', icon: 'zsgl' }
+        meta: { title: '区县接入', icon: 'zsgl' }
       }
     ]
   },

@@ -2,7 +2,7 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-03-09 15:24:53
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-21 16:05:39
+ * @LastEditTime: 2023-03-23 10:19:35
  * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -40,6 +40,7 @@ const actions = {
           item.children = asyncRouter(item.children)
         }
         item.path = JSON.parse(item.metadata)?.path || '/'
+        item.affix = JSON.parse(item.metadata)?.affix || false
         if (!item.parentId) {
           item.component = Layout
         } else {
@@ -47,7 +48,8 @@ const actions = {
         }
         item.meta = {
           title: item.name,
-          icon: item.icon
+          icon: item.icon,
+          affix: item.affix
         }
       })
       return routers

@@ -6,7 +6,6 @@
   min-width: 1280px;
   box-sizing: border-box;
   overflow-x: hidden;
-  padding: 2px;
 
   &-header {
     width: 100%;
@@ -20,7 +19,7 @@
   &-content {
     width: 100%;
     box-sizing: border-box;
-    margin-top: 15px;
+    margin-top: 10px;
     background: #FFFFFF;
     border-radius: 4px;
     background-size: 100% 100%;

@@ -4,13 +4,15 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
-              <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'">
+              <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'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -99,6 +101,7 @@
 </template>
 
 <script>
+import Vue from 'vue'
 // 接收报文查询
 // 引入表格头部数据
 import data from "./data";

@@ -23,9 +23,9 @@
 </template>
 
 <script>
-  import { loginIn } from "@/api/login.js";
-  import { api, getAction } from "@/api/manageApi";
-  export default {
+import { loginIn } from "@/api/login.js";
+import { api, getAction } from "@/api/manageApi";
+export default {
   name: "Login",
   data () {
     return {
@@ -96,7 +96,8 @@
                 //存储token
                 localStorage.setItem("token", `Bearer ${res.content}`);
                 //登录成功后需判断有无重定向，没有重定向则跳转首页
-                  this.$router.replace(this.$route.query.redirect || "/");
+                console.log(this.$route.query.redirect);
+                this.$router.replace(this.$route.query.redirect || "/home");
               } else {
                 //错误处理
               }
@@ -109,11 +110,11 @@
     },
   },
   components: {},
-  };
+};
 </script>
 <style scoped lang="scss">
-  .username,
-  .password {
+.username,
+.password {
   position: relative;
 
   &:before {
@@ -132,17 +133,17 @@
     border: 1px solid rgba(11, 161, 248, 0.4);
     background-color: rgba(6, 135, 205, 0.3) !important;
   }
-  }
+}
 
-  .username::before {
+.username::before {
   background-image: url(../../image/username.png);
-  }
+}
 
-  .password::before {
+.password::before {
   background-image: url(../../image/password.png);
-  }
+}
 
-  .bg {
+.bg {
   width: 100%;
   height: 100%;
   min-width: 1440px;
@@ -151,6 +152,7 @@
   background-size: 100% 100%;
   overflow: hidden;
   position: relative;
+
   .login-logo {
     background: url(../../image/loginLogo.png) no-repeat;
     background-size: 100% 100%;
@@ -160,9 +162,9 @@
     top: 25%;
     left: 19%;
   }
-  }
+}
 
-  .login-inner-bg {
+.login-inner-bg {
   background: url(../../image/loginBg.png) no-repeat;
   width: 20.6%;
   height: 43%;
@@ -185,14 +187,12 @@
     position: absolute;
     right: 0;
     top: -70px;
-      background-image: linear-gradient(
-        180deg,
+    background-image: linear-gradient(180deg,
         rgba(99, 163, 255, 1) 0,
         rgba(99, 163, 255, 1) 0,
         rgba(182, 220, 255, 1) 49.731445%,
         rgba(114, 190, 255, 1) 100%,
-        rgba(114, 190, 255, 1) 100%
-      );
+        rgba(114, 190, 255, 1) 100%);
     overflow-wrap: break-word;
     color: rgba(255, 255, 255, 1);
     font-size: 36px;
@@ -200,9 +200,9 @@
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
   }
-  }
+}
 
-  .login {
+.login {
   .user_style {
     h3 {
       color: #fff;
@@ -227,9 +227,9 @@
     cursor: pointer;
     background-color: #2d8cf0;
   }
-  }
+}
 
-  .login #loginform {
+.login #loginform {
   .el-form-item {
     margin-bottom: 24px !important;
   }
@@ -252,13 +252,14 @@
   .el-checkbox__label {
     color: #fff;
   }
-  }
+}
 
-  .inputUser .ivu-input {
+.inputUser .ivu-input {
   padding: 6px 24px !important;
   border: 1px solid #9f9f9f !important;
-  }
-  tr.hover-row > td.el-table__cell {
+}
+
+tr.hover-row>td.el-table__cell {
   background-color: transparent !important;
-  }
+}
 </style>

@@ -11,12 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="图标:" label-width="54px">
-              <el-input
-                v-model="form.icon"
-                placeholder="请选择图标"
-                :prefix-icon="form.icon"
-                clearable
-                @focus="getIconList" />
+              <el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,12 +63,12 @@
 </template>
 
 <script>
-  import { getParentMenuListAction } from '@/api/authorityManage'
-  import IconList from '../../../components/IconList'
-  import JsonEditor from '@/components/JsonEditors'
-  import { validateCode } from '@/utils/validate';
-  import { api, httpAction } from '@/api/manageApi'
-  export default {
+import { getParentMenuListAction } from '@/api/authorityManage'
+import IconList from '../../../components/IconList'
+import JsonEditor from '@/components/JsonEditors'
+import { validateCode } from '@/utils/validate';
+import { api, httpAction } from '@/api/manageApi'
+export default {
   name: 'MenuModal',
   components: {
     JsonEditor,
@@ -206,7 +201,6 @@
             method = 'put'
             url = `${this.dataUrl}/${formData.id}`
           }
-            debugger
           httpAction(url, formData, method)
             .then((res) => {
               if (res.status === 1) {
@@ -239,13 +233,14 @@
       this.$emit('input', false)
     }
   }
-  }
+}
 </script>
 <style scoped lang="scss">
-  .modifydialog {
+.modifydialog {
   &-con {
     background: #031a46;
   }
+
   /deep/.el-dialog__header {
     .dialog_title {
       display: -webkit-box;
@@ -260,14 +255,16 @@
       -ms-flex-pack: center;
       justify-content: center;
       white-space: nowrap;
+
       b {
         font-size: 16px;
       }
     }
+
     .el-dialog__headerbtn {
       right: 20px !important;
       top: 23px !important;
     }
   }
-  }
+}
 </style>

 /*
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-01-30 17:59:51
- * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-21 18:34:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-23 09:34:50
  * @FilePath: \监管系统\js-web-jianguan\src\views\system\users\data\index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -29,7 +29,8 @@ class data extends filter {
       },
       {
         prop: "departmentName",
-        label: "组织机构"
+        label: "组织机构",
+        minWidth: 130
       },
       {
         prop: "telephone",