产品下的运行数据

src/router/routes.js

@@ -1,6 +1,7 @@
 import layoutHeaderAside from '@/layout/header-aside'
 
 
+
 // 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
 const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
@@ -113,6 +114,8 @@ const frameIn = [
           },
           component: _import('demo/productManage/productClassify')
         },
+      
+     
         //  设备管理/设备
         {
           path: 'equipment',

src/views/demo/equipmentManage/equipment/index.vue

@@ -352,7 +352,8 @@ export default {
     },
     //查看
     goDetail(row) {
-      this.$router.push({ path: "equipmentInfo",query:{id:row.id,eqCode:row.eqCode} });
+      console.log(row,"设备。。")
+      this.$router.push({ path: "equipmentInfo",query:{id:row.id,eqCode:row.eqCode,labelCode:row.labelCode} });
     },
     //跳转产品分类
     goTag() {

src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -39,7 +39,6 @@
                 />
               </el-tab-pane>
               <el-tab-pane label="定时任务" name="second">
-
                 <div class="infoTitle">
                   <h5>定时任务</h5>
                   <!-- <el-button
@@ -49,17 +48,45 @@
                     >修改定时任务</el-button
                   > -->
                 </div>
-                <div class="taskDiv" v-for="(item,index) in rwList" :key="index">
-                  <el-tooltip class="item" effect="dark" :content="item.taskName" placement="top">
-                    <span class="gdWidth">{{item.taskName}}</span>
-                  </el-tooltip>：
-                    <span class="normalBtn">{{JSON.parse(item.objTime).timeType}}</span>
-                    <span class="normalBtn" v-if="JSON.parse(item.objTime).timeType!='每小时'">{{JSON.parse(item.objTime).time}}</span>
-                    <span class="normalBtn" v-if="JSON.parse(item.objTime).timeType=='每周'">{{JSON.parse(item.objTime).week.toString()}}</span>
-                    <span class="normalBtn" v-if="JSON.parse(item.objTime).timeType=='每月'">{{JSON.parse(item.objTime).month.toString()}}</span>
-                    <span class="normalBtn" v-if="JSON.parse(item.objTime).timeType=='每年'">{{JSON.parse(item.objTime).dateTime}}</span>
+                <div
+                  class="taskDiv"
+                  v-for="(item, index) in rwList"
+                  :key="index"
+                >
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="item.taskName"
+                    placement="top"
+                  >
+                    <span class="gdWidth">{{
+                      item.taskName
+                    }}</span> </el-tooltip
+                  >：
+                  <span class="normalBtn">{{
+                    JSON.parse(item.objTime).timeType
+                  }}</span>
+                  <span
+                    class="normalBtn"
+                    v-if="JSON.parse(item.objTime).timeType != '每小时'"
+                    >{{ JSON.parse(item.objTime).time }}</span
+                  >
+                  <span
+                    class="normalBtn"
+                    v-if="JSON.parse(item.objTime).timeType == '每周'"
+                    >{{ JSON.parse(item.objTime).week.toString() }}</span
+                  >
+                  <span
+                    class="normalBtn"
+                    v-if="JSON.parse(item.objTime).timeType == '每月'"
+                    >{{ JSON.parse(item.objTime).month.toString() }}</span
+                  >
+                  <span
+                    class="normalBtn"
+                    v-if="JSON.parse(item.objTime).timeType == '每年'"
+                    >{{ JSON.parse(item.objTime).dateTime }}</span
+                  >
                 </div>
-                
               </el-tab-pane>
               <el-tab-pane label="运行数据" name="third">
                 <!-- <span slot="label">
@@ -84,15 +111,15 @@
                 <div class="nowData">
                   <div>
                     <div>温度</div>
-                    <div>{{rightTempValue}}℃</div>
+                    <div>{{ rightTempValue }}℃</div>
                   </div>
                   <div>
                     <div>湿度</div>
-                    <div>{{rightWetValue}}%</div>
+                    <div>{{ rightWetValue }}%</div>
                   </div>
                   <div>
                     <div>露点温度</div>
-                    <div>{{rightDewValue}}℃</div>
+                    <div>{{ rightDewValue }}℃</div>
                   </div>
                 </div>
                 <h5 style="margin: 20px 0">历史定时任务数据</h5>
@@ -108,7 +135,8 @@
                         size="mini"
                         v-model="formTime.time"
                         type="date"
-                        placeholder="请选择">
+                        placeholder="请选择"
+                      >
                       </el-date-picker>
                     </el-form-item>
                     <el-form-item>
@@ -126,7 +154,10 @@
                         size="mini"
                         type="primary"
                         icon="el-icon-refresh-left"
-                        @click="formTime.time = '';getPoints()"
+                        @click="
+                          formTime.time = '';
+                          getPoints();
+                        "
                         >重置</el-button
                       >
                     </el-form-item>
@@ -153,13 +184,29 @@
                   ></el-table-column>
                   <el-table-column prop="time" label="检测时间" align="center">
                   </el-table-column>
-                  <el-table-column prop="device" label="设备编号" align="center">
+                  <el-table-column
+                    prop="device"
+                    label="设备编号"
+                    align="center"
+                  >
                   </el-table-column>
-                  <el-table-column prop="tempValue" label="温度(℃)" align="center">
+                  <el-table-column
+                    prop="tempValue"
+                    label="温度(℃)"
+                    align="center"
+                  >
                   </el-table-column>
-                  <el-table-column prop="wetValue" label="湿度(%)" align="center">
+                  <el-table-column
+                    prop="wetValue"
+                    label="湿度(%)"
+                    align="center"
+                  >
                   </el-table-column>
-                  <el-table-column prop="dewValue" label="露点温度(℃)" align="center">
+                  <el-table-column
+                    prop="dewValue"
+                    label="露点温度(℃)"
+                    align="center"
+                  >
                   </el-table-column>
                   <!-- <el-table-column
                     prop="houseName"
@@ -303,7 +350,12 @@
         </div>
       </el-dialog>
       <addDialog :dialogTitle="'设备基本信息'" ref="addDialog" />
-      <el-dialog title="检测详情" id="dialogStyle" width="800px" :visible.sync="checkDialog">
+      <el-dialog
+        title="检测详情"
+        id="dialogStyle"
+        width="800px"
+        :visible.sync="checkDialog"
+      >
         <!-- <detailTable ref="detailTable" :detail-table="checkInfo" :title="''" /> -->
         <div class="panel-height-add">
           <div style="padding: 2px">
@@ -385,7 +437,9 @@
         <div class="panel-height-add">
           <div style="padding: 2px">
             <div class="detBox">
-              <div class="title" v-for="(item, i) in checkInfo1" :key="i">{{item.title}}</div>
+              <div class="title" v-for="(item, i) in checkInfo1" :key="i">
+                {{ item.title }}
+              </div>
               <div
                 v-for="(item, i) in checkInfo1"
                 :key="i"
@@ -467,21 +521,21 @@
 <script>
 import addDialog from "../compontents/addDialog.vue";
 import api from "@/api";
-import mqtt from 'mqtt'
+import mqtt from "mqtt";
 
 import detailTable from "@/components/detailTable/index.vue";
-import log from '@/libs/util.log';
+import log from "@/libs/util.log";
 export default {
   name: "productInfo",
   components: { detailTable, addDialog },
   data() {
     return {
-   rightDewValue : 0,
-    rightTempValue : 0,
-    rightWetValue : 0,
-      alarmRecord:[],
-      pintsPageList:[],
-      rwList:[],
+      rightDewValue: null,
+      rightTempValue: null,
+      rightWetValue: null,
+      alarmRecord: [],
+      pintsPageList: [],
+      rwList: [],
       client: {},
       info: {},
       checkDialog: false,
@@ -560,14 +614,14 @@ export default {
       ],
       checkInfo1: [
         {
-          title:'设备1（编号/标识/设备名称）',
+          title: "设备1（编号/标识/设备名称）",
           name: "温度(℃)",
           val: [""],
           name1: "湿度(%RH)",
           val1: [""],
           name2: "露点温度(℃)",
           val2: [""],
-        }
+        },
       ],
       //分页
       pagination: {
@@ -600,10 +654,10 @@ export default {
   },
   created() {
     this.getBasic();
-    this.connect()
+    this.connect();
   },
-  destroyed(){
-    this.unconnect()
+  destroyed() {
+    this.unconnect();
   },
   methods: {
     connect() {
@@ -617,62 +671,66 @@ export default {
         //生产
         // username: "admin",
         // password: "admin@2Ld&DDrsk",
-        cleanSession : true,
-        keepAlive:60,
-        clientId: 'mqttjs_'+ Math.random().toString(16).substr(2, 8),
-        connectTimeout: 4000
-      }
+        cleanSession: true,
+        keepAlive: 60,
+        clientId: "mqttjs_" + Math.random().toString(16).substr(2, 8),
+        connectTimeout: 4000,
+      };
       //本地开发环境
-      this.client = mqtt.connect('ws://192.168.50.169:8083/mqtt',options);
+      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
       //测试环境
-        //  this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
-        //正式环境
-         // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
-      this.client.on("connect", (e)=>{
-        console.log("成功连接服务器:",e);
+      //  this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
+      //正式环境
+      // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
+      this.client.on("connect", (e) => {
+        console.log("成功连接服务器:", e);
         //订阅三个名叫'top/#', 'three/#'和'#'的主题
-        this.client.subscribe([
+        this.client.subscribe(
+          [
             // "/PUSH/c89512024085/DPUT/upload",
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
             "/PUSH/8951DQ2207200018/DPUT/upload",
-          ], { qos: 1 }, (err)=> {
-          if (!err) {
-            console.log("订阅成功");
-            //向主题叫“pubtop”发布一则内容为'hello,this is a nice day!'的消息
-            this.publish("pubtop", 'hello,this is a nice day!')
-          } else {
-            console.log('消息订阅失败！')
+          ],
+          { qos: 1 },
+          (err) => {
+            if (!err) {
+              console.log("订阅成功");
+              //向主题叫“pubtop”发布一则内容为'hello,this is a nice day!'的消息
+              this.publish("pubtop", "hello,this is a nice day!");
+            } else {
+              console.log("消息订阅失败！");
+            }
           }
-        });
+        );
       });
       //重新连接
-      this.reconnect()
+      this.reconnect();
       //是否已经断开连接
-      this.mqttError()
+      this.mqttError();
       //监听获取信息
-      this.getMessage()
+      this.getMessage();
     },
-//发布消息@topic主题  @message发布内容
-    publish(topic,message) {
+    //发布消息@topic主题  @message发布内容
+    publish(topic, message) {
       if (!this.client.connected) {
-        console.log('客户端未连接')
-        return
+        console.log("客户端未连接");
+        return;
       }
-      this.client.publish(topic,message,{qos: 1},(err) => {
-        if(!err) {
-          console.log('主题为'+topic+ "发布成功")
+      this.client.publish(topic, message, { qos: 1 }, (err) => {
+        if (!err) {
+          console.log("主题为" + topic + "发布成功");
         }
-      })
+      });
     },
-//监听接收消息
+    //监听接收消息
     getMessage() {
       this.client.on("message", (topic, message) => {
-        if(message) {
-          console.log('收到来着',topic,'的信息',message.toString())
-          const res = JSON.parse(message.toString())
-          this.runData=res.data
-          console.log(res, 'res',this.runData,'runData')
-          this.calcAve(this.runData)
+        if (message) {
+          console.log("收到来着", topic, "的信息", message.toString());
+          const res = JSON.parse(message.toString());
+          this.runData = res.data;
+          console.log(res, "res", this.runData, "runData");
+          this.calcAve(this.runData);
           // switch(topic) {
           //    case 'top/lll' :
           //      this.msg = res.msg
@@ -688,32 +746,31 @@ export default {
           //      this.msg = res
           //  }
           //  this.msg = message
-
         }
       });
     },
-//监听服务器是否连接失败
+    //监听服务器是否连接失败
     mqttError() {
-      this.client.on('error',(error) => {
-        console.log('连接失败：',error)
-        this.client.end()
-      })
+      this.client.on("error", (error) => {
+        console.log("连接失败：", error);
+        this.client.end();
+      });
     },
     unsubscribe() {
-      this.client.unsubscribe(this.mtopic, (error)=> {
-        console.log('主题为'+ this.mtopic+'取消订阅成功',error)
-      })
+      this.client.unsubscribe(this.mtopic, (error) => {
+        console.log("主题为" + this.mtopic + "取消订阅成功", error);
+      });
     },
-//断开连接
+    //断开连接
     unconnect() {
-      this.client.end()
-      this.client = null
-      console.log('服务器已断开连接！')
+      this.client.end();
+      this.client = null;
+      console.log("服务器已断开连接！");
     },
-//监听服务器重新连接
+    //监听服务器重新连接
     reconnect() {
-      this.client.on('reconnect', (error) => {
-          console.log('正在重连:', error)
+      this.client.on("reconnect", (error) => {
+        console.log("正在重连:", error);
       });
     },
     //公共方法计算平均值
@@ -725,24 +782,23 @@ export default {
       this.rightTempValue = 0;
       this.rightWetValue = 0;
 
-        arr.forEach((item) => {
-          avgNum++;
-          console.log(item, "item");
-          item.dewValue = parseInt(item.dewValue);
-          item.tempValue = parseInt(item.tempValue);
-          item.wetValue = parseInt(item.wetValue);
-          //露点均温
-          this.rightDewValue += item.dewValue;
-          //温度均温
-          this.rightTempValue += item.tempValue;
-          //湿度均温
-          this.rightWetValue += item.wetValue;
-          console.log(
-            this.rightDewValue,
-            this.rightTempValue,
-            this.rightWetValue
-          );
- 
+      arr.forEach((item) => {
+        avgNum++;
+        console.log(item, "item");
+        item.dewValue = parseInt(item.dewValue);
+        item.tempValue = parseInt(item.tempValue);
+        item.wetValue = parseInt(item.wetValue);
+        //露点均温
+        this.rightDewValue += item.dewValue;
+        //温度均温
+        this.rightTempValue += item.tempValue;
+        //湿度均温
+        this.rightWetValue += item.wetValue;
+        console.log(
+          this.rightDewValue,
+          this.rightTempValue,
+          this.rightWetValue
+        );
       });
       //取整
       console.log(this.rightDewValue, avgNum, "wwwwww");
@@ -858,34 +914,49 @@ export default {
     },
     tabsClick(v) {
       if (v.name == "fourth") {
-        this.$router.push({ path: "alarmRecord",query:{eqCode:this.$route.query.eqCode}});
-      }else if(v.name=="second"){
-        this.getRwList()
+        this.$router.push({
+          path: "alarmRecord",
+          query: { eqCode: this.$route.query.eqCode },
+        });
+      } else if (v.name == "second") {
+        this.getRwList();
       } else if (v.name == "third") {
-        this.getPoints()
+        this.getPoints();
       }
     },
-    getPoints(){
-      var condition = this.formTime;
+    getPoints() {
+      // var condition = this.formTime;
+      var condition = {
+        orgCode: localStorage.getItem("orgCode"),
+        labelCode: this.$route.query.labelCode,
+        device: this.$route.query.eqCode,
+        dataTime: this.formTime.time,
+      };
       condition = JSON.stringify(condition);
       var data = {
-          pageIndex: this.pagination2.curPage,
-          pageSize: this.pagination2.pageSize,
-          condition: condition,
-        };
-        api
-          .getPintsPageList(data)
-          .then((res) => {
-            if (res.code == 200) {
-              this.pintsPageList = res.data.records;
-              this.pagination2.pageSize = res.data.size;
-              this.pagination2.total = res.data.total;
-              this.calcAve( this.pintsPageList)
+        pageIndex: this.pagination2.curPage,
+        pageSize: this.pagination2.pageSize,
+        condition: condition,
+      };
+      api
+        .getPintsPageList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.pintsPageList = res.data.records;
+            this.pagination2.pageSize = res.data.size;
+            this.pagination2.total = res.data.total;
+            if (this.pintsPageList.length > 0) {
+              this.calcAve(this.pintsPageList);
+            } else {
+              this.rightDewValue = 0;
+              this.rightTempValue = 0;
+              this.rightWetValue = 0;
             }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     //获取定时任务列表数据
     getRwList() {
@@ -897,7 +968,7 @@ export default {
       //   condition: condition,
       // };
       api
-        .timingTaskEq(this.info.eqCode,localStorage.getItem("orgCode"))
+        .timingTaskEq(this.info.eqCode, localStorage.getItem("orgCode"))
         .then((res) => {
           if (res.code == 200) {
             this.rwList = res.data;
@@ -910,15 +981,13 @@ export default {
         });
     },
     //查询
-    search(){
-      
-    },
+    search() {},
     //重置
-    reset(){
-      this.formInline={}
+    reset() {
+      this.formInline = {};
     },
     //确定
-    sure(){},
+    sure() {},
     //表格序号
     indexMethod(index) {
       return (
@@ -996,16 +1065,16 @@ export default {
         }
       }
     }
-    .taskDiv{
+    .taskDiv {
       padding-bottom: 30px;
       padding-left: 100px;
-      .normalBtn{
+      .normalBtn {
         padding: 7px 15px;
         border-radius: 3px;
-        border:1px solid #DCDFE6;
+        border: 1px solid #dcdfe6;
         margin-right: 10px;
       }
-      .gdWidth{
+      .gdWidth {
         display: inline-block;
         position: absolute;
         text-align: right;
@@ -1016,7 +1085,6 @@ export default {
         text-overflow: ellipsis; /*超出部分文字以...显示*/
       }
     }
-
   }
 }
 ::v-deep .el-tabs {
@@ -1096,7 +1164,7 @@ export default {
     border-left: 1px solid #e6e6e6;
     border-top: 1px solid #e6e6e6;
     margin-bottom: 30px;
-    .title{
+    .title {
       background: #f3f3f3;
       line-height: 40px;
       border-bottom: 1px solid #e6e6e6;
@@ -1167,23 +1235,23 @@ export default {
     }
   }
 }
-.nowData{
+.nowData {
   display: flex;
-  >div{
+  > div {
     width: 200px;
     position: relative;
     text-align: center;
-    >div:nth-child(2){
+    > div:nth-child(2) {
       color: #008775;
       font-weight: bold;
       margin-top: 10px;
     }
   }
-  >div:not(:last-child)::after{
+  > div:not(:last-child)::after {
     content: "";
     width: 1px;
     height: 20px;
-    background-color: #EBEEF5;
+    background-color: #ebeef5;
     position: absolute;
     right: 0;
     top: 50%;

src/views/demo/productManage/productInfo/index.vue

@@ -132,6 +132,90 @@
                 </div>
               </el-tab-pane>
               <el-tab-pane label="运行数据" name="second">
+
+                <el-tabs v-model="runDataActiveName" @tab-click="runDataClick">
+    <el-tab-pane label="实时数据" name="realData">
+      <h5 style="margin: 20px 0">历史定时任务数据</h5>
+      <div class="topCalc">
+        <div class="temp">
+          <div class="tempName">
+            <div>
+              <img src="../../../../assets/images/temp.png" alt="" style="width:10px;height:15px;">
+            </div>
+            <div>温度 (℃)</div>
+          </div>
+          <div class="tempDetail">
+            <div class="bottom">
+              <div>最高</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>最低</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>平均</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+          </div>
+        </div>
+
+
+        <div class="temp">
+          <div class="tempName">
+            <div>
+              <img src="../../../../assets/images/wet.png" alt="" style="width:10px;height:15px;">
+            </div>
+            <div>湿度 (%RH)</div>
+          </div>
+          <div class="tempDetail">
+            <div class="bottom">
+              <div>最高</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>最低</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>平均</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+          </div>
+        </div>
+
+
+        <div class="temp">
+          <div class="tempName">
+            <div>
+              <img src="../../../../assets/images/dew.png" alt="" style="width:10px;height:15px;">
+            </div>
+            <div>露点温度 (℃)</div>
+          </div>
+          <div class="tempDetail">
+            <div class="bottom">
+              <div>最高</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>最低</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+            <div class="Separator"></div>
+            <div class="bottom">
+              <div>平均</div>
+              <div style="color:#008775;font-size:16px;font-weight: bolder;">28.4</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="历史定时任务" name="hisTask">
                 <h5 style="margin: 20px 0">历史定时任务数据</h5>
                 <div class="flex-between">
                   <el-form
@@ -253,7 +337,10 @@
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="pagination2.total"
                 >
-                </el-pagination>
+                </el-pagination></el-tab-pane>
+  
+  </el-tabs>
+
               </el-tab-pane>
 
               <el-tab-pane label="报警记录" name="fourth"></el-tab-pane>
@@ -527,6 +614,8 @@ export default {
   components: { detailTable ,addDialog},
   data() {
     return {
+      runDataActiveName:'realData',
+      title:"",
       devSum:'',
       runData:[{}],
       checkDialog:false,
@@ -899,7 +988,7 @@ export default {
       if(v.name=='fourth'){
         this.$router.push({ path: "alarmRecord" ,query:{proCode:this.$route.query.proCode} })
       }else if(v.name=='second'){
-        this.getRun()
+        // this.getRun()
       }else if(v.name=='third'){
         this.getList()
         this.getList1()
@@ -968,6 +1057,13 @@ export default {
       this.pagination2.curPage = val;
       this.getRun();
     },
+    runDataClick(tab){
+      if(tab.name=="realData"){
+
+      }else{
+        this.getRun()
+      }
+    }
   },
   mounted() {},
 };
@@ -1010,6 +1106,49 @@ export default {
         }
       }
     }
+    .topCalc{
+     display:flex;
+
+    .temp{
+      width: 250px;
+    height: 110px;
+    background-color:rgba(240, 240, 240, 1);
+    border:2px solid rgba(230, 230, 230, 1);
+      display: flex;
+    flex-direction: column;
+    font-size: 12px;
+    margin-right:20px;
+  
+    .tempName{
+      height: 35px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color:#000000;
+    border-bottom:2px solid rgba(230, 230, 230, 1);
+
+    
+
+    }
+    .tempDetail{
+    height: 75px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    .bottom{
+      height: 50px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    }
+    .Separator{
+      height:15px;
+      border:1px solid rgba(230, 230, 230, 1);
+    }
+    }
+    }
+   
+    }
   }
 }
 ::v-deep .el-tabs {

src/views/system/visualized/index.vue

@@ -288,8 +288,8 @@
         </div>
 
         <div class="left-bottom">
-          <lsyj></lsyj>
-          <yjxx></yjxx>
+          <lsyj v-bind:cfCode="cfCode" ref="lsyjCharts"></lsyj>
+          <yjxx ></yjxx>
           <wsdbh></wsdbh>
           <cn-temp></cn-temp>
         </div>
@@ -323,7 +323,7 @@ export default {
 
       tableDataLength: null,
       //下拉选选中的code
-      cfCode: "",
+      cfCode: null,
       //仓房列表
       deviceLists: [],
       //设备在线
@@ -429,7 +429,9 @@ export default {
     cfChange(val) {
       console.log(val, "val..");
       this.cfCode = val;
+      console.log(this.cfCode,"选择的code")
       this.getPointList();
+      this.$refs.lsyjCharts.getHisWarning()
     },
     connect() {
       let options = {
@@ -593,7 +595,7 @@ export default {
               },
               //资料管理的大小
               b: {
-                fontSize: 14,
+                fontSize: 12,
                 color: "#c2f3ff",
                 padding: [10, 0],
               },
@@ -606,6 +608,7 @@ export default {
             },
           },
         },
+       
         // legend: {
         //   type: "plain",
         //   orient: "vertical",
@@ -873,16 +876,16 @@ export default {
             center: ["50%", "50%"],
             startAngle: 0,
             endAngle: 359.9,
-            splitNumber: 128, //改变小格子宽度
+            splitNumber: 28, //改变小格子宽度
             hoverAnimation: true,
             axisTick: {
               show: false,
             },
             splitLine: {
-              length: 57,
+              length: 67,
               lineStyle: {
-                width: 5,
-                color: "#01423b", //改变小格子的线颜色
+                width: 2,
+                color: "#0e352e", //改变小格子的线颜色
               },
             },
             axisLabel: {
@@ -907,18 +910,16 @@ export default {
             ],
           },
         ],
-      };
-      setTimeout(() => {
-        that.sdtjAngle = that.sdtjAngle + 3;
-        myChart3.setOption(option, true);
-      }, 500);
-
-      window.addEventListener("resize", () => {
-        setTimeout(() => {
-          myChart3.resize();
-        }, 1000);
-      });
-    },
+ 
+
+
+      
+    }
+
+
+    that.sdtjAngle = that.sdtjAngle + 3,
+        myChart3.setOption(option, true)
+  },
 
     //点位列表
     getPointList() {
@@ -1139,11 +1140,6 @@ export default {
       });
       $(".area").mouseleave((e) => {
         this.isHover = false;
-        // $("#imgPoint").css({
-        //   top: top,
-        //   left: left,
-        // })
-        // $("#scrollDiv").hide();
       });
     },
     scale() {
@@ -1206,10 +1202,7 @@ export default {
   },
   created() {
     this.connect();
-    // setInterval(() =>{
-    //   //用setInterval做动画感觉有问题
-    //   this.drawSdtj();
-    // }, 6000);
+  
     api
       .equipmentTagList({ curPage: 1, pageSize: 99999 })
       .then((res) => {
@@ -1218,6 +1211,12 @@ export default {
           if (res.data.records.length > 1) {
             this.deviceLists = res.data.records;
             this.form.cfValue = res.data.records[0].labelCode;
+            this.cfCode=res.data.records[0].labelCode;
+            console.log(this.cfCode,"初始化仓房code")
+             //点位列表初始化
+           this.getPointList();
+           this.$refs.lsyjCharts.getHisWarning()
+           console.log("到这儿了。。。")
           }
         }
       })
@@ -1229,8 +1228,11 @@ export default {
     this.unconnect();
   },
   mounted() {
-    //点位列表初始化
-    this.getPointList();
+    //   setInterval(() =>{
+    //   //用setInterval做动画感觉有问题
+    //   this.drawSdtj();
+    // }, 100);
+   
     // this.getWsdAlarmParams();
     this.getTempWetStatus();
     this.addArea();
@@ -1250,7 +1252,7 @@ export default {
 
   padding: 10px;
   display: flex;
-  // background: #2c695f;
+  // background: #0e352e;
   background: url("../../../assets/images/bigScreen/bg.png") no-repeat;
   background-size: cover;
   .screen-left {

src/views/system/visualized/lsyj/index.vue

@@ -16,6 +16,12 @@
 import * as echarts from "echarts";
 import api from "@/api";
 export default {
+  props:{
+    cfCode:{
+      type:String,
+      required:true
+    }
+  },
     data(){
         return{
          lsyjData:[],
@@ -27,11 +33,13 @@ export default {
        //历史月趋势
     getHisWarning() {
       let params = {
-        labelCode: "307038864601222",
+        labelCode:this.cfCode,
+  
         orgCode: localStorage.getItem("orgCode"),
 
         round: 2,
       };
+      console.log(params,"yuequ")
       api.hisWarning(params).then((res) => {
         console.log(res, "月趋势");
         if(res.code==200){
@@ -160,11 +168,14 @@ export default {
         }
     },
     created(){
-    
-        this.getHisWarning()
+   
+        //this.getHisWarning()
   
    
        
+    },
+    mounted(){
+      console.log(this.cfCode,"创建时的cfCode")
     }
 }