sd
6 天以前 cbe76e64e5dc8aedf9ac94d607962ecbf3684575
国标配置更新树的勾选状态
2个文件已添加
4个文件已修改
668 ■■■■■ 已修改文件
src/pages/Knowledge/components/KnowledgeView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/Knowledge/index/App.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/SeparateRules.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/gb28181/components/gbZtree.vue 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/gb28181/index/App copy.vue 531 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/gb28181/index/App.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/Knowledge/components/KnowledgeView.vue
@@ -391,7 +391,7 @@
/* 文件管理容器 - 添加横向滚动 */
.file-manager-container {
  overflow-x: auto;
  //overflow-x: auto;
  padding-bottom: 100px;
  /* 为滚动条留出空间 */
}
src/pages/Knowledge/index/App.vue
@@ -57,9 +57,10 @@
  height: 100%;
}
.column-right {
  overflow-x: auto;
  padding: 5px;
  height: 100vh;
  background-color: #eee;
  //background-color: #eee;
  box-sizing: border-box;
  overflow: scroll;
}
src/pages/cameraAccess/components/SeparateRules.vue
@@ -13,11 +13,11 @@
          <div v-if="Camera.analytics && isShowPolling === 'show'" class="flex-box" v-show="cameraType === 'camera'">
            <span class="label">处理方式</span>
            <toggle-button  :width="60" :labels="{ checked: '实时', unchecked: '实时' }" :color="{
            <toggle-button :width="60" :labels="{ checked: '实时', unchecked: '实时' }" :color="{
              checked: '#3D68E1',
              unchecked: '#3D68E1',
              disabled: '#CCCCCC'
            }" :sync="true"/>
            }" :sync="true" />
            <!-- <toggle-button :value="Camera.dealWay" :width="60" :labels="{ checked: '实时', unchecked: '轮询' }" :color="{
              checked: '#3D68E1',
              unchecked: '#FF7733',
@@ -162,7 +162,7 @@
import { saveCameraScene } from "@/api/scene"
import { saveCameraAndTask, updateCameraAndTask } from "@/api/selectRule";
import { changeRunType,changeRunTypeTwo } from "@/api/pollConfig"
import { changeRunType, changeRunTypeTwo } from "@/api/pollConfig"
import { findAllFileByStackId } from "@/api/localVedio"
import VideoRuleData from "@/Pool/VideoRuleData"
@@ -223,6 +223,11 @@
      swipercanvasData: [],
      stackFilesPage: 1,
      stackFilesSize: 5
    }
  },
  computed: {
    isGb28182() {
      return this.TreeDataPool.selectedNode.cameraType === 1
    }
  },
  mounted() {
@@ -435,8 +440,8 @@
          }
        })
      }
console.info(
      this.Camera.rules)
      console.info(
        this.Camera.rules)
    },
    delScenRule() {
      this.Camera.update()
@@ -447,6 +452,7 @@
    //是否进行视频分析处理
    pollEnable(row) {
      // console.info("Camera.:"+JSON.stringify(this.Camera))
      console.log("this.Camera",this.Camera)
      let val = 0
      if (row) {
        if (this.PollData.RealTimeSum < this.PollData.channelTotal) {
@@ -460,12 +466,13 @@
        this.Camera.dealWay = false
        val = -1
      }
      console.info("isOpen:"+this.Camera.analytics?1:0)
      console.info("视频分析按钮2")
      // console.info("isOpen:" + this.Camera.analytics ? 1 : 0)
      if (this.Camera.cameraId && this.Camera.cameraId !== undefined) {
        changeRunTypeTwo({
          videoId: this.Camera.cameraId,
          // isOpen: val
          isOpen: this.Camera.analytics?1:0
          videoType:this.isGb28182 ? 1 : 0,
          isOpen: this.Camera.analytics ? 1 : 0
        }).then((rsp) => {
          this.getStatus()
          if (rsp && rsp.status === 200) {
src/pages/gb28181/components/gbZtree.vue
New file
@@ -0,0 +1,102 @@
<template>
  <el-tree ref="tree" :data="node" :props="defaultProps" node-key="ID" default-expand-all class="camera-tree"
    show-checkbox @check="handleCheckChange">
    <template #default="{ node, data }">
      <span class="custom-tree-node">
        <i :class="data.Parental !== 0 ? 'el-icon-folder' : 'el-icon-video-camera'"></i>
        <span>{{ node.label }}</span>
      </span>
    </template>
  </el-tree>
</template>
<script>
export default {
  name: 'CameraTree',
  props: {
    node: Array,       // 接收树数据
    height: [Number, String],
    setting: Object,
    value: Array       // 用于 v-model 的双向绑定
  },
  data() {
    return {
      results: [],
      checkedKeysList:[],
      defaultProps: {
        children: 'children',
        label: 'label'
      },
      count: 1
    };
  },
  mounted() {
    this.checkedKeys(this.node)
    this.$refs.tree.setCheckedKeys(this.checkedKeysList);
    // console.log("checkedKeysList",this.checkedKeysList)
    this.handleCheckChange()
  },
  methods: {
    checkedKeys(node) {
      if (node) {
        for (const item of node) {
          if (item.checked) {
            this.checkedKeysList.push(item.ID)
          }
          if(item.children){
            this.checkedKeys(item.children)
          }
        }
      }
    },
    handleCheckChange(data, checked, indeterminate) {
      this.results = [];
      const treeArr = this.$refs.tree.getCheckedNodes(false, false)
      // console.log("checked", checked.checkedKeys)
      // console.log("data", data)
      // console.log("treeArr", treeArr)
      //选择摄像机几路数量统计
      // let checkCount = 0;
      if (treeArr && treeArr.length > 0) {
        for (const item of treeArr) {
          // 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.Parental === 0).length)
    },
    getResults() {
      return this.results;
    },
    // 供父组件调用的方法 - 获取当前选中的节点键值
    getCheckedKeys() {
      return this.$refs.tree.getCheckedKeys();
    },
    // 供父组件调用的方法 - 获取当前选中的节点所组成的数组
    getCheckedNodes() {
      return this.$refs.tree.getCheckedNodes();
    },
    // 供父组件调用的方法 - 获取当前选中的节点数据
    getCurrentNode() {
      return this.$refs.tree.getCurrentNode();
    },
  }
}
</script>
<style scoped></style>
src/pages/gb28181/index/App copy.vue
New file
@@ -0,0 +1,531 @@
<template>
    <div class="s-system-manage">
        <div class="s-basic-setting">
            <el-tabs id="e-basic-setting" v-model="activeName" v-loading="loading" :element-loading-text="loadingText"
                type="border-card" @tab-click="hanleTabClick">
                <el-tab-pane label="国标ID" name="gb28181">
                    <div style="width: 775px">
                        <!-- GB28181设置 -->
                        <el-form :model="gb28181" :rules="rules" label-width="130px" class="alarmSetting" ref="gb28181">
                            <div style="text-align: left;margin-bottom: 16px;">
                                <!-- <el-radio-group v-model="gb28181.idType">
                                    <el-radio :label="0">输入已有ID</el-radio>
                                    <el-radio :label="1">生成新的ID</el-radio>
                                </el-radio-group> -->
                            </div>
                            <!-- <el-form-item label="所在地">
                                <el-select v-model="locationCity.province" @change="changeProvince" size="small"
                                    placeholder="请选择省份" :disabled="gb28181.idType === 0">
                                    <el-option v-for="item in locationCity.provinceOptions" :key="item.id"
                                        :label="item.name" size="small" :value="item.id"></el-option>
                                </el-select>
                                <el-select class="ml10 mr10" v-model="locationCity.city"
                                    :disabled="!locationCity.province" @change="changeCity" size="small"
                                    placeholder="请选择城市">
                                    <el-option v-for="item in locationCity.cityOptions" :key="item.id"
                                        :label="item.name" :value="item.id"></el-option>
                                </el-select>
                                <el-select v-model="locationCity.county" :disabled="!locationCity.city" size="small"
                                    placeholder="请选择区县">
                                    <el-option v-for="item in locationCity.countyOptions" :key="item.id"
                                        :label="item.name" :value="item.id"></el-option>
                                </el-select>
                                <el-button type="text" style="position: absolute" v-show="gb28181.idType === 1"
                                    @click="newGBID">生成ID</el-button>
                            </el-form-item> -->
                            <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-form-item>
                            <el-form-item label="SIP服务器域">
                                <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">
                                <el-switch v-model="gb28181.IsAuth"></el-switch>
                            </el-form-item> -->
                            <el-form-item label="SIP服务器地址">
                                <el-input v-model="gb28181.SipHost" placeholder="请输入" size="small"
                                    :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-form-item>
                            <el-form-item style="float: right">
                                <!-- <el-button type="primary" @click="submitGB28281" size="small">保存</el-button> -->
                            </el-form-item>
                        </el-form>
                    </div>
                </el-tab-pane>
                <el-tab-pane label="接入平台列表" name="subordinates">
                    <el-table :data="subDevTable" border fit highlight-current-row style="width: 100%; color:#000"
                        :header-cell-style="{ background: '#f8f8f8', color: '#222222', height: '30px' }">
                        <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
                        <el-table-column prop="name" label="名称" align="center"></el-table-column>
                        <el-table-column prop="publicid" label="ID" align="center"></el-table-column>
                        <el-table-column prop="corp" label="端口" align="center"></el-table-column>
                        <el-table-column prop="ip" label="IP" align="center"></el-table-column>
                        <el-table-column prop="status" label="状态" align="center">
                            <template slot-scope="scope">
                                <span :style="scope.row.alive ? `color:#047d19` : 'color:#f11a1a;'">{{
                                    scope.row.alive ? "在线" : "离线"
                                    }}</span>
                            </template>
                        </el-table-column>
                    </el-table>
                </el-tab-pane>
                <el-tab-pane label="国标摄像机" name="cameras">
                    <div style="text-align:left">
                        <el-button type="primary" size="small" @click="updateCamerasFromVideosvr">刷新</el-button>
                    </div>
                    <div class="camera-title">
                        <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" />
<!--                    <div class="base-image" >
                        <span>{{ 0 }}</span>
                        <div class="camera-image">
                            &lt;!&ndash; <img :src="'data:image/png;base64,' + TreeDataPool?.gb28181CameraBaseImage" width="450px"
                                alt /> &ndash;&gt;
                        </div>
                    </div>-->
                    <el-divider></el-divider>
                    <span class="camera-seleted-text">
                        已选择 (
                        <b>{{checkData}}</b>
                        / {{ totalNode}} ) 路
                    </span>
                    <el-button type="primary" size="small" @click="saveChecked">保存</el-button>
                </el-tab-pane>
            </el-tabs>
        </div>
    </div>
</template>
<script>
import gb28181 from "@/api/gb28181"
// import TreeMenu from "../components/gbZtree.vue"
import TreeMenu from "@/components/giantTree/index"
import { isPort, isIPv4 } from "@/scripts/validate"
import bus from "@/plugin/bus"
export default {
    name: "Gb28181Setting",
    components: {
        TreeMenu
    },
    directives: {
        focus: {
            inserted: function (el) {
                el.querySelector("input").focus()
            }
        }
    },
    data() {
        return {
           totalNode:0,
           checkData:0,
            treeData: [{
                id: 1,
                label: 'N332',
                type: 'folder',
                children: [{
                    id: 11,
                    label: 'N332_1',
                    type: 'folder',
                    children: [{
                        id: 111,
                        label: 'N332_1_1',
                        type: 'folder',
                        children: []
                    }, {
                        id: 112,
                        label: 'N332_1_2',
                        type: 'folder',
                        children: []
                    },]
                }]
            },
            {
                id: 2,
                label: '摄像机',
                type: 'camera',
                data: {
                    rtspAddress: 'http://*******',
                    deviceName: '摄像机',
                    deviceAddress: '机房',
                    videoType: "1",
                    lngLat: ''
                }
            }],
            activeName: "gb28181",
            treeHeight: 750,
            loading: false,
            loadingText: "",
            openeds: ["0"],
            gb28181: {},
            subDevTable: [],
            idType: 1,
            treeSettings: {
                check: {
                    enable: true
                }
            },
            rules: {
                ip: [
                    {
                        required: true,
                        message: "请输入IP地址",
                        trigger: "change"
                    },
                    //{ validator: isIPv4, trigger: "change" }
                ],
                ServerIp: [
                    {
                        required: true,
                        message: "请输入IP地址",
                        trigger: "change"
                    },
                    //{ validator: isIPv4, trigger: "change" }
                ],
                ServerPort: [
                    {
                        required: true,
                        message: "请输入端口",
                        trigger: "change"
                    },
                   // { validator: isPort, trigger: "change" }
                ],
                GbServerPort: [
                    {
                        required: true,
                        message: "请输入端口",
                        trigger: "change"
                    },
                   // { validator: isPort, trigger: "change" }
                ]
            },
            locationCity: {
                province: "",
                city: "",
                county: "",
                provinceOptions: [],
                cityOptions: [],
                countyOptions: []
            }
        }
    },
    mounted() {
        // this.TreeDataPool.multiple = true
        // 记录目录是否折叠
        // let foldList = localStorage.getItem("ztree_fold_list")
        // if (foldList) {
        //     this.TreeDataPool.foldNodeList = JSON.parse(foldList)
        // }
        // this.initGB28181Conf()
        this.newGBID()
    },
    methods: {
      handleParentMethod(checkCount){
        this.checkData  = checkCount
        // console.info(checkCount)
      },
        async getCamerasFromVideosvr() {
            // console.info(this.TreeDataPool)
            this.loading = true
            await this.fetchVideosvrCameras()
            this.loading = false
        },
        hanleTabClick(tab, event) {
            console.info("activeName:" + this.activeName)
            if (this.activeName == "subordinates") {
                gb28181.getAllSubServer().then((rsp) => {
                    if (rsp && rsp.status == 200) {
                        const results = rsp.data.map(item => {
                            return {
                                publicid: item.ID,
                                name: item.Name,
                                ip: item.RemoteIP,
                                corp: item.RemotePort,
                                alive: item.Online,
                            };
                        });
                        this.subDevTable = results;
                        // console.info("data:" + JSON.stringify(rsp.data))
                    }
                })
            } else if (this.activeName == "cameras") {
                this.getCamerasFromVideosvr()
            } else {
                gb28181.newGb28181ID().then((rsp) => {
                    if (rsp && rsp.status == 200) {
                        this.gb28181 = rsp.data;
                        // console.info("data:" + JSON.stringify(rsp.data))
                    }
                })
            }
        },
        changeProvince() {
            let pid = this.locationCity.province
            //   getGb28181AreaList({ parentId: pid }).then((rsp) => {
            //     if (rsp && rsp.success) {
            //       this.locationCity.cityOptions = rsp.data
            //       this.locationCity.city = this.locationCity.cityOptions[0].id
            //       this.changeCity()
            //     }
            //   })
        },
        changeCity() {
            let pid = this.locationCity.city
            //   getGb28181AreaList({ parentId: pid }).then((rsp) => {
            //     if (rsp && rsp.success) {
            //       this.locationCity.countyOptions = rsp.data
            //       this.locationCity.county = this.locationCity.countyOptions[0].id
            //     }
            //     console.log(this.locationCity.county)
            //   })
        },
        newGBID() {
            // console.log(this.locationCity.county)
            // console.log(this.locationCity.countyOptions)
            gb28181.newGb28181ID().then((rsp) => {
                if (rsp && rsp.status == 200) {
                    this.gb28181 = rsp.data;
                    // console.info("data:" + JSON.stringify(rsp.data))
                }
            })
        },
        submitGB28281() {
            this.$refs["gb28181"].validate((valid) => {
                if (valid) {
                    //   saveGB28181Config(this.gb28181).then((rsp) => {
                    //     if (rsp && rsp.success) {
                    //       this.$notify({
                    //         type: "success",
                    //         message: "GB28181设置保存成功"
                    //       })
                    //     }
                    //   })
                } else {
                    console.log("error submit!!")
                    return false
                }
            })
        },
        async updateCamerasFromVideosvr() {
            this.loading = true
            await this.fetchVideosvrCameras()
            this.loading = false
        },
        async fetchVideosvrCameras() {
            gb28181.getGb28181Pool().then((rsp) => {
                if (rsp && rsp.status == 200) {
                // console.log("treeData:",rsp.data.items)
                    this.treeData = rsp.data.items;
                    this.totalNode = rsp.data.total;
                }
                // console.log("treeData:",this.treeData)
            })
        },
        saveChecked() {
            const keys = this.$refs.tree.getResults();
            console.info(JSON.stringify(keys))
          if (this.checkData ==0) {
            this.$message({
              type: "warning",
              message: "请选择摄像机,再进行保存"
            })
            return
          }
             if (this.checkData > 500) {
                 this.$message({
                   type: "warning",
                    message: "最多仅支持选择500路摄像机. 请重新选择"
                })
               return
           }
          gb28181.saveGb28181CamTree(keys)
               .then((rsp) => {
                 if (rsp && rsp.status == 200) {
                       this.$message({
                             type: "success",
                             message: "保存成功"
                         })
                   }
                     this.loading = false
               })
                .catch((err) => {
                    this.$message({
                        type: "error",
                        message: "保存失败"
                    })
                    this.loading = false
                })
        },
    }
}
</script>
<style lang="scss">
.s-system-manage {
    width: 100% !important;
    min-width: 1067px;
    height: 100%;
    box-sizing: border-box;
    padding: 10px;
    background-color: #f8f9fb;
    .s-system-manage-breadcrumb {
        height: 5%;
        box-sizing: border-box;
        border: 1px solid #e4e7ed;
        box-shadow: #e4e7ed 0px 0px 9px inset;
        box-shadow: #e4e7ed 0px 0px 9px inset;
        border-radius: 5px;
    }
    .el-tabs--border-card {
        border: 0px solid #dcdfe6;
        -webkit-box-shadow: none;
        box-shadow: none;
        .el-tabs__header {
            border: 0px solid #dcdfe6;
            .el-tabs__item {
                padding: 5px 50px;
                height: 50px;
                font-family: PingFangSC-Regular;
                font-size: 15px;
                color: #222222;
                text-align: center;
                border: 0px solid transparent;
            }
            .el-tabs__item:nth-child(2) {
                padding-left: 50px !important;
            }
            .el-tabs__item:last-child {
                padding-right: 50px !important;
            }
            .el-tabs__item.is-active {
                color: #3d68e1;
                // border-right-color: #fff;
                // border-left-color: #fff;
            }
            .el-tabs__item:not(.is-disabled):hover {
                color: #3d68e1;
            }
        }
    }
    .el-tabs__header {
        margin-bottom: 0;
    }
    .el-tabs__content {
        height: calc(100% - 64px);
        box-sizing: border-box;
        overflow-y: auto;
        padding: 20px 40px !important;
        background: #fff;
        .el-tab-pane {
            width: 100%;
            .s-title {
                text-align: left;
                padding: 15px 0px;
                font-size: 16px;
            }
        }
    }
    .s-table {
        border: 1px solid #e8e8e9;
        margin-top: 40px;
    }
    .ui-top-title {
        padding-bottom: 10px;
        /* border-bottom: 1px solid #ebebeb; */
        position: relative;
        text-align: left;
        padding-left: 15px;
        font-size: 16px;
        font-weight: bold;
    }
    .ui-top-title:before {
        content: " ";
        border-left: 4px solid #f53d3d;
        display: inline-block;
        height: 16px;
        position: absolute;
        top: 50%;
        left: 0;
        margin-top: -13px;
    }
    .el-button--text {
        color: #3d68e1;
        text-decoration: underline;
    }
    .camera-title {
        text-align: left;
        padding: 0px 10px;
        margin: 5px 0px;
        height: 33px;
        background-color: #e4e2e2;
        line-height: 33px;
        font-size: 14px;
    }
    .camera-seleted-text {
        margin-right: 20px;
        .b {
            color: #3d68e1;
        }
    }
    .base-image {
        position: absolute;
        top: 18%;
        left: 57%;
        width: 450px;
        .camera-image {
            background-color: black;
            height: 254px;
        }
    }
}
</style>
src/pages/gb28181/index/App.vue
@@ -122,7 +122,8 @@
<script>
import gb28181 from "@/api/gb28181"
import TreeMenu from "@/components/giantTree/index"
import TreeMenu from "../components/gbZtree.vue"
// import TreeMenu from "@/components/giantTree/index"
import { isPort, isIPv4 } from "@/scripts/validate"
import bus from "@/plugin/bus"
export default {
@@ -246,6 +247,7 @@
    methods: {
      handleParentMethod(checkCount){
        this.checkData  = checkCount
        // console.info(checkCount)
      },
        async getCamerasFromVideosvr() {
            // console.info(this.TreeDataPool)
@@ -338,10 +340,11 @@
        async fetchVideosvrCameras() {
            gb28181.getGb28181Pool().then((rsp) => {
                if (rsp && rsp.status == 200) {
                // console.log("treeData:",rsp.data.items)
                    this.treeData = rsp.data.items;
                    this.totalNode = rsp.data.total;
                }
                // console.info("treeData:" + rsp.data)
                // console.log("treeData:",this.treeData)
            })
        },
        saveChecked() {