bugfix

src/views/alarm/cableTime/index.vue

@@ -94,61 +94,37 @@
       :visible.sync="centerDialogVisible"
       width="30%"
       center
-    >
-      <table style="margin: auto" class="device-detail-tb">
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">基站名称：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.siteName" />
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">告警对象：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.alarmTarget" />
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">告警级别：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.alarmLevelName" />
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">告警信息：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <div v-for="(item, index) in dialogInfo.alarmInfo" style="font-weight:700" :key="index">
-              <span>距离：{{ item.distance }}</span>&nbsp;&nbsp;
-              <span>驻波比：{{ item.value }}</span>&nbsp;
-            </div>
-            <div style="font-weight:700">漏缆百米损耗： {{ dialogInfo.lossValue }}</div>
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">最新上传时间：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.lateUploadTime" />
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">状态变化时间：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.statusTimeChange" />
-          </td>
-        </tr>
-      </table>
+    > 
+      <el-row class="flex row_obj">
+        <div class="text_header">基站名称：</div>
+        <div>{{ dialogInfo.siteName }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">告警对象：</div>
+        <div>{{ dialogInfo.alarmTarget }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">告警级别：</div>
+        <div>{{ dialogInfo.alarmLevelName }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">告警信息：</div>
+        <div>
+          <div v-for="(item, index) in dialogInfo.alarmInfo" style="font-weight:700;display: block;" :key="index">
+            <span>距离：{{ item.distance }}</span>&nbsp;&nbsp;
+            <span>驻波比：{{ item.value }}</span>&nbsp;
+          </div>
+          <div>漏缆百米损耗： {{ dialogInfo.lossValue }}</div>
+        </div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">最新上传时间：</div>
+        <div>{{ dialogInfo.lateUploadTime }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">状态变化时间：</div>
+        <div>{{ dialogInfo.statusTimeChange }}</div>
+      </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button
           v-if="
@@ -215,7 +191,6 @@ export default {
     this.getTableData()
   },
   created() {
-    console.log(this.$route.query)
     this.searchOption = this.$route.query
   },
   methods: {
@@ -322,6 +297,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.row_obj {
+  text-align: center;
+  margin-top: 20px;
+  div {
+    font-size: 16px;
+    font-weight: 700;
+    color: #333333;
+  }
+  .text_header {
+    width: 200px;
+    font-weight: 700;
+    color:#666666
+  }
+}
 .leakage-cable {
   .leakage-top {
     margin-bottom: 20px;

src/views/alarm/device/index.vue

@@ -71,40 +71,22 @@
       width="30%"
       center
     >
-      <table style="margin: auto" class="device-detail-tb">
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">网元设备：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.startPointDeviceName"></label>
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">连接状态：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.connectStatusName"></label>
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">网元设备：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.endPointDeviceName"></label>
-          </td>
-        </tr>
-        <tr style="line-height: 50px">
-          <td style="width: 150px">
-            <label class="particulars">上传时间：</label>
-          </td>
-          <td style="width: 180px; text-align: left">
-            <label v-text="dialogInfo.uploadTime"></label>
-          </td>
-        </tr>
-      </table>
+      <el-row class="flex row_obj">
+        <div class="text_header">网元设备：</div>
+        <div>{{ dialogInfo.startPointDeviceName }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">连接状态：</div>
+        <div>{{ dialogInfo.connectStatusName }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">网元设备：</div>
+        <div>{{ dialogInfo.endPointDeviceName }}</div>
+      </el-row>
+      <el-row class="flex row_obj">
+        <div class="text_header">上传时间：</div>
+        <div>{{ dialogInfo.uploadTime }}</div>
+      </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button
           type="primary"
@@ -278,6 +260,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.row_obj {
+  text-align: center;
+  margin-top: 20px;
+  div {
+    font-size: 16px;
+    font-weight: 700;
+    color: #333333;
+  }
+  .text_header {
+    width: 200px;
+    font-weight: 700;
+    color:#666666
+  }
+}
 .leakage-cable {
   .leakage-top {
     margin-bottom: 20px;

src/views/dashboard/api.js

@@ -7,6 +7,7 @@ const path = {
   fsuOpen: '/fsu/updateFsu',
   monitorEquipOpen: '/monitorEquip/updateMonitorEquip',
   leakyCableOpen: '/leakyCable/updateLeakyCable',
+  updateFeeder: '/antennaFeeder/updateFeeder',
 
   getYear: '/sysStandingWaveRatio/getYear',
   getMonth: '/sysStandingWaveRatio/getMonth',
@@ -30,6 +31,9 @@ export function monitorEquipOpen() {
 export function leakyCableOpen() {
   return request.post(path.leakyCableOpen, ...arguments)
 }
+export function updateFeeder() {
+  return request.post(path.updateFeeder, ...arguments)
+}
 
 export function getYear() {
   return request.post(path.getYear, ...arguments)

src/views/dashboard/components/type5.vue

@@ -11,7 +11,7 @@
             <span>记录信息</span>
           </div>
           <div>
-            <el-row class="text" :gutter="24">
+            <!-- <el-row class="text" :gutter="24">
               <el-col :span="10">
                 <div class="item_name">历史记录</div>
               </el-col>
@@ -26,15 +26,21 @@
                   @click="trendAnalysis"
                 >趋势分析图形</el-button>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row class="text" :gutter="24">
               <el-col :span="10">
                 <div class="item_name">维修记录</div>
               </el-col>
-              <el-col :span="7">
+              <el-col :span="8">
                 <div class="item_data">{{ form.log.monitor }}条</div>
               </el-col>
-              <el-col :span="7" />
+              <el-col :span="6" />
+               <el-button
+                  class="picbtn"
+                  type="success"
+                  size="mini"
+                  @click="trendAnalysis"
+                >趋势分析图形</el-button>
             </el-row>
           </div>
         </el-card>
@@ -232,12 +238,11 @@
                   v-if="statusl.length != 0"
                   class="item_data levelData"
                   :style="acolor"
-                />
+                >{{statusl[0].value }}</div>
               </el-col>
               <el-col :span="6">
                 <el-button
-                  v-if="
-                    timeStatus.level == '紧急告警' || timeStatus.level == '重要告警' || timeStatus.level == '一般告警'
+                  v-if="form.status[0].value == '紧急告警' || form.status[0].value == '重要告警' || form.status[0].value == '一般告警'
                   "
                   class="alarmbtn"
                   type="primary"
@@ -374,17 +379,17 @@ export default {
       })
     },
     leakylevelcolor() {
-      if (this.timeStatus.level === '正常') {
+      if (this.statusl[0].value === '正常') {
         this.acolor.color = 'green'
-      } else if (this.timeStatus.level === '紧急') {
+      } else if (this.statusl[0].value === '紧急') {
         this.acolor.color = '#f00'
-        this.timeStatus.level = '紧急告警'
-      } else if (this.timeStatus.level === '重要') {
+        this.statusl[0].value = '紧急告警'
+      } else if (this.statusl[0].value === '重要') {
         this.acolor.color = '#f89850'
-        this.timeStatus.level = '重要告警'
-      } else if (this.timeStatus.level === '一般') {
+        this.statusl[0].value = '重要告警'
+      } else if (this.statusl[0].value === '一般') {
         this.acolor.color = '#ead906'
-        this.timeStatus.level = '一般告警'
+        this.statusl[0].value = '一般告警'
       }
     },
     toalarm() {
@@ -442,7 +447,7 @@ export default {
 }
 .specialCard {
   position: absolute;
-  top: 205px;
+  top: 170px;
 }
 .posa {
   position: relative;

src/views/dashboard/components/type6.vue

@@ -222,12 +222,12 @@
                   v-if="statusl.length != 0"
                   class="item_data levelData"
                   :style="acolor"
-                />
+                >{{statusl[0].value}}</div>
               </el-col>
               <el-col :span="6">
                 <el-button
                   v-if="
-                    timeStatus.level == '紧急告警' || timeStatus.level == '重要告警' || timeStatus.level == '一般告警'
+                    form.status[0].value == '紧急告警' || form.status[0].value == '重要告警' || form.status[0].value == '一般告警'
                   "
                   class="alarmbtn"
                   type="primary"
@@ -272,7 +272,7 @@
               </el-col>
               <el-col :span="8">
                 <div class="item_data">
-                  {{ form.baseInfo.hundredMetersLoss }}
+                  {{ form.baseInfo.feederLossMeters }}
                 </div>
               </el-col>
               <el-col :span="6">
@@ -296,7 +296,7 @@
 
 <script>
 import { DetailMixins } from './mixins'
-import { leakyCableOpen } from '../api'
+import { updateFeeder } from '../api'
 import picAnalysis from '@/views/history/leakyCableStatus/components/picAnalysis.vue'
 import trendAnalysis from './trendAnalysis.vue'
 
@@ -358,22 +358,22 @@ export default {
         isOpen: this.form.baseInfo.isOpen,
         hundredMetersLoss: this.form.baseInfo.hundredMetersLoss
       }
-      leakyCableOpen(params).then((res) => {
+      updateFeeder(params).then((res) => {
         this.$message.success('修改成功')
       })
     },
     leakylevelcolor() {
-      if (this.timeStatus.level === '正常') {
+      if (this.form.status[0].value === '正常') {
         this.acolor.color = 'green'
-      } else if (this.timeStatus.level === '紧急') {
+      } else if (this.form.status[0].value === '紧急') {
         this.acolor.color = '#f00'
-        this.timeStatus.level = '紧急告警'
-      } else if (this.timeStatus.level === '重要') {
+        this.form.status[0].value = '紧急告警'
+      } else if (this.form.status[0].value === '重要') {
         this.acolor.color = '#f89850'
-        this.timeStatus.level = '重要告警'
-      } else if (this.timeStatus.level === '一般') {
+        this.form.status[0].value = '重要告警'
+      } else if (this.form.status[0].value === '一般') {
         this.acolor.color = '#ead906'
-        this.timeStatus.level = '一般告警'
+        this.form.status[0].value = '一般告警'
       }
     },
     toalarm() {
@@ -381,7 +381,6 @@ export default {
         path: '/alarm/cableTime',
         query: {
           alarmTargetName: this.form.baseInfo.leakyCableDescribe
-
         }
       })
     },

src/views/setting/add/comp/monitorEquip.vue

@@ -64,7 +64,7 @@
         />
       </el-form-item>
       <el-form-item label="IP：" prop="ip">
-        <el-input v-model="monitorForm.ip" placeholder="请输入设备厂商" />
+        <el-input v-model="monitorForm.ip" placeholder="请输入IP" />
       </el-form-item>
       <el-form-item label="设备类别：" prop="equipType">
         <el-select v-model="monitorForm.equipType" placeholder="请输入设备类别">

src/views/setting/add/comp/railWay.vue

@@ -54,8 +54,8 @@ export default {
           { required: true, message: "请输入铁路线终点站名", trigger: "blur" },
         ],
        
-        totalLong: [
-          { required: true, pattern:/^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]{1,5})$)|^(([1-9]+)$)/, message: "请输入整数或小数(小数点后最多5位)", trigger: "blur" },
+        totalLong: [ 
+          { required: true, pattern:/^0\.([1-9]|\d[1-9])$|^[1-9]\d{0,7}\.\d{0,2}$|^[1-9]\d{0,7}$/, message: "最大输入8位整数（小数点后最多2位）", trigger: "blur" },
         ],
       },
     };

src/views/user/userLog/index.vue

@@ -77,6 +77,7 @@ export default {
         : this.getTableData();
     },
     search(option){
+      this.params.current = 1
       this.istrue=1
       this.searchOption = option
       this.getTableData()