Merge remote-tracking branch 'origin/master'

src/components/HKVideo/hikvision-h5player.vue

@@ -248,7 +248,8 @@ defineExpose({
     top: calc(1000% - 32px) / 2;
     width: 32px;
     height: 32px;
-    background: url('@/assets/images/video/ajax-loader.gif');
+    background: url('@/assets/images/video/ajax-loader.gif') no-repeat;
+    background-size: 100% 100%;
   }
 }
 </style>

src/views/disasterRiskMonitor/hazardousChemicalEnterprises.vue

@@ -36,7 +36,7 @@
     <div class="box1">
       <van-search
         v-model="keyword"
-        placeholder="所属区县"
+        placeholder="搜索"
         class="common-search"
         :left-icon="searchImg"
         show-action
@@ -66,7 +66,6 @@
             label="位置"
             prop="name"
             align="center"
-            width="150px"
           />
           <el-table-column
             label="雨量"
@@ -87,7 +86,7 @@
                 @click="showDetails(scope.row)"
                 style="color: #1d92ff"
               >
-                播放
+                查看
               </div>
             </template>
           </el-table-column>
@@ -102,7 +101,9 @@ import { reactive, ref } from "vue";
 import searchImg from "@/assets/images/search.png";
 import { ElTable, ElTableColumn } from "element-plus";
 import { getPointInfo } from "@/api/disasterRiskMonitor/rainfall";
+import {useDict} from "@/utils/dict";
 
+const { district_type } = toRefs<any>(useDict('district_type'));
 const router = useRouter();
 let detailsData = ref({
   dataList: []

src/views/disasterRiskMonitor/hazardousChemicalEnterprisesView.vue

@@ -37,7 +37,7 @@
         />
         <el-table-column label="操作" align="center" width="50px">
           <template #default="scope">
-            <div class="btn" @click="switchVideo(scope.row)" style="color: #1d92ff">切换</div>
+            <div class="btn" @click="switchVideo(scope.row)" :style="{color: video1 === scope.row ? '#000' : '#1d92ff'}">切换</div>
           </template>
         </el-table-column>
       </el-table>
@@ -167,5 +167,6 @@ const switchVideo = row => {
   display: flex;
   align-items: center;
   gap: 6px;
+  margin-bottom: 10px;
 }
 </style>

src/views/disasterRiskMonitor/rainfallInRainShelter.vue

@@ -38,7 +38,7 @@
     <div class="box1">
       <van-search
         v-model="keyword"
-        placeholder="所属区县"
+        placeholder="搜索"
         class="common-search"
         :left-icon="searchImg"
         show-action
@@ -68,7 +68,6 @@
             label="位置"
             prop="name"
             align="center"
-            width="150px"
           />
           <el-table-column
             label="雨量"
@@ -84,7 +83,7 @@
           />
           <el-table-column label="操作" align="center" width="50px">
             <template #default="scope">
-              <div class="btn" @click="showDetails(scope.row)" style="color: #1d92ff">播放</div>
+              <div class="btn" @click="showDetails(scope.row)" style="color: #1d92ff">查看</div>
             </template>
           </el-table-column>
         </el-table>
@@ -98,7 +97,9 @@ import { reactive, ref } from "vue";
 import searchImg from "@/assets/images/search.png";
 import { ElTable, ElTableColumn } from "element-plus";
 import { getPointInfo } from "@/api/disasterRiskMonitor/rainfall";
+import {useDict} from "@/utils/dict";
 
+const { district_type } = toRefs<any>(useDict('district_type'));
 const router = useRouter();
 let detailsData = ref({
   dataList: []

src/views/disasterRiskMonitor/rainfallInRainShelterView.vue

@@ -37,7 +37,7 @@
         />
         <el-table-column label="操作" align="center" width="50px">
           <template #default="scope">
-            <div class="btn" @click="switchVideo(scope.row)" style="color: #1d92ff">切换</div>
+            <div class="btn" @click="switchVideo(scope.row)" :style="{color: video1 === scope.row ? '#000' : '#1d92ff'}">切换</div>
           </template>
         </el-table-column>
       </el-table>
@@ -169,5 +169,6 @@ const switchVideo = row => {
   display: flex;
   align-items: center;
   gap: 6px;
+  margin-bottom: 10px;
 }
 </style>

src/views/disasterRiskMonitor/rainfallMonitoring.vue

@@ -38,7 +38,7 @@
     <div class="box1">
       <van-search
         v-model="keyword"
-        placeholder="请输入位置信息"
+        placeholder="搜索"
         class="common-search"
         :left-icon="searchImg"
         show-action
@@ -68,7 +68,6 @@
             label="位置"
             prop="name"
             align="center"
-            width="150px"
           />
           <el-table-column
             label="雨量"
@@ -84,7 +83,7 @@
           />
           <el-table-column label="操作" align="center" width="50px">
             <template #default="scope">
-              <div class="btn" @click="showDetails(scope.row)" style="color: #1d92ff">播放</div>
+              <div class="btn" @click="showDetails(scope.row)" style="color: #1d92ff">查看</div>
             </template>
           </el-table-column>
         </el-table>
@@ -101,7 +100,9 @@ import icon1 from "@/assets/images/disasterRiskMonitor/galeDisaster/icon1.png";
 import { ElTable, ElTableColumn } from "element-plus";
 import RainfallMonitoringView from "@/views/disasterRiskMonitor/rainfallMonitoringView.vue";
 import { getPointInfo } from "@/api/disasterRiskMonitor/rainfall";
+import {useDict} from "@/utils/dict";
 
+const { district_type } = toRefs<any>(useDict('district_type'));
 const router = useRouter();
 let detailsData = ref({
   dataList: []

src/views/disasterRiskMonitor/rainfallMonitoringView.vue

@@ -50,7 +50,7 @@
         <el-table-column label="距离" prop="distance" align="center" width="60px" />
         <el-table-column label="操作" align="center" width="50px">
           <template #default="scope">
-            <div class="btn" @click="switchVideo(scope.row)" style="color: #1d92ff">切换</div>
+            <div class="btn" @click="switchVideo(scope.row)" :style="{color: video1 === scope.row ? '#000' : '#1d92ff'}">切换</div>
           </template>
         </el-table-column>
       </el-table>
@@ -198,5 +198,6 @@ const switchVideo = row => {
   display: flex;
   align-items: center;
   gap: 6px;
+  margin-bottom: 10px;
 }
 </style>