From a69131a4910d963288014a5049941f45e5ceb9b3 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 17 May 2024 10:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E7=BB=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/components/tableMain.vue |  2 +-
 src/views/homePage/index.vue                | 66 +++++++++++----------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 57b3096..e44e912 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -1515,7 +1515,7 @@ export default {
           console.log("上传日志");
           var params = {
             action:"yw_cmd_upload_i1_zip_log",
-            url: "http://180.166.218.222:40101/upload/",
+            //url: "http://180.166.218.222:40101/upload/",
             termIds: this.idArray,
           };
           this.changeIssue(params);
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 1af0ba5..7e5b964 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -72,7 +72,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="规约" class="gybox">
-            <el-select v-model="formdata.protocolId" filterable>
+            <el-select v-model="formdata.protocol" filterable>
               <el-option
                 v-for="item in protocolOptions"
                 :key="item.id"
@@ -101,7 +101,7 @@
        <div class="bottomSearch">
            <el-form-item label="出厂ID" class="oidbox">
             <el-input
-              v-model="formdata.bsIdentifier"
+              v-model="formdata.oid"
               placeholder="请输入出厂ID"
               clearable
             ></el-input>
@@ -113,8 +113,8 @@
               placement="top"
             >
               <el-checkbox
-                v-model="formdata.bsIdentifierExclude"
-                :checked="formdata.bsIdentifierExclude == 1 ? true : false"
+                v-model="formdata.oidExclude"
+                :checked="formdata.oidExclude == 1 ? true : false"
                 true-label="1"
                 false-label="0"
               ></el-checkbox>
@@ -260,11 +260,11 @@ export default {
         lineId:-1,
         towerId:-1,
         isonline: -1,
-        protocolId: -1,
+        protocol: -1,
         mntn: 1,
         activityId: -1,
-        bsIdentifier: "",
-        bsIdentifierExclude: 0,
+        oid: "",
+        oidExclude: 0,
         cmdid: "",
         cmdidExclude: 0,
         cma: "",
@@ -302,11 +302,11 @@ export default {
           lineId:-1,
           towerId:-1,
           isonline: -1,
-          protocolId: -1,
+          protocol: -1,
           mntn: 1,
           activityId: -1,
-          bsIdentifier: "",
-          bsIdentifierExclude: 0,
+          oid: "",
+          oidExclude: 0,
           cmdid: "",
           cmdidExclude: 0,
           cma: "",
@@ -340,8 +340,8 @@ export default {
       if (this.formdata.isonline !== -1) {
         params.isonline = this.formdata.isonline;
       }
-      if (this.formdata.protocolId !== -1) {
-        params.protocolId = this.formdata.protocolId;
+      if (this.formdata.protocol !== -1) {
+        params.protocol = this.formdata.protocol;
       }
       if (this.formdata.mntn !== -1) {
         params.mntn = this.formdata.mntn;
@@ -350,12 +350,12 @@ export default {
         params.activityId = this.formdata.activityId;
       }
       
-      if (this.formdata.bsIdentifier !== "") {
-        params.bsIdentifier = this.formdata.bsIdentifier;
+      if (this.formdata.oid !== "") {
+        params.oid = this.formdata.oid;
       }
-      console.log(this.formdata.bsIdentifierExclude)
-      if (this.formdata.bsIdentifierExclude !== 0) {
-        params.bsIdentifierExclude = this.formdata.bsIdentifierExclude;
+      console.log(this.formdata.oidExclude)
+      if (this.formdata.oidExclude !== 0) {
+        params.oidExclude = this.formdata.oidExclude;
       }
       if (this.formdata.cma !== "") {
         params.cma = this.formdata.cma;
@@ -404,6 +404,7 @@ export default {
     getSearchxl() {
       getSearchInfo({ type: 2, id: this.formdata.dyId })
         .then((res) => {
+          this.xlOptions = [{ id: -1, name: "全部" }]
           this.xlOptions = this.xlOptions.concat(res.data.list);
           this.formdata.lineId = this.xlOptions[0].id;
           this.getSearchgt();
@@ -414,6 +415,7 @@ export default {
     getSearchgt() {
       getSearchInfo({ type: 3, id: this.formdata.lineId })
         .then((res) => {
+          this.gtOptions = [{ id: -1, name: "全部" }]
           this.gtOptions = this.gtOptions.concat(res.data.list);
           this.formdata.towerId = this.gtOptions[0].id;
         })
@@ -455,7 +457,7 @@ export default {
     },
     onSubmit() {
       this.tableLoaidng = true;
-      localStorage.setItem("searchParams", JSON.stringify(this.formdata));
+     
       this.dataList = [];
       // 停止之前的定时器
       if (this.intervalId) {
@@ -488,9 +490,10 @@ export default {
       if (this.formdata.isonline !== -1) {
         params.isonline = this.formdata.isonline;
       }
-      if (this.formdata.protocolId !== -1) {
-        params.protocolId = this.formdata.protocolId;
+      if (this.formdata.protocol !== -1) {
+        params.protocol = this.formdata.protocol;
       }
+      
       if (this.formdata.mntn !== -1) {
         params.mntn = this.formdata.mntn;
       }
@@ -498,32 +501,33 @@ export default {
         params.activityId = this.formdata.activityId;
       }
       
-      if (this.formdata.bsIdentifier !== "") {
-        params.bsIdentifier = this.formdata.bsIdentifier;
+      if (this.formdata.oid !== "") {
+        params.oid = this.formdata.oid;
       }
-      console.log(this.formdata.bsIdentifierExclude)
-      if (this.formdata.bsIdentifierExclude !== 0) {
-        params.bsIdentifierExclude = this.formdata.bsIdentifierExclude;
+      console.log(this.formdata.oidExclude)
+      if (Number(this.formdata.oidExclude) !== 0) {
+        params.oidExclude = this.formdata.oidExclude;
       }
       if (this.formdata.cma !== "") {
         params.cma = this.formdata.cma;
       }
-      if (this.formdata.cmaExclude !== 0) {
+      if (Number(this.formdata.cmaExclude) !== 0) {
         params.cmaExclude = this.formdata.cmaExclude;
       }
       if (this.formdata.cmdid !=="") {
         params.cmdid = this.formdata.cmdid;
       }
-      if (this.formdata.cmdidExclude !== 0) {
+      if (Number(this.formdata.cmdidExclude) !== 0) {
         params.cmdidExclude = this.formdata.cmdidExclude;
       }
       if (this.formdata.version !== "") {
         params.version = this.formdata.version;
       }
-      if (this.formdata.versionExclude !== 0) {
+      if (Number(this.formdata.versionExclude) !== 0) {
         params.versionExclude = this.formdata.versionExclude;
       }
       console.log(params)
+      localStorage.setItem("searchParams", JSON.stringify(params));
       getTerminalJoggle(params)
         .then((res) => {
           console.log(res)
@@ -597,11 +601,11 @@ export default {
         lineId:-1,
         towerId:-1,
         isonline: -1,
-        protocolId: -1,
+        protocol: -1,
         mntn: 1,
         activityId: -1,
-        bsIdentifier: "",
-        bsIdentifierExclude: 0,
+        oid: "",
+        oidExclude: 0,
         cmdid: "",
         cmdidExclude: 0,
         cma: "",