Quellcode durchsuchen

feat: 增加参数设置中的参数, 更换圆环图片

sunxiao vor 1 Woche
Ursprung
Commit
df19b2d149

BIN
src/assets/images/control/number-card-middle.png


+ 1 - 1
src/views/control/CirclePanel.vue

@@ -39,7 +39,7 @@ defineProps({
   height: 186px;
   padding: 28px 0px 40px 0px;
   background:
-    url("@/assets/images/control/number-card-middle.svg") center center no-repeat,
+    url("@/assets/images/control/number-card-middle.png") center center no-repeat,
     url("@/assets/images/control/number-card-middle2.svg") center bottom no-repeat;
   background-size: contain;
   font-style: normal;

+ 13 - 7
src/views/control/DrawerSetting.vue

@@ -224,7 +224,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value2="dataSourceParams.auto.qycYxyTwo"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyXsyHYOne, value2: waterConfigParams.qyXsyHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyXsyHYOne, value2: waterConfigParams.qyXsyHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyXsyYcOne, value2: waterConfigParams.qyXsyYcTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -238,7 +239,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value2="dataSourceParams.auto.qycAdTwo"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyAdHYOne, value2: waterConfigParams.qyAdHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyAdHYOne, value2: waterConfigParams.qyAdHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyAdYCOne, value2: waterConfigParams.qyAdYCTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -313,7 +315,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value2="dataSourceParams.onePool.qycYxyTwo"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyXsyHYOne, value2: waterConfigParams.qyXsyHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyXsyHYOne, value2: waterConfigParams.qyXsyHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyXsyYCOne, value2: waterConfigParams.qyXsyYCTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -325,7 +328,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value1="dataSourceParams.onePool.qycAdOne"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyAdHYOne, value2: waterConfigParams.qyAdHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyAdHYOne, value2: waterConfigParams.qyAdHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyAdYCOne, value2: waterConfigParams.qyAdYCTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -372,7 +376,7 @@ const onDrawerAfterdEnter = () => {
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
                     { label: '仪表', value1: waterConfigParams.jsCodYB, value2: waterConfigParams.jsCodYB },
-                    { label: '化验', value1: waterConfigParams.jsCodHY, value2: waterConfigParams.jsCodHY }
+                    { label: '化验', value1: waterConfigParams.jsCodHY, value2: waterConfigParams.jsCodHY, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -397,7 +401,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value1="dataSourceParams.twoPool.qycYxyTwo"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyXsyHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyXsyHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyXsyCTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem
@@ -409,7 +414,8 @@ const onDrawerAfterdEnter = () => {
                   v-model:value1="dataSourceParams.twoPool.qycAdTwo"
                   :btn-group="[
                     { label: '手动', value1: '', value2: '', disabled: true },
-                    { label: '化验', value1: waterConfigParams.qyAdHYTwo }
+                    { label: '化验', value1: waterConfigParams.qyAdHYTwo },
+                    { label: '预测', value1: waterConfigParams.qyAdYCTwo, disabled: true }
                   ]"
                 ></BaseChooseItem>
                 <BaseChooseItem

+ 5 - 3
src/views/control/MedicinalView.vue

@@ -45,7 +45,7 @@ const handleSystemStatus = () => {
   if ( isProcessing ) return;
 
   isProcessing = true;
-  console.log( configurationStatus.value );
+
   if ( configurationStatus.value == 1 ) {
     return message.warning('当前组态未启用,无法投放');
   }
@@ -65,6 +65,7 @@ const handleSystemStatus = () => {
 const handleUpdateParams = () => {
   paramterDrawerVisible.value = false;
   initData();
+  initPanelData();
 }
 
 const getNumVal = (type, n1, n2) => {
@@ -283,7 +284,7 @@ onMounted(async () => {
 
   processNumber.value = systemSwitchType.value ? 100 : 0;
 
-  timerPanel.value = setInterval(initPanelData, 5 * 1000)
+  timerPanel.value = setInterval(initPanelData, 5 * 60 * 1000)
   timerParams.value = setInterval(initData, 40 * 60 * 1000);
 })
 
@@ -340,7 +341,7 @@ onUnmounted(() => {
                       class="custom-progress"
                     ></NProgress>
                   </div>
-                  <span class="tips">Libra智能{{ systemSwitchType ? "投药中" : "未启用" }}...</span>
+                  <span class="tips">LibraAI{{ systemSwitchType ? "投药中" : "未启用" }}...</span>
                 </div>
                 <div class="play_card">
                   <div class="play-btn space-x-[6px]" @click="handleSystemStatus">
@@ -457,6 +458,7 @@ onUnmounted(() => {
           text-align: center;
 
           .time {
+            width: 180px;
             color: #F6A52C;
             font-size: 10px;
             font-style: normal;