From 01024466f04b00c492d6892df5615461711212a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 13 Apr 2023 09:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carManagement/fleetManagement/index.vue   | 19 --------------
 .../src/views/deviceManagement/info/index.vue | 26 +------------------
 ruoyi-ui/src/views/index.vue                  | 15 ++++++++++-
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
index 7817cd7..dda4abc 100644
--- a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
+++ b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
@@ -98,25 +98,6 @@
       </el-table-column>
       <el-table-column :label="t('common.createTime')" align="center" prop="createTime"/>
       <el-table-column :label="t('common.createBy')" align="center" prop="createName"/>
-<!--      <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"-->
-<!--                       width="160">-->
-<!--        <template #default="scope">-->
-<!--          <el-button-->
-<!--              v-hasPermi="['carqueue:carqueue:edit']"-->
-<!--              icon="Edit"-->
-<!--              type="text"-->
-<!--              @click="handleUpdate(scope.row)"-->
-<!--          >{{ t('option.edit') }}-->
-<!--          </el-button>-->
-<!--          <el-button-->
-<!--              v-hasPermi="['carqueue:carqueue:remove']"-->
-<!--              icon="Delete"-->
-<!--              type="text"-->
-<!--              @click="handleDelete(scope.row)"-->
-<!--          >{{ t('option.remove') }}-->
-<!--          </el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <!--    分页-->
diff --git a/ruoyi-ui/src/views/deviceManagement/info/index.vue b/ruoyi-ui/src/views/deviceManagement/info/index.vue
index e9a8f0d..bfc301e 100644
--- a/ruoyi-ui/src/views/deviceManagement/info/index.vue
+++ b/ruoyi-ui/src/views/deviceManagement/info/index.vue
@@ -15,7 +15,7 @@
       <el-form-item :label="t('baseDevice.baseDevice.simCode')" prop="simCode">
         <el-input
             v-model="queryParams.simCode"
-            :placeholder="t('common.pleaseEnter') +t('baseDevice.baseDevice.deviceType')"
+            :placeholder="t('common.pleaseEnter') +t('baseDevice.baseDevice.simCode')"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleQuery"
@@ -41,28 +41,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="t('baseDevice.baseDevice.activeTime')" prop="activeTime">
-        <el-date-picker
-            v-model="queryParams.activeTime"
-            :size="size"
-            end-placeholder="结束时间"
-            range-separator="到"
-            start-placeholder="开始时间"
-            type="daterange"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseDevice.baseDevice.lastRunTime')" prop="lastRunTime">
-        <el-date-picker
-            v-model="queryParams.lastRunTime"
-            :size="size"
-            end-placeholder="结束时间"
-            range-separator="到"
-            start-placeholder="开始时间"
-            type="daterange"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
       <el-form-item label=" ">
         <el-button icon="Search" type="primary" @click="handleQuery">{{ t('option.search') }}</el-button>
         <el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
@@ -261,8 +239,6 @@ const queryParams = ref({
   simCode: undefined,
   deviceType: null,
   state: null,
-  activeTime: undefined,
-  lastRunTime: undefined,
   isDelete: undefined,
   createTime: undefined,
   createId: undefined,
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 630cc37..2500c17 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -118,7 +118,20 @@
             <div v-for="(i,index) in warringList" :key='i' ref="warningRef"
                  style="position:relative;color:#fff;height: 120px;">
               <img
-                  :src="`${i?.ispresslower === 1 ? 'src/assets/icons/ispresslower.png':''}${i?.ispresshigh === 1 ? 'src/assets/icons/ispresshigh.png':''}${i?.istemperaturehigh === 1 ? 'src/assets/icons/highTemperature.png':''}${i?.ispowerinvalue === 1 ? 'src/assets/icons/ispowerinvalue.png':''}`"
+                  v-if="i?.ispresslower === 1"
+                  src="../assets/icons/ispresslower.png"
+                  style="width: 40px;height: 40px;position: absolute;top: 10px;left: 0px">
+              <img
+                  v-if="i?.ispresshigh === 1"
+                  src="../assets/icons/ispresshigh.png"
+                  style="width: 40px;height: 40px;position: absolute;top: 10px;left: 0px">
+              <img
+                  v-if="i?.istemperaturehigh === 1"
+                  src="../assets/icons/highTemperature.png"
+                  style="width: 40px;height: 40px;position: absolute;top: 10px;left: 0px">
+              <img
+                  v-if="i?.ispowerinvalue === 1"
+                  src="../assets/icons/ispowerinvalue.png"
                   style="width: 40px;height: 40px;position: absolute;top: 10px;left: 0px">
               <div style="position: absolute;top: 10px;left: 50px;font-size: 16px">
                 {{ i?.ispresslower === 1 ? '低压' : '' }}