Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

channel-access/src/views/fqembed/companylist.vue

@@ -380,36 +380,12 @@ export default {
       // 云 *******************
       // 云 *******************
       regParkOptions: [
       regParkOptions: [
         {
         {
-          value: "上海云上公司",
-          label: "上海云上公司"
+          value: "贵州园区",
+          label: "贵州园区"
         },
         },
         {
         {
-          value: "东莞云上公司",
-          label: "东莞云上公司"
-        },
-        {
-          value: "东营云上公司",
-          label: "东营云上公司"
-        },
-        {
-          value: "中山云上公司",
-          label: "中山云上公司"
-        },
-        {
-          value: "重庆云上公司",
-          label: "重庆云上公司"
-        },
-        {
-          value: "郑州云上公司",
-          label: "郑州云上公司"
-        },
-        {
-          value: "贵州云上公司",
-          label: "贵州云上公司"
-        },
-        {
-          value: "开封云上公司",
-          label: "开封云上公司"
+          value: "开封园区",
+          label: "开封园区"
         }
         }
       ],
       ],
       regPark: "",
       regPark: "",
@@ -453,7 +429,8 @@ export default {
       // 获取详情数据
       // 获取详情数据
       detailsData: {},
       detailsData: {},
       baseURL: "",
       baseURL: "",
-      detailsNeedNo: ""
+      detailsNeedNo: "",
+      headers: {}
     };
     };
   },
   },
   methods: {
   methods: {
@@ -507,16 +484,17 @@ export default {
               solutionNo: row.solutionNo
               solutionNo: row.solutionNo
             }
             }
           },
           },
-          {
-            headers: {
-              token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-              userpin: "7c00bdd9dde04c59a50a0a45788b9a59"
-            }
-          }
+          this.headers
         )
         )
         .then(res => {
         .then(res => {
           console.log(res.data);
           console.log(res.data);
           if (res.data.status == 0) {
           if (res.data.status == 0) {
+            if (sessionStorage.activeName) {
+              sessionStorage.removeItem("activeName");
+              sessionStorage.activeName = this.activeName;
+            } else {
+              sessionStorage.activeName = this.activeName;
+            }
             location.reload();
             location.reload();
             this.$message("该方案已作废");
             this.$message("该方案已作废");
           }
           }
@@ -565,12 +543,7 @@ export default {
                 orgType: this.tissue || ""
                 orgType: this.tissue || ""
               }
               }
             },
             },
-            {
-              headers: {
-                token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-                userpin: "7c00bdd9dde04c59a50a0a45788b9a59"
-              }
-            }
+            this.headers
           )
           )
           .then(res => {
           .then(res => {
             console.log(res.data.msg);
             console.log(res.data.msg);
@@ -622,12 +595,7 @@ export default {
                 productType: this.pType || "" //产品类型
                 productType: this.pType || "" //产品类型
               }
               }
             },
             },
-            {
-              headers: {
-                token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-                userpin: "7c00bdd9dde04c59a50a0a45788b9a59"
-              }
-            }
+            this.headers
           )
           )
           .then(res => {
           .then(res => {
             console.log(res);
             console.log(res);
@@ -669,6 +637,12 @@ export default {
       //生产环境
       //生产环境
       this.baseURL = "/web/action/icapi/springBoard";
       this.baseURL = "/web/action/icapi/springBoard";
     }
     }
+    this.headers = {
+      headers: {
+        token: "3260d5a2452441dd93ecc7ecb35f6dc0",
+        userpin: "417c247bc8664999a508fd710cc25567"
+      }
+    };
     // console.log(JSON.parse(this.$route.query.data));
     // console.log(JSON.parse(this.$route.query.data));
   },
   },
   mounted() {
   mounted() {
@@ -807,7 +781,7 @@ export default {
       display: block;
       display: block;
       width: 6px;
       width: 6px;
       height: 6px;
       height: 6px;
-      background: #000000;
+      background: rgba(0, 0, 0, 0.25);
       border-radius: 6px;
       border-radius: 6px;
       transform: translate(-4px, 1px);
       transform: translate(-4px, 1px);
     }
     }