From a642307d94aacbba4f12e9065abbc8c3db10d36d Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 20 May 2024 09:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/index.vue | 165 +++++++++++++++++------------------
 src/views/logList/index.vue  | 146 +++++++++++++++++++++----------
 2 files changed, 179 insertions(+), 132 deletions(-)

diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 7e5b964..3b9588a 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -9,11 +9,7 @@
       >
         <div class="topSearch">
           <el-form-item label="电压" class="dybox">
-            <el-select
-              v-model="formdata.dyId"
-              @change="getSearchxl"
-              filterable
-            >
+            <el-select v-model="formdata.dyId" @change="getSearchxl" filterable>
               <el-option
                 v-for="item in dyOptions"
                 :key="item.id"
@@ -35,7 +31,6 @@
                 :label="item.name"
                 :value="item.id"
               >
-               
               </el-option>
             </el-select>
           </el-form-item>
@@ -67,8 +62,7 @@
                 :label="item.name"
                 :value="item.id"
               >
-            
-            </el-option>
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="规约" class="gybox">
@@ -79,8 +73,8 @@
                 :label="item.name"
                 :value="item.id"
               >
-              {{ item.name }}-{{ item.id }}
-            </el-option>
+                {{ item.name }}-{{ item.id }}
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="活动" class="activitybox">
@@ -98,8 +92,8 @@
             </el-select>
           </el-form-item>
         </div>
-       <div class="bottomSearch">
-           <el-form-item label="出厂ID" class="oidbox">
+        <div class="bottomSearch">
+          <el-form-item label="出厂ID" class="oidbox">
             <el-input
               v-model="formdata.oid"
               placeholder="请输入出厂ID"
@@ -187,7 +181,7 @@
             <el-button type="primary" @click="onSubmit">查询</el-button>
             <el-button type="primary" @click="onReset">重置</el-button>
           </el-form-item>
-        </div> 
+        </div>
       </el-form>
       <el-tooltip
         class="item"
@@ -222,13 +216,12 @@
 </template>
 <script>
 import {
-
   cmdActlistApi,
   getTerminalJoggle,
   getActivityApi,
   getProtocolList,
   getSearchInfo,
-  exportTerminalApi
+  exportTerminalApi,
 } from "@/utils/api/index";
 import tableMain from "./components/tableMain";
 export default {
@@ -239,7 +232,7 @@ export default {
   data() {
     return {
       showDiv: true, // 控制div的显示与隐藏
-    
+
       dyOptions: [{ id: -1, name: "全部" }], //电压数据
       xlOptions: [{ id: -1, name: "全部" }], //线路数据
       gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
@@ -256,9 +249,9 @@ export default {
         { id: 2, name: "未运维" },
       ], //是否运维
       formdata: {
-        dyId:-1,
-        lineId:-1,
-        towerId:-1,
+        dyId: -1,
+        lineId: -1,
+        towerId: -1,
         isonline: -1,
         protocol: -1,
         mntn: 1,
@@ -271,9 +264,8 @@ export default {
         cmaExclude: 0,
         version: "",
         versionExclude: 0,
-       
       },
-      
+
       dataList: [],
       dataListNew: [],
       tableLoaidng: true,
@@ -287,7 +279,6 @@ export default {
     };
   },
   created() {
-    
     this.activityIdLoc =
       JSON.parse(localStorage.getItem("activeId")) !== null
         ? JSON.parse(localStorage.getItem("activeId"))
@@ -298,34 +289,35 @@ export default {
       JSON.parse(localStorage.getItem("searchParams")) !== null
         ? JSON.parse(localStorage.getItem("searchParams"))
         : {
-          dyId:-1,
-          lineId:-1,
-          towerId:-1,
-          isonline: -1,
-          protocol: -1,
-          mntn: 1,
-          activityId: -1,
-          oid: "",
-          oidExclude: 0,
-          cmdid: "",
-          cmdidExclude: 0,
-          cma: "",
-          cmaExclude: 0,
-          version: "",
-          versionExclude: 0,
+            dyId: -1,
+            lineId: -1,
+            towerId: -1,
+            isonline: -1,
+            protocol: -1,
+            mntn: 1,
+            activityId: -1,
+            oid: "",
+            oidExclude: 0,
+            cmdid: "",
+            cmdidExclude: 0,
+            cma: "",
+            cmaExclude: 0,
+            version: "",
+            versionExclude: 0,
           };
   },
   mounted() {
     this.getSearchdy();
     this.getProtocol();
-    this.getactiveList()
+    this.getactiveList();
   },
   watch: {},
   methods: {
     //导出数据
-    exportTable(){let params = {
-        pageindex:1,
-        pagesize:10000,
+    exportTable() {
+      let params = {
+        pageindex: 1,
+        pagesize: 10000,
       };
       // 根据条件添加参数
       if (this.formdata.dyId !== -1) {
@@ -349,11 +341,11 @@ export default {
       if (this.formdata.activityId !== -1) {
         params.activityId = this.formdata.activityId;
       }
-      
+
       if (this.formdata.oid !== "") {
         params.oid = this.formdata.oid;
       }
-      console.log(this.formdata.oidExclude)
+      console.log(this.formdata.oidExclude);
       if (this.formdata.oidExclude !== 0) {
         params.oidExclude = this.formdata.oidExclude;
       }
@@ -363,7 +355,7 @@ export default {
       if (this.formdata.cmaExclude !== 0) {
         params.cmaExclude = this.formdata.cmaExclude;
       }
-      if (this.formdata.cmdid !=="") {
+      if (this.formdata.cmdid !== "") {
         params.cmdid = this.formdata.cmdid;
       }
       if (this.formdata.cmdidExclude !== 0) {
@@ -375,21 +367,21 @@ export default {
       if (this.formdata.versionExclude !== 0) {
         params.versionExclude = this.formdata.versionExclude;
       }
-      console.log(params)
+      console.log(params);
       exportTerminalApi(params)
         .then((res) => {
-          console.log(res)
+          console.log(res);
           const now = this.$moment(new Date());
           const formattedTime = now.format("YYYY年MM月DD日HH时mm分"); // 格式化时间字符串，例如 "2023-04-01_15_30_00"
-          const blob = new Blob([res])
-          const link = document.createElement('a')
-          link.href = window.URL.createObjectURL(blob)
-          link.download = `运维数据报表_${formattedTime}.xls`
-          link.click()
+          const blob = new Blob([res]);
+          const link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          link.download = `运维数据报表_${formattedTime}.xls`;
+          link.click();
         })
         .catch((err) => {});
     },
-   //获取电压信息
+    //获取电压信息
     getSearchdy() {
       getSearchInfo({ type: 1 })
         .then((res) => {
@@ -404,7 +396,7 @@ export default {
     getSearchxl() {
       getSearchInfo({ type: 2, id: this.formdata.dyId })
         .then((res) => {
-          this.xlOptions = [{ id: -1, name: "全部" }]
+          this.xlOptions = [{ id: -1, name: "全部" }];
           this.xlOptions = this.xlOptions.concat(res.data.list);
           this.formdata.lineId = this.xlOptions[0].id;
           this.getSearchgt();
@@ -415,7 +407,7 @@ export default {
     getSearchgt() {
       getSearchInfo({ type: 3, id: this.formdata.lineId })
         .then((res) => {
-          this.gtOptions = [{ id: -1, name: "全部" }]
+          this.gtOptions = [{ id: -1, name: "全部" }];
           this.gtOptions = this.gtOptions.concat(res.data.list);
           this.formdata.towerId = this.gtOptions[0].id;
         })
@@ -432,7 +424,7 @@ export default {
         .catch((err) => {});
     },
     //获取活动列表
-    getactiveList(){
+    getactiveList() {
       getActivityApi()
         .then((res) => {
           console.log(res);
@@ -457,7 +449,7 @@ export default {
     },
     onSubmit() {
       this.tableLoaidng = true;
-     
+
       this.dataList = [];
       // 停止之前的定时器
       if (this.intervalId) {
@@ -470,12 +462,11 @@ export default {
         // 在这里执行接口请求的代码
         this.fetchData();
       }, interval);
-      
     },
     fetchData() {
       let params = {
-        pageindex:1,
-        pagesize:10000,
+        pageindex: 1,
+        pagesize: 10000,
       };
       // 根据条件添加参数
       if (this.formdata.dyId !== -1) {
@@ -493,18 +484,18 @@ export default {
       if (this.formdata.protocol !== -1) {
         params.protocol = this.formdata.protocol;
       }
-      
+
       if (this.formdata.mntn !== -1) {
         params.mntn = this.formdata.mntn;
       }
       if (this.formdata.activityId !== -1) {
         params.activityId = this.formdata.activityId;
       }
-      
+
       if (this.formdata.oid !== "") {
         params.oid = this.formdata.oid;
       }
-      console.log(this.formdata.oidExclude)
+      console.log(this.formdata.oidExclude);
       if (Number(this.formdata.oidExclude) !== 0) {
         params.oidExclude = this.formdata.oidExclude;
       }
@@ -514,7 +505,7 @@ export default {
       if (Number(this.formdata.cmaExclude) !== 0) {
         params.cmaExclude = this.formdata.cmaExclude;
       }
-      if (this.formdata.cmdid !=="") {
+      if (this.formdata.cmdid !== "") {
         params.cmdid = this.formdata.cmdid;
       }
       if (Number(this.formdata.cmdidExclude) !== 0) {
@@ -526,39 +517,43 @@ export default {
       if (Number(this.formdata.versionExclude) !== 0) {
         params.versionExclude = this.formdata.versionExclude;
       }
-      console.log(params)
+      console.log(params);
       localStorage.setItem("searchParams", JSON.stringify(params));
       getTerminalJoggle(params)
         .then((res) => {
-          console.log(res)
+          console.log(res);
           this.dataList = res.data;
           this.getCmdList();
           this.onlineNum = this.dataList.filter(
-            (item) => item.onlinestatus ==1
+            (item) => item.onlinestatus == 1
           ).length;
           this.offlineNum = this.dataList.length - this.onlineNum;
           this.tableLoaidng = false;
           this.noPicNum = this.dataList.filter(
-            (item) => item.mntnStatus.reportMap == null ||
+            (item) =>
+              item.mntnStatus.reportMap == null ||
               item.mntnStatus.reportMap.pic == undefined ||
               item.mntnStatus.reportMap.pic == 0 ||
               item.mntnStatus.reportMap.pic == -1
           ).length;
-          
-          this.freeNum = this.dataList.filter(item => {  
-            // 确保mntnStatus和reportMap存在，并且freeROM不是null或undefined  
-            const freeROM = item.mntnStatus?.reportMap?.freeROM;  
-            // 如果freeROM存在并且可以被转换为数字  
-            if (freeROM !== null && freeROM !== undefined && !isNaN(parseInt(freeROM, 10))) {  
-              // 转换为整数并检查是否小于50  
-              return parseInt(freeROM, 10) < 50;  
-            }  
-            // 如果freeROM不存在或不是数字，则忽略此项  
-            return false;  
+
+          this.freeNum = this.dataList.filter((item) => {
+            // 确保mntnStatus和reportMap存在，并且freeROM不是null或undefined
+            const freeROM = item.mntnStatus?.reportMap?.freeROM;
+            // 如果freeROM存在并且可以被转换为数字
+            if (
+              freeROM !== null &&
+              freeROM !== undefined &&
+              !isNaN(parseInt(freeROM, 10))
+            ) {
+              // 转换为整数并检查是否小于50
+              return parseInt(freeROM, 10) < 50;
+            }
+            // 如果freeROM不存在或不是数字，则忽略此项
+            return false;
           }).length;
-         
-         console.log("我已经加载完数据")
-          
+
+          console.log("我已经加载完数据");
         })
         .catch((err) => {});
     },
@@ -597,9 +592,9 @@ export default {
     //重置
     onReset() {
       this.formdata = {
-        dyId:-1,
-        lineId:-1,
-        towerId:-1,
+        dyId: -1,
+        lineId: -1,
+        towerId: -1,
         isonline: -1,
         protocol: -1,
         mntn: 1,
@@ -664,7 +659,7 @@ export default {
           }
         }
       }
-      .dybox{
+      .dybox {
         .el-select {
           width: 120px;
         }
diff --git a/src/views/logList/index.vue b/src/views/logList/index.vue
index 83570e2..87a3865 100644
--- a/src/views/logList/index.vue
+++ b/src/views/logList/index.vue
@@ -1,16 +1,28 @@
 <template>
   <div class="logMainClass">
-    <h3>日志列表
-
-      <el-select v-model="logValue" placeholder="请选择" @change="logTypeChange">
+    <div class="logTitle">
+      <h3>日志列表</h3>
+      <el-select
+        v-model="logValue"
+        placeholder="请选择"
+        @change="logTypeChange"
+      >
         <el-option
           v-for="item in LogOptions"
           :key="item.value"
           :label="item.label"
-          :value="item.value">
+          :value="item.value"
+        >
         </el-option>
       </el-select>
-    </h3>
+      <el-input
+        v-model="cmdidVal"
+        placeholder="请输入装置编号"
+        clearable
+      ></el-input>
+      <el-button type="primary" @click="onSubmit">查询</el-button>
+    </div>
+
     <div class="boxLogTable">
       <el-table
         v-loading="logLoading"
@@ -24,7 +36,8 @@
         </el-table-column>
         <!-- <el-table-column prop="id" label="Id" width="80"> </el-table-column> -->
         <el-table-column prop="lineName" label="线路"> </el-table-column>
-        <el-table-column prop="cmdid" label="装置编号" width="160"> </el-table-column>
+        <el-table-column prop="cmdid" label="装置编号" width="160">
+        </el-table-column>
         <el-table-column label="规约" width="140">
           <template slot-scope="scope">
             {{ protocolMap[scope.row.protocol] }}
@@ -33,9 +46,12 @@
         <el-table-column prop="fileName" label="文件名">
           <template slot-scope="scope">
             <!-- <a :href="'http://61.169.135.146:40085/dl/' + scope.row.path" class="buttonText"></a> -->
-            <el-button type="text" @click="downFile(scope.row)" class="buttonText">{{
-              scope.row.fileName
-            }}</el-button>
+            <el-button
+              type="text"
+              @click="downFile(scope.row)"
+              class="buttonText"
+              >{{ scope.row.fileName }}</el-button
+            >
           </template>
         </el-table-column>
         <el-table-column label="文件大小" width="100">
@@ -43,8 +59,9 @@
             {{ scope.row.fileSize | changeType }}
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="上传时间" width="160"> </el-table-column>
-        <el-table-column label="操作" class-name="editClass" >
+        <el-table-column prop="createTime" label="上传时间" width="160">
+        </el-table-column>
+        <el-table-column label="操作" class-name="editClass">
           <template slot-scope="scope">
             <el-link
               type="danger"
@@ -60,20 +77,24 @@
   </div>
 </template>
 <script>
-import { logListApi,logDeleteApi} from "@/utils/api/index";
+import { logListApi, logDeleteApi } from "@/utils/api/index";
 export default {
   name: "log",
   components: {},
   data() {
     return {
-      logValue:0,
-      LogOptions:[{
+      logValue: 0,
+      cmdidVal: "",
+      LogOptions: [
+        {
           value: 0,
-          label: '日志'
-        }, {
+          label: "日志",
+        },
+        {
           value: 1,
-          label: '其它'
-        }],
+          label: "其它",
+        },
+      ],
       tableData: [],
       logLoading: false,
       protocolMap: {
@@ -86,8 +107,8 @@ export default {
         65285: "河南全景",
         65286: "河南郑州",
         65290: "河南统一视频v2020",
-        65298:"宁夏",
-        2:"南网"
+        65298: "宁夏",
+        2: "南网",
       },
     };
   },
@@ -104,15 +125,32 @@ export default {
   computed: {},
   created() {},
   mounted() {
-    this.getLogList(0);
+    this.getLogList();
   },
   methods: {
-    logTypeChange(val){
-      this.getLogList(val)
+    logTypeChange(val) {
+      let params = {
+        type: val,
+      };
+      // 根据条件添加参数
+      if (this.cmdidVal !== "") {
+        params.cmdid = this.cmdidVal;
+      }
+      this.getLogList(params);
+    },
+    onSubmit() {
+      let params = {
+        type: this.logValue,
+      };
+      // 根据条件添加参数
+      if (this.cmdidVal !== "") {
+        params.cmdid = this.cmdidVal;
+      }
+      this.getLogList(params);
     },
-    getLogList(val) {
+    getLogList(params) {
       this.logLoading = true;
-      logListApi({type:val})
+      logListApi(params)
         .then((res) => {
           this.tableData = res.data;
           this.logLoading = false;
@@ -144,23 +182,22 @@ export default {
         .catch(() => {});
     },
     //下载日志文件
-    downFile(row){
-      
-      // 创建一个新的a标签元素  
-      const a = document.createElement('a');  
-      // 设置a标签的href属性为文件的URL  
-      a.href = '/dl/'+row.path;  
-      console.log(a.href)
-      // 设置文件名（可选，取决于服务器配置）  
-      a.download = row.fileName; // 你希望保存的文件名  
+    downFile(row) {
+      // 创建一个新的a标签元素
+      const a = document.createElement("a");
+      // 设置a标签的href属性为文件的URL
+      a.href = "/dl/" + row.path;
+      console.log(a.href);
+      // 设置文件名（可选，取决于服务器配置）
+      a.download = row.fileName; // 你希望保存的文件名
 
-      // 触发点击事件  
-      document.body.appendChild(a);  
-      a.click();  
+      // 触发点击事件
+      document.body.appendChild(a);
+      a.click();
 
-      // 然后移除a标签  
-      document.body.removeChild(a); 
-    }
+      // 然后移除a标签
+      document.body.removeChild(a);
+    },
   },
 };
 </script>
@@ -169,15 +206,31 @@ export default {
   height: calc(100% - 24px);
   width: calc(100% - 24px);
   padding: 12px;
-  h3 {
+  .logTitle {
+    display: flex;
+    align-items: center;
+    height: 32px;
     margin-bottom: 12px;
-    font-size: 16px;
-    line-height: 24px;
-  }
+    h3 {
+      font-size: 16px;
+    }
+    .el-select {
+      margin: 0px 12px;
 
+      .el-input {
+        width: 100px;
+      }
+    }
+    .el-input {
+      width: 200px;
+    }
+    .el-button--small {
+      margin-left: 12px;
+    }
+  }
   .boxLogTable {
-    height: calc(100% - 36px);
-    background: #fcc;
+    height: calc(100% - 44px);
+
     .el-table__cell {
       text-align: center;
     }
@@ -190,7 +243,6 @@ export default {
       cursor: pointer;
       white-space: pre-wrap;
       &:hover {
-       
         text-decoration: underline;
       }
     }