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

@@ -139,7 +139,7 @@ input[type="number"] {
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #458ACF;
+  background: rgba(69, 138, 207,.3);
   background-clip: padding-box;
   min-height: 28px;
   -webkit-border-radius: 6px;
@@ -148,7 +148,12 @@ input[type="number"] {
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #458ACF;
+  background: rgba(69, 138, 207,.3);
+}
+// 滚动条位置
+.el-scrollbar__wrap{
+// margin-bottom: 0px!important;
+margin-right: 0px!important;
 }
 
 // element 样式补丁
@@ -591,4 +596,4 @@ table td {
 // 下拉框
 .el-menu--popup {
   padding-top: 20px;
-}
\ No newline at end of file
+}

@@ -367,14 +367,14 @@ aside {
   height: 28px;
   background: rgba(255, 255, 255, 0.1);
   border-radius: 16px;
-  color: #04c0a7;
+  color: #b0e4dd;
 }
 .resetbtnColor {
   width: 64px;
   height: 28px;
   background: rgba(255, 255, 255, 0.1);
   border-radius: 16px;
-  color: #04c0a7;
+  color: #A5CBDA;
 }
 .movebtnColor {
   width: 64px;

@@ -40,11 +40,8 @@
     mounted () {
       this.getdjywltotal();
       window.addEventListener("resize", () => {
-        this.cdata.seriesData = [];
+        this.config.data = [];
         this.getdjywltotal();
-        window.addEventListener("resize", () => {
-          this.getdjywltotal();
-        });
         // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
       })
     },

@@ -104,6 +104,8 @@
                   this.$store.dispatch('business/setInitRules', "layout1")
                   //存储token
                   localStorage.setItem("token", `Bearer ${res.content}`);
+                  this.$store.dispatch("products/setData", res.content[0].code);
+                  sessionStorage.setItem("products", res.content[0].code)
                   //登录成功后需判断有无重定向，没有重定向则跳转首页
                   this.$router.replace(this.$route.query.redirect || "/");
                 } else {

@@ -2,7 +2,7 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-03-09 20:54:28
  * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-15 15:45:01
+ * @LastEditTime: 2023-03-16 19:40:40
  * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -14,7 +14,7 @@
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
-          <el-col :span="4" class="btnColRight">
+          <el-col class="btnColRight">
             <btn nativeType="cx" @click="information">
               基本信息
             </btn>
@@ -73,16 +73,11 @@
     display: flex;
     flex-direction: column;
     .btnColRight {
+      margin-top: 10px;
+      display: flex;
+      justify-content: center;
       // background-color: cadetblue;
       height: 30px;
-      .button:nth-child(1) {
-        position: absolute;
-        left: 30px;
-      }
-      .button:nth-child(2) {
-        position: absolute;
-        left: 120px;
-      }
     }
     /deep/.content {
       .el-input__inner {

@@ -180,7 +180,7 @@
                             class="configurationbtnColor"
                             icon="el-icon-video-pause"
                             onClick={() => {
-                              this.getUserList(scope.row);
+                              this.getList(scope.row);
                             }}
                           >
                             配置
@@ -351,7 +351,7 @@
       },
 
       //  配置
-      getUserList (row) {
+      getList (row) {
         this.getTableList()
         const params = {};
         const queryOptions = {