Merge remote-tracking branch 'gogs/master'

src/views/device/manhole/ldzh/fzbj.vue

@@ -17,7 +17,20 @@
     <el-table :data="tableData" v-loading="tableLoading" border stripe>
       <el-table-column prop="imeiCardNumber" label="设备编号" width="200" />
       <el-table-column prop="batteryLevel" label="电池电量" />
-      <el-table-column prop="alarmStatus" label="报警状态" />
+      <!-- <el-table-column prop="alarmStatus" label="报警状态" /> -->
+      <el-table-column label="报警状态" align="center">
+        <template #default="scope">
+          <el-tag
+            :type="scope.row.alarmStatus === 0 ? 'success' : 'danger'"
+            effect="dark"
+          >
+            <div class="flex items-center">
+              <AlertTriangle v-if="scope.row.alarmStatus === 1" class="w-4 h-4 mr-1" />
+              {{ scope.row.alarmStatus === 0 ? "正常" : "告警" }}
+            </div>
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="tiltAngle" label="倾斜角度" />
       <el-table-column prop="createTime" label="创建时间" width="400" />
     </el-table>

src/views/device/manhole/ldzh/sqbj.vue

@@ -17,7 +17,19 @@
     <el-table :data="tableData" v-loading="tableLoading" border stripe>
       <el-table-column prop="imeiCardNumber" label="设备编号" width="200" />
       <el-table-column prop="batteryLevel" label="电池电量" />
-      <el-table-column prop="alarmStatus" label="报警状态" />
+      <el-table-column label="报警状态" align="center">
+        <template #default="scope">
+          <el-tag
+            :type="scope.row.alarmStatus === 0 ? 'success' : 'danger'"
+            effect="dark"
+          >
+            <div class="flex items-center">
+              <AlertTriangle v-if="scope.row.alarmStatus === 1" class="w-4 h-4 mr-1" />
+              {{ scope.row.alarmStatus === 0 ? "正常" : "告警" }}
+            </div>
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="tiltAngle" label="倾斜角度" />
       <el-table-column prop="createTime" label="创建时间" width="400" />
     </el-table>

src/views/device/manhole/ldzh/swbj.vue

@@ -17,7 +17,19 @@
     <el-table :data="tableData" v-loading="tableLoading" border stripe>
       <el-table-column prop="imeiCardNumber" label="设备编号" width="200" />
       <el-table-column prop="batteryLevel" label="电池电量" />
-      <el-table-column prop="alarmStatus" label="报警状态" />
+      <el-table-column label="报警状态" align="center">
+        <template #default="scope">
+          <el-tag
+            :type="scope.row.alarmStatus === 0 ? 'success' : 'danger'"
+            effect="dark"
+          >
+            <div class="flex items-center">
+              <AlertTriangle v-if="scope.row.alarmStatus === 1" class="w-4 h-4 mr-1" />
+              {{ scope.row.alarmStatus === 0 ? "正常" : "告警" }}
+            </div>
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="tiltAngle" label="倾斜角度" />
       <el-table-column prop="createTime" label="创建时间" width="400" />
     </el-table>

vite.config.js

@@ -36,8 +36,8 @@ export default defineConfig(({ mode, command }) => {
         },
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          // target: 'http://192.168.110.235:8100/background',
-          target: 'http://localhost:8100/background',
+          target: 'http://192.168.110.235:8100/background',
+          // target: 'http://localhost:8100/background',
           // target: 'http://localhost:8101/',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')