zhangzengfei
2022-09-13 316d969b4d6cff5e478d60f7bc739c4d39a6a0e7
隐藏GB28181,点位监控日期排序, 修改功能打开方式
5个文件已修改
94 ■■■■ 已修改文件
src/components/CameraLeft.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hashrate/HashManage/components/EquipmentForm.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/invalidCamera/components/DevBox.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/manageCenter/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/CameraLeft.vue
@@ -103,7 +103,7 @@
                    />
                  </el-menu-item-group>
                </el-submenu>
                <el-submenu index="1">
                <el-submenu index="1" v-show="false">
                  <template slot="title">
                    <!-- <i class="iconfont iconjiankongshexiangji"></i> -->
                    <span class="iconfont closeIcon" v-if="openeds[0] === '1'">&#xe64a;</span>
@@ -140,7 +140,7 @@
                    />
                  </el-menu-item-group>
                </el-submenu>
                <el-submenu index="2">
                <el-submenu index="2" v-show="false">
                  <template slot="title">
                    <!-- <i class="iconfont iconjiankongshexiangji"></i> -->
                    <span class="iconfont closeIcon" v-if="openeds[0] === '2'">&#xe64a;</span>
src/router/index.js
@@ -40,7 +40,10 @@
  {
    path: "/equipmentList",
    name: "equipmentList",
    component: () => import(/* webpackChunkName: "about" */ "../views/equipmentManagement/equipmentList")
    component: () => import(/* webpackChunkName: "about" */ "../views/equipmentManagement/equipmentList"),
    meta: {
      title: "设备管理"
    }
  },
  {
    path: "/personalCenter",
@@ -60,7 +63,10 @@
  {
    path: "/search",
    name: "search",
    component: () => import(/* webpackChunkName: "about" */ "../views/search")
    component: () => import(/* webpackChunkName: "about" */ "../views/search"),
    meta: {
      title: "统计查询"
    }
  },
  {
    path: "/searchOpen",
@@ -106,7 +112,10 @@
  {
    path: "/hashrateDetail",
    name: "hashrateDetail",
    component: () => import(/* webpackChunkName: "about" */ "../views/hashrate/hashrateDetail")
    component: () => import(/* webpackChunkName: "about" */ "../views/hashrate/hashrateDetail"),
    meta: {
      title: "算力管理"
    }
  },
  {
    path: "/manageCenter",
@@ -116,19 +125,28 @@
  {
    path: "/subAccount",
    name: "subAccount",
    component: () => import(/* webpackChunkName: "about" */ "../views/subAccount")
    component: () => import(/* webpackChunkName: "about" */ "../views/subAccount"),
    meta: {
      title: "用户管理"
    }
  },
  {
    // 实时监控
    path: "/video",
    name: "video",
    component: () => import(/* webpackChunkName: "about" */ "../views/video")
    component: () => import(/* webpackChunkName: "about" */ "../views/video"),
    meta: {
      title: "实时监控"
    }
  },
  {
    // 数据可视化
    path: "/dataView",
    name: "dataView",
    component: () => import(/* webpackChunkName: "about" */ "../views/dataView")
    component: () => import(/* webpackChunkName: "about" */ "../views/dataView"),
    meta: {
      title: "统计分析"
    }
  },
  {
    // 单点登录
@@ -139,7 +157,10 @@
  {
    path: "/invalidCamera",
    name: "invalidCamera",
    component: () => import(/* webpackChunkName: "about" */ "../views/invalidCamera")
    component: () => import(/* webpackChunkName: "about" */ "../views/invalidCamera"),
    meta: {
      title: "点位变更"
    }
  }
]
@@ -148,4 +169,8 @@
  routes
})
// router.beforeEach((to, from, next) => {
//   if (to.meta.title) document.title = to.meta.title
// })
export default router
src/views/hashrate/HashManage/components/EquipmentForm.vue
@@ -83,7 +83,7 @@
          :current-page="page"
          :page-size="size"
          layout="total, sizes, prev, pager, next, jumper"
          :page-sizes="[5, 10, 15, 20, 25]"
          :page-sizes="[5, 10, 15, 20, 25, 100]"
          :total="total"
          background
          :small="true"
@@ -133,19 +133,36 @@
        this.dataList = res.data.lists
        this.total = res.data.total
      }
      // let exportList = []
      // 根据rtsp 提取ip地址
      const ipReg = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
      this.dataList.forEach((cam) => {
        // var cinfo = {
        //   channel: cam.rtsp,
        //   nama: cam.name,
        //   task: cam.tasks
        //     .map((task) => {
        //       return task.taskname
        //     })
        //     .join(",")
        // }
        // exportList.push(cinfo)
        // 国标摄像机不显示ip
        if (cam.type === 1) {
          cam.ip = "-"
          return
        }
        let ip = ipReg.exec(cam.rtsp)
        if (ip.length > 0) {
        if (ip && ip.length > 0) {
          cam.ip = ip[0]
        }
      })
      // console.table(exportList)
    },
    handleSizeChange(size) {
      this.size = size
src/views/invalidCamera/components/DevBox.vue
@@ -67,7 +67,8 @@
      })
        .then((res) => {
          if (res.success) {
            this.dataList = res.data.list
            this.dataList = res.data.list.sort(this.compare("createTime", "inverted"))
            // this.dataList = this.reverseDate(res.data.list, "createTime")
            this.total = res.data.total
          } else {
            this.$notify.error("加载列表失败")
@@ -77,6 +78,19 @@
          this.$notify.error(e.msg)
        })
    },
    compare(prop, align) {
      return function(a, b) {
        var value1 = a[prop]
        var value2 = b[prop]
        if (align == "positive") {
          //正序
          return new Date(value1) - new Date(value2)
        } else if (align == "inverted") {
          //倒序
          return new Date(value2) - new Date(value1)
        }
      }
    },
    //分页功能
    handleSizeChange(size) {
      this.size = size
src/views/manageCenter/index.vue
@@ -763,15 +763,13 @@
      const val = userInfo.permissions.find((item) => {
        return item == route.permission
      })
      // 修改为全部在新标签页打开
      if (val) {
        if (route.path === "/search" || route.path === "/dataView") {
          const { href } = this.$router.resolve({
            path: route.path
          })
          window.open(href, "_blank")
          return
        }
        this.$router.push(route.path)
        const { href } = this.$router.resolve({
          path: route.path
        })
        window.open(href, "_blank")
      } else if (!userInfo.parentId) {
        this.$router.push(route.openPath)
      }