Skip to content

V
voltaic2
Commit 44359ce9 authored by limeimei's avatar limeimei
Browse files
Options

更新

parent 7e71ce5e
Pipeline #2367 canceled with stages
      Expand all Show whitespace changes
      Inline Side-by-side
      Showing with 9538 additions and 78 deletions
      package-lock.json
      View file @ 44359ce9
      This diff is collapsed.
      package.json
      View file @ 44359ce9
      ...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
      "dependencies": { "dependencies": {
      "axios": "^1.6.7", "axios": "^1.6.7",
      "core-js": "^3.8.3", "core-js": "^3.8.3",
      "crypto-js": "^4.2.0",
      "element-ui": "^2.15.14", "element-ui": "^2.15.14",
      "vue": "^2.6.14", "vue": "^2.6.14",
      "vue-router": "^3.5.1" "vue-router": "^3.5.1"
      ......
      src/components/direct.vue
      View file @ 44359ce9
      <template> <template>
      <div class="wrapper"> <div class="wrapper">
      <div class="top"> <div class="top">
      <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">GG2301AZ93</span></div>
      <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">在线</span></div>
      <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">{{currentDevice.temperature}}</span></div>
      <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">{{currentDevice.power}}</span></div>
      </div> </div>
      <el-button @click="getList">123</el-button>
      <div class="center"> <div class="center">
      <div v-for="item in list" :key="item.id"> <div v-for="item in list" :key="item.id">
      <div class="center_item"> <div class="center_item">
      <el-button type="primary">通道{{item.id +1}}</el-button> <el-button type="primary">通道{{item.id +1}}</el-button>
      <div class="item_table_w"> <div class="item_table_w">
      <div class="item_table"> <div class="item_table">
      <div class="item_text"><span style="margin-right: 37px;">电流</span> <span>14A</span> <div class="item_text"><span style="margin-right: 37px;">电流</span> <span>{{item.electric}}A</span>
      </div> </div>
      <div class="item_text2"><span style="margin-right: 37px;">电压</span><span>14A</span> </div> <div class="item_text2"><span style="margin-right: 37px;">电压</span><span>{{item.voltage}}V</span> </div>
      </div> </div>
      <img src="@/assets/img/box.png" alt="" class="item_img"> <img src="@/assets/img/box.png" alt="" class="item_img">
      </div> </div>
      ...@@ -31,34 +30,36 @@ ...@@ -31,34 +30,36 @@
      data() { data() {
      return { return {
      list: [], list:[],
      currentDevice:{power:'',temperature:''}
      }; };
      }, },
      created() { created() {
      // this.getList() this.getList()
      }, },
      methods: { methods: {
      getList() { getList() {
      console.log(localStorage.getItem('token'))
      // return // return
      http.post("/sys/dev/sn/model/list", { http.post("/sys/dev/device/runtime/list", {
      // currentPage: 1, currentPage: 1,
      // deviceName: '6D8X05-X5NAGR', deviceName: '6D8X05-X5NAGR',
      // identifier: 'gfTemperatureHumidity', identifier: 'gfConfluenceMachine',
      // productKey: '1TOMLS7WC58409644', productKey: '1TOMLS7WC58409644',
      // type: 'event' type: 'event'
      }).then((res) => { }).then((res) => {
      if (res.code == 200) { if (res.code == 200) {
      this.currentDevice={power:res.data.list[0].value.totalPower,
      temperature:res.data.list[0].value.temperature}
      let arr = res.data.list[0].value.allPathElect let arr = res.data.list[0].value.allPathElect
      let arr2 = res.data.list[0].value.allPathPower let arr2 = res.data.list[0].value.allPathPower
      arr.map((item, index) => { arr.map((item, index) => {
      if(index<16)
      this.list.push({ id: index, voltage: arr2[index], electric: item }) this.list.push({ id: index, voltage: arr2[index], electric: item })
      }) })
      ...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
      <style scoped> <style scoped>
      .wrapper { .wrapper {
      background: #F4F7FC; background: #F4F7FC;
      height: 100vh; min-height: 100vh;
      padding: 40px; padding: 40px;
      } }
      ...@@ -113,6 +114,7 @@ ...@@ -113,6 +114,7 @@
      background: #FFFFFF; background: #FFFFFF;
      display: flex; display: flex;
      margin-top: 40px; margin-top: 40px;
      flex-wrap: wrap;
      } }
      .center_item { .center_item {
      ......
      src/components/exchange.vue
      View file @ 44359ce9
      <template> <template>
      <div class="wrapper"> <div class="wrapper">
      <div class="top"> <div class="top">
      <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">GG23017NLX</span></div>
      <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">在线</span></div>
      <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">{{currentDevice.temperature}}</span></div>
      <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">{{currentDevice.power}}</span></div>
      </div> </div>
      <div class="center"> <div class="center">
      <img src="@/assets/img/clock.png" alt="" class="item_img"> <img src="@/assets/img/clock.png" alt="" class="item_img">
      {{allPathElect.electA}}A
      {{allPathElect.electB}}A
      {{allPathElect.electC}}A
      </div> </div>
      </div> </div>
      </template> </template>
      ...@@ -18,36 +21,49 @@ ...@@ -18,36 +21,49 @@
      data() { data() {
      return { return {
      list: [],
      currentDevice:{power:'',temperature:''},
      allPathElect:{},
      }; };
      }, },
      created() { created() {
      // this.getList() this.getDevice()
      this.getList()
      }, },
      methods: { methods: {
      getList() { getDevice() {
      console.log(localStorage.getItem('token'))
      // return // return
      http.post("/sys/dev/device/runtime/list", { http.post("/sys/dev/device/runtime/list", {
      currentPage: 1, currentPage: 1,
      deviceName: '6D8X05-X5NAGR', deviceName: '4NRVXE-STZ6RO',
      identifier: 'gfConfluenceMachine', identifier: 'gfConfluenceMachine',
      productKey: '1TOMLS7WC58409644', productKey: '1TOMLS7WC58409644',
      type: 'event' type: 'event'
      }).then((res) => { }).then((res) => {
      if (res.code == 200) { if (res.code == 200) {
      let arr = res.data.list[0].value.allPathElect this.currentDevice={power:res.data.list[0].value.totalPower,
      let arr2 = res.data.list[0].value.allPathPower temperature:res.data.list[0].value.temperature}
      arr.map((item, index) => {
      this.list.push({ id: index, voltage: arr2[index], electric: item })
      }) }
      });
      },
      getList() {
      http.post("/sys/dev/device/runtime/list", {
      currentPage: 1,
      deviceName: '4NRVXE-STZ6RO',
      identifier: 'gfDigitalMachine',
      productKey: '1TOMLS7WC58409644',
      type: 'event'
      }).then((res) => {
      if (res.code == 200) {
      this.allPathElect=res.data.list[0].value
      } }
      }); });
      ......
      src/components/grid.vue
      View file @ 44359ce9
      <template> <template>
      <div class="wrapper"> <div class="wrapper">
      <div class="top"> <div class="top">
      <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备SN</span><span class="top_item_con">GG23015K0C</span></div>
      <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备状态</span><span class="top_item_con">在线</span></div>
      <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备温度</span><span class="top_item_con">{{currentDevice.temperature}}</span></div>
      <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">1111</span></div> <div class="top_item"><span class="top_item_title">设备总功率</span><span class="top_item_con">{{currentDevice.power}}</span></div>
      </div> </div>
      <!-- <div class="center"> <!-- <div class="center">
      <img src="@/assets/img/clock.png" alt="" class="item_img"> <img src="@/assets/img/clock.png" alt="" class="item_img">
      ...@@ -18,37 +18,31 @@ ...@@ -18,37 +18,31 @@
      data() { data() {
      return { return {
      list: [], currentDevice:{power:'',temperature:''}
      }; };
      }, },
      created() { created() {
      // this.getList() this.getList()
      }, },
      methods: { methods: {
      getList() { getList() {
      console.log(localStorage.getItem('token'))
      // return
      http.post("/sys/dev/device/runtime/list", { http.post("/sys/dev/device/runtime/list", {
      currentPage: 1, currentPage: 1,
      deviceName: '6D8X05-X5NAGR', deviceName: 'ONMTC3-54UE0J',
      identifier: 'gfConfluenceMachine', identifier: 'gfConfluenceMachine',
      productKey: '1TOMLS7WC58409644', productKey: '1TOMLS7WC58409644',
      type: 'event' type: 'event'
      }).then((res) => { }).then((res) => {
      if (res.code == 200) { if (res.code == 200) {
      let arr = res.data.list[0].value.allPathElect
      let arr2 = res.data.list[0].value.allPathPower
      arr.map((item, index) => {
      this.list.push({ id: index, voltage: arr2[index], electric: item })
      })
      this.currentDevice={power:res.data.list[0].value.totalPower,
      temperature:res.data.list[0].value.temperature}
      } }
      }); });
      }, },
      ......
      src/utils/http.js
      View file @ 44359ce9
      ...@@ -14,15 +14,16 @@ const http = { ...@@ -14,15 +14,16 @@ const http = {
      get(url, params) { get(url, params) {
      const config = { const config = {
      method: "get", method: "get",
      url: baseURL + url, url: url,
      }; };
      if (params) config.params = params; if (params) config.data = params;
      return request(config); return request(config);
      }, },
      post(url, params) { post(url, params) {
      const config = { const config = {
      method: "post", method: "Post",
      url: url, url: url,
      }; };
      if (params) config.data = params; if (params) config.data = params;
      return request(config); return request(config);
      ......
      src/utils/request.js
      View file @ 44359ce9
      ...@@ -5,6 +5,7 @@ import http from "./http"; ...@@ -5,6 +5,7 @@ import http from "./http";
      import router from "../router"; import router from "../router";
      // 使用element-ui Message做消息提醒 // 使用element-ui Message做消息提醒
      import { Message } from "element-ui"; import { Message } from "element-ui";
      import CryptoJS from 'crypto-js';
      //1. 创建新的axios实例， //1. 创建新的axios实例，
      const service = axios.create({ const service = axios.create({
      // 公共接口 // 公共接口
      ...@@ -12,31 +13,37 @@ const service = axios.create({ ...@@ -12,31 +13,37 @@ const service = axios.create({
      // 超时时间 单位是ms，这里设置了3s的超时时间 // 超时时间 单位是ms，这里设置了3s的超时时间
      timeout: 10 * 1000, timeout: 10 * 1000,
      }); });
      // 2.请求拦截器 // 2.请求拦截器
      service.interceptors.request.use( service.interceptors.request.use(
      (config) => { (config) => {
      console.log(1111111);
      //发请求前做的一些处理，数据转化，配置请求头，设置token,设置loading等，根据需求去添加 //发请求前做的一些处理，数据转化，配置请求头，设置token,设置loading等，根据需求去添加
      config.data = JSON.stringify(config.data); //数据转化,也可以使用qs转换 config.data = JSON.stringify(config.data); //数据转化,也可以使用qs转换
      config.headers = { config.headers = {
      "Content-Type": "application/json", //配置请求头 "Content-Type": "application/json", //配置请求头
      }; };
      // 这里可以用本地储存去拿token // 这里可以用本地储存去拿token
      const token = localStorage.getItem("token"); //localStorage const token = localStorage.getItem("token")?localStorage.getItem("token"):''; //localStorage
      // const session = sessionStorage.getItem('token') //sessionStorage
      console.log(33333333)
      let TimeStamp = new Date().getTime(); let TimeStamp = new Date().getTime();
      // console.log(token); let src = `token=${token}&&timeStamp=${TimeStamp}`;
      let HmacSHA1 = CryptoJS.HmacSHA1(src, '90d2fca50ea8ed5472c5776c9fc53638').toString();
      if (token) { if (token) {
      config.headers={
      "Content-Type": "application/json",
      Authorization: "Bearer " + token,
      Sign: HmacSHA1,
      TimeStamp,
      let src = `token=${token}&&timeStamp=${TimeStamp}`; };
      return config
      } }
      let HmacSHA1 = CryptoJS.HmacSHA1(src, '90d2fca50ea8ed5472c5776c9fc53638').toString(); // else
      return config; return config;
      }, },
      (error) => { (error) => {
      ...@@ -73,7 +80,6 @@ service.interceptors.response.use( ...@@ -73,7 +80,6 @@ service.interceptors.response.use(
      return response.data; return response.data;
      }, },
      (error) => { (error) => {
      console.log(error)
      /***** 接收到异常响应的处理开始 *****/ /***** 接收到异常响应的处理开始 *****/
      if (error && error.response) { if (error && error.response) {
      // 1.公共错误处理 // 1.公共错误处理
      ...@@ -120,7 +126,6 @@ service.interceptors.response.use( ...@@ -120,7 +126,6 @@ service.interceptors.response.use(
      error.message = `连接错误${error.response.status}`; error.message = `连接错误${error.response.status}`;
      } }
      } else { } else {
      // console.log(error)
      // 超时处理 // 超时处理
      if (JSON.stringify(error).includes("timeout")) { if (JSON.stringify(error).includes("timeout")) {
      Message.error("服务器响应超时，请刷新当前页"); Message.error("服务器响应超时，请刷新当前页");
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment