Browse Source

Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

lxh 2 days ago
parent
commit
b3d036a036

+ 5 - 5
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -148,12 +148,12 @@
           <FullscreenExitOutlined style="font-size: 18px" />
         </div>
         <!-- 是人员定位表单代码,由于放在tab中,表格对已知刷新,导致表单数据也在刷寻,造成输入一半的中文时会清空输入框的内容,导致的输入不上数据 -->
-        <div v-if="deviceType.startsWith('location') && activeKey == '1'" class="location-form" style="position: absolute; z-index: 9999; top: 50px">
+        <div v-if="deviceType.startsWith('location') || deviceType.startsWith('vehicle') && activeKey == '1'" class="location-form" style="position: absolute; z-index: 9999; top: 50px">
           <div class="location-form-item">
-            <span class="location-form-label">人员名称:</span>
+            <span class="location-form-label">{{deviceType.startsWith('location') ? '人员名称:' : '车辆名称'}}</span>
             <Input style="width: 200px" v-model:value="locationForm.strname" />
           </div>
-          <div class="location-form-item">
+          <!-- <div class="location-form-item">
             <span class="location-form-label">所属部门:</span>
             <MTreeSelect
               style="width: 200px"
@@ -163,7 +163,7 @@
               :virtual="false"
               :isGetPopupContainer="false"
             />
-          </div>
+          </div> -->
           <div class="location-form-item">
             <span class="location-form-label">分站名称:</span>
             <Input style="width: 200px" v-model:value="locationForm.stationname" />
@@ -304,7 +304,7 @@
                 :isShowActionColumn="true"
                 :isShowSelect="false"
                 title="设备监测"
-                :form-config="vehicleFormConfig"
+                style="margin-top: 60px"
                 :scroll="{ y: scroll.y - 110 }"
               >
                 <template v-if="!noLocationList.includes('location')" #action="{ record }">

+ 2 - 2
src/views/vent/monitorManager/gateMonitor/components/AlarmHistoryTableHj.vue

@@ -40,13 +40,13 @@
   const alarmHistory = ref();
   const columns: BasicColumn[] = [
     {
-      title: '安装地点',
+      title: '报警内容',
       dataIndex: 'content',
       width: 300,
       align: 'center',
     },
     {
-      title: '报警事件',
+      title: '报警时间',
       dataIndex: 'createTime',
       width: 300,
       align: 'center',