添加apps.json代理,整理代码

zhangzengfei

2020-10-27 e65c4102f0175d666746936381c3dee278358a72

添加apps.json代理,整理代码

 public/apps.json

@@ -1,171 +1,398 @@
{
  "code": "200",
  "success": true,
  "code": 200,
  "data": [
    {
      "id": "5",
      "name": "gb28181",
      "src": "../../images/app-mid/GB-config.png",
      "alt": "GB28181配置",
      "type": "2",
      "url": "/view/gb28181/",
      "title": "GB28181配置",
      "width": 600,
      "height": 670
    },
    {
      "id": "12",
      "name": "cameraVideo",
      "src": "../../images/app-mid/monitor.png",
      "alt": "实时监控",
      "id": "a9c4a1ad-0137-4137-acf3-fc293d6c295b",
      "name": "实时监控",
      "package": "cameraVideo",
      "type": "2",
      "url": "/view/cameraVideo/",
      "title": "实时监控",
      "width": 1328,
      "height": 690
      "height": 690,
      "iconBlob": "",
      "icon": "../../images/app-mid/monitor.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:01",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "9",
      "name": "algorithmManage",
      "src": "../../images/app-mid/algorithm-store.png",
      "alt": "应用中心",
      "id": "7dea48a4-8294-4914-85d8-c2bbd4caf553",
      "name": "应用中心",
      "package": "algorithmManage",
      "type": "2",
      "url": "/view/ai/",
      "title": "应用中心",
      "width": 1243,
      "height": 670
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/algorithm-store.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:02",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "1",
      "name": "cameraAccess",
      "src": "../../images/app-mid/camera-access.png",
      "alt": "camera-access",
      "id": "2224a376-5436-4323-ad65-c26d95efaa54",
      "name": "摄像机配置",
      "package": "cameraAccess",
      "type": "2",
      "url": "/view/cameraAccess/",
      "title": "摄像机配置",
      "width": 1200,
      "height": 670
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/camera-access.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:03",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "2",
      "name": "dataStack",
      "src": "../../images/app-mid/datastack-config.png",
      "alt": "datastack-config",
      "type": "2",
      "url": "/view/cameraAccess/?dataStack=1",
      "title": "数据栈配置",
      "width": 1200,
      "height": 670
    },
    {
      "id": "4",
      "name": "datapush",
      "src": "../../images/app-mid/data-push.png",
      "alt": "data-push",
      "id": "6404e04d-f01a-4a6f-9f6b-5d53a7fc9af3",
      "name": "数据推送",
      "package": "datapush",
      "type": "2",
      "url": "/view/datapush/",
      "title": "数据推送",
      "width": 1024,
      "height": 512
      "height": 512,
      "iconBlob": "",
      "icon": "../../images/app-mid/data-push.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:05",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "7",
      "name": "library",
      "src": "../../images/app-mid/library.png",
      "alt": "比对库管理",
      "type": "2",
      "url": "/view/library/",
      "title": "比对库管理",
      "width": 1200,
      "height": 670
    },
    {
      "id": "11",
      "name": "analysisPower",
      "src": "../../images/app-mid/hashrate-manage.png",
      "alt": "算力管理",
      "id": "d71e7870-016d-4f02-ab24-895a74c713c8",
      "name": "算力管理",
      "package": "analysisPower",
      "type": "2",
      "url": "/view/analysisPower/",
      "title": "算力管理",
      "width": 1200,
      "height": 670
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/hashrate-manage.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:07",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "13",
      "name": "search",
      "src": "../../images/app-mid/search.png",
      "alt": "统计查询",
      "id": "f45474ee-70cf-4ed2-8a06-c17429fbb70a",
      "name": "统计查询",
      "package": "search",
      "type": "2",
      "url": "/view/search/",
      "title": "统计查询",
      "width": 1344,
      "height": 675
      "height": 677,
      "iconBlob": "",
      "icon": "../../images/app-mid/search.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:08",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "15",
      "name": "syslog",
      "src": "../../images/app-mid/log-manage.png",
      "alt": "日志管理",
      "id": "850b5e86-dbcf-40f2-8511-745a4d06ec84",
      "name": "日志管理",
      "package": "syslog",
      "type": "2",
      "url": "/view/syslog/",
      "title": "日志管理",
      "width": 1200,
      "height": 600
      "height": 600,
      "iconBlob": "",
      "icon": "../../images/app-mid/log-manage.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:09",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "17",
      "name": "settings",
      "src": "../../images/app-mid/settings.png",
      "alt": "系统设置",
      "id": "5a5e0610-0a62-4de3-8021-2c6652c29ebf",
      "name": "系统设置",
      "package": "settings",
      "type": "2",
      "url": "/view/settings/",
      "title": "系统设置",
      "width": 1200,
      "height": 650
      "height": 650,
      "iconBlob": "",
      "icon": "../../images/app-mid/settings.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:10",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "18",
      "name": "vindicate",
      "src": "../../images/app-mid/vindicate.png",
      "alt": "系统维护",
      "id": "ee64fe23-7631-4ef9-9aca-ea09673693be",
      "name": "系统维护",
      "package": "vindicate",
      "type": "2",
      "url": "/view/vindicate/",
      "title": "系统维护",
      "width": 760,
      "height": 534
      "height": 534,
      "iconBlob": "",
      "icon": "../../images/app-mid/vindicate.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:11",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "19",
      "name": "heatCamera",
      "src": "../../images/app-mid/algorithm-manage.png",
      "alt": "热力图",
      "id": "1e51abbf-a4dd-4cf9-9eee-2149102d6d62",
      "name": "比对库管理",
      "package": "library",
      "type": "2",
      "url": "/view/heatCamera/",
      "title": "热力图",
      "width": 760,
      "height": 600
      "url": "/view/library/",
      "title": "比对库管理",
      "width": 1200,
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/library.png",
      "version": "1.0.0",
      "create_time": "2020-10-10 20:39:25",
      "create_by": "basic",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": true,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "20",
      "name": "areaManage",
      "src": "../../images/app-mid/device.png",
      "alt": "摄像机区域管理",
      "id": "aaf6875a-2e45-414a-affd-ae0a97420920",
      "name": "GB28181配置",
      "package": "gb28181",
      "type": "2",
      "url": "/view/gb28181/",
      "title": "GB28181配置",
      "width": 600,
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/GB-config.png",
      "version": "1.0.2",
      "create_time": "2020-10-24 21:47:23",
      "create_by": "basic",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "af412cbe-472e-4dbc-b962-b290483c9ea9",
      "name": "数据栈配置",
      "package": "dataStack",
      "type": "2",
      "url": "/view/cameraAccess/?dataStack=1",
      "title": "数据栈配置",
      "width": 1200,
      "height": 670,
      "iconBlob": "",
      "icon": "../../images/app-mid/datastack-config.png",
      "version": "1.0.1",
      "create_time": "2020-10-24 21:47:38",
      "create_by": "basic",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "c60621e5-1147-4f75-8e66-5b695d8d286d",
      "name": "摄像机区域管理",
      "package": "areaManage",
      "type": "2",
      "url": "/view/areaManage/",
      "title": "摄像机区域管理",
      "width": 1200,
      "height": 600
      "height": 600,
      "iconBlob": "",
      "icon": "../../images/app-mid/device.png",
      "version": "1.0.1",
      "create_time": "2020-10-24 21:59:24",
      "create_by": "basic",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "202",
      "name": "visual",
      "src": "../../images/app-mid/visual.png",
      "alt": "数据可视化",
      "id": "70c4eaea-a884-4a7f-a2d3-3d40aa5999bf",
      "name": "数据可视化",
      "package": "visual",
      "type": "1",
      "url": "/view/visual/",
      "title": "数据可视化",
      "width": 1200,
      "height": 600
      "height": 600,
      "iconBlob": "",
      "icon": "../../images/app-mid/visual.png",
      "version": "1.0.1",
      "create_time": "",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "1.0.1",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "f45474ee-70cf-4e22-8a06-c17429fbb70a",
      "name": "热力图",
      "package": "heatCamera",
      "type": "2",
      "url": "/view/heatCamera/",
      "title": "热力图",
      "width": 1344,
      "height": 880,
      "iconBlob": "",
      "icon": "../../images/app-mid/algorithm-manage.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:08",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "f454741e-70cf-4e22-8a06-c17429fbb70c",
      "name": "统计查询(集群)",
      "package": "searchForCluster",
      "type": "2",
      "url": "/view/searchForCluster/",
      "title": "统计查询(集群)",
      "width": 1344,
      "height": 677,
      "iconBlob": "",
      "icon": "../../images/app-mid/search.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:08",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    },
    {
      "id": "fa5434ee-70cf-4e22-8a06-c17429fbb70b",
      "name": "相机标定",
      "package": "labelMark",
      "type": "2",
      "url": "/view/labelMark/",
      "title": "相机标定",
      "width": 1500,
      "height": 750,
      "iconBlob": "",
      "icon": "../../images/app-mid/360.png",
      "version": "1.0.0",
      "create_time": "2020-10-09 14:00:08",
      "create_by": "",
      "update_time": "",
      "update_by": "",
      "isDelete": 0,
      "isDefault": false,
      "remoteVersion": "",
      "installed": true,
      "isUpgrade": false,
      "progressMsg": ""
    }
  ]
  ],
  "msg": "请求处理成功",
  "success": true
}

 src/Pool/TreeData.ts

@@ -301,7 +301,6 @@
      cameraName: this.searchInput,
      //isPlatform: 1
    };
    debugger
    if(this.searchFrom == 'cluster'){
      params.isPlatform = 1
    }

 src/components/LeftNav.vue

@@ -468,7 +468,6 @@
      this.TreeDataPool.fetchClusterTree();
      findCluster().then(res => {
        if (res.success) {
          debugger
          this.clusterName = res.data.clusterName;
        }


 src/components/cardWindow.vue

@@ -107,8 +107,6 @@
      }
    },
    async nextPage(dataInfo, index) {
      console.log(this)
      debugger
      let id = dataInfo[0].id
      let res = this.CardList.getBehindEle(id)
      if (res) {

 src/components/serfDiagram/index.vue

@@ -165,17 +165,6 @@
      }
    },
    nodeClick (event, node) {
      // if (this.nodeSelected[node.id]) {
      //   this.unSelectNode(node.id)
      //   // is not nodeSelected
      // } else {
      //   this.selectNode(node)

      // }
      // this.selectNodesLinks()
      // this.$set(this.nodes, node.index, node)
      console.log(event, node)
      debugger
      if (event.timeStamp - this.movement < 200) {
        this.$emit("selected-node", event, this.members[node.id]);
      }
@@ -297,7 +286,7 @@
  right: 50%;
  top: 100%;
  border: solid transparent;
  content: ' ';
  content: " ";
  height: 0;
  width: 0;
  position: absolute;

 src/components/serfDiagram/indexC.vue

@@ -203,7 +203,6 @@
    outerNodes(){
      let arr = [];
      this.members.forEach(item=>{
        debugger
        if(item.hardwareType == '03'){
          arr.push({
            id:item.id,
@@ -346,7 +345,6 @@
      console.log(this.members[node.id])
      if (event.timeStamp - this.movement < 200) {
        //this.$emit("selected-node", event, this.members[node.id]);
        debugger
        let someNode = this.members.find(one=>one.id == node.id)
        this.$emit("selected-node", event, someNode);
      }

 src/components/subComponents/FileUpload/btn.vue

@@ -31,7 +31,6 @@
  watch:{
    attrs:{
      handler(n,o){
        debugger
        this.$nextTick(()=>{
          this.uploader.uploader.assignBrowse(this.$refs.btn, this.directory, this.single, n)
        })

 src/components/subComponents/FileUpload/file.vue

@@ -203,7 +203,6 @@
      this._actionCheck()
    },
    processResponse(message) {
      debugger
      let res = message
      try {
        res = JSON.parse(message)
@@ -239,7 +238,6 @@
      this.isComplete = true
      this.isUploading = false
      console.log('rootFile, file, message',rootFile, file, message)
      debugger
    },
    _fileComplete() {
      this._fileSuccess()
@@ -247,7 +245,6 @@
    _fileError(rootFile, file, message) {
      this._fileProgress()
      console.log('rootFile, file, message',rootFile, file, message)
      debugger
      this.processResponse(message)
      this.error = true
      this.isComplete = false

 src/components/subComponents/FileUpload/index.vue

@@ -185,7 +185,6 @@
      this.statusText.paused = "暂停中";

    },

    onComplete () {

      debugger

      this.$emit("complete", { filename: this.fileName, identifier: this.fileMd5 });

    },

    fileComplete () {


 src/components/treeMenu/index.vue

@@ -335,7 +335,6 @@
    },
    dropNode(node, item, draggedItem, e) {
      console.log('dropNode',node, item,draggedItem);
      debugger
      this.TreeDataPool.dropNode(draggedItem.id, item.id)
    }
  }

 src/pages/ai/index/App.vue

@@ -794,7 +794,6 @@
        _this.installFile = file;

        if (res.success) {

          _this.installDialogVisible = true;

          debugger

          if (res.data.apps.length > 0) {

            _this.installAppPackage = {

              appId: res.data.apps[0].appId,

@@ -862,7 +861,6 @@
    },



    donwload (item) {

      debugger

      item.upgradeLoading = true;

      //this.downloading = true;

      this.downloadItem = item.id;

@@ -981,7 +979,7 @@
.src-title {

  //color: #bfbfbf;

  color: #bbcee8;

  font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC';

  font-family: "PingFangSC-Semibold", "PingFang SC Semibold", "PingFang SC";

  font-weight: 650;

  font-style: normal;

  height: 36px;

@@ -1006,7 +1004,7 @@
      position: absolute;

      top: 50%;

      left: 50%;

      background: url('/images/algo/green.gif');

      background: url("/images/algo/green.gif");

      overflow: hidden;

      transform: translate(-50%, -50%);

      .inner-bar {

@@ -1168,16 +1166,16 @@
        }

      }

      .drawer-content {

        font-family: 'PingFangSC-Regular';

        font-family: "PingFangSC-Regular";

        .el-step__title.is-process {

          border-color: #3d68e1 !important;

          color: #3d68e1 !important;

          font-family: Tahoma, Helvetica, Arial, '\5B8B\4F53', sans-serif;

          font-family: Tahoma, Helvetica, Arial, "\5B8B\4F53", sans-serif;

        }

        .el-step__head.is-process {

          border-color: #3d68e1 !important;

          color: #3d68e1 !important;

          font-family: Tahoma, Helvetica, Arial, '\5B8B\4F53', sans-serif;

          font-family: Tahoma, Helvetica, Arial, "\5B8B\4F53", sans-serif;

        }

        .el-input {

          width: 100%;


 src/pages/cameraAccess/components/SystemInfo.vue

@@ -131,7 +131,6 @@
  },
  mounted(){
    console.log('PollData.RealTimeValidCount',this.PollData.RealTimeValidCount)
    debugger;
  }
}
</script>

 src/pages/cameraAccess/components/scene/Editor.vue

@@ -32,7 +32,13 @@
                  placeholder="选关系"

                  @change="selConnection(sdkItem)"

                >

                  <el-option :value="item.value" :title="item.name" :label="item.name" v-for="item in sdkConnects" :key="item.id"></el-option>

                  <el-option

                    :value="item.value"

                    :title="item.name"

                    :label="item.name"

                    v-for="item in sdkConnects"

                    :key="item.id"

                  ></el-option>

                  <!-- <el-option value="&&" title="and/且" label="and/且"></el-option>

                  <el-option value="||" title="or/或" label="or/或"></el-option>

                  <el-option value="=>" title="—>/触发" label="—>/触发"></el-option> -->

@@ -393,7 +399,6 @@
              arg => arg.operators[0].operator == 'range'

            )

            if (rangeOne) {

              debugger

              if (rangeOne.min.trim() && rangeOne.max.trim()) {

                rangeOne.sdk_arg_value = rangeOne.min + '|' + rangeOne.max

              } else {

@@ -1207,7 +1212,6 @@
              if (d.sort == arg.sort) {

              

                if (arg.sdk_arg_value.indexOf('|') > 0) {

                  debugger

                  //区间值

                  d.min = arg.sdk_arg_value.split('|')[0];

                  d.max = arg.sdk_arg_value.split('|')[1];

@@ -1321,7 +1325,6 @@
          if(!sdk.polygon_id){

            return sdk

          }

          debugger



          //多于两项算法时,算法关系不能为空

          if (sdk.rule_with_pre === '' && index != 0) {


 src/pages/desktop/index/App.vue

@@ -86,29 +86,6 @@
        if (rsp && rsp.success) {
          _that.$store.state.desktop.docks = [];
          let installedApps = [];
          let testObj = {
            id: 'tjcxjq',
            create_by: 'test',
            create_time: '',
            height: 675,
            icon: '../../images/app-mid/search.png',
            installed: true,
            isDelete: 0,
            isUpgrade: false,
            title: '统计查询(集群)',
            name: '统计查询(集群)',
            remoteVersion: '',
            type: '2',
            update_by: '',
            update_time: '',
            url: "/view/searchForCluster/",
            version: '1.0.0',
            width: 1344,
            isDefault: false
          };
   
          console.log(rsp.data);
          rsp.data.push(testObj);

          rsp.data.forEach(function (item) {
            if (item.installed) {
@@ -203,12 +180,12 @@
  width: 100%;
  height: 100%;
  background-size: 100% 100%;
  background-image: url('/images/desktop/background.png');
  background-image: url("/images/desktop/background.png");
  background-attachment: fixed;
}

.clearFix:after {
  content: '';
  content: "";
  display: block;
  height: 0;
  clear: both;

 src/pages/desktop/index/components/ToolsEntry.vue

@@ -2,12 +2,7 @@
  <div class="tools-entry">

    <div class="entry-wrap">

      <div class="app-list clearFix">

        <div

          class="app"

          v-for="dock in stateDocks"

          :key="dock.id"

          @click="dockClick(dock)"

        >

        <div class="app" v-for="dock in stateDocks" :key="dock.id" @click="dockClick(dock)">

          <div class="wrap">

            <div class="app-icon" >

              <img :src="dock.src" :alt="dock.alt" />

@@ -17,7 +12,7 @@
        </div>

      </div>

      <div class="logo">

        <img :src="`${publicPath}images/desktop/desk-logo.png`" alt="">

        <img :src="`${publicPath}images/desktop/desk-logo.png`" alt />

      </div>

    </div>

  </div>

@@ -40,7 +35,6 @@
  },

  mounted() {

    window.addEventListener('message', e => {

      console.log('msg')

      if (e.data && e.data.msg) {

        let msg = e.data.msg;

        // token 不合法, 退出

@@ -51,7 +45,6 @@


        // 打开检索, toSearch?showType=findByPic&targetId=108ba0bc-b0a1-433d-8e1e-d5d2e712b53b&picSmUrl=192.168.20.10:6700/47628,7cc869f3a9c714&compType=1

        if (msg.indexOf("toSearch") >= 0) {

          console.log('msg,search')

          let params = msg.substring(7);

          this.addFrameByName("search", params)

        }


 src/pages/desktop/index/store/modules/desktop.js

@@ -138,7 +138,6 @@
      let minOne = state.minDocks.find(one => one.id == dock.id);
      
      minOne.highlight = false;
      debugger
      minOne.screenshot = dock.screenshot?dock.screenshot:minOne.screenshot;
      //找到minDocks最近打开的状态isShow为true的dock置为高亮
      let minLen = state.minDocks.length;

 src/pages/gb28181/index/App.vue

@@ -83,8 +83,7 @@
                style="position: absolute"
                v-show="gb28181.idType === 1"
                @click="newGBID"
                >生成ID</el-button
              >
              >生成ID</el-button>
            </el-form-item>

            <!-- <el-form-item label="国际服务器端口" prop="GbServerPort">
@@ -101,11 +100,7 @@
            </el-form-item>

            <el-form-item label="国标端口" prop="ServerPort">
              <el-input
                v-model.number="gb28181.GbServerPort"
                placeholder="请输入"
                size="small"
              ></el-input>
              <el-input v-model.number="gb28181.GbServerPort" placeholder="请输入" size="small"></el-input>
            </el-form-item>

            <el-form-item label="开启鉴权">
@@ -113,17 +108,11 @@
            </el-form-item>

            <el-form-item label="鉴权密码" v-show="gb28181.IsAuth">
              <el-input
                v-model="gb28181.Password"
                placeholder="请输入"
                size="small"
              ></el-input>
              <el-input v-model="gb28181.Password" placeholder="请输入" size="small"></el-input>
            </el-form-item>

            <el-form-item>
              <el-button type="primary" @click="submitGB28281" size="small"
                >保存</el-button
              >
              <el-button type="primary" @click="submitGB28281" size="small">保存</el-button>
            </el-form-item>
          </el-form>
        </el-menu-item-group>
@@ -142,37 +131,12 @@
              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="id"
                label="ID"
                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"
              ></el-table-column>
              <el-table-column
                prop="mark"
                label="备注"
                align="center"
              ></el-table-column>
              <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="id" label="ID" 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"></el-table-column>
              <el-table-column prop="mark" label="备注" align="center"></el-table-column>
            </el-table>
          </div>
        </el-menu-item-group>
@@ -335,7 +299,6 @@
      
    },
    toOpenMenuList(e){
      debugger
      let t = e.clientY - this.$el.offsetTop+30;
      let l = e.clientX-this.$el.offsetLeft;


 src/pages/labelMark/components/RightSide.vue

@@ -12,37 +12,52 @@
      </div>
    </div>
    <div class="action-bar">
      <el-button class="drawboard-trigger" size="small" @click="isEdit=!isEdit" :icon="isEdit?'el-icon-lock':'el-icon-edit'">{{isEdit?'锁定':'编辑'}}</el-button>
      <el-button
        class="drawboard-trigger"
        size="small"
        @click="isEdit=!isEdit"
        :icon="isEdit?'el-icon-lock':'el-icon-edit'"
      >{{isEdit?'锁定':'编辑'}}</el-button>
    </div>
    <div class="drawboard">
      <div class="mask" :class="{'edit-status-mask':isEdit}" ref="editBoard" >
        <div class="label" @click="editLabel(item)" v-for="(item,index) in labels" :key="index" :style="{left:`${item.x}px`, top:`${item.y}px`, backgroundColor: colorPick, width: `${dotSize}px`, height: `${dotSize}px` }"></div>
        <div
          class="label"
          @click="editLabel(item)"
          v-for="(item,index) in labels"
          :key="index"
          :style="{left:`${item.x}px`, top:`${item.y}px`, backgroundColor: colorPick, width: `${dotSize}px`, height: `${dotSize}px` }"
        ></div>
      </div>
      <img :src="`/httpImage/${snapshot_url}`" alt />
      <div class="popBox" v-show="isShowPop" :style="`top:${curLabel.y + 22}px;left:${curLabel.x}px`">
      <div
        class="popBox"
        v-show="isShowPop"
        :style="`top:${curLabel.y + 22}px;left:${curLabel.x}px`"
      >
        <div class="title">标注信息</div>
        <div class="details">
          <div class="detail-item">
            <div class="left">
              <label for="">平面坐标X:</label>
              <label for>平面坐标X:</label>
              <span class="fix-width">{{curLabel.x}}</span>
              <i>px</i>
            </div>
            <span class="devide"></span>
            <div class="right">
              <label for="">实际坐标X:</label>
              <label for>实际坐标X:</label>
              <el-input type="text" size="mini" style="width:90px" v-model="curLabel.posX"></el-input>
            </div>
          </div>
          <div class="detail-item">
            <div class="left">
              <label for="">平面坐标Y:</label>
              <label for>平面坐标Y:</label>
              <span class="fix-width">{{curLabel.y}}</span>
              <i>px</i>
            </div>
            <span class="devide"></span>
            <div class="right">
              <label for="">实际坐标Y:</label>
              <label for>实际坐标Y:</label>
              <el-input type="text" size="mini" style="width:90px" v-model="curLabel.posY"></el-input>
            </div>
          </div>
@@ -54,7 +69,6 @@
        </div>
      </div>
    </div>
    
  </div>
</template>

@@ -95,7 +109,6 @@
  watch:{
    'TreeDataPool.selectedNode':{
      handler(n,o){
        debugger
        let curCamera = this.cameraData.find(item => item.id==n.id);
        this.snapshot_url = curCamera.snapshot_url;
      },
@@ -113,7 +126,6 @@
    getAllCameraData(){
      getCamerasByServer().then(res=>{
        if(res.success){
          debugger
          this.cameraData = res.data;
        }
      }).catch(e=>{
@@ -141,7 +153,6 @@
      this.isNewLabel = true;
    },
    editLabel(label){
      debugger
      if(!this.isEdit) return;
      this.isShowPop = true;
      this.curLabel = JSON.parse(JSON.stringify(label));
@@ -206,7 +217,7 @@
    .drawboard-trigger{
      background: transparent;
      color: #fff;
      border-color: rgba(255,255,255,.3);
      border-color: rgba(255, 255, 255, 0.3);
    }
  }
  .drawboard {
@@ -241,7 +252,7 @@
      padding: 14px;
      border-radius: 3px;
      color: #fff;
      background: rgba(0,0,0,.7);
      background: rgba(0, 0, 0, 0.7);
      .title{
        font-weight: bold;
        text-align: left;

 src/pages/labelTrack/index/App.vue

File was deleted

 src/pages/labelTrack/index/api.ts

File was deleted

 src/pages/labelTrack/index/main.ts

File was deleted

 src/pages/settings/components/BasicSetting.vue

@@ -684,7 +684,6 @@
      });
    },
    checkTimeZone(val) {
      debugger;

    },
    submitClock() {

 src/pages/settings/components/ClusterManagement.vue

@@ -627,7 +627,6 @@
        return;
      }
      if (this.activeName === "2") {
        debugger
        if (_this.showJoinConfirm) return;

        this.$confirm("是否要加入节点 " + node.nodeName + "?", "加入集群", {

 vue.config.js

@@ -72,6 +72,14 @@
        // ws: true,
        changeOrigin: true,
      },
      "/data/api-v/app/findAllApp": {
        target: '/',
        target: 'http://localhost:8080/',
        changeOrigin: true,
        pathRewrite: {
          '^/data/api-v/app/findAllApp': 'apps.json'
        }
      },
      "/api-v": {
        target: 'http://192.168.20.10:8000',
        changeOrigin: true