diff --git a/src/assets/css/global.less b/src/assets/css/global.less
index 7fa43a2..97bce46 100644
--- a/src/assets/css/global.less
+++ b/src/assets/css/global.less
@@ -1,5 +1,5 @@
 //Brand @color
-@color-primary: #169e8c;
+@color-primary: #1c77ac;
 @color-primary-light: mix(@color-white, @color-primary, 80%);
 @color-primary-lighter: mix(@color-white, @color-primary, 90%);
 //Functional @color
diff --git a/src/assets/fonts - 副本/iconfont.css b/src/assets/fonts - 副本/iconfont.css
new file mode 100644
index 0000000..2e77ad2
--- /dev/null
+++ b/src/assets/fonts - 副本/iconfont.css	
@@ -0,0 +1,61 @@
+@font-face {
+  font-family: "iconfont"; /* Project id  */
+  src: url('iconfont.ttf?t=1690188947515') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-paizhao:before {
+  content: "\e6ba";
+}
+
+.icon-paizhao-xianxing:before {
+  content: "\e8d1";
+}
+
+.icon-tuiguanglishitupianjinqun:before {
+  content: "\e613";
+}
+
+.icon-gongsi:before {
+  content: "\e62e";
+}
+
+.icon-dianli:before {
+  content: "\e649";
+}
+
+.icon-dianlihangye:before {
+  content: "\e791";
+}
+
+.icon-shexiangtoulixian:before {
+  content: "\e7b2";
+}
+
+.icon-video-camera:before {
+  content: "\e962";
+}
+
+.icon-shexiangtou-lixian:before {
+  content: "\ef1c";
+}
+
+.icon-shexiangtou-zaixian:before {
+  content: "\ef1d";
+}
+
+.icon-shudianxianlu_2722010801:before {
+  content: "\efed";
+}
+
+.icon-tupian_normal:before {
+  content: "\e681";
+}
+
diff --git a/src/assets/fonts - 副本/iconfont.ttf b/src/assets/fonts - 副本/iconfont.ttf
new file mode 100644
index 0000000..21ab318
Binary files /dev/null and b/src/assets/fonts - 副本/iconfont.ttf differ
diff --git a/src/assets/fonts/iconfont.css b/src/assets/fonts/iconfont.css
index 2e77ad2..9007d35 100644
--- a/src/assets/fonts/iconfont.css
+++ b/src/assets/fonts/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1690188947515') format('truetype');
+  src: url('iconfont.ttf?t=1700030201509') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-1wenhe:before {
+  content: "\e653";
+}
+
 .icon-paizhao:before {
   content: "\e6ba";
 }
@@ -43,6 +47,10 @@
   content: "\e962";
 }
 
+.icon-qixiang:before {
+  content: "\e67c";
+}
+
 .icon-shexiangtou-lixian:before {
   content: "\ef1c";
 }
@@ -59,3 +67,7 @@
   content: "\e681";
 }
 
+.icon-fubing:before {
+  content: "\e7ac";
+}
+
diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf
index 21ab318..817081f 100644
Binary files a/src/assets/fonts/iconfont.ttf and b/src/assets/fonts/iconfont.ttf differ
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 30607fe..c55e31c 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -314,7 +314,18 @@ export default {
           title: "历史图片",
         },
       ],
-
+      fubingItems: [
+        {
+          icon: "iconfont icon-qixiang",
+          index: "/weather",
+          title: "气象检测",
+        },
+        {
+          icon: "iconfont icon-fubing",
+          index: "/icing",
+          title: "覆冰",
+        },
+      ],
       role: "",
     };
   },
@@ -342,6 +353,8 @@ export default {
       this.items = this.items2;
     } else if (this.role == 4) {
       this.items = this.hnjcitems;
+    } else if (this.role == 5) {
+      this.items = this.fubingItems;
     }
 
     console.log(this.items);
@@ -440,5 +453,12 @@ export default {
     border: 1px solid #169e8c;
     background-color: #169e8c;
   }
+  .el-menu-item [class^="iconfont"] {
+    margin-right: 5px;
+    width: 24px;
+    text-align: center;
+    font-size: 18px;
+    vertical-align: middle;
+  }
 }
 </style>
diff --git a/src/components/header.vue b/src/components/header.vue
index 77b0c8e..c199b78 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="header">
-    <div class="logoTitle">视频监控可视化平台</div>
+    <div class="logoTitle" v-if="role == 5">覆冰在线检测系统</div>
+    <div class="logoTitle" v-else>视频监控可视化平台</div>
     <div class="menuBox">
       <vSidebar></vSidebar>
       <div class="userInfo">
@@ -41,6 +42,7 @@ export default {
   data() {
     return {
       userName: localStorage.getItem("userName"),
+      role: localStorage.getItem("role"),
     };
   },
   methods: {
diff --git a/src/fubingCommon/leftTree.vue b/src/fubingCommon/leftTree.vue
new file mode 100644
index 0000000..7d5bfd1
--- /dev/null
+++ b/src/fubingCommon/leftTree.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="leftTreeBox">
+    <div class="searchBar">
+      <el-input
+        placeholder="输入关键字进行过滤"
+        v-model="filterText"
+        prefix-icon="el-icon-search"
+      >
+      </el-input>
+    </div>
+    <el-tree
+      ref="tree"
+      :data="lineTreeData"
+      :props="defaultProps"
+      node-key="id"
+      :default-expanded-keys="defaultExpandedKeys"
+      highlight-current
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+      :current-node-key="currentNodekey"
+      @node-click="handleNodeClick"
+    >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span v-if="node.level === 1">
+          <span class="iconfont icon-dianli" style="margin-right: 6px"></span>
+          <span>{{ node.label }} </span>
+        </span>
+        <span v-else-if="node.level === 2">
+          <span class="iconfont icon-dianlihangye" style="margin-right: 6px">
+          </span>
+          <span
+            >{{ node.label }}
+            <span class="num">({{ data.list.length }}) </span></span
+          >
+        </span>
+        <span v-else>
+          <span
+            class="iconfont icon-shexiangtoulixian"
+            v-if="data.onlinestatus == 0"
+            :class="data.onlinestatus == 0 ? 'disconnect' : ''"
+            style="margin-right: 6px"
+          ></span>
+          <span
+            class="iconfont icon-shexiangtou-lixian"
+            v-else
+            :class="data.onlinestatus == 0 ? 'disconnect' : ''"
+            style="margin-right: 6px"
+          ></span>
+          <span
+            :id="data.id"
+            :class="data.onlinestatus == 0 ? 'disconnect' : ''"
+            >{{ node.label }}</span
+          >
+        </span>
+      </span>
+    </el-tree>
+  </div>
+</template>
+<script>
+import { getdyTreeListJoggle } from "@/utils/api/index";
+export default {
+  data() {
+    return {
+      filterText: "", //查询字段过滤
+      lineTreeData: [],
+      defaultExpandedKeys: [], //默认展开
+      collapsedKeys: [], // 收起节点的key数组
+      defaultProps: {
+        //指定参数格式回显数据
+        children: "list",
+        label: "name",
+      },
+      currentData: {}, //当前选中的数据
+      currentNodekey: "", //默认选中的节点树,
+    };
+  },
+  watch: {
+    // filterText(val) {
+    //   console.log(val);
+    //   this.$refs.tree.filter(val);
+    //   console.log(this.$refs.tree);
+    // },
+    filterText(newVal) {
+      this.handleFilter(); // 当 filterText 发生变化时执行过滤操作
+    },
+  },
+  created() {
+    this.getLineTreeList(); //获取树状图
+  },
+  methods: {
+    handleFilter() {
+      // 在输入框输入完成后的500毫秒执行过滤节点方法
+      setTimeout(() => {
+        this.$refs.tree.filter(this.filterText);
+      }, 500);
+    },
+    //树状图搜索
+    filterNode(value, data, node) {
+      // 如果什么都没填全部匹配全部返回
+      if (!value) return true;
+      this.searchName = data.name + data.cmdid;
+      //console.log(this.searchName);
+      // 如果传入的value和data中的label相同，匹配成功
+      if (this.searchName.indexOf(value) !== -1) {
+        return true;
+      }
+    },
+    //获取树状图列表
+    getLineTreeList() {
+      getdyTreeListJoggle({ type: 1 })
+        .then((res) => {
+          this.lineTreeData = res.data.list;
+          this.currentData = JSON.parse(localStorage.getItem("currentData"));
+          this.lineTreeData.forEach((node) => {
+            if (node.list) {
+              node.list.forEach((child) => {
+                this.defaultExpandedKeys.push(child.id);
+              });
+            } else {
+              this.defaultExpandedKeys.push(node.id);
+            }
+          });
+          this.defaultExpandedKeys =
+            JSON.parse(localStorage.getItem("defaultKey")) !== null
+              ? JSON.parse(localStorage.getItem("defaultKey"))
+              : this.defaultExpandedKeys; //获取保存的defaultKey ;
+
+          console.log(this.defaultExpandedKeys);
+          if (this.lineTreeData[0].list[0].list.length > 0) {
+          }
+          if (
+            this.currentData !== null &&
+            Object.keys(this.currentData).length !== 0
+          ) {
+            this.currentNodekey = this.currentData.id;
+            this.handleNodeClick(this.currentData);
+          } else {
+            this.currentData = this.lineTreeData[0]; //第一个选中的数据
+            this.currentNodekey = this.lineTreeData[0].id; //第一个数据
+            this.handleNodeClick(this.currentData);
+          }
+          this.$nextTick(() => {
+            this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来
+          });
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+
+    //点击当前选中的treenode
+    handleNodeClick(data) {
+      this.currentData = data;
+      this.$parent.getCurrentData(this.currentData);
+    },
+  },
+};
+</script>
+<style lang="less">
+.leftTreeBox {
+  width: 200px;
+  display: flex;
+  flex-direction: column;
+  padding: 16px 0;
+  .searchBar {
+    width: 94%;
+    margin: 0 auto;
+    margin-bottom: 8px;
+  }
+  .el-tree {
+    overflow-y: scroll;
+    overflow-x: hidden;
+    .el-tree-node__content {
+      height: 32px;
+      font-size: 12px;
+    }
+    .custom-tree-node {
+      color: #333;
+      overflow: hidden;
+      span {
+        display: flex;
+        display: inline-table;
+        overflow: hidden;
+        align-items: center;
+      }
+      .num {
+        color: #169e8c;
+      }
+    }
+  }
+
+  .el-tree--highlight-current
+    .el-tree-node.is-current
+    > .el-tree-node__content {
+    // 设置颜色
+    color: #fff;
+    background: #169e8c;
+    .custom-tree-node {
+      color: #fff;
+      //overflow: hidden;
+      span {
+        display: flex;
+        //overflow: hidden;
+        align-items: center;
+        .num {
+          color: #fff;
+        }
+        .iconfont {
+          //width: 30px;
+          display: inline-table;
+        }
+      }
+    }
+  }
+
+  .disconnect {
+    color: #d3d3d3;
+  }
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 3af820b..cbd6720 100644
--- a/src/main.js
+++ b/src/main.js
@@ -57,6 +57,11 @@ router.beforeEach((to, from, next) => {
   const role = localStorage.getItem("role");
   const token = localStorage.getItem("token");
   console.log(role, token);
+  // if (token && role == "5") {
+  //   next({
+  //     path: "/weather",
+  //   });
+  // }
   if (to.path == "/echarts") {
     console.log("asdasdasdasd");
     // 在免登录白名单，直接进入
diff --git a/src/router/index.js b/src/router/index.js
index be6169b..0263db0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,9 +119,22 @@ const routes = [
         name: "echartsDemo",
         meta: { title: "echarts图表", icon: "", keepAlive: true },
       },
+      //气象检测
+      {
+        path: "/weather",
+        component: () => import("../views/weather/index.vue"),
+        name: "weather",
+        meta: { title: "气象检测", icon: "", keepAlive: true },
+      },
+      //覆冰
+      {
+        path: "/icing",
+        component: () => import("../views/icing/index.vue"),
+        name: "icing",
+        meta: { title: "覆冰", icon: "", keepAlive: true },
+      },
     ],
   },
-
   {
     path: "/login",
     component: () => import("../views/login/index.vue"),
diff --git a/src/views/icing/index.vue b/src/views/icing/index.vue
new file mode 100644
index 0000000..6ae8773
--- /dev/null
+++ b/src/views/icing/index.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="icingBox">
+    <div class="icingContain">
+      <leftTree ref="sideTree"></leftTree>
+      <div class="rightTable">
+        <div class="dataBox">
+          <div class="childBox">
+            <div class="searchBox" ref="searchref">
+              <el-form
+                :inline="true"
+                :model="formdata"
+                class="demo-form-inline"
+              >
+                <el-form-item label="开始日期">
+                  <el-date-picker
+                    v-model="formdata.starttime"
+                    type="date"
+                    placeholder="开始日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束日期">
+                  <el-date-picker
+                    v-model="formdata.endtime"
+                    type="date"
+                    placeholder="结束日期"
+                    class="ml10"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" @click="onSubmit">查询</el-button>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" @click="onSubmit"
+                    >导出数据</el-button
+                  >
+                </el-form-item>
+              </el-form>
+            </div>
+            <div class="childTableShowBox">
+              <el-table :data="tableData" style="width: 100%">
+                <el-table-column
+                  prop="terminalNumber"
+                  label="监测终端编号"
+                ></el-table-column>
+                <el-table-column prop="time" label="时间"></el-table-column>
+                <el-table-column
+                  prop="functionalUnitIdentifier"
+                  label="功能单元识别码"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxPullForceKg"
+                  label="最大拉力(Kg)"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxPullForceWindBiasAngle"
+                  label="最大拉力时风偏角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxPullForceTiltAngle"
+                  label="最大拉力时倾斜角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minPullForceKg"
+                  label="最小拉力(Kg)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minPullForceWindBiasAngle"
+                  label="最小拉力时风偏角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minPullForceTiltAngle"
+                  label="最小拉力时倾斜角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxWindBiasAngle"
+                  label="最大风偏角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxWindBiasAngleTiltAngle"
+                  label="最大风偏角时倾斜角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="maxWindBiasAnglePullForceKg"
+                  label="最大风偏角时拉力(Kg)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minWindBiasAngle"
+                  label="最小风偏角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minWindBiasAngleTiltAngle"
+                  label="最小风偏角时倾斜角(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minWindBiasAnglePullForceKg"
+                  label="最小风偏角时拉力(Kg)"
+                ></el-table-column>
+              </el-table>
+            </div>
+            <div class="pageNation">
+              <el-pagination
+                @current-change="handleCurrentChange"
+                @size-change="handleSizeChange"
+                :current-page="page"
+                :page-size="pageSize"
+                layout="sizes, prev, pager, next, jumper,total"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import leftTree from "../../fubingCommon/leftTree";
+export default {
+  name: "icing",
+  components: {
+    leftTree,
+  },
+  data() {
+    return {
+      msg: "",
+      childFlag: false,
+      tableData: [],
+      formdata: {},
+      page: 1, // 当前页数
+      pageSize: 20, // 每页数量
+      total: 0, //总条数
+    };
+  },
+  created() {
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
+  },
+  mounted() {
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
+    this.$set(this.formdata, "endtime", new Date().getTime());
+  },
+  methods: {
+    getCurrentData(data) {
+      console.log("执行父组件", data);
+      if (data.dyValue) {
+        console.log("电压");
+
+        this.tableData = [
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+        ];
+      } else if (data.bsManufacturer) {
+        this.tableData = [
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+        ];
+      } else {
+        console.log("杆塔");
+        this.tableData = [
+          {
+            terminalNumber: "终端A",
+            time: "2023-03-15 08:00:00",
+            functionalUnitIdentifier: "功能单元1",
+            maxPullForceKg: "20Kg",
+            maxPullForceWindBiasAngle: "60°",
+            maxPullForceTiltAngle: "30°",
+            minPullForceKg: "5Kg",
+            minPullForceWindBiasAngle: "30°",
+            minPullForceTiltAngle: "20°",
+            maxWindBiasAngle: "70°",
+            maxWindBiasAngleTiltAngle: "45°",
+            maxWindBiasAnglePullForceKg: "15Kg",
+            minWindBiasAngle: "20°",
+            minWindBiasAngleTiltAngle: "30°",
+            minWindBiasAnglePullForceKg: "8Kg",
+          },
+        ];
+      }
+    },
+    onSubmit() {},
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      // this.picList = [];
+      // this.getPicData();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      //this.getPicData();
+    },
+  },
+};
+</script>
+<style lang="less">
+.icingBox {
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
+  background: #fff;
+  .icingContain {
+    display: flex;
+    height: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+  }
+  .rightTable {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    flex: 1;
+    overflow: hidden;
+    border-left: 1px solid #ddd;
+    .dataBox {
+      width: calc(100% - 24px);
+      height: calc(100% - 24px);
+      padding: 12px 12px;
+      background: #fff;
+    }
+    // .fatherTableShowBox {
+    //   height: calc(100% - 0px);
+    // }
+    .childBox {
+      height: calc(100% - 50px);
+      .childTableShowBox {
+        height: calc(100% - 50px);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2fe6a9c..77cfb99 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -80,7 +80,13 @@ export default {
               if (res.code == 200) {
                 this.$store.commit("SET_TOKEN", res.data.sessionId); //将token保存在vuex中
                 this.$store.commit("SET_USERINFO", res.data); //将用户信息保存在vuex中
-                this.$router.push("/stritl");
+                console.log(res.data);
+                if (res.data.role == 5) {
+                  this.$router.push("/weather");
+                } else {
+                  this.$router.push("/stritl");
+                }
+
                 this.$message({
                   duration: 1500,
                   showClose: true,
diff --git a/src/views/weather/index.vue b/src/views/weather/index.vue
new file mode 100644
index 0000000..b684874
--- /dev/null
+++ b/src/views/weather/index.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="weatherBox">
+    <div class="weatherContain">
+      <leftTree ref="sideTree"></leftTree>
+      <div class="rightTable">
+        <div class="dataBox">
+          <div class="fatherTableShowBox" v-if="!childFlag">
+            <el-table
+              :data="tableData"
+              style="width: 100%"
+              height="calc(100% - 40px)"
+            >
+              <el-table-column prop="line" label="线路"> </el-table-column>
+              <el-table-column prop="pole" label="杆塔"> </el-table-column>
+              <el-table-column prop="terminal" label="终端"> </el-table-column>
+              <el-table-column prop="time" label="时间"> </el-table-column>
+              <el-table-column prop="temperature" label="温度(℃)">
+              </el-table-column>
+              <el-table-column prop="humidity" label="湿度(%RH)">
+              </el-table-column>
+              <el-table-column prop="windSpeed" label="瞬时风速(m/s)">
+              </el-table-column>
+              <el-table-column prop="windDirection" label="瞬时风向(°)">
+              </el-table-column>
+              <el-table-column prop="rainfall" label="雨量(mm/hour)">
+              </el-table-column>
+              <el-table-column prop="pressure" label="气压(hPa(百帕))">
+              </el-table-column>
+              <el-table-column prop="sunlight" label="日照(W/m2)">
+              </el-table-column>
+            </el-table>
+            <div class="pageNation">
+              <el-pagination
+                @current-change="handleCurrentChange"
+                @size-change="handleSizeChange"
+                :current-page="page"
+                :page-size="pageSize"
+                layout="sizes, prev, pager, next, jumper,total"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+          <div class="childBox" v-else>
+            <div class="searchBox" ref="searchref">
+              <el-form
+                :inline="true"
+                :model="formdata"
+                class="demo-form-inline"
+              >
+                <el-form-item label="开始日期">
+                  <el-date-picker
+                    v-model="formdata.starttime"
+                    type="date"
+                    placeholder="开始日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束日期">
+                  <el-date-picker
+                    v-model="formdata.endtime"
+                    type="date"
+                    placeholder="结束日期"
+                    class="ml10"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" @click="onSubmit">查询</el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <div class="childTableShowBox">
+              <el-table :data="childTableDate" style="width: 100%">
+                <el-table-column prop="time" label="时间"></el-table-column>
+                <el-table-column
+                  prop="temperature"
+                  label="温度(℃)"
+                ></el-table-column>
+                <el-table-column
+                  prop="humidity"
+                  label="湿度(%RH)"
+                ></el-table-column>
+                <el-table-column
+                  prop="windSpeed"
+                  label="瞬时风速(m/s)"
+                ></el-table-column>
+                <el-table-column
+                  prop="windDirection"
+                  label="瞬时风向(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="rainfall"
+                  label="雨量(mm/hour)"
+                ></el-table-column>
+                <el-table-column
+                  prop="pressure"
+                  label="气压(hPa(百帕))"
+                ></el-table-column>
+                <el-table-column
+                  prop="sunlight"
+                  label="日照(W/m2)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minuteAverageWindSpeed"
+                  label="1分钟平均风速(m/s)"
+                ></el-table-column>
+                <el-table-column
+                  prop="minuteAverageWindDirection"
+                  label="1分钟平均风向(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="tenMinuteAverageWindSpeed"
+                  label="10分钟平均风速(m/s)"
+                ></el-table-column>
+                <el-table-column
+                  prop="tenMinuteAverageWindDirection"
+                  label="10分钟平均风向(°)"
+                ></el-table-column>
+                <el-table-column
+                  prop="tenMinuteMaxWindSpeed"
+                  label="10分钟最大风速(m/s)"
+                ></el-table-column>
+              </el-table>
+            </div>
+            <div class="pageNation">
+              <el-pagination
+                @current-change="handleCurrentChange"
+                @size-change="handleSizeChange"
+                :current-page="page"
+                :page-size="pageSize"
+                layout="sizes, prev, pager, next, jumper,total"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import leftTree from "../../fubingCommon/leftTree";
+export default {
+  name: "weather",
+  components: {
+    leftTree,
+  },
+  data() {
+    return {
+      msg: "",
+      childFlag: false,
+      tableData: [],
+      childTableDate: [],
+      formdata: {},
+      page: 1, // 当前页数
+      pageSize: 20, // 每页数量
+      total: 0, //总条数
+    };
+  },
+  created() {
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
+  },
+  mounted() {
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
+    this.$set(this.formdata, "endtime", new Date().getTime());
+  },
+  methods: {
+    getCurrentData(data) {
+      console.log("执行父组件", data);
+      if (data.dyValue) {
+        console.log("电压");
+        this.msg = "公司所有数据";
+        this.childFlag = false;
+        this.tableData = [
+          {
+            line: "线路A",
+            pole: "杆塔1",
+            terminal: "终端1",
+            time: "2023-03-15 08:00:00",
+            temperature: "25℃",
+            humidity: "60%",
+            windSpeed: "0.5m/s",
+            windDirection: "120°",
+            rainfall: "0mm/hour",
+            pressure: "1015hPa",
+            sunlight: "500W/m2",
+          },
+          {
+            line: "线路B",
+            pole: "杆塔2",
+            terminal: "终端2",
+            time: "2023-03-15 09:00:00",
+            temperature: "23℃",
+            humidity: "70%",
+            windSpeed: "0.3m/s",
+            windDirection: "90°",
+            rainfall: "0mm/hour",
+            pressure: "1013hPa",
+            sunlight: "350W/m2",
+          },
+          {
+            line: "线路C",
+            pole: "杆塔3",
+            terminal: "终端3",
+            time: "2023-03-15 10:00:00",
+            temperature: "27℃",
+            humidity: "55%",
+            windSpeed: "0.7m/s",
+            windDirection: "60°",
+            rainfall: "0mm/hour",
+            pressure: "1017hPa",
+            sunlight: "650W/m2",
+          },
+          {
+            line: "线路D",
+            pole: "杆塔4",
+            terminal: "终端4",
+            time: "2023-03-15 11:00:00",
+            temperature: "24℃",
+            humidity: "65%",
+            windSpeed: "0.4m/s",
+            windDirection: "30°",
+            rainfall: "0mm/hour",
+            pressure: "1016hPa",
+            sunlight: "450W/m2",
+          },
+          {
+            line: "线路E",
+            pole: "杆塔5",
+            terminal: "终端5",
+            time: "2023-03-15 12:00:00",
+            temperature: "28℃",
+            humidity: "50%",
+            windSpeed: "0.6m/s",
+            windDirection: "90°",
+            rainfall: "0mm/hour",
+            pressure: "1018hPa",
+            sunlight: "750W/m2",
+          },
+        ];
+      } else if (data.bsManufacturer) {
+        this.msg = "杆塔下所有数据";
+        this.childFlag = false;
+        this.tableData = [
+          {
+            line: "线路F",
+            pole: "杆塔6",
+            terminal: "终端6",
+            time: "2023-03-15 13:00:00",
+            temperature: "26℃",
+            humidity: "60%",
+            windSpeed: "0.5m/s",
+            windDirection: "150°",
+            rainfall: "0mm/hour",
+            pressure: "1017hPa",
+            sunlight: "600W/m2",
+          },
+          {
+            line: "线路G",
+            pole: "杆塔7",
+            terminal: "终端7",
+            time: "2023-03-15 14:00:00",
+            temperature: "29℃",
+            humidity: "45%",
+            windSpeed: "0.7m/s",
+            windDirection: "180°",
+            rainfall: "mm/hour, ",
+            pressure: "184hPa（百帕） ",
+            sunlight: "789W/m²",
+          },
+          {
+            line: "线路H",
+            pole: "杆塔8 ",
+            terminal: "终端8 ",
+            time: "24-Mar-23 16:45 ",
+            temperature: "24℃（摄氏度） ",
+            humidity: "78% （百分比） ",
+            windSpeed: "1.8m/s（米/秒） ",
+            windDirection: "88 °（度） ",
+            rainfall: "至今无数据 ",
+            pressure: "184hPa（百帕） ",
+            sunlight: " 无数据 ",
+            comment: " 天气晴朗，适合户外活动。",
+          },
+        ];
+      } else {
+        console.log("杆塔");
+        this.msg = "装置当天数据";
+        this.childFlag = true;
+        this.childTableDate = [
+          {
+            time: "2023-03-15 08:00:00",
+            temperature: "25℃",
+            humidity: "60%",
+            windSpeed: "0.5m/s",
+            windDirection: "120°",
+            rainfall: "0mm/hour",
+            pressure: "1015hPa",
+            sunlight: "500W/m2",
+            minuteAverageWindSpeed: "无数据",
+            minuteAverageWindDirection: "无数据",
+            tenMinuteAverageWindSpeed: "无数据",
+            tenMinuteAverageWindDirection: "无数据",
+            tenMinuteMaxWindSpeed: "无数据",
+          },
+          {
+            time: "2023-03-15 09:00:00",
+            temperature: "23℃",
+            humidity: "70%",
+            windSpeed: "0.3m/s",
+            windDirection: "90°",
+            rainfall: "0mm/hour",
+            pressure: "1013hPa",
+            sunlight: "350W/m2",
+            minuteAverageWindSpeed: "无数据",
+            minuteAverageWindDirection: "无数据",
+            tenMinuteAverageWindSpeed: "无数据",
+            tenMinuteAverageWindDirection: "无数据",
+            tenMinuteMaxWindSpeed: "无数据",
+          },
+        ];
+      }
+    },
+    onSubmit() {},
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      // this.picList = [];
+      // this.getPicData();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      //this.getPicData();
+    },
+  },
+};
+</script>
+<style lang="less">
+.weatherBox {
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
+  background: #fff;
+  .weatherContain {
+    display: flex;
+    height: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+  }
+  .rightTable {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    flex: 1;
+    overflow: hidden;
+    border-left: 1px solid #ddd;
+    .dataBox {
+      width: calc(100% - 24px);
+      height: calc(100% - 24px);
+      padding: 12px 12px;
+      background: #fff;
+    }
+    .fatherTableShowBox {
+      height: calc(100% - 0px);
+    }
+    .childBox {
+      height: calc(100% - 50px);
+      .childTableShowBox {
+        height: calc(100% - 50px);
+      }
+    }
+  }
+}
+</style>