修复滚动相关

.idea/workspace.xml

@@ -2,21 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="819ecefb-6243-4a26-9d25-b85c9c1e5444" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/.env.development" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Header.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Header.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/LabStats/BasicStats.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/BasicStats.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/LabStats/DeviceStats.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/DeviceStats.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/components/LabStats/EnvSensing.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/EnvSensing.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/LabStats/EquipmentStats.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/EquipmentStats.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/LabStats/PersonStats.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/PersonStats.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/components/LabStats/RiskWarning.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/RiskWarning.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/LabStats/SafetyLevel.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LabStats/SafetyLevel.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/VideoMonitor/BuildingNav.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/VideoMonitor/BuildingNav.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/VideoMonitor/VideoGrid.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/VideoMonitor/VideoGrid.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/utils/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/request.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/vue.config.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -33,25 +22,114 @@
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="2" />
+          <entry key="project.open.time.0" value="1" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.opened" value="3" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="js" value="1" />
+          <entry key="json" value="1" />
+          <entry key="vue" value="9" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="JSON" value="1" />
+          <entry key="JavaScript" value="1" />
+          <entry key="Vue.js" value="9" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="js" value="9" />
+          <entry key="vue" value="100" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JavaScript" value="9" />
+          <entry key="Vue.js" value="100" />
         </counts>
       </usages-collector>
     </session>
   </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/package.json">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/components/LabStats/BasicStats.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-90" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/api/index.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="509">
+              <caret line="50" column="19" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/components/LabStats/EnvSensing.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="49" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/components/LabStats/RiskWarning.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="5" column="31" lean-forward="true" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>getTriggerInfo</find>
       <find>mqtt</find>
+      <find>wrapResult</find>
+      <find>sensorList</find>
+      <find>/labScreen/riskWarning</find>
+      <find>getSafetyLevelStats</find>
+      <find>list</find>
+      <find>实验室安全分级统计</find>
+      <find>实验室实时风险预警</find>
+      <find>displayList</find>
     </findStrings>
     <dirStrings>
       <dir>E:\git\2021项目\anKeYuan1080\src</dir>
+      <dir>E:\git\2021项目\anKeYuan1080\src\components\LabStats</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/api/index.js" />
+        <option value="$PROJECT_DIR$/src/components/LabStats/SafetyLevel.vue" />
+        <option value="$PROJECT_DIR$/src/components/LabStats/EnvSensing.vue" />
+        <option value="$PROJECT_DIR$/src/components/LabStats/RiskWarning.vue" />
+      </list>
+    </option>
+  </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER">
     <package-json value="$PROJECT_DIR$/package.json" />
@@ -87,11 +165,6 @@
               <item name="anKeYuan1080" type="b2602c69:ProjectViewProjectNode" />
               <item name="anKeYuan1080" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="anKeYuan1080" type="b2602c69:ProjectViewProjectNode" />
-              <item name="anKeYuan1080" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -100,9 +173,10 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../v3-PC端" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="nodejs_package_manager_path" value="npm" />
     <property name="prettierjs.PrettierConfiguration.Package" value="E:\git\2021项目\anKeYuan1080\node_modules\prettier" />
   </component>
   <component name="RunDashboard">
@@ -117,6 +191,23 @@
       </list>
     </option>
   </component>
+  <component name="RunManager">
+    <configuration name="serve" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="serve" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="npm.serve" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -129,14 +220,16 @@
       <updated>1773912834911</updated>
       <workItem from="1773912836836" duration="662000" />
       <workItem from="1773914515310" duration="92000" />
+      <workItem from="1774227844656" duration="2280000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="754000" />
+    <option name="totallyTimeSpent" value="3034000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -144,7 +237,7 @@
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32899022" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -164,4 +257,51 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/BasicStats.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-90" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/DeviceStats.vue">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/EquipmentStats.vue">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/PersonStats.vue">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/api/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="509">
+          <caret line="50" column="19" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/SafetyLevel.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1260">
+          <caret line="43" column="19" lean-forward="true" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/EnvSensing.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="49" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/LabStats/RiskWarning.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="5" column="31" lean-forward="true" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+  </component>
 </project>

src/api/index.js

@@ -87,7 +87,8 @@ export async function getEnvSensingList() {
         humidity: humS ? humS.deviceValue : '-',
         tvoc: tvocS ? tvocS.deviceValue : '-',
         co2: { value: co2S ? co2S.deviceValue : '-', warn: co2S ? !co2S.operatingState : false },
-        o2: { value: o2S ? o2S.deviceValue : '-', warn: o2S ? !o2S.operatingState : false }
+        o2: { value: o2S ? o2S.deviceValue : '-', warn: o2S ? !o2S.operatingState : false },
+        sensorList:r.sensorList
       }
     })
     return wrapResult({ list })

src/components/LabStats/EnvSensing.vue

@@ -9,15 +9,15 @@
           <div class="sensor-item" v-for="(item, idx) in displayList" :key="idx">
             <div class="lab-name">{{ item.lab }}<span class="lab-unit">{{ item.dept }}</span></div>
             <div class="sensor-values">
-              <span class="sensor-val">温度:{{ item.temp }}°C</span>
-              <span class="sensor-val">湿度:{{ item.humidity }}%</span>
-              <span class="sensor-val">TVOC {{ item.tvoc }}mg/m³</span>
-              <span class="sensor-val" :class="{ alarm: item.co2.warn }">
-                <span v-if="item.co2.warn" class="alarm-icon">⚠</span>CO₂ {{ item.co2.value }}ppm
-              </span>
-              <span class="sensor-val" :class="{ alarm: item.o2.warn }">
-                <span v-if="item.o2.warn" class="alarm-icon">⚠</span>O₂ {{ item.o2.value }}%
-              </span>
+              <span class="sensor-val" v-for="(minItem,minIndex) in item.sensorList" :key="minIndex">{{ minItem.deviceName }}:{{ minItem.deviceValue?minItem.deviceValue:'-' }}{{ minItem.unit }}</span>
+              <!--<span class="sensor-val">湿度:{{ item.humidity }}%</span>-->
+              <!--<span class="sensor-val">TVOC {{ item.tvoc }}mg/m³</span>-->
+              <!--<span class="sensor-val" :class="{ alarm: item.co2.warn }">-->
+                <!--<span v-if="item.co2.warn" class="alarm-icon">⚠</span>CO₂ {{ item.co2.value }}ppm-->
+              <!--</span>-->
+              <!--<span class="sensor-val" :class="{ alarm: item.o2.warn }">-->
+                <!--<span v-if="item.o2.warn" class="alarm-icon">⚠</span>O₂ {{ item.o2.value }}%-->
+              <!--</span>-->
             </div>
           </div>
         </div>
@@ -43,7 +43,11 @@ export default {
   computed: {
     // 复制一份数据实现无缝滚动
     displayList() {
-      return [...this.list, ...this.list]
+      if(this.list[9]){
+        return [...this.list, ...this.list]
+      }else{
+        return [...this.list]
+      }
     }
   },
   async mounted() {
@@ -58,7 +62,7 @@ export default {
     async loadData() {
       try {
         const res = await getEnvSensingList()
-        this.list = res.data.list
+        this.list = res.data.list;
         if (!this.scrollTimer) {
           this.$nextTick(() => setTimeout(() => this.startScroll(), 500))
         }

src/components/LabStats/RiskWarning.vue

@@ -38,7 +38,11 @@ export default {
   },
   computed: {
     displayList() {
-      return [...this.list, ...this.list]
+      if(this.list[4]){
+        return [...this.list, ...this.list]
+      }else{
+        return [...this.list]
+      }
     }
   },
   async mounted() {