diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {
diff --git a/src/components/login.vue b/src/components/login.vue
index 36cbc33..24710ee 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -138,7 +138,7 @@
                   // 用户在线状态计时
                   loginTime();
                   // 保存cook
-
+                  
                   this.$router.push("/welcome");
 
                   sessionStorage.setItem("powerHandle", response2.data.data);

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {
diff --git a/src/components/login.vue b/src/components/login.vue
index 36cbc33..24710ee 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -138,7 +138,7 @@
                   // 用户在线状态计时
                   loginTime();
                   // 保存cook
-
+                  
                   this.$router.push("/welcome");
 
                   sessionStorage.setItem("powerHandle", response2.data.data);
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 64a7b26..eac618f 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -137,9 +137,9 @@
                   size="medium"
                 >
                   <el-option
-                    v-for="(item, index) in ProjectList"
+                    v-for="(item, index) in allProjectSite"
                     :key="index"
-                    :label="item.groupName"
+                    :label="item.platformName"
                     :value="index"
                   >
                   </el-option>
@@ -634,7 +634,7 @@
 import Modify from "ol/interaction/Modify";
 import FormatWKT from "ol/format/WKT";
 import { ScaleLine, ZoomSlider, ZoomToExtent, Zoom } from "ol/control";
-// import echarts from "echarts";
+import { mapGetters } from "vuex";
 export default {
   name: "previewOfSiteStatus",
   components: { countTo }, //加载数字滚动插件
@@ -754,7 +754,7 @@
       dynamic: 0,
       ChecksplatformCode: "", //选取的平台的编号
       platformtype: "", //选取的站点统计类型
-      ChecksplatformCodeTest: "全部项目", //选取的默认文字
+      ChecksplatformCodeTest: "", //选取的默认文字
       historyList: [],
       // 项目选择B
       // 平台站点数量及状态统计A
@@ -791,7 +791,7 @@
       // 项目站点覆盖排名B
       // 设备分类A
       myChart: {},
-      XianYou: "", //现有设备总数
+      // XianYou: "", //现有设备总数
       titlearr: [],
       valuearr: [],
       myChart2: {},
@@ -847,20 +847,7 @@
       this.map.getView().setZoom(5);
     },
 
-    //根据当前项目后台坐标计算出的中心飞行到指定城市
-    flyToCity() {
-      // console.log("经纬度最大边框是：" + this.north);
-      // console.log("经纬度最大边框是：" + this.south);
-      // console.log("经纬度最大边框是：" + this.east);
-      // console.log("经纬度最大边框是：" + this.west);
-      this.map
-        .getView()
-        .setCenter([
-          (this.east + this.west) / 2,
-          (this.north + this.south) / 2
-        ]);
-      this.map.getView().setZoom(10);
-    },
+   
     //项目图层切换
     initPointToMap(projectNo) {
       this.$http
@@ -890,35 +877,31 @@
       }, 0);
     },
     // 获取所有平台
-    LoadAllProject() {
-      this.$http
-        .post(
-          this.nozzle.userGroupRelaGetGroups +
-            "?&pageNo=" +
-            1 +
-            "&typeStr=" +
-            "&pageSize=" +
-            999
-        )
-        .then(response => {
-          // console.log(response);
-          if (response.status === 200) {
-            var qwe = response.data.data === "" ? [] : response.data.data;
+    // LoadAllProject() {
+    //   this.$http
+    //     .post(
+    //       this.nozzle.userGroupRelaGetGroups +
+    //         "?&pageNo=" +
+    //         1 +
+    //         "&typeStr=" +
+    //         "&pageSize=" +
+    //         999
+    //     )
+    //     .then(response => {
+    //       if (response.status === 200) {
+    //         var qwe = response.data.data === "" ? [] : response.data.data;
 
-            this.ProjectList = this.ProjectList.concat(qwe);
-            // console.log(this.ProjectList);
-          } else {
-            message(response);
-          }
-        })
-        .catch(response => {
-          message(response);
-        });
-    },
+    //         this.ProjectList = this.ProjectList.concat(qwe);
+    //       } else {
+    //         message(response);
+    //       }
+    //     })
+    //     .catch(response => {
+    //       message(response);
+    //     });
+    // },
     // 根据平台渲染站点统计
     loadSiteNumForOroject() {
-      // console.log(this.platformtype, this.ChecksplatformCode);
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -929,16 +912,13 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
             this.Site.EOff = response.data.data.offline;
-            // this.Project.EAll = response.data.data.projectcount;
-            // this.Project.EOn = response.data.data.completed;
-            // this.Project.EOff = response.data.data.noncompleted;
           } else {
             message(response);
           }
@@ -949,15 +929,11 @@
     },
     // 单击显示平台站点
     allpreview(index, item, event) {
-      // console.log(index, platform, event.target);
       this.namelist.forEach(item => {
         item.select = false;
       });
       this.namelist[index].select = true;
-
-      // console.log(this.platformtype, this.ChecksplatformCode);
       this.platformtype = item.type;
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -968,9 +944,9 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
@@ -1011,8 +987,6 @@
         })
         .then(response => {
           if (response.status === 200) {
-            // this.XianYou = response.data.data.total;
-            // console.log(response.data.data);
             this.titlearr = response.data.data.title;
             this.valuearr = response.data.data.value;
             this.loadRegionEcharts(this.titlearr, this.valuearr);
@@ -1034,7 +1008,6 @@
         })
         .then(response => {
           if (response.data.code === 1) {
-            // console.log(response);
             this.areaList = response.data.data;
           } else {
             message(response);
@@ -1051,7 +1024,7 @@
       this.$http
         .post(this.nozzle.warnLogListWarnLog, {
           current: 1,
-          size: 99,
+          size: 999,
           data: {
             platForm: this.ChecksplatformCode,
             endTime: "",
@@ -1076,16 +1049,14 @@
     },
     // 点击项目ZZJ
     ListClick(index) {
-      this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
-
+      this.ChecksplatformCode = this.allProjectSite[index]["platformCode"];
       //刷新联动地图上的点位按照项目实际的个数
-      // console.log(this.ChecksplatformCode);
       this.initPointToMap(this.ChecksplatformCode);
       if (
-        this.ProjectList[index]["areaCode"] &&
-        this.ProjectList[index]["groupNo"] != ""
+        this.allProjectSite[index]["areaCode"] &&
+        this.allProjectSite[index]["platformCode"] != ""
       )
-        this.gotoProgramArea(this.ProjectList[index]["areaCode"]);
+        this.gotoProgramArea(this.allProjectSite[index]["areaCode"]);
       else {
         this.fwClick();
         if (this.vectorSourceArea) {
@@ -1094,16 +1065,14 @@
       }
 
       // 限制数组的长度不超过10个
-      // console.log(this.historyList.length);
-      // console.log(this.ProjectList[index]["groupName"]);
-      var gname = this.ProjectList[index]["groupName"];
+      var gname = this.allProjectSite[index]["platformName"];
       if (this.historyList.length >= 10 && this.historyList.includes(gname)) {
       } else if (this.historyList.length >= 10) {
         this.historyList.pop();
       }
       this.historyList = this.selectTag(
         this.historyList,
-        this.ProjectList[index]["groupName"]
+        this.allProjectSite[index]["platformName"]
       );
 
       this.setItem(this.historyList);
@@ -1116,30 +1085,30 @@
       // 根据平台渲染站点实时报警信息
       this.loadSiteBaoJing();
       // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用
-      if (
-        this.ProjectList[index].latitude != null &&
-        this.ProjectList[index].longitude != null &&
-        this.ProjectList[index].zoomLevel != null
-      ) {
-        let MapPoint = new esri.geometry.Point(
-          this.ProjectList[index].longitude,
-          this.ProjectList[index].latitude,
-          new esri.SpatialReference({
-            wkid: 4326
-          })
-        );
-        this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
-      }
+      // if (
+      //   this.ProjectList[index].latitude != null &&
+      //   this.ProjectList[index].longitude != null &&
+      //   this.ProjectList[index].zoomLevel != null
+      // ) {
+      //   let MapPoint = new esri.geometry.Point(
+      //     this.ProjectList[index].longitude,
+      //     this.ProjectList[index].latitude,
+      //     new esri.SpatialReference({
+      //       wkid: 4326
+      //     })
+      //   );
+      //   this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
+      // }
     },
     // 点击历史搜索的文字
     HistoryClick(item) {
       this.ChecksplatformCodeTest = item;
-      this.ProjectList.forEach(item1 => {
-        if (item1["groupName"] == item) {
-          this.ChecksplatformCode = item1["groupNo"];
+      this.allProjectSite.forEach(item1 => {
+        if (item1["platformName"] == item) {
+          this.ChecksplatformCode = item1["platformCode"];
           //地图联动响应的项目
           this.initPointToMap(this.ChecksplatformCode);
-          if (item1["areaCode"] && item1["groupNo"] != "")
+          if (item1["areaCode"] && item1["platformCode"] != "")
             this.gotoProgramArea(item1["areaCode"]);
           else {
             this.fwClick();
@@ -1156,20 +1125,20 @@
           // 根据平台渲染站点实时报警信息
           this.loadSiteBaoJing();
           // 返回出项目的坐标以及缩放等级**************************GIS调用
-          if (
-            item1.latitude != null &&
-            item1.longitude != null &&
-            item1.zoomLevel != null
-          ) {
-            let MapPoint = new esri.geometry.Point(
-              item1.longitude,
-              item1.latitude,
-              new esri.SpatialReference({
-                wkid: 4326
-              })
-            );
-            this.map.centerAndZoom(MapPoint, item1.zoomLevel);
-          }
+          // if (
+          //   item1.latitude != null &&
+          //   item1.longitude != null &&
+          //   item1.zoomLevel != null
+          // ) {
+          //   let MapPoint = new esri.geometry.Point(
+          //     item1.longitude,
+          //     item1.latitude,
+          //     new esri.SpatialReference({
+          //       wkid: 4326
+          //     })
+          //   );
+          //   this.map.centerAndZoom(MapPoint, item1.zoomLevel);
+          // }
         }
       });
     },
@@ -1193,13 +1162,11 @@
     },
     // 加载设备分类的ecahrts
     loadRegionEcharts(titlearr, valuearr) {
-      // console.log(data);
       // 基于准备好的dom，初始化echarts实例
       let myChart1 = this.$echarts.init(
         document.getElementById("previewOfSiteStatusCentent4eCharts")
       );
       // 绘制图表
-      // this.myChart1.clear();
       let option = {
         xAxis: {
           type: "category",
@@ -1725,10 +1692,7 @@
       var cell,
         resultwkt = "";
       var feature;
-      this.north = -90;
-      this.south = 90;
-      this.east = -180;
-      this.west = 180;
+
 
       for (var i = 0; i < clusterData.length; i++) {
         cell = clusterData[i];
@@ -1751,11 +1715,6 @@
         this.vectorSource.addFeature(feature);
 
         this.source.addFeature(feature);
-        //计算边框，用于切换项目定位中心点
-        this.north = Math.max(parseFloat(cell.lat), this.north);
-        this.south = Math.min(parseFloat(cell.lat), this.south);
-        this.east = Math.max(parseFloat(cell.lon), this.east);
-        this.west = Math.min(parseFloat(cell.lon), this.west);
       }
 
       this.clusterSource = new Cluster({
@@ -1795,7 +1754,7 @@
                 })
               }) */
             });
-          } else if (size > 2) {
+          } else if (size >= 2) {
             return new Style({
               text: new Text({
                 text: size.toString(),
@@ -1826,7 +1785,7 @@
         }
       });
       //飞行到指定的城市项目中心点
-      // this.flyToCity()
+
       //?要判断currentZoom加哪一个
       if (this.currentZoom >= 8) this.map.addLayer(this.vector);
       else this.map.addLayer(this.layer);
@@ -1942,6 +1901,7 @@
         ) {
           return feature;
         });
+        
         if (feature) {
           //捕捉到要素后，进行后续操作，如弹出要素信息
           // this.addPopupContent(e.coordinate, feature.values_.features);
@@ -2763,18 +2723,15 @@
   computed: {
     switchStatus: function() {
       return this.flag; // 直接监听props里的status状态
-    }
+    },
+    ...mapGetters(["allProjectSite"])
   },
-  /*   created() {
-    window.closepopup = this.closepopup;
-    window.historyData = this.historyData;
-  }, */
   created() {},
   mounted: function() {
     // 默认加载所有的平台
-    this.LoadAllProject();
+    // this.LoadAllProject();
 
-    this.loadRegionEcharts();
+    // this.loadRegionEcharts();
     // 根据平台渲染站点数量统计及状态统计
     this.loadSiteNumForOroject();
     // 根据平台渲染设备分类

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {
diff --git a/src/components/login.vue b/src/components/login.vue
index 36cbc33..24710ee 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -138,7 +138,7 @@
                   // 用户在线状态计时
                   loginTime();
                   // 保存cook
-
+                  
                   this.$router.push("/welcome");
 
                   sessionStorage.setItem("powerHandle", response2.data.data);
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 64a7b26..eac618f 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -137,9 +137,9 @@
                   size="medium"
                 >
                   <el-option
-                    v-for="(item, index) in ProjectList"
+                    v-for="(item, index) in allProjectSite"
                     :key="index"
-                    :label="item.groupName"
+                    :label="item.platformName"
                     :value="index"
                   >
                   </el-option>
@@ -634,7 +634,7 @@
 import Modify from "ol/interaction/Modify";
 import FormatWKT from "ol/format/WKT";
 import { ScaleLine, ZoomSlider, ZoomToExtent, Zoom } from "ol/control";
-// import echarts from "echarts";
+import { mapGetters } from "vuex";
 export default {
   name: "previewOfSiteStatus",
   components: { countTo }, //加载数字滚动插件
@@ -754,7 +754,7 @@
       dynamic: 0,
       ChecksplatformCode: "", //选取的平台的编号
       platformtype: "", //选取的站点统计类型
-      ChecksplatformCodeTest: "全部项目", //选取的默认文字
+      ChecksplatformCodeTest: "", //选取的默认文字
       historyList: [],
       // 项目选择B
       // 平台站点数量及状态统计A
@@ -791,7 +791,7 @@
       // 项目站点覆盖排名B
       // 设备分类A
       myChart: {},
-      XianYou: "", //现有设备总数
+      // XianYou: "", //现有设备总数
       titlearr: [],
       valuearr: [],
       myChart2: {},
@@ -847,20 +847,7 @@
       this.map.getView().setZoom(5);
     },
 
-    //根据当前项目后台坐标计算出的中心飞行到指定城市
-    flyToCity() {
-      // console.log("经纬度最大边框是：" + this.north);
-      // console.log("经纬度最大边框是：" + this.south);
-      // console.log("经纬度最大边框是：" + this.east);
-      // console.log("经纬度最大边框是：" + this.west);
-      this.map
-        .getView()
-        .setCenter([
-          (this.east + this.west) / 2,
-          (this.north + this.south) / 2
-        ]);
-      this.map.getView().setZoom(10);
-    },
+   
     //项目图层切换
     initPointToMap(projectNo) {
       this.$http
@@ -890,35 +877,31 @@
       }, 0);
     },
     // 获取所有平台
-    LoadAllProject() {
-      this.$http
-        .post(
-          this.nozzle.userGroupRelaGetGroups +
-            "?&pageNo=" +
-            1 +
-            "&typeStr=" +
-            "&pageSize=" +
-            999
-        )
-        .then(response => {
-          // console.log(response);
-          if (response.status === 200) {
-            var qwe = response.data.data === "" ? [] : response.data.data;
+    // LoadAllProject() {
+    //   this.$http
+    //     .post(
+    //       this.nozzle.userGroupRelaGetGroups +
+    //         "?&pageNo=" +
+    //         1 +
+    //         "&typeStr=" +
+    //         "&pageSize=" +
+    //         999
+    //     )
+    //     .then(response => {
+    //       if (response.status === 200) {
+    //         var qwe = response.data.data === "" ? [] : response.data.data;
 
-            this.ProjectList = this.ProjectList.concat(qwe);
-            // console.log(this.ProjectList);
-          } else {
-            message(response);
-          }
-        })
-        .catch(response => {
-          message(response);
-        });
-    },
+    //         this.ProjectList = this.ProjectList.concat(qwe);
+    //       } else {
+    //         message(response);
+    //       }
+    //     })
+    //     .catch(response => {
+    //       message(response);
+    //     });
+    // },
     // 根据平台渲染站点统计
     loadSiteNumForOroject() {
-      // console.log(this.platformtype, this.ChecksplatformCode);
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -929,16 +912,13 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
             this.Site.EOff = response.data.data.offline;
-            // this.Project.EAll = response.data.data.projectcount;
-            // this.Project.EOn = response.data.data.completed;
-            // this.Project.EOff = response.data.data.noncompleted;
           } else {
             message(response);
           }
@@ -949,15 +929,11 @@
     },
     // 单击显示平台站点
     allpreview(index, item, event) {
-      // console.log(index, platform, event.target);
       this.namelist.forEach(item => {
         item.select = false;
       });
       this.namelist[index].select = true;
-
-      // console.log(this.platformtype, this.ChecksplatformCode);
       this.platformtype = item.type;
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -968,9 +944,9 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
@@ -1011,8 +987,6 @@
         })
         .then(response => {
           if (response.status === 200) {
-            // this.XianYou = response.data.data.total;
-            // console.log(response.data.data);
             this.titlearr = response.data.data.title;
             this.valuearr = response.data.data.value;
             this.loadRegionEcharts(this.titlearr, this.valuearr);
@@ -1034,7 +1008,6 @@
         })
         .then(response => {
           if (response.data.code === 1) {
-            // console.log(response);
             this.areaList = response.data.data;
           } else {
             message(response);
@@ -1051,7 +1024,7 @@
       this.$http
         .post(this.nozzle.warnLogListWarnLog, {
           current: 1,
-          size: 99,
+          size: 999,
           data: {
             platForm: this.ChecksplatformCode,
             endTime: "",
@@ -1076,16 +1049,14 @@
     },
     // 点击项目ZZJ
     ListClick(index) {
-      this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
-
+      this.ChecksplatformCode = this.allProjectSite[index]["platformCode"];
       //刷新联动地图上的点位按照项目实际的个数
-      // console.log(this.ChecksplatformCode);
       this.initPointToMap(this.ChecksplatformCode);
       if (
-        this.ProjectList[index]["areaCode"] &&
-        this.ProjectList[index]["groupNo"] != ""
+        this.allProjectSite[index]["areaCode"] &&
+        this.allProjectSite[index]["platformCode"] != ""
       )
-        this.gotoProgramArea(this.ProjectList[index]["areaCode"]);
+        this.gotoProgramArea(this.allProjectSite[index]["areaCode"]);
       else {
         this.fwClick();
         if (this.vectorSourceArea) {
@@ -1094,16 +1065,14 @@
       }
 
       // 限制数组的长度不超过10个
-      // console.log(this.historyList.length);
-      // console.log(this.ProjectList[index]["groupName"]);
-      var gname = this.ProjectList[index]["groupName"];
+      var gname = this.allProjectSite[index]["platformName"];
       if (this.historyList.length >= 10 && this.historyList.includes(gname)) {
       } else if (this.historyList.length >= 10) {
         this.historyList.pop();
       }
       this.historyList = this.selectTag(
         this.historyList,
-        this.ProjectList[index]["groupName"]
+        this.allProjectSite[index]["platformName"]
       );
 
       this.setItem(this.historyList);
@@ -1116,30 +1085,30 @@
       // 根据平台渲染站点实时报警信息
       this.loadSiteBaoJing();
       // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用
-      if (
-        this.ProjectList[index].latitude != null &&
-        this.ProjectList[index].longitude != null &&
-        this.ProjectList[index].zoomLevel != null
-      ) {
-        let MapPoint = new esri.geometry.Point(
-          this.ProjectList[index].longitude,
-          this.ProjectList[index].latitude,
-          new esri.SpatialReference({
-            wkid: 4326
-          })
-        );
-        this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
-      }
+      // if (
+      //   this.ProjectList[index].latitude != null &&
+      //   this.ProjectList[index].longitude != null &&
+      //   this.ProjectList[index].zoomLevel != null
+      // ) {
+      //   let MapPoint = new esri.geometry.Point(
+      //     this.ProjectList[index].longitude,
+      //     this.ProjectList[index].latitude,
+      //     new esri.SpatialReference({
+      //       wkid: 4326
+      //     })
+      //   );
+      //   this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
+      // }
     },
     // 点击历史搜索的文字
     HistoryClick(item) {
       this.ChecksplatformCodeTest = item;
-      this.ProjectList.forEach(item1 => {
-        if (item1["groupName"] == item) {
-          this.ChecksplatformCode = item1["groupNo"];
+      this.allProjectSite.forEach(item1 => {
+        if (item1["platformName"] == item) {
+          this.ChecksplatformCode = item1["platformCode"];
           //地图联动响应的项目
           this.initPointToMap(this.ChecksplatformCode);
-          if (item1["areaCode"] && item1["groupNo"] != "")
+          if (item1["areaCode"] && item1["platformCode"] != "")
             this.gotoProgramArea(item1["areaCode"]);
           else {
             this.fwClick();
@@ -1156,20 +1125,20 @@
           // 根据平台渲染站点实时报警信息
           this.loadSiteBaoJing();
           // 返回出项目的坐标以及缩放等级**************************GIS调用
-          if (
-            item1.latitude != null &&
-            item1.longitude != null &&
-            item1.zoomLevel != null
-          ) {
-            let MapPoint = new esri.geometry.Point(
-              item1.longitude,
-              item1.latitude,
-              new esri.SpatialReference({
-                wkid: 4326
-              })
-            );
-            this.map.centerAndZoom(MapPoint, item1.zoomLevel);
-          }
+          // if (
+          //   item1.latitude != null &&
+          //   item1.longitude != null &&
+          //   item1.zoomLevel != null
+          // ) {
+          //   let MapPoint = new esri.geometry.Point(
+          //     item1.longitude,
+          //     item1.latitude,
+          //     new esri.SpatialReference({
+          //       wkid: 4326
+          //     })
+          //   );
+          //   this.map.centerAndZoom(MapPoint, item1.zoomLevel);
+          // }
         }
       });
     },
@@ -1193,13 +1162,11 @@
     },
     // 加载设备分类的ecahrts
     loadRegionEcharts(titlearr, valuearr) {
-      // console.log(data);
       // 基于准备好的dom，初始化echarts实例
       let myChart1 = this.$echarts.init(
         document.getElementById("previewOfSiteStatusCentent4eCharts")
       );
       // 绘制图表
-      // this.myChart1.clear();
       let option = {
         xAxis: {
           type: "category",
@@ -1725,10 +1692,7 @@
       var cell,
         resultwkt = "";
       var feature;
-      this.north = -90;
-      this.south = 90;
-      this.east = -180;
-      this.west = 180;
+
 
       for (var i = 0; i < clusterData.length; i++) {
         cell = clusterData[i];
@@ -1751,11 +1715,6 @@
         this.vectorSource.addFeature(feature);
 
         this.source.addFeature(feature);
-        //计算边框，用于切换项目定位中心点
-        this.north = Math.max(parseFloat(cell.lat), this.north);
-        this.south = Math.min(parseFloat(cell.lat), this.south);
-        this.east = Math.max(parseFloat(cell.lon), this.east);
-        this.west = Math.min(parseFloat(cell.lon), this.west);
       }
 
       this.clusterSource = new Cluster({
@@ -1795,7 +1754,7 @@
                 })
               }) */
             });
-          } else if (size > 2) {
+          } else if (size >= 2) {
             return new Style({
               text: new Text({
                 text: size.toString(),
@@ -1826,7 +1785,7 @@
         }
       });
       //飞行到指定的城市项目中心点
-      // this.flyToCity()
+
       //?要判断currentZoom加哪一个
       if (this.currentZoom >= 8) this.map.addLayer(this.vector);
       else this.map.addLayer(this.layer);
@@ -1942,6 +1901,7 @@
         ) {
           return feature;
         });
+        
         if (feature) {
           //捕捉到要素后，进行后续操作，如弹出要素信息
           // this.addPopupContent(e.coordinate, feature.values_.features);
@@ -2763,18 +2723,15 @@
   computed: {
     switchStatus: function() {
       return this.flag; // 直接监听props里的status状态
-    }
+    },
+    ...mapGetters(["allProjectSite"])
   },
-  /*   created() {
-    window.closepopup = this.closepopup;
-    window.historyData = this.historyData;
-  }, */
   created() {},
   mounted: function() {
     // 默认加载所有的平台
-    this.LoadAllProject();
+    // this.LoadAllProject();
 
-    this.loadRegionEcharts();
+    // this.loadRegionEcharts();
     // 根据平台渲染站点数量统计及状态统计
     this.loadSiteNumForOroject();
     // 根据平台渲染设备分类
diff --git a/src/router/index.js b/src/router/index.js
index 7fc8196..13640f9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -288,6 +288,7 @@
   if (to.name === "login") {
     next();
   } else if (JSON.parse(getSession("logins")) === "true") {
+    next();
     if (!store.state.common.allDept.length) {
       store
         .dispatch("common/getAllDept")
@@ -302,14 +303,13 @@
           next("/Login");
         });
     }
-    next();
   } else {
-    message({
-      data: {
-        code: 1,
-        msg: "请先登录在进行操作!"
-      }
-    });
+    // message({
+    //   data: {
+    //     code: 1,
+    //     msg: "请先登录在进行操作!"
+    //   }
+    // });
     next(`/Login`);
   }
 });

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {
diff --git a/src/components/login.vue b/src/components/login.vue
index 36cbc33..24710ee 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -138,7 +138,7 @@
                   // 用户在线状态计时
                   loginTime();
                   // 保存cook
-
+                  
                   this.$router.push("/welcome");
 
                   sessionStorage.setItem("powerHandle", response2.data.data);
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 64a7b26..eac618f 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -137,9 +137,9 @@
                   size="medium"
                 >
                   <el-option
-                    v-for="(item, index) in ProjectList"
+                    v-for="(item, index) in allProjectSite"
                     :key="index"
-                    :label="item.groupName"
+                    :label="item.platformName"
                     :value="index"
                   >
                   </el-option>
@@ -634,7 +634,7 @@
 import Modify from "ol/interaction/Modify";
 import FormatWKT from "ol/format/WKT";
 import { ScaleLine, ZoomSlider, ZoomToExtent, Zoom } from "ol/control";
-// import echarts from "echarts";
+import { mapGetters } from "vuex";
 export default {
   name: "previewOfSiteStatus",
   components: { countTo }, //加载数字滚动插件
@@ -754,7 +754,7 @@
       dynamic: 0,
       ChecksplatformCode: "", //选取的平台的编号
       platformtype: "", //选取的站点统计类型
-      ChecksplatformCodeTest: "全部项目", //选取的默认文字
+      ChecksplatformCodeTest: "", //选取的默认文字
       historyList: [],
       // 项目选择B
       // 平台站点数量及状态统计A
@@ -791,7 +791,7 @@
       // 项目站点覆盖排名B
       // 设备分类A
       myChart: {},
-      XianYou: "", //现有设备总数
+      // XianYou: "", //现有设备总数
       titlearr: [],
       valuearr: [],
       myChart2: {},
@@ -847,20 +847,7 @@
       this.map.getView().setZoom(5);
     },
 
-    //根据当前项目后台坐标计算出的中心飞行到指定城市
-    flyToCity() {
-      // console.log("经纬度最大边框是：" + this.north);
-      // console.log("经纬度最大边框是：" + this.south);
-      // console.log("经纬度最大边框是：" + this.east);
-      // console.log("经纬度最大边框是：" + this.west);
-      this.map
-        .getView()
-        .setCenter([
-          (this.east + this.west) / 2,
-          (this.north + this.south) / 2
-        ]);
-      this.map.getView().setZoom(10);
-    },
+   
     //项目图层切换
     initPointToMap(projectNo) {
       this.$http
@@ -890,35 +877,31 @@
       }, 0);
     },
     // 获取所有平台
-    LoadAllProject() {
-      this.$http
-        .post(
-          this.nozzle.userGroupRelaGetGroups +
-            "?&pageNo=" +
-            1 +
-            "&typeStr=" +
-            "&pageSize=" +
-            999
-        )
-        .then(response => {
-          // console.log(response);
-          if (response.status === 200) {
-            var qwe = response.data.data === "" ? [] : response.data.data;
+    // LoadAllProject() {
+    //   this.$http
+    //     .post(
+    //       this.nozzle.userGroupRelaGetGroups +
+    //         "?&pageNo=" +
+    //         1 +
+    //         "&typeStr=" +
+    //         "&pageSize=" +
+    //         999
+    //     )
+    //     .then(response => {
+    //       if (response.status === 200) {
+    //         var qwe = response.data.data === "" ? [] : response.data.data;
 
-            this.ProjectList = this.ProjectList.concat(qwe);
-            // console.log(this.ProjectList);
-          } else {
-            message(response);
-          }
-        })
-        .catch(response => {
-          message(response);
-        });
-    },
+    //         this.ProjectList = this.ProjectList.concat(qwe);
+    //       } else {
+    //         message(response);
+    //       }
+    //     })
+    //     .catch(response => {
+    //       message(response);
+    //     });
+    // },
     // 根据平台渲染站点统计
     loadSiteNumForOroject() {
-      // console.log(this.platformtype, this.ChecksplatformCode);
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -929,16 +912,13 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
             this.Site.EOff = response.data.data.offline;
-            // this.Project.EAll = response.data.data.projectcount;
-            // this.Project.EOn = response.data.data.completed;
-            // this.Project.EOff = response.data.data.noncompleted;
           } else {
             message(response);
           }
@@ -949,15 +929,11 @@
     },
     // 单击显示平台站点
     allpreview(index, item, event) {
-      // console.log(index, platform, event.target);
       this.namelist.forEach(item => {
         item.select = false;
       });
       this.namelist[index].select = true;
-
-      // console.log(this.platformtype, this.ChecksplatformCode);
       this.platformtype = item.type;
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -968,9 +944,9 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
@@ -1011,8 +987,6 @@
         })
         .then(response => {
           if (response.status === 200) {
-            // this.XianYou = response.data.data.total;
-            // console.log(response.data.data);
             this.titlearr = response.data.data.title;
             this.valuearr = response.data.data.value;
             this.loadRegionEcharts(this.titlearr, this.valuearr);
@@ -1034,7 +1008,6 @@
         })
         .then(response => {
           if (response.data.code === 1) {
-            // console.log(response);
             this.areaList = response.data.data;
           } else {
             message(response);
@@ -1051,7 +1024,7 @@
       this.$http
         .post(this.nozzle.warnLogListWarnLog, {
           current: 1,
-          size: 99,
+          size: 999,
           data: {
             platForm: this.ChecksplatformCode,
             endTime: "",
@@ -1076,16 +1049,14 @@
     },
     // 点击项目ZZJ
     ListClick(index) {
-      this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
-
+      this.ChecksplatformCode = this.allProjectSite[index]["platformCode"];
       //刷新联动地图上的点位按照项目实际的个数
-      // console.log(this.ChecksplatformCode);
       this.initPointToMap(this.ChecksplatformCode);
       if (
-        this.ProjectList[index]["areaCode"] &&
-        this.ProjectList[index]["groupNo"] != ""
+        this.allProjectSite[index]["areaCode"] &&
+        this.allProjectSite[index]["platformCode"] != ""
       )
-        this.gotoProgramArea(this.ProjectList[index]["areaCode"]);
+        this.gotoProgramArea(this.allProjectSite[index]["areaCode"]);
       else {
         this.fwClick();
         if (this.vectorSourceArea) {
@@ -1094,16 +1065,14 @@
       }
 
       // 限制数组的长度不超过10个
-      // console.log(this.historyList.length);
-      // console.log(this.ProjectList[index]["groupName"]);
-      var gname = this.ProjectList[index]["groupName"];
+      var gname = this.allProjectSite[index]["platformName"];
       if (this.historyList.length >= 10 && this.historyList.includes(gname)) {
       } else if (this.historyList.length >= 10) {
         this.historyList.pop();
       }
       this.historyList = this.selectTag(
         this.historyList,
-        this.ProjectList[index]["groupName"]
+        this.allProjectSite[index]["platformName"]
       );
 
       this.setItem(this.historyList);
@@ -1116,30 +1085,30 @@
       // 根据平台渲染站点实时报警信息
       this.loadSiteBaoJing();
       // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用
-      if (
-        this.ProjectList[index].latitude != null &&
-        this.ProjectList[index].longitude != null &&
-        this.ProjectList[index].zoomLevel != null
-      ) {
-        let MapPoint = new esri.geometry.Point(
-          this.ProjectList[index].longitude,
-          this.ProjectList[index].latitude,
-          new esri.SpatialReference({
-            wkid: 4326
-          })
-        );
-        this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
-      }
+      // if (
+      //   this.ProjectList[index].latitude != null &&
+      //   this.ProjectList[index].longitude != null &&
+      //   this.ProjectList[index].zoomLevel != null
+      // ) {
+      //   let MapPoint = new esri.geometry.Point(
+      //     this.ProjectList[index].longitude,
+      //     this.ProjectList[index].latitude,
+      //     new esri.SpatialReference({
+      //       wkid: 4326
+      //     })
+      //   );
+      //   this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
+      // }
     },
     // 点击历史搜索的文字
     HistoryClick(item) {
       this.ChecksplatformCodeTest = item;
-      this.ProjectList.forEach(item1 => {
-        if (item1["groupName"] == item) {
-          this.ChecksplatformCode = item1["groupNo"];
+      this.allProjectSite.forEach(item1 => {
+        if (item1["platformName"] == item) {
+          this.ChecksplatformCode = item1["platformCode"];
           //地图联动响应的项目
           this.initPointToMap(this.ChecksplatformCode);
-          if (item1["areaCode"] && item1["groupNo"] != "")
+          if (item1["areaCode"] && item1["platformCode"] != "")
             this.gotoProgramArea(item1["areaCode"]);
           else {
             this.fwClick();
@@ -1156,20 +1125,20 @@
           // 根据平台渲染站点实时报警信息
           this.loadSiteBaoJing();
           // 返回出项目的坐标以及缩放等级**************************GIS调用
-          if (
-            item1.latitude != null &&
-            item1.longitude != null &&
-            item1.zoomLevel != null
-          ) {
-            let MapPoint = new esri.geometry.Point(
-              item1.longitude,
-              item1.latitude,
-              new esri.SpatialReference({
-                wkid: 4326
-              })
-            );
-            this.map.centerAndZoom(MapPoint, item1.zoomLevel);
-          }
+          // if (
+          //   item1.latitude != null &&
+          //   item1.longitude != null &&
+          //   item1.zoomLevel != null
+          // ) {
+          //   let MapPoint = new esri.geometry.Point(
+          //     item1.longitude,
+          //     item1.latitude,
+          //     new esri.SpatialReference({
+          //       wkid: 4326
+          //     })
+          //   );
+          //   this.map.centerAndZoom(MapPoint, item1.zoomLevel);
+          // }
         }
       });
     },
@@ -1193,13 +1162,11 @@
     },
     // 加载设备分类的ecahrts
     loadRegionEcharts(titlearr, valuearr) {
-      // console.log(data);
       // 基于准备好的dom，初始化echarts实例
       let myChart1 = this.$echarts.init(
         document.getElementById("previewOfSiteStatusCentent4eCharts")
       );
       // 绘制图表
-      // this.myChart1.clear();
       let option = {
         xAxis: {
           type: "category",
@@ -1725,10 +1692,7 @@
       var cell,
         resultwkt = "";
       var feature;
-      this.north = -90;
-      this.south = 90;
-      this.east = -180;
-      this.west = 180;
+
 
       for (var i = 0; i < clusterData.length; i++) {
         cell = clusterData[i];
@@ -1751,11 +1715,6 @@
         this.vectorSource.addFeature(feature);
 
         this.source.addFeature(feature);
-        //计算边框，用于切换项目定位中心点
-        this.north = Math.max(parseFloat(cell.lat), this.north);
-        this.south = Math.min(parseFloat(cell.lat), this.south);
-        this.east = Math.max(parseFloat(cell.lon), this.east);
-        this.west = Math.min(parseFloat(cell.lon), this.west);
       }
 
       this.clusterSource = new Cluster({
@@ -1795,7 +1754,7 @@
                 })
               }) */
             });
-          } else if (size > 2) {
+          } else if (size >= 2) {
             return new Style({
               text: new Text({
                 text: size.toString(),
@@ -1826,7 +1785,7 @@
         }
       });
       //飞行到指定的城市项目中心点
-      // this.flyToCity()
+
       //?要判断currentZoom加哪一个
       if (this.currentZoom >= 8) this.map.addLayer(this.vector);
       else this.map.addLayer(this.layer);
@@ -1942,6 +1901,7 @@
         ) {
           return feature;
         });
+        
         if (feature) {
           //捕捉到要素后，进行后续操作，如弹出要素信息
           // this.addPopupContent(e.coordinate, feature.values_.features);
@@ -2763,18 +2723,15 @@
   computed: {
     switchStatus: function() {
       return this.flag; // 直接监听props里的status状态
-    }
+    },
+    ...mapGetters(["allProjectSite"])
   },
-  /*   created() {
-    window.closepopup = this.closepopup;
-    window.historyData = this.historyData;
-  }, */
   created() {},
   mounted: function() {
     // 默认加载所有的平台
-    this.LoadAllProject();
+    // this.LoadAllProject();
 
-    this.loadRegionEcharts();
+    // this.loadRegionEcharts();
     // 根据平台渲染站点数量统计及状态统计
     this.loadSiteNumForOroject();
     // 根据平台渲染设备分类
diff --git a/src/router/index.js b/src/router/index.js
index 7fc8196..13640f9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -288,6 +288,7 @@
   if (to.name === "login") {
     next();
   } else if (JSON.parse(getSession("logins")) === "true") {
+    next();
     if (!store.state.common.allDept.length) {
       store
         .dispatch("common/getAllDept")
@@ -302,14 +303,13 @@
           next("/Login");
         });
     }
-    next();
   } else {
-    message({
-      data: {
-        code: 1,
-        msg: "请先登录在进行操作!"
-      }
-    });
+    // message({
+    //   data: {
+    //     code: 1,
+    //     msg: "请先登录在进行操作!"
+    //   }
+    // });
     next(`/Login`);
   }
 });
diff --git a/src/store/getters.js b/src/store/getters.js
index 1523fa1..dc221d9 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   allCity: state => state.common.allCity, //所有城市
   allPlatSite: state => state.common.allPlatSite, //所有项目站点
   allProject: state => state.common.allProject, //所有项目
+  allProjectSite: state => state.common.allProjectSite, //所有项目(包含默认头部--全部项目)
 
   menu: state => state.user.menu, //用户权限范围菜单
 }

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 1ca0f14..8aadd66 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -38,7 +38,7 @@
               type="text"
               size="small"
               @click="handleClick('config', scope.row)"
-              >配置因子</el-button
+              >修复因子</el-button
             >
             <!-- <el-button
               type="text"
@@ -1123,9 +1123,22 @@
         //添加站点
         case "create":
           this.iscodefalse = false;
-          this.projectObj = {};
           this.yzaddflag = true;
           this.title = "新增站点";
+          this.projectList = this.allPlatSite.map((item) => {
+            return {
+              id: item.id,
+              key: item.platformName,
+              value: item.platformCode,
+              areaId: item.area,
+            };
+          });
+          this.projectObj = {};
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //编辑站点
         case "update":
@@ -1149,10 +1162,15 @@
             this.ruleForm[key] = data[key];
           }
           this.yzaddflag = true;
+          setTimeout(() => {
+            if(this.$refs.ruleForm){
+              this.$refs.ruleForm.clearValidate();
+            }
+          }, 0);
           break;
         //配置因子
         case "config":
-          this.title = "配置因子";
+          this.title = "修复因子";
           (this.configForm = {
             ruleId: "", //规则引擎
 
diff --git a/src/components/index.vue b/src/components/index.vue
index 268ef5a..b423ddd 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -469,8 +469,9 @@
       }
     },
     ZhuXIao() {
-      this.$router.push({ path: "/Login" });
+      // this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+      location.reload();
     },
     // 初始化验证
     initRules() {
diff --git a/src/components/login.vue b/src/components/login.vue
index 36cbc33..24710ee 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -138,7 +138,7 @@
                   // 用户在线状态计时
                   loginTime();
                   // 保存cook
-
+                  
                   this.$router.push("/welcome");
 
                   sessionStorage.setItem("powerHandle", response2.data.data);
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 64a7b26..eac618f 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -137,9 +137,9 @@
                   size="medium"
                 >
                   <el-option
-                    v-for="(item, index) in ProjectList"
+                    v-for="(item, index) in allProjectSite"
                     :key="index"
-                    :label="item.groupName"
+                    :label="item.platformName"
                     :value="index"
                   >
                   </el-option>
@@ -634,7 +634,7 @@
 import Modify from "ol/interaction/Modify";
 import FormatWKT from "ol/format/WKT";
 import { ScaleLine, ZoomSlider, ZoomToExtent, Zoom } from "ol/control";
-// import echarts from "echarts";
+import { mapGetters } from "vuex";
 export default {
   name: "previewOfSiteStatus",
   components: { countTo }, //加载数字滚动插件
@@ -754,7 +754,7 @@
       dynamic: 0,
       ChecksplatformCode: "", //选取的平台的编号
       platformtype: "", //选取的站点统计类型
-      ChecksplatformCodeTest: "全部项目", //选取的默认文字
+      ChecksplatformCodeTest: "", //选取的默认文字
       historyList: [],
       // 项目选择B
       // 平台站点数量及状态统计A
@@ -791,7 +791,7 @@
       // 项目站点覆盖排名B
       // 设备分类A
       myChart: {},
-      XianYou: "", //现有设备总数
+      // XianYou: "", //现有设备总数
       titlearr: [],
       valuearr: [],
       myChart2: {},
@@ -847,20 +847,7 @@
       this.map.getView().setZoom(5);
     },
 
-    //根据当前项目后台坐标计算出的中心飞行到指定城市
-    flyToCity() {
-      // console.log("经纬度最大边框是：" + this.north);
-      // console.log("经纬度最大边框是：" + this.south);
-      // console.log("经纬度最大边框是：" + this.east);
-      // console.log("经纬度最大边框是：" + this.west);
-      this.map
-        .getView()
-        .setCenter([
-          (this.east + this.west) / 2,
-          (this.north + this.south) / 2
-        ]);
-      this.map.getView().setZoom(10);
-    },
+   
     //项目图层切换
     initPointToMap(projectNo) {
       this.$http
@@ -890,35 +877,31 @@
       }, 0);
     },
     // 获取所有平台
-    LoadAllProject() {
-      this.$http
-        .post(
-          this.nozzle.userGroupRelaGetGroups +
-            "?&pageNo=" +
-            1 +
-            "&typeStr=" +
-            "&pageSize=" +
-            999
-        )
-        .then(response => {
-          // console.log(response);
-          if (response.status === 200) {
-            var qwe = response.data.data === "" ? [] : response.data.data;
+    // LoadAllProject() {
+    //   this.$http
+    //     .post(
+    //       this.nozzle.userGroupRelaGetGroups +
+    //         "?&pageNo=" +
+    //         1 +
+    //         "&typeStr=" +
+    //         "&pageSize=" +
+    //         999
+    //     )
+    //     .then(response => {
+    //       if (response.status === 200) {
+    //         var qwe = response.data.data === "" ? [] : response.data.data;
 
-            this.ProjectList = this.ProjectList.concat(qwe);
-            // console.log(this.ProjectList);
-          } else {
-            message(response);
-          }
-        })
-        .catch(response => {
-          message(response);
-        });
-    },
+    //         this.ProjectList = this.ProjectList.concat(qwe);
+    //       } else {
+    //         message(response);
+    //       }
+    //     })
+    //     .catch(response => {
+    //       message(response);
+    //     });
+    // },
     // 根据平台渲染站点统计
     loadSiteNumForOroject() {
-      // console.log(this.platformtype, this.ChecksplatformCode);
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -929,16 +912,13 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
             this.Site.EOff = response.data.data.offline;
-            // this.Project.EAll = response.data.data.projectcount;
-            // this.Project.EOn = response.data.data.completed;
-            // this.Project.EOff = response.data.data.noncompleted;
           } else {
             message(response);
           }
@@ -949,15 +929,11 @@
     },
     // 单击显示平台站点
     allpreview(index, item, event) {
-      // console.log(index, platform, event.target);
       this.namelist.forEach(item => {
         item.select = false;
       });
       this.namelist[index].select = true;
-
-      // console.log(this.platformtype, this.ChecksplatformCode);
       this.platformtype = item.type;
-
       this.$http
         .post(this.nozzle.getSiteNum, {
           data: { platform: this.ChecksplatformCode, type: this.platformtype }
@@ -968,9 +944,9 @@
             this.Site.SAll = this.Site.EAll;
             this.Site.SOn = this.Site.EOn;
             this.Site.SOff = this.Site.EOff;
-            this.Project.SAll = this.Project.EAll;
-            this.Project.SOn = this.Project.EOn;
-            this.Project.SOff = this.Project.EOff;
+            // this.Project.SAll = this.Project.EAll;
+            // this.Project.SOn = this.Project.EOn;
+            // this.Project.SOff = this.Project.EOff;
             // 将新数据设置成数字滚动的结束值 也就是展示值
             this.Site.EAll = response.data.data.all;
             this.Site.EOn = response.data.data.online;
@@ -1011,8 +987,6 @@
         })
         .then(response => {
           if (response.status === 200) {
-            // this.XianYou = response.data.data.total;
-            // console.log(response.data.data);
             this.titlearr = response.data.data.title;
             this.valuearr = response.data.data.value;
             this.loadRegionEcharts(this.titlearr, this.valuearr);
@@ -1034,7 +1008,6 @@
         })
         .then(response => {
           if (response.data.code === 1) {
-            // console.log(response);
             this.areaList = response.data.data;
           } else {
             message(response);
@@ -1051,7 +1024,7 @@
       this.$http
         .post(this.nozzle.warnLogListWarnLog, {
           current: 1,
-          size: 99,
+          size: 999,
           data: {
             platForm: this.ChecksplatformCode,
             endTime: "",
@@ -1076,16 +1049,14 @@
     },
     // 点击项目ZZJ
     ListClick(index) {
-      this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
-
+      this.ChecksplatformCode = this.allProjectSite[index]["platformCode"];
       //刷新联动地图上的点位按照项目实际的个数
-      // console.log(this.ChecksplatformCode);
       this.initPointToMap(this.ChecksplatformCode);
       if (
-        this.ProjectList[index]["areaCode"] &&
-        this.ProjectList[index]["groupNo"] != ""
+        this.allProjectSite[index]["areaCode"] &&
+        this.allProjectSite[index]["platformCode"] != ""
       )
-        this.gotoProgramArea(this.ProjectList[index]["areaCode"]);
+        this.gotoProgramArea(this.allProjectSite[index]["areaCode"]);
       else {
         this.fwClick();
         if (this.vectorSourceArea) {
@@ -1094,16 +1065,14 @@
       }
 
       // 限制数组的长度不超过10个
-      // console.log(this.historyList.length);
-      // console.log(this.ProjectList[index]["groupName"]);
-      var gname = this.ProjectList[index]["groupName"];
+      var gname = this.allProjectSite[index]["platformName"];
       if (this.historyList.length >= 10 && this.historyList.includes(gname)) {
       } else if (this.historyList.length >= 10) {
         this.historyList.pop();
       }
       this.historyList = this.selectTag(
         this.historyList,
-        this.ProjectList[index]["groupName"]
+        this.allProjectSite[index]["platformName"]
       );
 
       this.setItem(this.historyList);
@@ -1116,30 +1085,30 @@
       // 根据平台渲染站点实时报警信息
       this.loadSiteBaoJing();
       // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用
-      if (
-        this.ProjectList[index].latitude != null &&
-        this.ProjectList[index].longitude != null &&
-        this.ProjectList[index].zoomLevel != null
-      ) {
-        let MapPoint = new esri.geometry.Point(
-          this.ProjectList[index].longitude,
-          this.ProjectList[index].latitude,
-          new esri.SpatialReference({
-            wkid: 4326
-          })
-        );
-        this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
-      }
+      // if (
+      //   this.ProjectList[index].latitude != null &&
+      //   this.ProjectList[index].longitude != null &&
+      //   this.ProjectList[index].zoomLevel != null
+      // ) {
+      //   let MapPoint = new esri.geometry.Point(
+      //     this.ProjectList[index].longitude,
+      //     this.ProjectList[index].latitude,
+      //     new esri.SpatialReference({
+      //       wkid: 4326
+      //     })
+      //   );
+      //   this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel);
+      // }
     },
     // 点击历史搜索的文字
     HistoryClick(item) {
       this.ChecksplatformCodeTest = item;
-      this.ProjectList.forEach(item1 => {
-        if (item1["groupName"] == item) {
-          this.ChecksplatformCode = item1["groupNo"];
+      this.allProjectSite.forEach(item1 => {
+        if (item1["platformName"] == item) {
+          this.ChecksplatformCode = item1["platformCode"];
           //地图联动响应的项目
           this.initPointToMap(this.ChecksplatformCode);
-          if (item1["areaCode"] && item1["groupNo"] != "")
+          if (item1["areaCode"] && item1["platformCode"] != "")
             this.gotoProgramArea(item1["areaCode"]);
           else {
             this.fwClick();
@@ -1156,20 +1125,20 @@
           // 根据平台渲染站点实时报警信息
           this.loadSiteBaoJing();
           // 返回出项目的坐标以及缩放等级**************************GIS调用
-          if (
-            item1.latitude != null &&
-            item1.longitude != null &&
-            item1.zoomLevel != null
-          ) {
-            let MapPoint = new esri.geometry.Point(
-              item1.longitude,
-              item1.latitude,
-              new esri.SpatialReference({
-                wkid: 4326
-              })
-            );
-            this.map.centerAndZoom(MapPoint, item1.zoomLevel);
-          }
+          // if (
+          //   item1.latitude != null &&
+          //   item1.longitude != null &&
+          //   item1.zoomLevel != null
+          // ) {
+          //   let MapPoint = new esri.geometry.Point(
+          //     item1.longitude,
+          //     item1.latitude,
+          //     new esri.SpatialReference({
+          //       wkid: 4326
+          //     })
+          //   );
+          //   this.map.centerAndZoom(MapPoint, item1.zoomLevel);
+          // }
         }
       });
     },
@@ -1193,13 +1162,11 @@
     },
     // 加载设备分类的ecahrts
     loadRegionEcharts(titlearr, valuearr) {
-      // console.log(data);
       // 基于准备好的dom，初始化echarts实例
       let myChart1 = this.$echarts.init(
         document.getElementById("previewOfSiteStatusCentent4eCharts")
       );
       // 绘制图表
-      // this.myChart1.clear();
       let option = {
         xAxis: {
           type: "category",
@@ -1725,10 +1692,7 @@
       var cell,
         resultwkt = "";
       var feature;
-      this.north = -90;
-      this.south = 90;
-      this.east = -180;
-      this.west = 180;
+
 
       for (var i = 0; i < clusterData.length; i++) {
         cell = clusterData[i];
@@ -1751,11 +1715,6 @@
         this.vectorSource.addFeature(feature);
 
         this.source.addFeature(feature);
-        //计算边框，用于切换项目定位中心点
-        this.north = Math.max(parseFloat(cell.lat), this.north);
-        this.south = Math.min(parseFloat(cell.lat), this.south);
-        this.east = Math.max(parseFloat(cell.lon), this.east);
-        this.west = Math.min(parseFloat(cell.lon), this.west);
       }
 
       this.clusterSource = new Cluster({
@@ -1795,7 +1754,7 @@
                 })
               }) */
             });
-          } else if (size > 2) {
+          } else if (size >= 2) {
             return new Style({
               text: new Text({
                 text: size.toString(),
@@ -1826,7 +1785,7 @@
         }
       });
       //飞行到指定的城市项目中心点
-      // this.flyToCity()
+
       //?要判断currentZoom加哪一个
       if (this.currentZoom >= 8) this.map.addLayer(this.vector);
       else this.map.addLayer(this.layer);
@@ -1942,6 +1901,7 @@
         ) {
           return feature;
         });
+        
         if (feature) {
           //捕捉到要素后，进行后续操作，如弹出要素信息
           // this.addPopupContent(e.coordinate, feature.values_.features);
@@ -2763,18 +2723,15 @@
   computed: {
     switchStatus: function() {
       return this.flag; // 直接监听props里的status状态
-    }
+    },
+    ...mapGetters(["allProjectSite"])
   },
-  /*   created() {
-    window.closepopup = this.closepopup;
-    window.historyData = this.historyData;
-  }, */
   created() {},
   mounted: function() {
     // 默认加载所有的平台
-    this.LoadAllProject();
+    // this.LoadAllProject();
 
-    this.loadRegionEcharts();
+    // this.loadRegionEcharts();
     // 根据平台渲染站点数量统计及状态统计
     this.loadSiteNumForOroject();
     // 根据平台渲染设备分类
diff --git a/src/router/index.js b/src/router/index.js
index 7fc8196..13640f9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -288,6 +288,7 @@
   if (to.name === "login") {
     next();
   } else if (JSON.parse(getSession("logins")) === "true") {
+    next();
     if (!store.state.common.allDept.length) {
       store
         .dispatch("common/getAllDept")
@@ -302,14 +303,13 @@
           next("/Login");
         });
     }
-    next();
   } else {
-    message({
-      data: {
-        code: 1,
-        msg: "请先登录在进行操作!"
-      }
-    });
+    // message({
+    //   data: {
+    //     code: 1,
+    //     msg: "请先登录在进行操作!"
+    //   }
+    // });
     next(`/Login`);
   }
 });
diff --git a/src/store/getters.js b/src/store/getters.js
index 1523fa1..dc221d9 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   allCity: state => state.common.allCity, //所有城市
   allPlatSite: state => state.common.allPlatSite, //所有项目站点
   allProject: state => state.common.allProject, //所有项目
+  allProjectSite: state => state.common.allProjectSite, //所有项目(包含默认头部--全部项目)
 
   menu: state => state.user.menu, //用户权限范围菜单
 }
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index 9600898..919ddcf 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -8,7 +8,8 @@
     allRole:[],
     allCity:[],
     allPlatSite:[],
-    allProject:[]
+    allProject:[],
+    allProjectSite:[],
   },
   mutations: {
     //设置所有部门
@@ -30,6 +31,10 @@
     //设置所有项目
     SET_ALLPROJECT:(state, allProject)=>{
       state.allProject = allProject;
+    },
+    //设置所有项目包含默认头部(全部项目)
+    SET_ALLPROJECTSITE:(state, allProjectSite)=>{
+      state.allProjectSite = allProjectSite;
     }
   },
   actions: {
@@ -83,8 +88,16 @@
               value: item.platformCode
             }
           });
+          const preArr = [
+            {
+              platformCode: "",
+              platformName: "全部项目",
+            }
+          ]
+          const allProjectSite = [...preArr, ...res.data.data];
           commit('SET_ALLPROJECT',treeArr);
           commit('SET_ALLPLATSITE',res.data.data);
+          commit('SET_ALLPROJECTSITE',allProjectSite);
         }
       }).catch(e =>{
         console.log(e);