From 2146867f8278b6ba96f41453eca2504327b53b39 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 30 May 2024 10:52:48 +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/components/tableMain.vue |   8 +-
 src/views/homePage/index.vue                |  56 ++++--
 src/views/report/index.vue                  | 209 ++++++++++----------
 3 files changed, 147 insertions(+), 126 deletions(-)

diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index b954865..42f277d 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -1029,8 +1029,8 @@ export default {
         yw_cmd_stop_frpc: "停止frpc",
         i1_cmd_stop_aging_test: "停止老化测试",
         del_file: "删除文件",
-        upload_file: "上传文件",
-        download_file: "下发文件",
+        pull_files: "拉取文件",
+        push_file: "推送文件",
       },
       taskdrawer: false,
       drawer: false,
@@ -1938,7 +1938,7 @@ export default {
       this.$refs.pullFileFormref.validate((valid) => {
         if (valid) {
           var params = {
-            action: "upload_file",
+            action: "pull_files",
             path: this.pullFileForm.pullFile,
             termIds: this.idArray,
           };
@@ -1981,7 +1981,7 @@ export default {
       this.$refs.pushFileFormref.validate((valid) => {
         if (valid) {
           var params = {
-            action: "download_file",
+            action: "push_file",
             path: this.pushFileForm.name,
             content: base64Data,
             termIds: this.idArray,
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 3b9588a..b6a1d4b 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -285,26 +285,40 @@ export default {
         : -1;
     //this.fetchData(); // 初始化时获取数据
     //setInterval(this.fetchData, 60000); // 每10秒刷新数据
-    this.formdata =
-      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,
-          };
+    let jsonSearch = JSON.parse(localStorage.getItem("searchParams"));
+    if (jsonSearch !== null) {
+      if (!jsonSearch.hasOwnProperty("isonline")) {
+        jsonSearch.isonline = -1;
+      }
+      if (!jsonSearch.hasOwnProperty("mntn")) {
+        jsonSearch.mntn = -1;
+      }
+
+      this.formdata = jsonSearch;
+      console.log(this.formdata);
+    } else {
+      this.formdata = jsonSearch;
+    }
+    // this.formdata =
+    //   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,
+    //       };
   },
   mounted() {
     this.getSearchdy();
@@ -434,6 +448,7 @@ export default {
             name: item.title,
           }));
           this.activityOptions = this.activityOptions.concat(activeArr);
+
           //this.formdata.activityId = this.activityOptions[0].id;
           this.formdata.activityId =
             JSON.parse(localStorage.getItem("activeId")) !== null
@@ -444,6 +459,7 @@ export default {
         .catch((err) => {});
     },
     changeActive(val) {
+      console.log(this.activityOptions);
       console.log(val);
       localStorage.setItem("activeId", JSON.stringify(val));
     },
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index 87b534e..207875b 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -37,44 +37,42 @@
           ></el-button>
         </div>
         <div class="mlbpox" v-loading="leftComLoading">
-        <div
-          class="commandList"
-         
-          v-if="leftCommand.length != 0"
-         
-        >
-          <p
-            class="comLi"
-            v-for="(item, index) in leftCommand"
-            :key="index"
-            @dblclick="handleShowCommand(item)"
-          >
-            <span class="indexClass">{{ index + 1 }}</span>
-            <span class="comMsg"
-              ><b>时间：{{ item.createTime }}</b>
-              <b v-if="item.terminal && item.terminal.cmdid">设备ID：{{ item.terminal.cmdid }}</b>
-              <b v-if="item.cmdMap &&item.cmdMap.fileName">apk版本：{{ item.cmdMap.fileName }}</b>
-              <b>命令：{{ cmdCn[item.name] }}</b
-              >
-             
-              <b v-if="item.estimatedPublishTime * 1000 - newupdatatime > 0"
-                >命令预计拿走时间：
+          <div class="commandList" v-if="leftCommand.length != 0">
+            <p
+              class="comLi"
+              v-for="(item, index) in leftCommand"
+              :key="index"
+              @dblclick="handleShowCommand(item)"
+            >
+              <span class="indexClass">{{ index + 1 }}</span>
+              <span class="comMsg"
+                ><b>时间：{{ item.createTime }}</b>
+                <b v-if="item.terminal && item.terminal.cmdid"
+                  >设备ID：{{ item.terminal.cmdid }}</b
+                >
+                <b v-if="item.cmdMap && item.cmdMap.fileName"
+                  >apk版本：{{ item.cmdMap.fileName }}</b
+                >
+                <b>命令：{{ cmdCn[item.name] }}</b>
 
-                {{
-                  $moment(item.estimatedPublishTime * 1000).format(
-                    "MM-DD HH:mm:ss"
-                  )
-                }}
-                {{ remainingTime(item) }}
-              </b>
-            </span>
-          </p>
-        </div>
-        <div class="commandList" v-else>
-          <p>暂无下发命令</p>
+                <b v-if="item.estimatedPublishTime * 1000 - newupdatatime > 0"
+                  >命令预计拿走时间：
+
+                  {{
+                    $moment(item.estimatedPublishTime * 1000).format(
+                      "MM-DD HH:mm:ss"
+                    )
+                  }}
+                  {{ remainingTime(item) }}
+                </b>
+              </span>
+            </p>
+          </div>
+          <div class="commandList" v-else>
+            <p>暂无下发命令</p>
+          </div>
         </div>
       </div>
-      </div>
       <div class="commandRunRight commandClass">
         <div class="headTitle">
           <span class="title">已下发终端</span>
@@ -111,34 +109,38 @@
           ></el-button>
         </div>
         <div class="mlbpox" v-loading="rightComLoading">
-        <div class="commandList" v-if="rightCommand.length != 0" >
-          <p class="comLi" v-for="(item, index) in rightCommand" :key="index">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :open-delay="600"
-              :content="item.status == '1' ? '已下发' : '已取消'"
-              placement="top"
-            >
-              <span
-                class="indexClass"
-                :class="item.status == '1' ? 'normalClass' : 'cancelClass'"
-                >{{ index + 1 }}</span
+          <div class="commandList" v-if="rightCommand.length != 0">
+            <p class="comLi" v-for="(item, index) in rightCommand" :key="index">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :open-delay="600"
+                :content="item.status == '1' ? '已下发' : '已取消'"
+                placement="top"
               >
-            </el-tooltip>
-            <span class="comMsg" 
-              ><b>下发时间：{{ item.publishTime }}</b>
-              <b v-if="item.terminal && item.terminal.cmdid">设备ID：{{ item.terminal.cmdid }}</b>
-              <b>命令：{{ cmdCn[item.name] }}</b>
-              <b v-if="item.cmdMap &&item.cmdMap.fileName">apk版本：{{ item.cmdMap.fileName }}</b>
-              <b v-else>cmd：{{ item.cmdMap }}</b>
-            </span>
-          </p>
+                <span
+                  class="indexClass"
+                  :class="item.status == '1' ? 'normalClass' : 'cancelClass'"
+                  >{{ index + 1 }}</span
+                >
+              </el-tooltip>
+              <span class="comMsg"
+                ><b>下发时间：{{ item.publishTime }}</b>
+                <b v-if="item.terminal && item.terminal.cmdid"
+                  >设备ID：{{ item.terminal.cmdid }}</b
+                >
+                <b>命令：{{ cmdCn[item.name] }}</b>
+                <b v-if="item.cmdMap && item.cmdMap.fileName"
+                  >apk版本：{{ item.cmdMap.fileName }}</b
+                >
+                <b v-else>cmd：{{ item.cmdMap }}</b>
+              </span>
+            </p>
+          </div>
+          <div class="commandList" v-else>
+            <p>暂无已下发命令</p>
+          </div>
         </div>
-        <div class="commandList" v-else>
-          <p>暂无已下发命令</p>
-        </div>
-      </div>
       </div>
     </div>
     <el-dialog
@@ -152,7 +154,7 @@
         <!-- {{ deveceMsg }} -->
         <p>设备ID:{{ devCmdid }}</p>
         <p>操作时间：{{ deveceMsg.createTime }}</p>
-        <p>待执行操作：{{cmdCn[deveceMsg.name]}}  {{ deveceMsg.name }}</p>
+        <p>待执行操作：{{ cmdCn[deveceMsg.name] }} {{ deveceMsg.name }}</p>
         <p>cmd：{{ deveceMsg.cmd }}</p>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -162,21 +164,26 @@
   </div>
 </template>
 <script>
-import { cmdSendApi,getCmdActionApi,cmdActlistApi,cmdActHislistApi } from "@/utils/api/index";
+import {
+  cmdSendApi,
+  getCmdActionApi,
+  cmdActlistApi,
+  cmdActHislistApi,
+} from "@/utils/api/index";
 export default {
   name: "report",
   components: {},
   data() {
     return {
       leftComLoading: false, //左侧loading
-      rightComLoading:false,//右侧loiading
+      rightComLoading: false, //右侧loiading
       // runCommand: [],
       // endCommand: [],
       leftCommand: [],
       rightCommand: [],
       commandShow: false,
       deveceMsg: {},
-      devCmdid:'',
+      devCmdid: "",
       cmdCn: {
         yw_cmd_android_reboot: "重启设备",
         yw_cmd_mcu_reboot: "MCU单片机重启",
@@ -190,19 +197,17 @@ export default {
         yw_cmd_stop_frpc: "停止frpc",
         i1_cmd_stop_aging_test: "停止老化测试",
         del_file: "删除文件",
-        upload_file: "上传文件",
-        download_file: "下发文件",
+        pull_files: "拉取文件",
+        push_file: "推送文件",
       },
       cmdtimer: null,
       endtimer: null,
       updateTime: null,
       newupdatatime: null,
       //运维操作列表
-      operateOptions: [
-        {id: 0, key: "all", desc: "全部"}
-      ],
-      operateL: 'all',
-      operateR: 'all',
+      operateOptions: [{ id: 0, key: "all", desc: "全部" }],
+      operateL: "all",
+      operateR: "all",
       leftcmdVal: "",
       rightcmdVal: "",
       intervalId: null, // 用于存储setInterval返回的ID
@@ -216,19 +221,19 @@ export default {
   mounted() {
     this.getCmdList();
     this.getEndList();
-    this.getCmdOptionsFun()
+    this.getCmdOptionsFun();
     this.startCountdown(); // 在组件挂载后开始倒计时
   },
 
   methods: {
-    getCmdOptionsFun(){
+    getCmdOptionsFun() {
       getCmdActionApi()
-          .then((res) => {
-            console.log(res);
-            this.operateOptions = this.operateOptions.concat(res.data);
-           // this.operateL = this.operateOptions[0].desc;
-          })
-          .catch((err) => {});
+        .then((res) => {
+          console.log(res);
+          this.operateOptions = this.operateOptions.concat(res.data);
+          // this.operateL = this.operateOptions[0].desc;
+        })
+        .catch((err) => {});
     },
     startCountdown() {
       this.newupdatatime = new Date().getTime(); // 更新当前时间
@@ -264,12 +269,12 @@ export default {
     getCmdList() {
       this.leftComLoading = true;
       let params = {
-        pageNum:1,
-        pageSize:300,
+        pageNum: 1,
+        pageSize: 300,
       };
-      console.log(this.operateL)
+      console.log(this.operateL);
       // 根据条件添加参数
-      if (this.operateL!=='all') {
+      if (this.operateL !== "all") {
         params.action = this.operateL;
       }
       if (this.leftcmdVal !== "") {
@@ -278,10 +283,10 @@ export default {
       cmdActlistApi(params)
         .then((res) => {
           console.log(res);
-           //this.runCommand = res.data.list;
+          //this.runCommand = res.data.list;
           this.leftCommand = res.data.list;
           this.leftComLoading = false;
-          
+
           this.updateTime = new Date();
         })
         .catch((err) => {});
@@ -291,30 +296,30 @@ export default {
       this.commandShow = true;
       console.log(this.commandShow);
       this.deveceMsg = val;
-      this.devCmdid = val.terminal.cmdid
+      this.devCmdid = val.terminal.cmdid;
     },
-   
+
     //获取已取走列表
     getEndList() {
       this.rightComLoading = true;
       let params = {
-        pageNum:1,
-        pageSize:300,
+        pageNum: 1,
+        pageSize: 300,
       };
       // 根据条件添加参数
-      if (this.operateR!== 'all') {
+      if (this.operateR !== "all") {
         params.action = this.operateR;
       }
-      if (this.rightcmdVal!== "") {
+      if (this.rightcmdVal !== "") {
         params.cmdid = this.rightcmdVal;
       }
       cmdActHislistApi(params)
         .then((res) => {
           console.log(res);
           //this.endCommand = res.data;
-           //this.endCommand = res.data.list
+          //this.endCommand = res.data.list
           this.rightCommand = res.data.list;
-          
+
           this.rightComLoading = false;
           this.updateTime = new Date();
         })
@@ -322,23 +327,23 @@ export default {
     },
     //左侧筛选
     selectLeftChanged() {
-      this.getCmdList()
+      this.getCmdList();
     },
     leftInputChange() {
       console.log(this.leftcmdVal);
-      this.getCmdList()
+      this.getCmdList();
     },
 
     //右侧筛选
     selectRightChanged() {
-      this.getEndList()
+      this.getEndList();
     },
     rightInputChange() {
-      this.getEndList()
+      this.getEndList();
     },
-     //取消操作
-     handleCancel(val) {
-      console.log(val)
+    //取消操作
+    handleCancel(val) {
+      console.log(val);
       cmdSendApi({
         action: "cancel",
         id: val,
@@ -482,7 +487,7 @@ export default {
           padding: 4px;
         }
       }
-      .mlbpox{
+      .mlbpox {
         height: calc(100% - 40px);
       }
       .commandList {