Просмотр исходного кода

[Style 0000] 风量监测模块样式更新

houzekong 1 месяц назад
Родитель
Сommit
8bd9838e45

+ 7 - 2
src/assets/images/home-container/configurable/preset/syswind-icon-spd.svg

@@ -1,9 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="29.905" height="20.273" viewBox="0 0 29.905 20.273">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26.422" height="16.021" viewBox="0 0 26.422 16.021">
   <defs>
     <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
       <stop offset="0" stop-color="#83e4ff"/>
       <stop offset="1" stop-color="#fff"/>
     </linearGradient>
   </defs>
-  <path id="路径_57944" data-name="路径 57944" d="M54.586,213.407l.059.123,6.987,15.652a1.311,1.311,0,0,1-2.349,1.161l-.046-.092-1.994-4.469H47.234l-2,4.469a1.311,1.311,0,0,1-2.433-.974l.038-.1,6.987-15.652a2.636,2.636,0,0,1,4.755-.123Zm14.373,13.031a1.311,1.311,0,0,1,.1,2.62l-.1,0H65.025a1.311,1.311,0,0,1-.1-2.62l.1,0ZM52.233,214.592l-.007.007L48.4,223.158h7.667L52.25,214.6a.013.013,0,0,0-.017-.007ZM70.27,219.88a1.311,1.311,0,0,1,.1,2.62l-.1,0H62.4a1.311,1.311,0,0,1-.1-2.62l.1,0Zm-5.246-6.557a1.311,1.311,0,0,1,.1,2.62l-.1,0H59.779a1.311,1.311,0,0,1-.1-2.62l.1,0Z" transform="translate(-42.184 -211.32)" stroke="rgba(0,0,0,0)" stroke-miterlimit="10" stroke-width="1" fill="url(#linear-gradient)"/>
+  <g id="组_16684" data-name="组 16684" transform="translate(-20.302 -27.786)">
+    <path id="路径_57945" data-name="路径 57945" d="M238.933,68.267h3.929l2.483,7.755c.582,1.765.962,3.359,1.569,5.149h.129c.582-1.79,1.011-3.384,1.6-5.149l2.427-7.755h3.8L249.121,84.2h-4.457Z" transform="translate(-218.631 -40.48)" fill="url(#linear-gradient)"/>
+    <path id="路径_57946" data-name="路径 57946" d="M.828,0H9.675V2.9H0Z" transform="translate(37.049 28.327)" fill="url(#linear-gradient)"/>
+    <path id="路径_57947" data-name="路径 57947" d="M.828,0H9.675V2.9H0Z" transform="translate(35.114 35.1)" fill="url(#linear-gradient)"/>
+    <path id="路径_57948" data-name="路径 57948" d="M.828,0H9.675V2.9H0Z" transform="translate(33.179 40.905)" fill="url(#linear-gradient)"/>
+  </g>
 </svg>

+ 2 - 4
src/assets/images/home-container/configurable/preset/syswind-icon-vol.svg

@@ -1,11 +1,9 @@
-<svg id="组_16687" data-name="组 16687" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20.467" height="23.701" viewBox="0 0 20.467 23.701">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26.353" height="23.814" viewBox="0 0 26.353 23.814">
   <defs>
     <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
       <stop offset="0" stop-color="#3df6ff"/>
       <stop offset="1" stop-color="#fff"/>
     </linearGradient>
   </defs>
-  <path id="路径_57940" data-name="路径 57940" d="M248.889,544m1.436,0h.359a1.269,1.269,0,0,1,1.436,1.436v7.9a1.27,1.27,0,0,1-1.436,1.436h-.359a1.27,1.27,0,0,1-1.436-1.436v-7.9A1.269,1.269,0,0,1,250.325,544Z" transform="translate(-248.889 -531.073)" fill="url(#linear-gradient)"/>
-  <path id="路径_57941" data-name="路径 57941" d="M504.889,288m1.436,0h.359a1.27,1.27,0,0,1,1.436,1.436v16.518a1.27,1.27,0,0,1-1.436,1.436h-.359a1.27,1.27,0,0,1-1.436-1.436V289.436A1.27,1.27,0,0,1,506.325,288Z" transform="translate(-496.271 -283.691)" fill="url(#linear-gradient)"/>
-  <path id="路径_57942" data-name="路径 57942" d="M760.889,160m1.436,0h.359a1.27,1.27,0,0,1,1.436,1.436v20.827a1.27,1.27,0,0,1-1.436,1.436h-.359a1.27,1.27,0,0,1-1.436-1.436V161.436A1.27,1.27,0,0,1,762.325,160Z" transform="translate(-743.654 -160)" fill="url(#linear-gradient)"/>
+  <path id="路径_57950" data-name="路径 57950" d="M459.1,110.272a.638.638,0,0,1-.449-.186.632.632,0,0,1-.186-.449v-1.266a.638.638,0,0,1,.186-.449.632.632,0,0,1,.449-.186h17.112a1.266,1.266,0,0,0,0-2.533h-5.7a.638.638,0,0,1-.449-.186.632.632,0,0,1-.186-.449V103.3a.634.634,0,0,1,.635-.635h5.7a3.8,3.8,0,0,1,0,7.605Zm-3.8,5.069a.638.638,0,0,1-.449-.186.632.632,0,0,1-.186-.449V113.44a.634.634,0,0,1,.635-.635h15.211a.638.638,0,0,1,.449.186.632.632,0,0,1,.186.449v1.266a.638.638,0,0,1-.186.449.632.632,0,0,1-.449.186Zm6.335,5.073a.638.638,0,0,1-.449-.186.632.632,0,0,1-.186-.449v-1.266a.638.638,0,0,1,.186-.449.632.632,0,0,1,.449-.186h3.8a.638.638,0,0,1,.449.186.632.632,0,0,1,.186.449v1.266a.634.634,0,0,1-.635.635h-3.8Zm6.339-2.536h8.24a3.8,3.8,0,0,1,0,7.605h-5.7a.639.639,0,0,1-.449-.186.632.632,0,0,1-.186-.449v-1.266a.639.639,0,0,1,.186-.449.632.632,0,0,1,.449-.186h5.7a1.266,1.266,0,0,0,0-2.533h-8.24a.638.638,0,0,1-.449-.186.632.632,0,0,1-.186-.449v-1.266a.634.634,0,0,1,.635-.635Zm0,0" transform="translate(-454.167 -102.168)" stroke="rgba(0,0,0,0)" stroke-miterlimit="10" stroke-width="1" fill="url(#linear-gradient)"/>
 </svg>

BIN
src/assets/images/home-container/configurable/preset/syswind-space-red.png


+ 4 - 2
src/views/vent/home/configurable/components/preset/SysWindCard.vue

@@ -159,14 +159,16 @@
       background-repeat: no-repeat;
       background-position: bottom left;
       width: 208px;
-      height: 30px;
+      height: 28px;
+      line-height: 28px;
     }
     .syswind__card__spd_space {
       background-image: var(--image-syswind-space-blue);
       background-repeat: no-repeat;
       background-position: bottom left;
       width: 208px;
-      height: 30px;
+      height: 28px;
+      line-height: 28px;
     }
     .syswind__card__vol_wrapper {
       background-image: var(--image-syswind-border-green);

+ 8 - 8
src/views/vent/home/configurable/configurable.data.ts

@@ -6352,7 +6352,7 @@ export const testConfigVent182: Config[] = [
       background: {
         show: true,
         type: 'video',
-        link: '/video/mainFan.mp4',
+        link: 'http://182.92.126.35:8092/modelreq/sys/common/static/webfile/mainFan.mp4',
       },
       layout: {
         direction: 'column',
@@ -6423,7 +6423,7 @@ export const testConfigVent182: Config[] = [
       background: {
         show: true,
         type: 'video',
-        link: '/video/fanLocal.mp4',
+        link: 'http://182.92.126.35:8092/modelreq/sys/common/static/webfile/fanLocal.mp4',
       },
       layout: {
         direction: 'column',
@@ -6494,7 +6494,7 @@ export const testConfigVent182: Config[] = [
       background: {
         show: true,
         type: 'video',
-        link: '/video/gate.mp4',
+        link: 'http://182.92.126.35:8092/modelreq/sys/common/static/webfile/gate.mp4',
       },
       layout: {
         direction: 'row',
@@ -6556,13 +6556,13 @@ export const testConfigVent182: Config[] = [
           config: {
             title: '${strinstallpos}',
             volumns: [
-              { label: '风量', value: '${readData.m3}', lowerLimit: '100' },
-              { label: '需风量', value: '100' },
+              { label: '风量', value: '${readData.m3}', lowerLimit: '${needq}' },
+              { label: '需风量', value: '${needq}' },
             ],
             speeds: [
-              { label: '风速', value: '${readData.va}', lowerLimit: '2', upperLimit: '100' },
-              { label: '规程最大值', value: '100' },
-              { label: '规程最小值', value: '2' },
+              { label: '风速', value: '${readData.va}', lowerLimit: '${deviceRegulation.fmin}', upperLimit: '${deviceRegulation.fmax}' },
+              { label: '规程最大值', value: '${deviceRegulation.fmax}' },
+              { label: '规程最小值', value: '${deviceRegulation.fmin}' },
             ],
             prop: 'string',
           },