diff --git a/config/index.js b/config/index.js
index 89d87e6..0dddf7c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -18,7 +18,7 @@
         }
       },
       "/nfQuery": {
-        target: "http://192.168.16.100:8864", //陈迁接口
+        target: "http://192.168.30.199:7099", //陈迁接口
         changeOrigin: true, //是否跨域
         pathRewrite: {
           "^/nfQuery": "" //需要rewrite重写的,

diff --git a/config/index.js b/config/index.js
index 89d87e6..0dddf7c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -18,7 +18,7 @@
         }
       },
       "/nfQuery": {
-        target: "http://192.168.16.100:8864", //陈迁接口
+        target: "http://192.168.30.199:7099", //陈迁接口
         changeOrigin: true, //是否跨域
         pathRewrite: {
           "^/nfQuery": "" //需要rewrite重写的,
diff --git a/src/components/DataAnalysis/StatisticalReport.vue b/src/components/DataAnalysis/StatisticalReport.vue
index 6cea6d3..7c08416 100644
--- a/src/components/DataAnalysis/StatisticalReport.vue
+++ b/src/components/DataAnalysis/StatisticalReport.vue
@@ -1,9 +1,38 @@
 <template>
-  <div id="pagetwo">
+  <div id="pagetwo" class="report">
     <div class="form">
-      <span class="SelectTitle">站点编号:</span>
-      <el-input v-model="site" placeholder="请输入站点编号"></el-input>
-      <span class="SelectTitle">时间选择:</span>
+      <el-select
+        class="widthinput"
+        v-model="curProjectCode"
+        filterable
+        :clearable="true"
+        placeholder="请选择项目"
+        @change="handleChange"
+      >
+        <el-option
+          v-for="item in projectList"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-select
+        clearable
+        v-model="site"
+        filterable
+        placeholder="请选择站点"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in siteList"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点编号:</span> -->
+      <!-- <el-input v-model="site" placeholder="请输入站点编号"></el-input> -->
+      <!-- <span class="SelectTitle">时间选择:</span> -->
       <el-date-picker
         v-model="TimeValue"
         type="datetimerange"
@@ -120,13 +149,88 @@
       loading: "",
       alltotalWater: "",
       List: [],
-      loading: ""
+      loading: "",
+      //项目存放数组
+      projectList: [],
+      //当前所选项目编码
+      curProjectCode: "",
+      //当前所选项目下的所有站点
+      siteList: []
     };
   },
   mounted() {
     //			this.search()
+    this.initProject();
+    this.getData1();
   },
   methods: {
+    //初始化项目
+    initProject() {
+      this.$http.get(this.nozzle.StationBaseControllerGetPlatFormSiteTree).then(res => {
+        if(res.data.code === 1) {
+          this.projectList = res.data.data;
+          // this.cascaderOptions = this.$fn.handleTree(res.data.data,'platformCode');
+        }
+
+        // if (response.data.data.length > 0) {
+          
+        //   this.ProjectOptions = this.ProjectOptions.concat(
+        //     response.data.data
+        //   );
+        //   this.Project = this.ProjectOptions[0].platformCode;
+        //   this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+        // } else {
+        //   this.$message({
+        //     showClose: true,
+        //     message: "无项目",
+        //     type: "warning"
+        //   });
+        // }
+      })
+      .catch(response => {
+        this.$message({
+          showClose: true,
+          message: "请求平台失败",
+          type: "warning"
+        });
+      });
+    },
+    //获取项目下的站点
+    getSiteList(platformCode) {
+      // this.platCode = platformCode;
+      // this.SiteOptions = [
+      //   {
+      //     siteName: "请先选择项目",
+      //     siteNo: ""
+      //   }
+      // ];
+      // this.Site = "";
+      this.siteList = [];
+      let siteArr = this.projectList.filter((item,index) =>{
+        if(item.platformCode === platformCode) {
+          return item.dropSiteList;
+        }
+      })
+      this.siteList = siteArr[0].dropSiteList;
+      // console.log(111,this.siteList);
+      // for (var i = 0; i < this.ProjectOptions.length; i++) {
+      //   if (this.ProjectOptions[i].platformCode == CODE) {
+      //     this.SiteOptions = this.SiteOptions.concat(
+      //       this.ProjectOptions[i].dropSiteList
+      //     );
+      //     return;
+      //   }
+      // }
+    },
+    //项目选择事件
+    handleChange(value) {
+      this.site = "";
+      if(value) {
+        this.getSiteList(value);
+      }else{
+       this.siteList = [];
+      }
+    },
     getData1() {
       var url =
         this.nozzle.Conn +
@@ -146,10 +250,11 @@
         this.alltotalWater = math.toFixed(3);
       });
     },
+    //搜索
     search() {
-      if (this.site == "") {
+      if (this.site === "") {
         this.$message({
-          message: "请输入站点编号",
+          message: "请先选择站点",
           type: "warning"
         });
         return;
@@ -165,17 +270,33 @@
   }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .form {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  height: 50px;
+  @include fa();
   text-align: left;
   color: var(--white);
   font-size: 14px;
   box-sizing: border-box;
-  padding-left: 10px;
+  flex-wrap: wrap;
+  &>div{
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  /deep/ .el-button{
+    margin-bottom: 10px;
+  }
+}
+.report{
+  @include fd();
+  .tableSection{
+    flex: 1;
+    table{
+      height: 100%;
+      tbody{
+        min-height: calc(100% - 62px);
+      }
+    }
+  }
 }
 .form .el-input {
   width: 200px;
@@ -190,8 +311,8 @@
 }
 
 .tableSection {
-  padding: 10px;
-  background: rgba(255, 255, 255, 0.05);
+  // padding: 10px;
+  // background: rgba(255, 255, 255, 0.05);
 }
 
 table {

diff --git a/config/index.js b/config/index.js
index 89d87e6..0dddf7c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -18,7 +18,7 @@
         }
       },
       "/nfQuery": {
-        target: "http://192.168.16.100:8864", //陈迁接口
+        target: "http://192.168.30.199:7099", //陈迁接口
         changeOrigin: true, //是否跨域
         pathRewrite: {
           "^/nfQuery": "" //需要rewrite重写的,
diff --git a/src/components/DataAnalysis/StatisticalReport.vue b/src/components/DataAnalysis/StatisticalReport.vue
index 6cea6d3..7c08416 100644
--- a/src/components/DataAnalysis/StatisticalReport.vue
+++ b/src/components/DataAnalysis/StatisticalReport.vue
@@ -1,9 +1,38 @@
 <template>
-  <div id="pagetwo">
+  <div id="pagetwo" class="report">
     <div class="form">
-      <span class="SelectTitle">站点编号:</span>
-      <el-input v-model="site" placeholder="请输入站点编号"></el-input>
-      <span class="SelectTitle">时间选择:</span>
+      <el-select
+        class="widthinput"
+        v-model="curProjectCode"
+        filterable
+        :clearable="true"
+        placeholder="请选择项目"
+        @change="handleChange"
+      >
+        <el-option
+          v-for="item in projectList"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-select
+        clearable
+        v-model="site"
+        filterable
+        placeholder="请选择站点"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in siteList"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点编号:</span> -->
+      <!-- <el-input v-model="site" placeholder="请输入站点编号"></el-input> -->
+      <!-- <span class="SelectTitle">时间选择:</span> -->
       <el-date-picker
         v-model="TimeValue"
         type="datetimerange"
@@ -120,13 +149,88 @@
       loading: "",
       alltotalWater: "",
       List: [],
-      loading: ""
+      loading: "",
+      //项目存放数组
+      projectList: [],
+      //当前所选项目编码
+      curProjectCode: "",
+      //当前所选项目下的所有站点
+      siteList: []
     };
   },
   mounted() {
     //			this.search()
+    this.initProject();
+    this.getData1();
   },
   methods: {
+    //初始化项目
+    initProject() {
+      this.$http.get(this.nozzle.StationBaseControllerGetPlatFormSiteTree).then(res => {
+        if(res.data.code === 1) {
+          this.projectList = res.data.data;
+          // this.cascaderOptions = this.$fn.handleTree(res.data.data,'platformCode');
+        }
+
+        // if (response.data.data.length > 0) {
+          
+        //   this.ProjectOptions = this.ProjectOptions.concat(
+        //     response.data.data
+        //   );
+        //   this.Project = this.ProjectOptions[0].platformCode;
+        //   this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+        // } else {
+        //   this.$message({
+        //     showClose: true,
+        //     message: "无项目",
+        //     type: "warning"
+        //   });
+        // }
+      })
+      .catch(response => {
+        this.$message({
+          showClose: true,
+          message: "请求平台失败",
+          type: "warning"
+        });
+      });
+    },
+    //获取项目下的站点
+    getSiteList(platformCode) {
+      // this.platCode = platformCode;
+      // this.SiteOptions = [
+      //   {
+      //     siteName: "请先选择项目",
+      //     siteNo: ""
+      //   }
+      // ];
+      // this.Site = "";
+      this.siteList = [];
+      let siteArr = this.projectList.filter((item,index) =>{
+        if(item.platformCode === platformCode) {
+          return item.dropSiteList;
+        }
+      })
+      this.siteList = siteArr[0].dropSiteList;
+      // console.log(111,this.siteList);
+      // for (var i = 0; i < this.ProjectOptions.length; i++) {
+      //   if (this.ProjectOptions[i].platformCode == CODE) {
+      //     this.SiteOptions = this.SiteOptions.concat(
+      //       this.ProjectOptions[i].dropSiteList
+      //     );
+      //     return;
+      //   }
+      // }
+    },
+    //项目选择事件
+    handleChange(value) {
+      this.site = "";
+      if(value) {
+        this.getSiteList(value);
+      }else{
+       this.siteList = [];
+      }
+    },
     getData1() {
       var url =
         this.nozzle.Conn +
@@ -146,10 +250,11 @@
         this.alltotalWater = math.toFixed(3);
       });
     },
+    //搜索
     search() {
-      if (this.site == "") {
+      if (this.site === "") {
         this.$message({
-          message: "请输入站点编号",
+          message: "请先选择站点",
           type: "warning"
         });
         return;
@@ -165,17 +270,33 @@
   }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .form {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  height: 50px;
+  @include fa();
   text-align: left;
   color: var(--white);
   font-size: 14px;
   box-sizing: border-box;
-  padding-left: 10px;
+  flex-wrap: wrap;
+  &>div{
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  /deep/ .el-button{
+    margin-bottom: 10px;
+  }
+}
+.report{
+  @include fd();
+  .tableSection{
+    flex: 1;
+    table{
+      height: 100%;
+      tbody{
+        min-height: calc(100% - 62px);
+      }
+    }
+  }
 }
 .form .el-input {
   width: 200px;
@@ -190,8 +311,8 @@
 }
 
 .tableSection {
-  padding: 10px;
-  background: rgba(255, 255, 255, 0.05);
+  // padding: 10px;
+  // background: rgba(255, 255, 255, 0.05);
 }
 
 table {
diff --git a/src/components/DataAnalysis/dataScreening.vue b/src/components/DataAnalysis/dataScreening.vue
index f41160b..48133fa 100644
--- a/src/components/DataAnalysis/dataScreening.vue
+++ b/src/components/DataAnalysis/dataScreening.vue
@@ -1,13 +1,51 @@
 <template>
   <div id="dataScreening">
     <div class="form">
-      <span class="SelectTitle">站点编号:</span>
+      <!-- <el-cascader
+        ref="elcascader"
+        :props="cascaderProps"
+        :clearable="true"
+        @change="handleChange"
+        :show-all-levels="false"
+        v-model="Site"
+        :options="cascaderOptions"
+      /> -->
+      <el-select
+        class="widthinput"
+        v-model="curProjectCode"
+        filterable
+        :clearable="true"
+        placeholder="请选择项目"
+        @change="handleChange"
+      >
+        <el-option
+          v-for="item in projectList"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-select
+        clearable
+        v-model="site"
+        filterable
+        placeholder="请选择站点"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in siteList"
+          :key="item.siteNo"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点编号:</span>
       <el-input
         v-model="site"
         placeholder="请输入站点编号"
         class="widthinput"
-      ></el-input>
-      <span class="SelectTitle">时间选择:</span>
+      ></el-input> -->
+      <!-- <span class="SelectTitle">时间选择:</span> -->
       <el-date-picker
         class="data"
         v-model="TimeValue"
@@ -45,12 +83,17 @@
       >
     </div>
     <div id="echart">
-      <div>
-        <div style="width:100%;height:400px" ref="chart"></div>
-      </div>
-      <div>
-        <div style="width:100%;height:400px" ref="chart1"></div>
-      </div>
+      <template v-if="noData">
+        <div class="noData"></div>
+      </template>
+      <template v-else>
+        <div>
+          <div style="width:100%;height:400px" ref="chart"></div>
+        </div>
+        <div>
+          <div style="width:100%;height:400px" ref="chart1"></div>
+        </div>
+      </template>
     </div>
   </div>
 </template>
@@ -130,10 +173,79 @@
       value1: "SBL1",
       value2: "Z",
       name1: "",
-      name2: ""
+      name2: "",
+      //项目存放数组
+      projectList: [],
+      //当前所选项目编码
+      curProjectCode: "",
+      //当前所选项目下的所有站点
+      siteList: [],
+      noData: true,
     };
   },
+  mounted() {
+    this.initProject();
+    this.getData1();
+  },
   methods: {
+    //初始化项目
+    initProject() {
+      this.$http.get(this.nozzle.StationBaseControllerGetPlatFormSiteTree).then(res => {
+        if(res.data.code === 1) {
+          this.projectList = res.data.data;
+          // this.cascaderOptions = this.$fn.handleTree(res.data.data,'platformCode');
+        }
+
+        // if (response.data.data.length > 0) {
+          
+        //   this.ProjectOptions = this.ProjectOptions.concat(
+        //     response.data.data
+        //   );
+        //   this.Project = this.ProjectOptions[0].platformCode;
+        //   this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+        // } else {
+        //   this.$message({
+        //     showClose: true,
+        //     message: "无项目",
+        //     type: "warning"
+        //   });
+        // }
+      })
+      .catch(response => {
+        this.$message({
+          showClose: true,
+          message: "请求平台失败",
+          type: "warning"
+        });
+      });
+    },
+    //获取项目下的站点
+    getSiteList(platformCode) {
+      // this.platCode = platformCode;
+      // this.SiteOptions = [
+      //   {
+      //     siteName: "请先选择项目",
+      //     siteNo: ""
+      //   }
+      // ];
+      // this.Site = "";
+      this.siteList = [];
+      let siteArr = this.projectList.filter((item,index) =>{
+        if(item.platformCode === platformCode) {
+          return item.dropSiteList;
+        }
+      })
+      this.siteList = siteArr[0].dropSiteList;
+    },
+    //项目选择事件
+    handleChange(value) {
+      this.site = "";
+      if(value) {
+        this.getSiteList(value);
+      }else{
+       this.siteList = [];
+      }
+    },
     getName() {
       let obj1 = {};
       obj1 = this.options.find(item => {
@@ -199,10 +311,11 @@
         this.initCharts(timeList, sbl1AvgList, zAvgList);
       });
     },
+    //搜索
     search() {
-      if (this.site == "") {
+      if (this.site === "") {
         this.$message({
-          message: "请输入站点编号",
+          message: "请先选择站点",
           type: "warning"
         });
         return;
@@ -219,6 +332,7 @@
     closeLoad() {
       if (this.flag1 && this.flag2) {
         this.loading.close();
+        this.noData = false;
       }
     },
     initCharts(...arr) {
@@ -562,18 +676,22 @@
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 /* 顶部搜索 */
-.form {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  height: 50px;
+.form{
+  @include fa();
   text-align: left;
   color: var(--white);
   font-size: 14px;
   box-sizing: border-box;
-  padding-left: 10px;
+  flex-wrap: wrap;
+  &>div{
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  /deep/ .el-button{
+    margin-bottom: 10px;
+  }
 }
 .form .el-input {
   width: 200px;