BUG修复0530—2

src/layout/index.vue

@@ -35,7 +35,7 @@
       <div class="content">
         <div class="breadcrumb-container">
           <el-breadcrumb separator="/">
-            <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="index" :to="item.path">
+            <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="index">
               {{ item.meta?.title || '未命名页面' }}
             </el-breadcrumb-item>
           </el-breadcrumb>
@@ -221,3 +221,9 @@ export default {
   }
 }
 </style>
+<style>
+.el-breadcrumb__inner {
+  color: #000;
+  font-weight: 600;
+}
+</style>

src/views/dustMonitoring/components/healthyProgress.vue

@@ -20,13 +20,16 @@
   </div>
 </template>
 <script setup>
-import { onMounted } from "vue";
+import { onMounted, watch } from "vue";
 const props = defineProps({
   progress: {
     type: Number,
     default: 100,
   },
 });
+watch(() => props.progress, (newProgress) => {
+  init()
+});
 tailwind.config = {
   theme: {
     extend: {

src/views/dustMonitoring/components/warn.vue

 <template>
   <div class="title layout1">
-    <span class="warn-title">告警：</span>
-    <!-- <span class="jump-icon">>></span> -->
+    <span class="warn-title">{{title}}：</span>
+    <span class="jump-icon">>></span>
   </div>
   <div class="content">
     <div class="item" v-for="item in listInfo" :key="item">

src/views/dustMonitoring/index.vue

@@ -25,12 +25,9 @@
         <el-form-item label="分析时间">
           <el-date-picker
             v-model="form.dateValue"
-            type="datetimerange"
+            type="daterange"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            format="YYYY-MM-DD HH:mm:ss"
-            date-format="YYYY/MM/DD ddd"
-            time-format="A hh:mm:ss"
             @calendar-change="calendarChange"
             @visible-change="visibleChange"
             :disabled-date="disabledFn"
@@ -52,7 +49,7 @@
       <div class="right-box">
         <div class="part1">
           <div class="battery">
-            <healthyCom></healthyCom>
+            <healthyCom :progress="healthPercent"></healthyCom>
           </div>
         </div>
         <div class="part2">
@@ -324,8 +321,8 @@ const getHealthIndex = () => {
   const params = {
     customerId: userStore.customerId,
     deviceNo: form.dusterNo,
-    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD HH:mm:ss"),
-    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD HH:mm:ss"),
+    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD") + ' 00:00:00',
+    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD") + ' 23:59:59',
   };
   getDataFun(url, params).then((res) => {
     if (res && res.data) {
@@ -349,8 +346,8 @@ const getPressure = () => {
   const params = {
     customerId: userStore.customerId,
     deviceNo: form.dusterNo,
-    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD HH:mm:ss"),
-    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD HH:mm:ss"),
+    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD") + ' 00:00:00',
+    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD") + ' 23:59:59',
   };
   getDataFun(url, params).then((res) => {
     if (res && res.data) {
@@ -374,8 +371,8 @@ const getEnergy = () => {
   const params = {
     customerId: userStore.customerId,
     deviceNo: form.dusterNo,
-    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD HH:mm:ss"),
-    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD HH:mm:ss"),
+    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD") + ' 00:00:00',
+    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD") + ' 23:59:59',
   };
   getDataFun(url, params).then((res) => {
     if (res && res.data) {
@@ -396,6 +393,7 @@ const detailObj = reactive({
   faultCompart: "",
   compartHealthList: [],
 });
+const healthPercent = ref()
 // 获取除尘器详情
 const getDustDetail = () => {
   if (!form.dusterNo) {
@@ -405,8 +403,8 @@ const getDustDetail = () => {
   const params = {
     customerId: userStore.customerId,
     deviceNo: form.dusterNo,
-    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD HH:mm:ss"),
-    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD HH:mm:ss"),
+    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD") + ' 00:00:00',
+    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD") + ' 23:59:59',
   };
   getDataFun(url, params)
     .then((res) => {
@@ -518,11 +516,13 @@ const getDustDetail = () => {
           }
         })
       );
+      healthPercent.value = parseFloat(res.data.healthPercent);
     })
     .catch(() => {
       dustInfo.forEach((item) => {
         item.value = 0;
       });
+      healthPercent.value = 0;
     });
 };
 const closedLoopInfoList = ref([]);
@@ -536,8 +536,8 @@ const getAlarmInfo = () => {
   const params = {
     customerId: userStore.customerId,
     deviceNo: form.dusterNo,
-    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD HH:mm:ss"),
-    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD HH:mm:ss"),
+    startTime: moment(form.dateValue[0]).format("YYYY-MM-DD") + ' 00:00:00',
+    endTime: moment(form.dateValue[1]).format("YYYY-MM-DD") + ' 23:59:59',
   };
   getDataFun(url, params)
     .then((res) => {

src/views/equipmentManagement/components/paramsSetings.vue

@@ -9,12 +9,22 @@
       <!-- 左侧参数设置 -->
       <div class="setting-group">
         <div class="setting-row" v-for="item in leftInfoEnum" :key="item.label">
-          <span class="label">{{ item.label }}</span>
+          <span class="label" :class="{'layout_2': item.type2 === 'checkbox'}">
+            <el-checkbox
+              style="margin-right: 10px"
+              v-if="item.type2 === 'checkbox'"
+              v-model="infoObj[item.propKey2]"
+            ></el-checkbox>
+            {{ item.label }}
+          </span>
           <el-input
             v-if="item.type === 'input'"
             v-model="infoObj[item.propKey]"
           ></el-input>
-          <el-select v-model="infoObj[item.propKey]" v-if="item.type === 'select'">
+          <el-select
+            v-model="infoObj[item.propKey]"
+            v-if="item.type === 'select'"
+          >
             <el-option
               v-for="option in item.options"
               :key="option.code"
@@ -90,7 +100,12 @@
     <div class="checkbox-group mgr10">
       <div class="select-input">
         <label class="custom-checkbox">
-          <input type="checkbox" checked /> 脉冲阀设备Y/N 通信IP
+          <input
+            type="checkbox"
+            checked
+            v-model="infoObj.liftValveCommunicationIp"
+          />
+          脉冲阀设备Y/N 通信IP
         </label>
         <div style="margin-left: 10px">
           <el-input></el-input>
@@ -155,6 +170,7 @@ let infoObj = reactive({
   faultThreshold: "", // 故障阈值
   valleyDection: "", // 谷值判定%
   valveNum: "", // 阀数量
+  valveCheck: "", // 阀数量选中
   liftValveFailure: "", // 提升阀故障
   onlineBackblow: false, // 在线反吹
   fastBlow: true, // 块/慢
@@ -254,7 +270,9 @@ const infoEnum = reactive([
   {
     label: "阀数量",
     propKey: "valveNum",
+    propKey2: "valveCheck",
     type: "input",
+    type2: "checkbox",
   },
   {
     label: "提升阀故障",
@@ -383,6 +401,10 @@ body {
   justify-content: space-between;
   align-items: center;
 }
+.layout_2 {
+  display: flex;
+  align-items: center;
+}
 
 .label {
   color: #64748b;