From 5bc72617529fd27d769962d6ff83006661ac9ddc Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 29 Nov 2023 16:26:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=86=E5=86=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/global.less           |   2 +-
 src/assets/fonts - 副本/iconfont.css |  61 +++++
 src/assets/fonts - 副本/iconfont.ttf | Bin 0 -> 6580 bytes
 src/assets/fonts/iconfont.css        |  14 +-
 src/assets/fonts/iconfont.ttf        | Bin 6580 -> 8092 bytes
 src/components/Sidebar.vue           |  22 +-
 src/components/header.vue            |   4 +-
 src/fubingCommon/leftTree.vue        | 220 +++++++++++++++
 src/main.js                          |   5 +
 src/router/index.js                  |  15 +-
 src/views/icing/index.vue            | 326 ++++++++++++++++++++++
 src/views/login/index.vue            |   8 +-
 src/views/weather/index.vue          | 389 +++++++++++++++++++++++++++
 13 files changed, 1060 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/fonts - 副本/iconfont.css
 create mode 100644 src/assets/fonts - 副本/iconfont.ttf
 create mode 100644 src/fubingCommon/leftTree.vue
 create mode 100644 src/views/icing/index.vue
 create mode 100644 src/views/weather/index.vue

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 0000000000000000000000000000000000000000..21ab3183b3075a000f0a018089164dbe976c9fc9
GIT binary patch
literal 6580
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

literal 0
HcmV?d00001

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 21ab3183b3075a000f0a018089164dbe976c9fc9..817081fedba2225eba78a16f798b9091175f8680 100644
GIT binary patch
delta 2195
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
G{(l2Lq;hEh

delta 664
zcmZXR&ubGw6vw}BcGKN#vZke?L6Wp+5f3FO7Evh(dg?_ycoIPqZJR^W2F#&~kn|!w
zC|Gjop$E~EH))EL&_6-M-aSNxO$x>p(TiZ$@9Y#*e9LEN-gn-wo!z*!b@u7$M)#vL
z1*mayV}9ZO+{Kq8rvQ5$7}>7OmhMjU3u6Gf<XnY<)3u&(ze6S})%r4%Y4Vw`sfDFG
zrNhsUK4$(y`nhUpxh5CXBc5mJk1v+0v%@c@Ujaw1vEO`c>0YCLz5JyBWVadc69QPx
zsEM04-6*m}EB}}uD^y?CGv2Mt^be$TEGPUl82z(GO<OEIgbSrrny%!l2RI&kTJ_+y
zit_C?w+UjANy2*4IcU5^RVPkz^<v$|D*Y^mskp&tPz+{*m7vpG>uvUT_sU^D97GZD
z_epDAoj4=R`Tse_S{6GdkY=ADI2_kSlD$&xedSBz83VMXbx8vg5EKo1*kHz>KO$H$
z#PJ>OiT;4znt?6Q+cdBl`nv{wOM7Jl2SAuJoaZbE^9Fqb;lO}YJQlEluhLW}RZYFI
z7Oj1I&VJ`!cHg(ZCw@8Y51E~0JD*!sIbW1mVoO4X#1U7L;z>%<;>#hl-WIB@D`QvV
GANd;_NQ;F4

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>