再登大屏显示修改

2023-05-12 16:58:35 +08:00 · 2023-05-12 16:58:35 +08:00 · 5cccdf2e29
commit 5cccdf2e29
parent eec6a1914b
5 changed files with 63 additions and 18 deletions
--- a/src/assets/css/iconfont.css
+++ b/src/assets/css/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 3879194 */
-  src: url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.woff2?t=1679810021855') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.woff?t=1679810021855') format('woff'),
-       url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.ttf?t=1679810021855') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff2?t=1683879014134') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff?t=1683879014134') format('woff'),
+       url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.ttf?t=1683879014134') format('truetype');
 }

 .iconfont {
@ -13,6 +13,10 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-zhongyingwen:before {
+  content: "\e607";
+}
+
 .icon-baojingxinxi:before {
  content: "\e636";
 }
--- a/src/views/Temp/GetonAgain/index.vue
+++ b/src/views/Temp/GetonAgain/index.vue
@ -14,9 +14,9 @@
        <header2
          ref="headerref"
          :width="'100%'"
-          :height="'100px'"
+          :height="'150px'"
          :title="'再登-环境物联管理系统'"
-          :titleTip="[]"
+          :titleTip="titleTip"
          :typeFun="['time']"
          :alarmType="[]"
        ></header2>
@ -67,8 +67,22 @@ import { getSensorByDept } from "@/http/PaintShopView/index";
 import bottom from "./bottom.vue";
 import right from "./right.vue";
 import top from "./top.vue";
-import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+import { useI18n } from "vue-i18n";
+let { t } = useI18n();
+let titleTip = [
+  {
+    color: "#E43961",
+    name: t("messages.abnormal"),
+  },
+  {
+    color: "#20AEC5",
+    name: t("messages.NoAbnormal"),
+  },
+  {
+    color: "#A7A6BD",
+    name: t("messages.disconnection"),
+  },
+];
 const store = Offsite();
 let Acontent = ref();
 let time = ref(null);
@ -89,7 +103,9 @@ async function getSensorByDeptfun() {

  if (result.code == 200) {
    topref.value.setcontentData(result.data);
-    bottomref.value.setcontentData({power: {"5月": 445, "4月":1102 , "3月": 1861, "2月": 1754, "1月": 1344}});
+    bottomref.value.setcontentData({
+      power: { "5月": 445, "4月": 1102, "3月": 1861, "2月": 1754, "1月": 1344 },
+    });
    // bottomref.value.setcontentData(result.data);
    rightref.value.setcontentData(result.data);
  }
@ -100,11 +116,17 @@ function getWebsocket(val) {
    let data = JSON.parse(val);
    if (data.type == "electronicView") {
      // store.changenoise(data.msg);
-
      topref.value.setcontentData(data.msg);
      bottomref.value.setcontentData(data.msg);
      rightref.value.setcontentData(data.msg);
    }
+    if (data.type == "dust") {
+      if (data.msg.devId == "ae578cd0-efd1-11ed-b2ee-2d727e0cafab") {
+        rightref.value.setcontentData({
+          dust: { pm25: data.msg.pm25, pm10: data.msg.pm10 },
+        });
+      }
+    }
  } catch (err) {}
 }
 function errWebsocket(val) {
@ -166,7 +188,7 @@ onUnmounted(() => {
 .content {
  display: flex;
  width: 100%;
-  --header: 100px;
+  --header: 150px;
  height: calc(1080px - var(--header));
 }
 </style>
--- a/src/views/Temp/GetonAgain/right.vue
+++ b/src/views/Temp/GetonAgain/right.vue
@ -198,8 +198,10 @@ let {t} = useI18n();
      
      // Productionref.value.changeData(ProductionOption.option)
      // pmref.value.setData({two:10,ten:10})
-      pm25ref.value.setData(10)
-      pm10ref.value.setData(10)
+      console.log(val);
+      
+      pm25ref.value.setData(val.dust.pm25)
+      pm10ref.value.setData(val.dust.pm10)
      // pmref.value.setData({two:val.dust.pm25,ten:val.dust.pm10})
  }
  onMounted(() => {
--- a/src/views/Temp/GetonAgain/top.vue
+++ b/src/views/Temp/GetonAgain/top.vue
@ -260,8 +260,10 @@ const powerBox = (width: any, height: any) => {
 //   }
  function setcontentData(val){
    // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-    verticalNum4.value.setData(val.noise,'icon-shengyin',120,"dB")
-    verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
+    // verticalNum4.value.setData(val.noise,'icon-shengyin',120,"dB")
+    // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"ppm")
+    verticalNum4.value.setData(52,'icon-shengyin',120,"dB")
+    verticalNum5.value.setData(100,'icon-yanwubaojingqi',200,"ppm")
    // verticalNum6.value.setData(val.TVOC_CH2O.CH2O,'icon-app_icons--',5,"mg/m3")
    // verticalNum7.value.setData(val.TVOC_CH2O.TVOC,'icon-TVOC-Outlined',5,"PPM")
    // console.log(pmref.value);
--- a/src/views/index.vue
+++ b/src/views/index.vue
@ -11,14 +11,15 @@
 <template>
  <div :class="$style['container']" ref="appRef">
    <div class="navbar">
-      <el-dropdown effect="dark" @command="changelang">
+      <el-dropdown effect="dark" @command="changelang" >
    <span class="el-dropdown-link">
-      {{ lang }}
+      <!-- <img src="../assets/svg/gateway.svg" alt="" class="langimg" height="20px" width="20px"> -->
+      <i class="iconfont icon-zhongyingwen langimg"></i>
    </span>
    <template #dropdown>
      <el-dropdown-menu>
-        <el-dropdown-item command="简体中文">简体中文</el-dropdown-item>
-        <el-dropdown-item command="English/USD">English/USD</el-dropdown-item>
+        <el-dropdown-item :class="'简体中文' == lang?'select':'' " command="简体中文">简体中文</el-dropdown-item>
+        <el-dropdown-item :class="'English/USD' == lang?'select':'' " command="English/USD">English/USD</el-dropdown-item>
      </el-dropdown-menu>
    </template>
  </el-dropdown>
@ -52,6 +53,7 @@ import { ref, onMounted, onUnmounted } from "vue";
 import list from "@/components/assembly/indexList.vue";
 import { useI18n } from "vue-i18n";
 import { getStoredLanguage, saveStoredLanguage } from "@/utils/languageStorage";
+let langicon=require("@/assets/svg/language.svg")
 window.document.title = "大屏物联管理系统";
 let { t } = useI18n();
 let routerList = [
@ -274,6 +276,7 @@ let routerList = [
 ];
 let lang=ref(getStoredLanguage()||'简体中文')
 function changelang(val){
+
 saveStoredLanguage(val)
 location.reload()
 }
@ -288,6 +291,13 @@ onUnmounted(() => {});
 }
 </style>
 <style scoped>
+@import '../assets/css/iconfont.css';
+.langimg{
+  width: 50px;
+  height: 50px;
+  font-size: 50px;
+  color: #fff;
+}
 .itemlist {
  height: 1030px;
  width: 1920px;
@ -313,6 +323,7 @@ onUnmounted(() => {});
  font-size: 30px;
  color: #fff;
 }
+
 .el-dropdown-menu {
  background-color: #303133 !important;
  color: #fff;
@ -324,6 +335,10 @@ onUnmounted(() => {});
  background-color: #303133 !important;
  color: #fff;
 }
+:deep(.select) {
+  background-color: #e4f5f5 !important;
+  color: #409EFF !important;
+}
 </style>
 <style>
 body {