优化

1 year ago · 2146867f82
parent c7fe72bf3b
commit 2146867f82
3 changed files with 147 additions and 126 deletions
--- 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,
--- 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));
    },
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@ -37,12 +37,7 @@
          ></el-button>
        </div>
        <div class="mlbpox" v-loading="leftComLoading">
-        <div
-          class="commandList"
-         
-          v-if="leftCommand.length != 0"
-         
-        >
+          <div class="commandList" v-if="leftCommand.length != 0">
            <p
              class="comLi"
              v-for="(item, index) in leftCommand"
@ -52,10 +47,13 @@
              <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.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"
                  >命令预计拿走时间：
@ -128,9 +126,13 @@
              </el-tooltip>
              <span class="comMsg"
                ><b>下发时间：{{ item.publishTime }}</b>
-              <b v-if="item.terminal && item.terminal.cmdid">设备ID：{{ item.terminal.cmdid }}</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-if="item.cmdMap && item.cmdMap.fileName"
+                  >apk版本：{{ item.cmdMap.fileName }}</b
+                >
                <b v-else>cmd：{{ item.cmdMap }}</b>
              </span>
            </p>
@ -162,7 +164,12 @@
  </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: {},
@ -176,7 +183,7 @@ export default {
      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,7 +221,7 @@ export default {
  mounted() {
    this.getCmdList();
    this.getEndList();
-    this.getCmdOptionsFun()
+    this.getCmdOptionsFun();
    this.startCountdown(); // 在组件挂载后开始倒计时
  },

@ -267,9 +272,9 @@ export default {
        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 !== "") {
@ -291,7 +296,7 @@ export default {
      this.commandShow = true;
      console.log(this.commandShow);
      this.deveceMsg = val;
-      this.devCmdid = val.terminal.cmdid
+      this.devCmdid = val.terminal.cmdid;
    },

    //获取已取走列表
@ -302,7 +307,7 @@ export default {
        pageSize: 300,
      };
      // 根据条件添加参数
-      if (this.operateR!== 'all') {
+      if (this.operateR !== "all") {
        params.action = this.operateR;
      }
      if (this.rightcmdVal !== "") {
@ -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)
+      console.log(val);
      cmdSendApi({
        action: "cancel",
        id: val,