sd
5 天以前 3b994b7b56b3ef2f2044a199d2bdb1cbf985d247
国标配置优化回显功能
3个文件已修改
66 ■■■■■ 已修改文件
src/pages/cameraAccess/components/SeparateRules.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/gb28181/components/gbZtree.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/gb28181/index/App.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/SeparateRules.vue
@@ -190,6 +190,9 @@
  computed: {
    cameraType() {
      return this.TreeDataPool.treeActiveName === "camera" ? "camera" : "dataStack"
    },
    isGb28182() {
      return this.TreeDataPool.selectedNode.cameraType === 1
    }
  },
  data() {
@@ -223,11 +226,6 @@
      swipercanvasData: [],
      stackFilesPage: 1,
      stackFilesSize: 5
    }
  },
  computed: {
    isGb28182() {
      return this.TreeDataPool.selectedNode.cameraType === 1
    }
  },
  mounted() {
src/pages/gb28181/components/gbZtree.vue
@@ -51,10 +51,15 @@
    },
    handleCheckChange(data, checked, indeterminate) {
      this.results = [];
      const treeArr = this.$refs.tree.getCheckedNodes(false, false)
      const treeArr = this.$refs.tree.getCheckedNodes(false, false) || []
      const treeArr2 = this.$refs.tree.getHalfCheckedNodes(false, false) || []
      // if (treeArr2&&treeArr2.value) {
      //   treeArr.push(...treeArr2.value)
      // }
      // console.log("checked", checked.checkedKeys)
      // console.log("data", data)
      // console.log("treeArr", treeArr)
      // console.log("treeArr2", treeArr2)
      //选择摄像机几路数量统计
      // let checkCount = 0;
      if (treeArr && treeArr.length > 0) {
@@ -75,7 +80,25 @@
          // }
        }
      }
      this.$emit('cehckDataUpload', treeArr.filter(node => node.Parental === 0).length)
      if (treeArr2 && treeArr2.length > 0) {
        for (const item of treeArr2) {
          // console.log("item",item)
          this.results.push({
            ID: item.ID,
            ParentID: item.ParentID,
            DeviceID: item.DeviceID,
            DeviceName: item.DeviceName,
            Name: item.label,
            Parental: item.Parental,
            Longitude: item.Longitude,
            Latitude: item.Latitude
          })
          // if (item.Parental == 0) {
          //   checkCount = checkCount + 1;
          // }
        }
      }
      this.$emit('cehckDataUpload', treeArr.filter(node => node.checked).length)
    },
    getResults() {
      return this.results;
src/pages/gb28181/index/App.vue
@@ -41,13 +41,11 @@
                            <el-form-item label="SIP服务器ID">
                                <!-- <el-input v-model="gb28181.PublicId" placeholder="请输入" size="small"
                                    :disabled="gb28181.idType === 1"></el-input> -->
                                <el-input v-model="gb28181.SipSerial" placeholder="请输入" size="small"
                                    :disabled="true"></el-input>
                <el-input v-model="gb28181.SipSerial" placeholder="请输入" size="small" :disabled="true"></el-input>
                            </el-form-item>
                            <el-form-item label="SIP服务器域">
                                <el-input v-model.number="gb28181.SipRealm" placeholder="请输入" :disabled="true"
                                    size="small"></el-input>
                <el-input v-model.number="gb28181.SipRealm" placeholder="请输入" :disabled="true" size="small"></el-input>
                            </el-form-item>
                            <!-- <el-form-item label="开启鉴权" style="text-align: left">
@@ -59,8 +57,7 @@
                                    :disabled="!gb28181.IsAuth"></el-input>
                            </el-form-item>
                            <el-form-item label="SIP服务器端口">
                                <el-input v-model="gb28181.SipPort" placeholder="请输入" size="small"
                                    :disabled="true"></el-input>
                <el-input v-model="gb28181.SipPort" placeholder="请输入" size="small" :disabled="true"></el-input>
                            </el-form-item>
                            <el-form-item style="float: right">
@@ -95,8 +92,8 @@
                        <b>国标摄像机配置</b>
                        <span>(最多勾选500路摄像机)</span>
                    </div>
                    <tree-menu ref="tree" app="gb28181" treeName="localTree" :node="treeData" :height="treeHeight"  @cehckDataUpload="handleParentMethod"
                        :setting="treeSettings" style="width:600px;min-height:500px" />
          <tree-menu ref="tree" app="gb28181" treeName="localTree" :node="treeData" :height="treeHeight"
            @cehckDataUpload="handleParentMethod" :setting="treeSettings" style="width:600px;min-height:500px" />
<!--                    <div class="base-image" >
                        <span>{{ 0 }}</span>
                        <div class="camera-image">
@@ -143,37 +140,37 @@
           totalNode:0,
           checkData:0,
            treeData: [{
                id: 1,
        ID: 1,
                label: 'N332',
                type: 'folder',
                children: [{
                    id: 11,
          ID: 11,
                    label: 'N332_1',
                    type: 'folder',
                    children: [{
                        id: 111,
            ID: 111,
                        label: 'N332_1_1',
                        type: 'folder',
                        children: []
                    }, {
                        id: 112,
            ID: 112,
                        label: 'N332_1_2',
                        type: 'folder',
                        children: []
            children: [],
            checked: true
                    },]
                }]
            },
            {
                id: 2,
        ID: 2,
                label: '摄像机',
                type: 'camera',
                data: {
                    rtspAddress: 'http://*******',
                    deviceName: '摄像机',
                    deviceAddress: '机房',
                    videoType: "1",
                    lngLat: ''
                }
        lngLat: '',
        checked: true
            }],
            activeName: "gb28181",
            treeHeight: 750,