删除debugger

zhangzengfei

2022-11-17 82d8cf2628b7d8f741b53053855b9cfed97b13c9

删除debugger

 src/components/giantTree/index.vue

@@ -315,10 +315,10 @@
    itemCheck(evt, treeId, treeNode) {
      this.TreeDataPool.selectedNode = treeNode;
      this.TreeDataPool.treeType = this.treeName;
      debugger;
      // 多选
      // this.ztreeObj.checkNode(treeNode, true, false, false);
      let checkedNodes = this.ztreeObj.getCheckedNodes(true);
      console.log("itemCheck checkedNodes:", checkedNodes)
      this.TreeDataPool.updateZTreeCheckNodes(checkedNodes);

      // 实时统计选中个数

 src/components/subComponents/FileUpload/btn.vue

@@ -34,7 +34,6 @@

  mounted() {
    this.$nextTick(() => {
      debugger;
      let props = { accept: "" };
      if (this.sourceType == 1) {
        props.accept = ".mp4";

 src/components/subComponents/FileUpload/file.vue

@@ -106,7 +106,6 @@
      const isFolder = this.file.isFolder;
      let type = isFolder ? "folder" : "unknown";
      const categoryMap = this.file.uploader.opts.categoryMap;
      debugger
      const typeMap = categoryMap || {
        image: ["gif", "jpg", "jpeg", "png", "bmp", "webp"],
        video: ["mp4", "m3u8", "rmvb", "avi", "swf", "3gp", "mkv", "flv"],

 src/components/subComponents/VueCron.vue

@@ -184,7 +184,6 @@
        obj.week
    },
    save() {
      debugger
      this.$emit("update", this.cronText)
    }
  }

 src/components/treeMenu/jsTree/tree.vue

@@ -262,7 +262,6 @@
                  }
                }
                var dataItem = self.initializeDataItem(data[i]);
                debugger
                self.$set(oriParent, i, dataItem);
              }
            } else {

 src/pages/cameraAccess/components/LinkageRule.vue

@@ -267,7 +267,6 @@
    },
    showRules() {
      this.tableRuleList = [];

      if (this.selectedCameraIds.length > 0) {
        this.loadingRuleList = true;
        let seq = this.newUid();

 src/pages/cameraAccess/components/SceneRule.vue

@@ -324,7 +324,6 @@
        });
        return false;
      }
      debugger;
      this.eventAudio.src = "/httpImage/" + this.soundPath;
      if (this.togglePlay) {
        this.eventAudio.play();

 src/pages/cameraAccess/components/SystemInfo.vue

@@ -146,13 +146,7 @@
    initCpuCharts() {
      this.$forceUpdate();
    },
  },
  mounted() {
    console.log(
      "PollData.RealTimeValidCount",
      this.PollData.RealTimeValidCount
    );
  },
  }
};
</script>
<style lang="scss">

 src/pages/cameraPlayer/components/player/index.vue

@@ -38,7 +38,7 @@
      default: false
    }
  },

 
  computed: {
    poster() {
      return "/images/player/player_poster.gif?t=" + Math.random()
@@ -75,7 +75,7 @@
      if (id !== this.wfsId) {
        return
      }

 
      if (this.wfs.websocketLoader && this.wfs.websocketLoader.client) {
        if (this.wfs.websocketLoader.client.disconnected) {
          this.clickStart();
@@ -83,7 +83,7 @@
          return
        }
      }

 
      let _this = this;
      setTimeout(() => {
        _this.checkConnect(id)
@@ -93,11 +93,11 @@
      if (this.rtspUrl == "") {
        return;
      }

 
      if (this.cameraID == "") {
        this.cameraID = this.getUuid();
      }

 
      if (Wfs.isSupported()) {
        let wsAddr = this.wsAddr;
        let cameraInfo = {
@@ -106,14 +106,14 @@
          isRunning: this.isRunning,
          isGb28181: this.isGb
        };

 
        // let camera = document.getElementById(this.cameraID);
        let camera = this.$refs.videoPlayer;
        this.wfs = new Wfs();
        let randomId = this.getUuid();
        this.wfsId = randomId;
        this.wfs.attachMedia(camera, "chX", "H264Raw", wsAddr, cameraInfo);

 
        this.checkConnect(randomId)
      }
    },
@@ -123,8 +123,8 @@
      for (var i = 0; i < 36; i++) {
        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
      }
      s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
      s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
      s[8] = s[13] = s[18] = s[23] = "-";
      var uuid = s.join("");
      return uuid;
@@ -135,7 +135,7 @@
  }
};
</script>

 
<style lang="scss">
#area-canvas {
  background: transparent;
@@ -146,7 +146,7 @@
  width: 100%;
  height: 100%;
}

 
video {
  object-fit: fill;
  width: 100%;
@@ -164,7 +164,7 @@
    width: 100%;
    height: 10%;
    background: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9));

 
    i {
      float: right;
      font-size: 15px;
@@ -179,10 +179,10 @@
    }
  }
}

 
.video-player:hover {
  .controls {
    display: block;
  }
}
</style>
</style>

 src/pages/cameraPlayer/index/App.vue

@@ -1,50 +1,102 @@
<template>
  <div style="width:100%; height: 100%;">
    <camera-player :cameraID="query.cameraId" :rtspUrl="query.rtspUrl" :isGb="query.gb28181 ==='1'"></camera-player>
    <camera-player
      :cameraID="query.cameraId"
      :rtspUrl="query.rtspUrl"
      :isGb="query.gb28181 === '1'"
      v-if="!enableWasm"
    ></camera-player>
    <wasm-player
      :cameraID="query.cameraId"
      :rtspUrl="query.rtspUrl"
      :isGb="query.gb28181 === '1'"
      :videoUrl="query.videoUrl"
      :isStream="isStream"
      v-else
    ></wasm-player>
  </div>
</template>

 
<script>
// 接口使用
// 参数 cameraId 摄像机id, rtspUrl 摄像机rtsp地址, gb28181 是否是国标摄像机(1 或 0)
// 参数 cameraId 摄像机id, rtspUrl 摄像机rtsp地址, gb28181 是否是国标摄像机(1 或 0), enableWasm 使用wasm 播放器, isStream 是否播放实时流, videoUrl 视频文件地址
// http://192.168.20.191:7003/view/cameraPlayer/index.html?cameraId=e7e6157a-5929-4e78-b390-e365141169c8&rtspUrl=rtsp://admin:a1234567@192.168.5.51:554/h264/ch1/main/av_stream

import CameraPlayer from "../components/player";

 
import CameraPlayer from "../components/player"
import WasmPlayer from "@/components/wasmPlayer"
 
export default {
  name: "BasicCameraPlayer",
  components: {
    CameraPlayer
    CameraPlayer,
    WasmPlayer
  },
  data() {
    return {
      query: {
        cameraId: "",
        rtspUrl: "",
        gb28181: "0"
      }
        gb28181: "0",
        videoUrl: `${location.protocol === "https" ? "wss" : "ws"}://${location.host}/ws`
      },
      enableWasm: false,
      isStream: true
    }
  },
  mounted() {
    this.urlParse();
    this.urlParse()
  },
  methods: {
    urlParse() {
      let url = window.location.search;
      let obj = {};
      let reg = /[?&][^?&]+=[^?&]+/g;
      let arr = url.match(reg);
      let url = window.location.search
      let obj = {}
      let reg = /[?&][^?&]+=[^?&]+/g
      let arr = url.match(reg)
      if (arr) {
        arr.forEach((item) => {
          let temArr = item.substring(1).split('=');
          let key = decodeURIComponent(temArr[0]);
          let value = decodeURIComponent(temArr[1]);
          obj[key] = value;
        });
          let temArr = item.substring(1).split("=")
          let key = decodeURIComponent(temArr[0])
          let value = decodeURIComponent(temArr[1])
          obj[key] = value
          if (key == "rtspUrl") {
            obj[key] = this.rtspParse(value)
          }
 
          if (key == "enableWasm" && value == "1") {
            this.enableWasm = true
          }
          if (key == "isStream" && value == "0") {
            this.isStream = false
          }
        })
      }
      this.query = Object.assign({}, this.query, obj);
      console.log("cameraPlayer:", this.query)
      this.query = Object.assign({}, this.query, obj)
      console.log("cameraPlayer:", this.query, "enableWasm:", this.enableWasm, "isStream:", this.isStream)
    },
    // 对传入的rtsp密码进行urlEncode处理
    rtspParse(input) {
      // 无效的rtsp地址
      if (!input.length || input.indexOf("rtsp://") != 0) {
        return
      }
 
      let userinfoSplitPos = input.indexOf(":", 7)
      let userinfoEndPos = input.lastIndexOf("@")
 
      // 未包含登录信息的rtsp地址, 直接返回原url
      if (userinfoSplitPos == -1 || userinfoEndPos == -1 || userinfoEndPos < userinfoSplitPos) {
        return input
      }
 
      let usrPassword = input.slice(userinfoSplitPos + 1, userinfoEndPos)
      if (usrPassword.indexOf("@") != -1) {
        return input
      }
 
      let encodePassword = encodeURIComponent(usrPassword)
 
      return input.replace(usrPassword, encodePassword)
    }
  }
};
</script>
}
</script>

 src/pages/changchunTrack/index/Video.vue

@@ -219,7 +219,6 @@
            this.list2TakeTurn.push(info);
          }
        });
        // debugger
        if (this.list2TakeTurn.length == 0 && res.data.length) {
          this.list2TakeTurn.push(res.data[0]);
        }

 src/pages/desktop/index/App.vue

@@ -93,7 +93,6 @@
        this.showApps();
      }
      if (e.data.msg == "checkSN") {
        debugger;
        this.$refs.desktop.validateSn();
      }
      if (e.data.msg === "changeColor") {

 src/pages/library/components/carList.vue

@@ -753,7 +753,6 @@
  },
  data() {
    var checkCar = (rule, value, callback) => {
      debugger;
      if (!value) {
        return callback();
      } else {
@@ -977,7 +976,6 @@
        data: fd,
      });
      if (res.success) {
        debugger;
        this.form.carUrls.push({ url: "/httpImage/" + res.data.picUrl });
      }
    },

 src/pages/library/components/personList.vue

@@ -1121,7 +1121,6 @@
    },

    deleteThis() {
      debugger;
      deleteDbPersonById({ id: this.toDeleteId })
        .then((data) => {
          if (data.success) {

 src/pages/maintain/index/App.vue

@@ -239,7 +239,6 @@
      })
    },
    setRebootCron(value) {
      debugger
      this.rebootCron = value
      setRebootTask({ task: value }).then(rsp => {
        if (rsp && rsp.success) {

 src/pages/settings/views/NetSettings.vue

@@ -20,28 +20,15 @@
      <div class="net-right" v-loading="configLoading">

        <div class="net-set" v-if="activePage == 0">

          <div class="title">网络设置</div>

          <el-form

            :model="ruleForm"

            :rules="rules"

            ref="joinForm"

            class="join-form"

          >

          <el-form :model="ruleForm" :rules="rules" ref="joinForm" class="join-form">

            <el-form-item prop="deviceName">

              <div class="p-title">设备名称</div>

              <el-input

                v-model="ruleForm.deviceName"

                size="small"

                placeholder="必填"

              ></el-input>

              <el-input v-model="ruleForm.deviceName" size="small" placeholder="必填"></el-input>

            </el-form-item>



            <el-form-item prop="port">

              <div class="p-title">端口</div>

              <el-input

                v-model="ruleForm.port"

                placeholder="选填，外部访问的端口"

                size="small"

              ></el-input>

              <el-input v-model="ruleForm.port" placeholder="选填，外部访问的端口" size="small"></el-input>

            </el-form-item>

          </el-form>

          <!-- <div class="save-btn" @click="saveServerName">保存</div> -->

@@ -53,37 +40,22 @@
        <div class="wifi-set" v-if="activePage == 1 && !inWifiDetail">

          <div class="title">无线网络</div>



          <switchBar

            :barName="`无线网卡`"

            @switchChange="wifiControl"

            :value="isOpenWifi"

          ></switchBar>

          <switchBar :barName="`无线网卡`" @switchChange="wifiControl" :value="isOpenWifi"></switchBar>



          <div class="wifi-option" v-for="(item, i) in wifiList" :key="i">

            <div class="name">

              <span class="icon iconfont" v-if="item.isConnected"

                >&#xe676;</span

              >

              <span

                :style="!item.isConnected ? { 'margin-left': '24px' } : {}"

                >{{ item.name }}</span

              >

              <span class="icon iconfont" v-if="item.isConnected">&#xe676;</span>

              <span :style="!item.isConnected ? { 'margin-left': '24px' } : {}">{{ item.name }}</span>

            </div>



            <div class="more-detail">

              <span class="icon iconfont lock">&#xe726;</span>

              <span class="icon iconfont signal">&#xe6e5;</span>

              <span class="icon iconfont more-icon" @click="checkWifi(item)"

                >&#xe640;</span

              >

              <span class="icon iconfont more-icon" @click="checkWifi(item)">&#xe640;</span>

            </div>

          </div>

        </div>

        <div

          class="wifi-detail"

          v-if="activePage == 1 && inWifiDetail"

          ref="ipvHolder"

        >

        <div class="wifi-detail" v-if="activePage == 1 && inWifiDetail" ref="ipvHolder">

          <div class="title">无线网络</div>

          <div class="btns">

            <div class="cancel">删除</div>

@@ -97,21 +69,12 @@
              <el-form-item prop="name">

                <div class="p-title">名称</div>

                <!-- <div class="wifi-name">{{ 12123 }}</div> -->

                <el-input

                  v-model="wifiForm.name"

                  placeholder=""

                  size="small"

                ></el-input>

                <el-input v-model="wifiForm.name" placeholder="" size="small"></el-input>

              </el-form-item>



              <el-form-item prop="password">

                <div class="p-title">密码</div>

                <el-input

                  v-model="wifiForm.password"

                  placeholder="请输入密码"

                  size="small"

                  show-password

                ></el-input>

                <el-input v-model="wifiForm.password" placeholder="请输入密码" size="small" show-password></el-input>

              </el-form-item>

            </el-form>

          </div>

@@ -121,22 +84,13 @@
          <div class="general-box fold" :class="{ hidden: IPV4_hid }">

            <div class="in-title">

              IPV4

              <span

                class="icon iconfont icon-fold"

                @click="toggleFold('IPV4_hid')"

                >&#xe757;</span

              >

              <span class="icon iconfont icon-fold" @click="toggleFold('IPV4_hid')">&#xe757;</span>

            </div>



            <el-form :model="ipv4Form" :rules="ipv4FormRules" ref="ipv4Form">

              <el-form-item>

                <div class="p-title">方法</div>

                <el-select

                  v-model="value"

                  placeholder="请选择"

                  size="small"

                  :popper-append-to-body="false"

                >

                <el-select v-model="value" placeholder="请选择" size="small" :popper-append-to-body="false">

                  <el-option

                    v-for="item in options"

                    :key="item.value"

@@ -147,66 +101,38 @@
              </el-form-item>

              <el-form-item prop="ip">

                <div class="p-title">IP</div>

                <ip-input

                  :ip="ipv4Form.ip"

                  @on-blur="ipv4Form.ip = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv4Form.ip" @on-blur="ipv4Form.ip = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="subMask">

                <div class="p-title">子网掩码</div>

                <ip-input

                  :ip="ipv4Form.subMask"

                  @on-blur="ipv4Form.subMask = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv4Form.subMask" @on-blur="ipv4Form.subMask = arguments[0]"></ip-input>

              </el-form-item>



              <el-form-item prop="gateway">

                <div class="p-title">网关</div>

                <ip-input

                  :ip="ipv4Form.gateway"

                  @on-blur="ipv4Form.gateway = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="dns">

                <div class="p-title">首选DNS</div>

                <ip-input

                  :ip="ipv4Form.dns1"

                  @on-blur="ipv4Form.dns1 = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="dns">

                <div class="p-title">备用DNS</div>

                <ip-input

                  :ip="ipv4Form.dns2"

                  @on-blur="ipv4Form.dns2 = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>

              </el-form-item>

            </el-form>

          </div>



          <div

            class="general-box fold"

            :class="{ hidden: IPV6_hid }"

            ref="ipv6Holder"

          >

          <div class="general-box fold" :class="{ hidden: IPV6_hid }" ref="ipv6Holder">

            <div class="in-title">

              IPV6

              <span

                class="icon iconfont icon-fold"

                @click="toggleFold('IPV6_hid')"

                >&#xe757;</span

              >

              <span class="icon iconfont icon-fold" @click="toggleFold('IPV6_hid')">&#xe757;</span>

            </div>



            <el-form :model="ipv6Form" :rules="ipv6FormRules" ref="ipv6Form">

              <el-form-item>

                <div class="p-title">方法</div>

                <el-select

                  v-model="value"

                  placeholder="请选择"

                  size="small"

                  :popper-append-to-body="false"

                >

                <el-select v-model="value" placeholder="请选择" size="small" :popper-append-to-body="false">

                  <el-option

                    v-for="item in options"

                    :key="item.value"

@@ -217,58 +143,36 @@
              </el-form-item>

              <el-form-item prop="ip">

                <div class="p-title">IP</div>

                <ip-input

                  :ip="ipv6Form.ip"

                  @on-blur="ipv6Form.ip = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv6Form.ip" @on-blur="ipv6Form.ip = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="subMask">

                <div class="p-title">前缀</div>

                <div style="display: flex; width: 100%">

                  <el-input

                    v-model="ipv6Form.prefix"

                    placeholder

                    size="small"

                  ></el-input>

                  <el-input v-model="ipv6Form.prefix" placeholder size="small"></el-input>



                  <div class="ad">

                    <i class="el-icon-remove-outline" @click="minusPrefix"></i>

                  </div>

                  <div class="ad">

                    <i

                      class="el-icon-circle-plus-outline"

                      @click="+ipv6Form.prefix++"

                    ></i>

                    <i class="el-icon-circle-plus-outline" @click=";+ipv6Form.prefix++"></i>

                  </div>

                  <div class="ad">

                    <i

                      class="el-icon-refresh-left"

                      @click="ipv6Form.prefix = ''"

                    ></i>

                    <i class="el-icon-refresh-left" @click="ipv6Form.prefix = ''"></i>

                  </div>

                </div>

              </el-form-item>



              <el-form-item prop="gateway">

                <div class="p-title">网关</div>

                <ip-input

                  :ip="ipv6Form.gateway"

                  @on-blur="ipv6Form.gateway = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv6Form.gateway" @on-blur="ipv6Form.gateway = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="dns">

                <div class="p-title">首选DNS</div>

                <ip-input

                  :ip="ipv6Form.dns1"

                  @on-blur="ipv6Form.dns1 = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv6Form.dns1" @on-blur="ipv6Form.dns1 = arguments[0]"></ip-input>

              </el-form-item>

              <el-form-item prop="dns">

                <div class="p-title">备用DNS</div>

                <ip-input

                  :ip="ipv6Form.dns2"

                  @on-blur="ipv6Form.dns2 = arguments[0]"

                ></ip-input>

                <ip-input :ip="ipv6Form.dns2" @on-blur="ipv6Form.dns2 = arguments[0]"></ip-input>

              </el-form-item>

            </el-form>

          </div>

@@ -281,25 +185,12 @@


        <div class="wire" v-if="activePage == 2 && !inWireDetail">

          <div class="title">有线网络</div>

          <div

            class="wire-bar"

            v-for="(item, i) in wireArr"

            :key="i"

            @click.self="checkWire(item)"

          >

          <div class="wire-bar" v-for="(item, i) in wireArr" :key="i" @click.self="checkWire(item)">

            <div class="name">{{ "网络" + item.index }}</div>



            <div class="right">

              <span

                class="icon iconfont good"

                v-if="item.lower_up && item.active"

                >&#xe6f1;</span

              >

              <span

                class="icon iconfont bad"

                v-if="!item.lower_up && item.active"

                >&#xe6e6;</span

              >

              <span class="icon iconfont good" v-if="item.lower_up && item.active">&#xe6f1;</span>

              <span class="icon iconfont bad" v-if="!item.lower_up && item.active">&#xe6e6;</span>

              <el-switch

                v-model="item.active"

                active-color="#4E94FF"

@@ -322,32 +213,20 @@
            </el-form-item>

            <el-form-item prop="ip">

              <div class="p-title">IP</div>

              <ip-input

                :ip="wireForm.ip"

                @on-blur="wireForm.ip = arguments[0]"

              ></ip-input>

              <ip-input :ip="wireForm.ip" @on-blur="wireForm.ip = arguments[0]"></ip-input>

            </el-form-item>

            <el-form-item prop="subMask">

              <div class="p-title">子网掩码</div>

              <ip-input

                :ip="wireForm.subMask"

                @on-blur="wireForm.subMask = arguments[0]"

              ></ip-input>

              <ip-input :ip="wireForm.subMask" @on-blur="wireForm.subMask = arguments[0]"></ip-input>

            </el-form-item>



            <el-form-item prop="gateway">

              <div class="p-title">网关</div>

              <ip-input

                :ip="wireForm.gateway"

                @on-blur="wireForm.gateway = arguments[0]"

              ></ip-input>

              <ip-input :ip="wireForm.gateway" @on-blur="wireForm.gateway = arguments[0]"></ip-input>

            </el-form-item>

            <el-form-item prop="dns">

              <div class="p-title">DNS</div>

              <ip-input

                :ip="wireForm.dns"

                @on-blur="wireForm.dns = arguments[0]"

              ></ip-input>

              <ip-input :ip="wireForm.dns" @on-blur="wireForm.dns = arguments[0]"></ip-input>

            </el-form-item>

          </el-form>



@@ -372,17 +251,17 @@
  getNetWorkCardInfo,

  getDevInfo,

  downNetCard,

  upNetCard,

} from "@/api/system";

  upNetCard

} from "@/api/system"



import ipInput from "../components/IPInput";

import switchBar from "../components/switchBar";

import ipInput from "../components/IPInput"

import switchBar from "../components/switchBar"



import WifiGateway from "../components/WifiGateway";

import LoraGateway from "../components/LoraGateway";

import MqttGateway from "../components/MqttGateway";

import WifiGateway from "../components/WifiGateway"

import LoraGateway from "../components/LoraGateway"

import MqttGateway from "../components/MqttGateway"



import { isIPv4 } from "@/scripts/validate";

import { isIPv4 } from "@/scripts/validate"



export default {

  components: {

@@ -390,36 +269,36 @@
    switchBar,

    WifiGateway,

    LoraGateway,

    MqttGateway,

    MqttGateway

  },

  data() {

    const checkPwd = (rule, value, callback) => {

      if (!value) {

        return callback(new Error("密码不能为空"));

        return callback(new Error("密码不能为空"))

      }

      setTimeout(() => {

        if (value.length != 6) {

          callback(new Error("密码应为6位!"));

          callback(new Error("密码应为6位!"))

        } else {

          callback();

          callback()

        }

      }, 1000);

    };

      }, 1000)

    }

    return {

      isHighClass: false,

      ruleForm: {

        deviceName: "",

        port: "",

        port: ""

      },

      wifiForm: {

        name: "",

        password: "",

        password: ""

      },

      wireArr: [],

      inWifiDetail: false,

      wifiList: [

        { name: "无线网络1", isConnected: false },

        { name: "无线网络2", isConnected: true },

        { name: "无线网络2", isConnected: true }

      ],

      isOpenWifi: false,

      inWireDetail: false,

@@ -427,7 +306,7 @@
        dns: "",

        subMask: "",

        gateway: "",

        ip: "",

        ip: ""

      },

      originalConfig: {},

      wireFormRules: {

@@ -435,43 +314,41 @@
          {

            required: true,

            message: "请输入IP地址",

            trigger: "change",

            trigger: "change"

          },

          { validator: isIPv4, trigger: "change" },

          { validator: isIPv4, trigger: "change" }

        ],



        gateway: [

          {

            required: true,

            message: "请输入网关",

            trigger: "change",

            trigger: "change"

          },

          { validator: isIPv4, trigger: "change" },

          { validator: isIPv4, trigger: "change" }

        ],

        dns: [

          {

            required: true,

            message: "请输入dns地址",

            trigger: "change",

            trigger: "change"

          },

          { validator: isIPv4, trigger: "change" },

          { validator: isIPv4, trigger: "change" }

        ],



        subMask: [

          {

            required: true,

            message: "请输入子网掩码",

            trigger: "change",

            trigger: "change"

          },

          { validator: isIPv4, trigger: "change" },

        ],

          { validator: isIPv4, trigger: "change" }

        ]

      },

      activePage: 0,

      activeWireItem: {},

      rules: {

        deviceName: [

          { required: true, message: "请输入设备名称", trigger: "change" },

        ],

        deviceName: [{ required: true, message: "请输入设备名称", trigger: "change" }]

      },

      ipv4Form: {},

      ipv6Form: {},

@@ -482,108 +359,107 @@
        { name: "有线网络", icon: "\ue73b" },

        { name: "WiFi网关", icon: "\ue73b" },

        { name: "LORA网关", icon: "\ue73b" },

        { name: "MQTT网关", icon: "\ue73b" },

        { name: "MQTT网关", icon: "\ue73b" }

      ],

      ipv6FormRules: {},

      options: [

        {

          value: "选项1",

          label: "自动",

          label: "自动"

        },

        {

          value: "选项2",

          label: "手动",

        },

          label: "手动"

        }

      ],

      value: "",

      IPV4_hid: false,

      IPV6_hid: false,

      configLoading: false,

    };

      configLoading: false

    }

  },

  mounted() {

    this.getCurServer();

    this.fetchWireList();

    this.getCurServer()

    this.fetchWireList()

  },

  methods: {

    minusPrefix() {

      debugger;

      this.ipv6Form.prefix;

      this.ipv6Form.prefix

    },

    switchNetCard(item) {

      if (item.active) {

        upNetCard({ ifname: item.name }).then(

          (res) => {

            if (res.success) {

              this.$message.success(res.data);

              this.fetchWireList();

              this.$message.success(res.data)

              this.fetchWireList()

            }

          },

          (err) => {

            item.active = false;

            this.$message.error(err.msg);

            item.active = false

            this.$message.error(err.msg)

          }

        );

        )

      } else {

        downNetCard({ ifname: item.name }).then(

          (res) => {

            if (res.success) {

              this.$message.success(res.data);

              this.fetchWireList();

              this.$message.success(res.data)

              this.fetchWireList()

            }

          },

          (err) => {

            item.active = true;

            this.$message.error(err.msg);

            item.active = true

            this.$message.error(err.msg)

          }

        );

        )

      }

    },

    getCurServer() {

      getDevInfo().then((res) => {

        this.ruleForm.deviceName = res.data.server_name;

        this.ruleForm.port = res.data.server_port;

      });

        this.ruleForm.deviceName = res.data.server_name

        this.ruleForm.port = res.data.server_port

      })

    },

    fetchWireList() {

      getWireList().then((res) => {

        if (res && res.success) {

          this.wireArr = res.data;

          this.wireArr = res.data

          this.wireArr.forEach((x) => {

            let t = x.flags.split("|")[0] == "up";

            this.$set(x, "active", t);

          });

            let t = x.flags.split("|")[0] == "up"

            this.$set(x, "active", t)

          })

        }

      });

      })

    },

    cancelSaveWire() {

      this.inWireDetail = false;

      this.wireForm.ip = "";

      this.wireForm.gateway = "";

      this.wireForm.dns = "";

      this.wireForm.subMask = "";

      this.originalConfig = this.wireForm;

      this.inWireDetail = false

      this.wireForm.ip = ""

      this.wireForm.gateway = ""

      this.wireForm.dns = ""

      this.wireForm.subMask = ""

      this.originalConfig = this.wireForm

    },

    saveServerName() {

      setServerName({

        server_name: this.ruleForm.deviceName,

        server_port: this.ruleForm.port,

        server_port: this.ruleForm.port

      }).then((res) => {

        if (res && res.success) {

          this.$message.success(res.data);

          this.$message.success(res.data)

        }

      });

      })

    },

    openRight(i) {

      if (i == 0) {

        this.ruleForm.deviceName = "";

        this.ruleForm.port = "";

        this.getCurServer();

        this.ruleForm.deviceName = ""

        this.ruleForm.port = ""

        this.getCurServer()

      }

      if (i == 1) {

        this.inWifiDetail = false;

        this.inWifiDetail = false

      }

      this.activePage = i;

      this.activePage = i

    },

    saveWire(ifname) {

      this.$refs["wireForm"].validate((valid) => {

@@ -593,24 +469,21 @@
            gateway: this.wireForm.gateway,

            dns: this.wireForm.dns,

            subMask: this.wireForm.subMask,

            ifname: this.activeWireItem.name,

          };

            ifname: this.activeWireItem.name

          }



          let newUri =

            location.protocol +

            "//" +

            data.ip +

            (location.port == 80 ? "" : ":" + location.port);

          let newUri = location.protocol + "//" + data.ip + (location.port == 80 ? "" : ":" + location.port)



          this.$confirm("确认需要修改服务器配置吗？", {

            center: true,

            cancelButtonClass: "comfirm-class-cancle",

            confirmButtonClass: "comfirm-class-sure",

            confirmButtonClass: "comfirm-class-sure"

          })

            .then(() => {

              this.configLoading = true;

              this.configLoading = true

              if (this.wireForm.ip !== this.originalConfig.ip) {

                this.configLoading = false;

                this.configLoading = false

                console.log("set time out")

                var changeIPTimer = setTimeout(() => {

                  this.$alert(

                    '<strong>您已修改了服务器ip, 请重新登录</strong><a target="_parent" href="' +

@@ -621,99 +494,92 @@
                    "提示",

                    {

                      dangerouslyUseHTMLString: true,

                      customClass: "noticeBox",

                      customClass: "noticeBox"

                    }

                  );

                }, 10000);

                  )

                }, 10000)

              }



              setNetWorkCard(data)

                .then((rsp) => {

                  this.configLoading = false;

                  this.configLoading = false

                  if (rsp && rsp.success) {

                    this.$notify({

                      type: "success",

                      message: "服务器配置成功",

                    });

                      message: "服务器配置成功"

                    })

                  }

                })

                .catch((err) => {

                  clearTimeout(changeIPTimer);

                  this.configLoading = false;

                  this.$notify({

                    type: "error",

                    message: "保存失败",

                  });

                });

                .catch((err) => {})

              this.$message({

                message: "操作完成,请稍后",

                type: "success",

              });

                type: "success"

              })

            })

            .catch((err) => {});

            .catch((err) => {})

        } else {

          return false;

          return false

        }

      });

      })

    },

    wifiControl(val) {},

    checkWifi() {

      this.inWifiDetail = true;

      this.inWifiDetail = true

    },

    openWireDetail(item) {

      this.inWireDetail = true;

      this.activeWireItem = item;

      this.inWireDetail = true

      this.activeWireItem = item

      getNetWorkCardInfo({

        ifname: item.name,

        ifname: item.name

      }).then(

        (res) => {

          if (res && res.success) {

            this.wireForm.ip = res.data.ip;

            this.wireForm.gateway = res.data.gateway;

            this.wireForm.dns = res.data.dns;

            this.wireForm.subMask = res.data.subMask;

            this.originalConfig = JSON.parse(JSON.stringify(this.wireForm));

            this.wireForm.ip = res.data.ip

            this.wireForm.gateway = res.data.gateway

            this.wireForm.dns = res.data.dns

            this.wireForm.subMask = res.data.subMask

            this.originalConfig = JSON.parse(JSON.stringify(this.wireForm))

          }

        },

        (err) => {

          this.$message.error("查找不到数据: " + err.msg);

          this.$message.error("查找不到数据: " + err.msg)

        }

      );

      )

    },

    checkWire(item) {

      if (item.addrs) {

        this.openWireDetail(item);

        return;

        this.openWireDetail(item)

        return

      }

      this.$confirm("您还未配置网络信息，是否现在配置？", "提示", {

        confirmButtonText: "确定",

        cancelButtonText: "取消",

        type: "warning",

        customClass: "confirmBox",

        customClass: "confirmBox"

      }).then(() => {

        this.openWireDetail(item);

      });

        this.openWireDetail(item)

      })

    },

    toggleFold(tog) {

      const demo = this.$refs.ipvHolder;

      const demo = this.$refs.ipvHolder

      if (!(this.IPV4_hid && !this.IPV6_hid)) {

        setTimeout(() => {

          demo.scrollIntoView({

            block: "end",

            inline: "nearest",

            behavior: "smooth",

          });

        }, 300);

            behavior: "smooth"

          })

        }, 300)

      }

      this[tog] = !this[tog];

    },

      this[tog] = !this[tog]

    }

  },

  computed: {

    showStatus() {

      return this.wireArr.some((item) => item.lower_up == true);

    },

  },

};

      return this.wireArr.some((item) => item.lower_up == true)

    }

  }

}

</script>

<style lang="scss">

.all {

@@ -855,11 +721,8 @@
      border-radius: 8px;

      margin-bottom: 4px;

    }

    .el-form-item.is-required:not(.is-no-asterisk)

      > .el-form-item__label:before,

    .el-form-item.is-required:not(.is-no-asterisk)

      .el-form-item__label-wrap

      > .el-form-item__label:before {

    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before,

    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label:before {

      display: none;

    }

    .el-select {


 src/pages/settings/views/generalSettings.vue

@@ -396,7 +396,6 @@
      }).then((res) => {

        if (res.success) {

          sessionStorage.setItem("userInfo", JSON.stringify(res.data));

          debugger;

          this.$message.success(res.msg);

        }

      });

@@ -482,7 +481,6 @@
        if (res.success) {

          window.parent.postMessage({ msg: "AppUpdate" }, "*");

          sessionStorage.setItem("userInfo", JSON.stringify(res.data));

          debugger;

          this.$message.success(res.msg);

        }

      });


 src/pages/systemSettings/components/ClusterManagement.vue

@@ -292,7 +292,6 @@
  },
  data() {
    const checkPwd = (rule, value, callback) => {
      debugger;
      if (!value) {
        return callback(new Error("密码不能为空"));
      }

 src/pages/vindicate/views/backUp.vue

@@ -176,7 +176,6 @@
    },

    recoverFile(bakDir) {

      recoverBackup({ bakDir }).then((res) => {

        debugger;

        res.data;

      });

    },


 src/pages/visual/Pool/TreeData.ts

@@ -79,6 +79,8 @@
    this.gb28181Data.forEach((n: any) => {
      nodeFilter(n);
    });

    console.log("treedata.", this.selectedNodes)
  }

  getParent(id: string): string {