优化提示

2 years ago · dbb514d8de
parent 521cd167c5
commit dbb514d8de
4 changed files with 119 additions and 106 deletions
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@ -15,39 +15,10 @@
          间隔：<b>{{ val.span }}分钟</b>
        </p>
      </div>
-      <!-- <el-descriptions
-        title=""
-        :column="3"
-        border
-        v-for="(val, index) in ruleSchedule"
-        :key="index"
-      >
-        <el-descriptions-item label="开始时间">{{
-          val.startTime
-        }}</el-descriptions-item>
-        <el-descriptions-item label="结束时间">{{
-          val.endTime
-        }}</el-descriptions-item>
-        <el-descriptions-item
-          label="时间间隔（分）"
-          :contentStyle="contentStyle"
-        >
-          <el-tag size="small">{{ val.span }}</el-tag>
-        </el-descriptions-item>
-      </el-descriptions> -->
      <h3>设置通道</h3>
      <div class="chooseTDBox">
        <label>选择通道:</label>
        <div class="checkBox">
-          <!-- <el-checkbox-group v-model="checkedAisle" @change="handleChange">
-            <el-checkbox
-              :label="val.id"
-              border
-              v-for="val in aisleList"
-              :key="val.id"
-              >{{ val.name }}</el-checkbox
-            >
-          </el-checkbox-group> -->
          <el-radio-group v-model="checkedAisle" @change="handleChange">
            <el-radio
              :label="val.id"
@ -67,16 +38,23 @@
            v-for="(xlitem, index) in dyitem.list"
            :key="index"
          >
-            <h4>线路：{{ xlitem.name }}</h4>
            <div class="zzbox">
+              <el-checkbox
+                :indeterminate="isIndeterminate"
+                v-model="xlitem.index"
+                @change="handleCheckAllChange"
+              >
+                <h4>线路：{{ xlitem.name }}</h4>
+              </el-checkbox>
              <el-checkbox-group v-model="zzListCheck" @change="handleCheckBox">
                <el-checkbox
                  :label="zzitem.id"
                  v-for="(zzitem, index) in xlitem.list"
                  :key="index"
                  :checked="checked"
-                  >{{ zzitem.displayName }}</el-checkbox
-                >
+                  >{{ zzitem.displayName }}
+                  <b v-if="false" class="zzstatus">装置正在下发</b>
+                </el-checkbox>
              </el-checkbox-group>
            </div>
          </div>
@ -167,6 +145,9 @@ export default {
      zzListCheck: [],
      loading: false,
      checked: false,
+      //全选
+      checkAll: true,
+      isIndeterminate: true, //全选设置默认选中
    };
  },
  mounted() {},
@ -187,6 +168,11 @@ export default {
        })
        .catch((err) => {});
    },
+    //q全选
+    handleCheckAllChange(val) {
+      console.log(val);
+      this.isIndeterminate = false;
+    },
    //选择通道
    handleChange() {
      console.log(this.checkedAisle);
@ -344,11 +330,22 @@ export default {
        }
        margin-left: 16px;
        .zzbox {
-          margin-left: 16px;
+          h4 {
+          }
          .el-checkbox-group {
+            display: flex;
+            flex-direction: column;
+            margin-left: 22px;
            .el-checkbox {
-              line-height: 24px;
-              width: 196px;
+              line-height: 28px;
+              //width: 196px;
+              .el-checkbox__label {
+                b {
+                  margin-left: 18px;
+                  font-weight: normal;
+                  font-size: 12px;
+                }
+              }
            }
          }
        }
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@ -105,9 +105,26 @@
                @click.native.stop="handleDeviceReset(scope.row)"
                >装置复位</el-button
              >
-              <el-button type="text">远程升级</el-button>
-              <el-button type="text">获取GPS位置</el-button>
-              <el-button type="text">GPS开关</el-button>
+              <!-- <el-button type="text">远程升级</el-button> -->
+              <el-button
+                type="text"
+                @click.native.stop="handleShowGPS(scope.row)"
+                >获取GPS位置</el-button
+              >
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="handleCommand"
+              >
+                <span class="el-dropdown-link">
+                  GPS开关<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+                  <el-dropdown-item command="open">开启GPS</el-dropdown-item>
+                  <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <!--<el-button type="text">GPS开关</el-button> -->
              <el-button
                type="text"
                @click.native.stop="handleImageCapture(scope.row)"
@ -147,6 +164,8 @@ import {
  getTerminalJoggle,
  deleteTerminalJoggle,
  resetTerminalApi,
+  getTermGPSJoggle,
+  setTermGPSJoggle,
 } from "@/utils/api/index";
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
@ -228,6 +247,60 @@ export default {
        })
        .catch((err) => {});
    },
+    //获取GPS位置
+    handleShowGPS(data) {
+      console.log(data);
+      getTermGPSJoggle({ termid: data.id, cmId: data.cmdid })
+        .then((res) => {
+          console.log(res);
+          this.$alert(
+            "<p><label>经度:</label><span>" +
+              `${res.data.longitude}` +
+              "</span></p><p><label>纬度:</label><span>" +
+              `${res.data.latitude}` +
+              "</span></p><p><label>半径:</label><span>" +
+              `${res.data.radius}` +
+              "</span></p>",
+            "GPS位置",
+            {
+              dangerouslyUseHTMLString: true,
+              customClass: "messageGps",
+            }
+          );
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+    //切换gps开启关闭
+    changeGPS(val) {
+      console.log(val);
+      setTermGPSJoggle({ gpsstatus: val, termid: this.channelId })
+        .then((res) => {
+          console.log(res);
+          if (val == 0) {
+            this.$message("关闭GPS");
+          } else {
+            this.$message({
+              message: "成功开启GPS",
+              type: "success",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+    handleCommand(command) {
+      switch (command) {
+        case "open": //开启
+          this.changeGPS(1);
+          break;
+        case "close": //关闭
+          this.changeGPS(0);
+          break;
+      }
+    },
    //图像采集参数
    handleImageCapture(data) {
      this.$refs.imageCaptureref.display();
@ -309,5 +382,11 @@ export default {
    margin-top: 16px;
    height: calc(100% - 48px);
  }
+  .dropgps {
+    color: #409eff;
+    margin-left: 16px;
+    margin-right: 16px;
+    cursor: pointer;
+  }
 }
 </style>
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@ -90,7 +90,7 @@ export default {
    },
    //最新数据
    getNewListData(val) {
-      this.loading = true;
+      //this.loading = true;
      getNewDeviceList({
        queryTime: this.queryTime,
        termId: val,
@ -106,7 +106,7 @@ export default {
          } else {
            this.infornr = res.data;
          }
-          this.loading = false;
+          //this.loading = false;
        })
        .catch((err) => {});
    },
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@ -173,8 +173,6 @@ import {
  getdyTreeListJoggle,
  getChannelByTermidJoggle,
  getTerminalPhotoListJoggle,
-  getTermGPSJoggle,
-  setTermGPSJoggle,
  getLatestPhotoJoggle,
  getReturnedPhotoJoggle,
 } from "@/utils/api/index";
@ -220,17 +218,7 @@ export default {
      nopicPath: require("@/assets/img/nopic.jpg"),
      loadingBg: true,
      loading: true,
-      GPSValue: "",
-      GpsOption: [
-        {
-          value: "1",
-          label: "开启",
-        },
-        {
-          value: "0",
-          label: "关闭",
-        },
-      ],
+
      newPicData: "",
      timer: null,
      i: 0,
@ -320,6 +308,8 @@ export default {
      this.channelListOption = [];
      this.getChannelList(this.channelId); //获取通道id接口
      this.stop();
+      this.btnvideoloading = false;
+      this.btnpicloading = false;
    },
    //获取通道的接口
    getChannelList(id) {
@ -451,59 +441,6 @@ export default {
      });
    },

-    //切换gps开启关闭
-    changeGPS(val) {
-      console.log(val);
-      setTermGPSJoggle({ gpsstatus: val, termid: this.channelId })
-        .then((res) => {
-          console.log(res);
-          if (val == 0) {
-            this.$message("关闭GPS");
-          } else {
-            this.$message({
-              message: "成功开启GPS",
-              type: "success",
-            });
-          }
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
-    },
-    handleCommand(command) {
-      switch (command) {
-        case "open": //开启
-          this.changeGPS(1);
-          break;
-        case "close": //关闭
-          this.changeGPS(0);
-          break;
-      }
-    },
-    //获取GPS位置
-    handleShowGPS() {
-      getTermGPSJoggle({ termid: this.channelId })
-        .then((res) => {
-          console.log(res);
-          this.$alert(
-            "<p><label>经度:</label><span>" +
-              `${res.data.longitude}` +
-              "</span></p><p><label>纬度:</label><span>" +
-              `${res.data.latitude}` +
-              "</span></p><p><label>半径:</label><span>" +
-              `${res.data.radius}` +
-              "</span></p>",
-            "GPS位置",
-            {
-              dangerouslyUseHTMLString: true,
-              customClass: "messageGps",
-            }
-          );
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
-    },
    //手动拍照
    handleCommandpic(command) {
      this.btnpicloading = true;