218 Commits 5ad7fa1239 ... fcaf6b7f28

Author SHA1 Message Date
  xiayu3 fcaf6b7f28 Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security 4 years ago
  xiayu3 9af7d91e54 [FE]:Ai报警界面逻辑修改&AI任务界面接口数据更改 4 years ago
  xiayu3 99229edde0 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 years ago
  xiayu3 a7c5a45ca3 [FE]:修改视频监控接口数据 4 years ago
  xiayu3 80bab777fc [FE]:视频回放页面样式修改 4 years ago
  xiayu3 1ce75b1ef8 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 years ago
  xiayu3 c7d3dfb76c [FE]:修改AI报警接口数据 4 years ago
  xiayu3 22e1d89af6 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 years ago
  xiayu3 f1d0510a0a [FE]:修改视频监控页面逻辑 4 years ago
  xiayu3 5a85c7712a Merge remote-tracking branch 'origin/dev-security' into dev-security 4 years ago
  xiayu3 26f78ba0b9 [FE]:视频监控界面流媒体完成 4 years ago
  xiayu3 01bf6c60e0 [FE]:合并冲突 4 years ago
  xiayu3 6ed3c853d8 [FE]:修改视频监控页面逻辑以及界面 4 years ago
  xiayu3 b6f500b56d Merge remote-tracking branch 'origin/dev-security' into dev-security 4 years ago
  xiayu3 0011b3d9f8 feat:ai任务接口调整 4 years ago
  liuchang e0b96780f3 [FE]更新和后端联调改动 4 years ago
  liuchang b01af74802 [FE]更新服务接口文件 4 years ago
  liuchang 38857426c4 [FE]提交监控终端api更新 4 years ago
  chenlp5 91638384f1 feat: DraggableGrid 4 years ago
  luoxu5 b84df77a3a feat:修改新增假勤数据回显问题,设备管理接口联调 4 years ago
  xiayu3 a1a85805a0 Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security 4 years ago
  xiayu3 e732ae3768 feat:更新ai任务界面&视频监控界面 4 years ago
  liuchang 095c160e93 修复文件格式,修复拖拽异常问题 4 years ago
  liuwenxun 729f257dae [FE]增加了Ai报警和进出口记录界面 4 years ago
  luoxu5 4803da2fe4 feat:修改设备管理页面 4 years ago
  liuchang 9196fa66e5 增添测试提示 4 years ago
  liuchang bfef089fbd 更新视频配置 4 years ago
  xiayu3 b4fce4e26f feat:修改视频监控数据接口 4 years ago
  luoxu5 e1e6b4e721 feat:修改设备管理页面 4 years ago
  xiayu3 774138e475 feat:修改识别记录界面 4 years ago
  xiayu3 d3b072645a feat:添加数据接口 4 years ago
  chenlp5 cc99a6b298 Merge remote-tracking branch 'origin/storedev' into dev-security 4 years ago
  chenlp5 41b0e3ffa1 [FE]考勤及安防前端部分 4 years ago
  wangdong6 855dee76a3 Merge remote-tracking branch 'origin/master' 4 years ago
  wangdong6 ce6caf3e9e 新增安防场景与设备关联关系服务 4 years ago
  konghl 3ace2b8fb2 新增minio配置 4 years ago
  konghl 95a5af6883 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl b235b8cc7c 增加时间工具方法 4 years ago
  konghl 0f893e9871 轨迹回放时间轴显示船舶 4 years ago
  konghl 5b25048c26 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl 569b70605d 修改单人轨迹时间抽 4 years ago
  konghl f3b7a571da 重构人员定位轨迹回放 4 years ago
  chenxr3 c5de3eedce 月考勤数据查询接口修改bug 4 years ago
  konghl d1691caa94 工单申请修改用户和部门 4 years ago
  wangchao 1690e0e21b 修改考勤查询日报bug 4 years ago
  wangdong6 0584159bd1 Merge remote-tracking branch 'origin/master' 4 years ago
  wangdong6 f02a5c9889 修改考勤规则查询接口 4 years ago
  wangdong6 013e377cef 修改考勤规则查询接口 4 years ago
  konghl 2ac7393605 重构人员轨迹查询 4 years ago
  konghl 190e8a2ec0 新增工单申请及审批接口 4 years ago
  wangdong6 a0a75ce1c6 修改考勤规则保存接口 4 years ago
  wangchao 208cc9c6ed Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao eb0f593fc9 查询报表修改参数 4 years ago
  wangchao 78caba4d27 考勤详情修改 4 years ago
  wangchao 69f40fa73d Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 6ff5fe626a 考勤报告接收前台参数方式修改 4 years ago
  wangdong6 5151d2fea9 Merge remote-tracking branch 'origin/master' 4 years ago
  wangdong6 9a5dcf3200 封装考勤规则管理接口 4 years ago
  zhaolx5 84e32ed3ca 解决打包失败的问题 4 years ago
  zhaolx5 ac019a0444 Merge remote-tracking branch 'origin/master' 4 years ago
  zhaolx5 d80c144412 变更ipu-cache的版本号 4 years ago
  konghl 5c299da82a 问题修改 4 years ago
  chenxr3 c65072f9be 定位提交 4 years ago
  konghl 9d8fd7b88a 增加设备和围栏的判断字段 4 years ago
  wangchao 9773787bd2 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 0c3414ba5f 配置文件增加注释 4 years ago
  wangchao 62a630e635 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 59071e3124 增加空格 4 years ago
  konghl 4b9cfc964f 新增mock工程 4 years ago
  konghl 8ff2333bdb 修改配置文件,用于上传服务器 4 years ago
  konghl 35e8568374 修改项目名称,用于上传服务器 4 years ago
  konghl 296cdba193 重构后台系统,仅用于上传服务器 4 years ago
  konghl 0122efbabc 重构后台系统,仅用于上传服务器 4 years ago
  konghl 9a39799cc0 部署服务器,修改配置文件 4 years ago
  konghl ddf35fd300 暂时不启用非实体对象的判断 4 years ago
  chenxr3 7939fc8ace 首页修改提交 4 years ago
  konghl db678770b9 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl bebb2b89fe 人员定位问题修改 4 years ago
  konghl 04ada0e6f8 实时救援问题修改 4 years ago
  wangkang3 33bb67ddb7 提交 4 years ago
  chenxr3 b15b5e27ad 首页修改提交 4 years ago
  konghl 8b281e8053 修改pom,排除登录验证 4 years ago
  konghl cb0c0e8182 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl 53804e97f6 修改镜屏推送信息 4 years ago
  konghl 6809ddead2 重构实时报警和历史报警 4 years ago
  konghl 2363abc631 修改镜屏topic 4 years ago
  konghl 6c328c4398 轨迹查询重构 4 years ago
  konghl b0ee3a41b4 历史轨迹回放重构,增加定时任务判断设备离线 4 years ago
  chenxr3 622b446cee 首页修改提交 4 years ago
  chenxr3 4756df9027 修改提交 4 years ago
  konghl 67e75e92ff 删除枚举等,重构人员定位 4 years ago
  chenxr3 563af28335 修改提交 4 years ago
  konghl 08a6631852 修改设备类型 4 years ago
  konghl c183618ccb Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl 2387b3f8e5 修改设备 4 years ago
  konghl 7712978aac 修改地图标记类型和设备类型 4 years ago
  konghl 97a96a8da4 中台服务的版本从2.1升级为2.1.5 4 years ago
  chenxr3 626a7699ce 修改提交 4 years ago
  konghl cbbdfa675d 修改北向接口缓存方式 4 years ago
  konghl 387e92633d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 years ago
  konghl 9ec6ffcd72 统一设备管理返回格式 4 years ago
  konghl 46d45bf56c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 years ago
  konghl b61fa21c4f 修改kafka配置文件 4 years ago
  konghl 24f03b82fc 统一设备管理的返回格式 4 years ago
  konghl 8c1bd0a40d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl d6c9ee7ac9 统一用户管理返回值 4 years ago
  konghl 2667543ebe 修改人员信息返回值 4 years ago
  konghl 33f605d78d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 years ago
  konghl 8c6e6b34db 统一地图标记和终端管理的返回格式 4 years ago
  konghl 6f5679bb9b 修改pom 4 years ago
  konghl f8ec732c5e 配置kafka 4 years ago
  wangchao 91cb23750d Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 7a19aa2489 加入uspa拦截器token验证 4 years ago
  wangchao 605bfe142d Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 0307a3595b 用户管理删除和新增 4 years ago
  wangchao 42c9ce12f2 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 2f12fb16fb 终端绑定 4 years ago
  wangchao a4780fea36 后台项目初始化 4 years ago
  wangchao 1d225203e0 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 7b5bd7fc8f 解绑查询关联关系 4 years ago
  wangchao 5b7ada9d09 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 3abd9ac159 测试 4 years ago
  wangchao 5c2edbe8f2 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 701921f2c7 设备管理分页查询的修改 4 years ago
  wangchao d1e6198a6c 设备管理报错修改 4 years ago
  wangchao cd2a9a0807 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 42136256e1 设备管理模块后台修改 4 years ago
  konghl e5ac90e3cc 修改git忽略文件配置 4 years ago
  konghl 173629f8c7 修改用户管理 4 years ago
  konghl 8b50ef3257 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl 15425d68aa 用户管理功能修改 4 years ago
  wangchao f4c0dc51b9 后台项目安防一体化系统初始化 4 years ago
  konghl e9eb1c63df 修改工程,无错误 4 years ago
  zhaolx5 12e2261ca9 初始化工程 4 years ago
  wangchao 21a1d106ba Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao d53bf64414 修改项目结构 4 years ago
  wangchao 10d36573b9 修改项目结构 4 years ago
  wangkang3 657320fadd 提交 4 years ago
  wangchao 993f22008d Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 1e6aae2459 修改设备添加数据库时间 4 years ago
  konghl aa3a0f690d 实际报警初始化查询 4 years ago
  konghl 3640ccd134 拆分properties配置文件 4 years ago
  konghl 9afed3d1cd 修改镜屏名称、新增查询历史报警救援等 4 years ago
  konghl 52a85f945f 修改日期工具类 4 years ago
  wanyao ee205bc24c 回退 4 years ago
  wanyao 16d1d23fee 主机启动慢的原因测试1 4 years ago
  wangkang3 d34871ad0c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangkang3 57e2b527f0 修改镜屏uuid 4 years ago
  wangkang3 a4f2b748b2 提交 4 years ago
  wangkang3 07f3e9bb23 修改提交 4 years ago
  konghl 499e7a7d94 合并海图参数 4 years ago
  konghl fe61027787 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 years ago
  konghl 70691e3608 增加海图配置参数、重构数据推送、新增轨迹回放接口 4 years ago
  konghl 510c6be0e7 修改人员定位功能数据订阅的解析 4 years ago
  chenxr3 186e9e66f4 轨迹分析页面 4 years ago
  wangchao 71ba3d6e50 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao eb6f6af53e 修改时间工具类与轨迹分析 4 years ago
  wangchao dc4c59924a Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 1c6dc5d9cd 轨迹分析信息查询 4 years ago
  chenxr3 69f534d648 地图标记绘制多边形颜色优化 4 years ago
  konghl ea8cc62767 修改配置文件 4 years ago
  wangchao ffb3b16b49 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 4f36bbe4f2 考勤方法的修改 4 years ago
  wangchao 4ea204d4e4 考勤查询功能详情信息 4 years ago
  wangchao 76ba12e88b Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 8088a9af4d 考勤查询功能 4 years ago
  konghl 0824340e9c 修改人员定位功能 4 years ago
  wangchao ceb2e684c3 测试批量插入 4 years ago
  wangchao a19b9e2346 合并代码 4 years ago
  wangchao d0cdba1219 Merge remote-tracking branch 'origin/master' 4 years ago
  wangchao 14d32a62c0 删除终端时删除终端绑定关系 4 years ago
  wangchao 1d834a772a 删除终端时删除终端绑定关系 4 years ago
  chenxr3 8e19767361 设备类型标识格式更改 4 years ago
  konghl b8a06cf6e6 添加人员的枚举值 4 years ago
  konghl ec04cf2f49 删除.project文件 4 years ago
  konghl 2e3c3b67ca 修改枚举位置 4 years ago
  konghl 004b6f9498 新增定位推送,修改枚举类的位置 4 years ago
  wangkang3 76ef98bf1e 代码提交 4 years ago
  wangchao 63feb0d24b 终端管理页面加ui替换 4 years ago
  wangchao e0572c53e1 关联终端,解绑终端修改,考勤管理架子编写 4 years ago
  wangchao 9ff2237cbf 关联终端,解绑终端修改 4 years ago
  wangchao 7acc72f757 关联终端,解绑终端修改 4 years ago
  wangchao 332e05b5f4 关联终端,解绑终端修改 4 years ago
  wangchao b7fe4ca37c 后台daoimpl的修改 4 years ago
  konghl a3c4950238 修改字段 4 years ago
  konghl 48cb0bbdfa 增加返回参数 4 years ago
  konghl 429b4dbfa9 修改北向接口 4 years ago
  konghl 2e0b6dcd44 增加业务常量 4 years ago
  konghl 12d7573f2e 新增功能:地图标记增删改查 4 years ago
  wangkang3 8f7b30e3be 地图标记模块接口接入 4 years ago
  chenxr3 1013865ef3 设备管理页面 4 years ago
  wangchao 97dca84162 修改设备验证 4 years ago
  wangchao 0c9930d3e3 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao 8bd1ff2323 终端关联,终端解绑等接口 4 years ago
  wangchao d01adabd91 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao d40c613702 修改gis接口等 4 years ago
  wangchao 35550a3e47 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao bd86ba7a47 设备增删改查以及关联与解绑终端 4 years ago
  wangchao a8c7c1cf4d 项目配置修改以及剔除uspa 4 years ago
  wangchao c251472c3d gis获取token接口 4 years ago
  wangchao fba9354c6a Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao 5ff38a7f9b 解决跨域问题 4 years ago
  wangchao 74f666ab34 添加注释,增加轨迹文件等 4 years ago
  wangchao 5f13388aac 修改地图管理文件 4 years ago
  wangchao 41aea6126c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao 24f1743496 按评审要求修改文件 4 years ago
  wangchao 666c0f81c2 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 years ago
  wangchao 779c6e3826 修改日志文件 4 years ago
  wangchao 0e5599165c 修改日志文件 4 years ago
  wangchao c217a49b3a 更新项目 4 years ago
  wangchao 408a2042a9 后台项目初始化 4 years ago
  wangkang3 7bbf8eb6a8 页面初始化提交 4 years ago
  liuchang 000ebd90c9 更新文件 4 years ago
  liuchang 46a262ab4b 删除 4 years ago
  liuchang d1d76df146 更新提交 4 years ago
  wanyao 1d2d95bc39 删除 4 years ago
  wanyao f74da4a0dd 删除 4 years ago
  wanyao b667fddfbc 初始化 4 years ago

+ 8 - 0
security-protection-platform/src/api/system/index.js

75
      return resp
75
      return resp
76
    })
76
    })
77
  },
77
  },
78
  // 获取ai任务模型下拉框列表
79
  getAiTaskModelList() {
80
    return $default.get('/sp/sysConfigAiTask/queryAiTaskModelList')
81
  },
82
  // 获取ai任务列表
83
  getAiTaskList(params) {
84
    return $default.get('/sp/sysConfigAiTask/queryPageAiTask?', params)
85
  },
78
  // 获取设备列表数据
86
  // 获取设备列表数据
79
  getDeviceData (data) {
87
  getDeviceData (data) {
80
    // return $http.get('/system/getDeviceData', data).catch((err) => { return err })
88
    // return $http.get('/system/getDeviceData', data).catch((err) => { return err })

+ 15 - 13
security-protection-platform/src/modules/aialarm/index.vue

71
      </t-table-column>
71
      </t-table-column>
72
      <t-table-column label="处理时间" prop="processTime" width="160px">
72
      <t-table-column label="处理时间" prop="processTime" width="160px">
73
      </t-table-column>
73
      </t-table-column>
74
      <t-table-column label="操作">
74
      <t-table-column label="操作" width="120">
75
        <template slot-scope="scope">
75
        <template slot-scope="scope">
76

76

77
          <a href="javascript:void(0)" size="sm" style="color:#0089D4" @click="handleClick(scope,0)">详情</a>
77
          <a href="javascript:void(0)" size="sm" style="color:#0089D4" @click="handleClick(scope,0)">详情</a>
92
          <div class="detail">
92
          <div class="detail">
93
            <label class="detail_title">状态:</label>
93
            <label class="detail_title">状态:</label>
94
            <div class="detail_content">
94
            <div class="detail_content">
95
              <t-tag v-if="alarmDetailData.status==='未确认'" state="warning">未确认</t-tag>
96
              <t-tag v-if="alarmDetailData.status==='已处理'" state="success">已处理</t-tag>
97
              <t-tag v-if="alarmDetailData.status==='处理中'" state="info">处理中</t-tag>
98
              <t-tag v-if="alarmDetailData.status==='误报'" state="danger">误报</t-tag>
95
              <t-tag v-if="alarmDetailData.statusZh==='未确认'" state="warning">未确认</t-tag>
96
              <t-tag v-if="alarmDetailData.statusZh==='已处理'" state="success">已处理</t-tag>
97
              <t-tag v-if="alarmDetailData.statusZh==='处理中'" state="info">处理中</t-tag>
98
              <t-tag v-if="alarmDetailData.statusZh==='误报'" state="danger">误报</t-tag>
99
            </div>
99
            </div>
100

100

101
          </div>
101
          </div>
109
          </div>
109
          </div>
110
          <div class="detail">
110
          <div class="detail">
111
            <label class="detail_title">报警时间:</label>
111
            <label class="detail_title">报警时间:</label>
112
            <div class="detail_content">{{ alarmDetailData.aiIdenTime }}</div>
112
            <div class="detail_content">{{ alarmDetailData.aiIdenTime|formatDateTime }}</div>
113
          </div>
113
          </div>
114

114

115
          <div class="detail">
115
          <div class="detail">
121
            <div class="detail_content">{{ alarmDetailData.monitorSceneName }}</div>
121
            <div class="detail_content">{{ alarmDetailData.monitorSceneName }}</div>
122
          </div>
122
          </div>
123

123

124
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
124
          <div class="detail">
125
            <label class="detail_title">处理人:</label>
125
            <label class="detail_title">处理人:</label>
126
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName }}</div>
126
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName }}</div>
127
          </div>
127
          </div>
128

128

129
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
129
          <div class="detail">
130
            <label class="detail_title">处理时间:</label>
130
            <label class="detail_title">处理时间:</label>
131
            <div>{{ alarmDetailData.doneDate }}</div>
131
            <div>{{ alarmDetailData.disposeDate }}</div>
132
          </div>
132
          </div>
133
        </div>
133
        </div>
134

134

145
          </div>
145
          </div>
146
        </div>
146
        </div>
147
        <div v-if="clickdetail==1">
147
        <div v-if="clickdetail==1">
148
          <div v-if="alarmDetailData.status!='END'" class="radio">
148
          <div v-if="alarmDetailData.statusZh!='END'" class="radio">
149
            <div>报警处理 : </div>
149
            <div>报警处理 : </div>
150
            <div v-if="alarmDetailData.status=='INI'">
150
            <div v-if="alarmDetailData.statusZh=='INI'">
151
              <t-radio-group v-model="status">
151
              <t-radio-group v-model="status">
152
                <t-radio label="RUN">
152
                <t-radio label="RUN">
153

153

161
              </t-radio-group>
161
              </t-radio-group>
162
            </div>
162
            </div>
163

163

164
            <div v-if="alarmDetailData.status=='RUN'||alarmDetailData.status=='FAL'">
164
            <div v-if="alarmDetailData.statusZh=='RUN'||alarmDetailData.statusZh=='FAL'">
165
              <t-radio-group v-model="status">
165
              <t-radio-group v-model="status">
166
                <t-radio label="END">关闭</t-radio>
166
                <t-radio label="END">关闭</t-radio>
167
              </t-radio-group>
167
              </t-radio-group>
193
import aialarmapi from '@/api/aialarm'
193
import aialarmapi from '@/api/aialarm'
194
import formatDateTime from '@/utils/formatDateTime.js'
194
import formatDateTime from '@/utils/formatDateTime.js'
195
export default {
195
export default {
196

196
  filters: {
197
    formatDateTime
198
  },
197
  data () {
199
  data () {
198
    return {
200
    return {
199
      searchdata: {
201
      searchdata: {

+ 3 - 2
security-protection-platform/src/modules/attendance/abnormal/index.vue

2
  <div class="page-main">
2
  <div class="page-main">
3
    <div class="page-content">
3
    <div class="page-content">
4
      <div class="row mt-32">
4
      <div class="row mt-32">
5
        <div class="col-3">
6
          <span>月份:</span>
5
        <div class="keep-row">
6
          <span>月份</span>
7
          <t-date-picker v-model="form.month" style="width:200px" type="month" placeholder="请选择月份" />
7
          <t-date-picker v-model="form.month" style="width:200px" type="month" placeholder="请选择月份" />
8
        </div>
8
        </div>
9
        <div class="keep-row">
9
        <div class="keep-row">
157
    font-size: 14px;
157
    font-size: 14px;
158
  }
158
  }
159
  .keep-row{
159
  .keep-row{
160
    margin-left: 24px;
160
    display: flex;
161
    display: flex;
161
    align-items: center;
162
    align-items: center;
162
  }
163
  }

+ 3 - 2
security-protection-platform/src/modules/attendance/report/index.vue

5
        <!-- 日报 -->
5
        <!-- 日报 -->
6
        <t-tab-panel label="日报" panel-id="tab-1">
6
        <t-tab-panel label="日报" panel-id="tab-1">
7
          <div class="row mt-32">
7
          <div class="row mt-32">
8
            <div class="col-3">
9
              <span>日期:</span>
8
            <div class="keep-row">
9
              <span>日期</span>
10
              <t-date-picker v-model="dailyForm.workDay" style="width:200px" placeholder="请选择日期"></t-date-picker>
10
              <t-date-picker v-model="dailyForm.workDay" style="width:200px" placeholder="请选择日期"></t-date-picker>
11
            </div>
11
            </div>
12
            <div class="keep-row">
12
            <div class="keep-row">
243
  .keep-row {
243
  .keep-row {
244
    display: flex;
244
    display: flex;
245
    align-items: center;
245
    align-items: center;
246
    margin-left: 24px;
246
  }
247
  }
247
  .search-btn {
248
  .search-btn {
248
    margin-left: auto;
249
    margin-left: auto;

+ 29 - 12
security-protection-platform/src/modules/system/assignment/index.vue

33
      <div class="table-box">
33
      <div class="table-box">
34
        <t-table :data="taskDataList" line @selection-change="selectChange">
34
        <t-table :data="taskDataList" line @selection-change="selectChange">
35
          <t-table-column type="selection" width="70"></t-table-column>
35
          <t-table-column type="selection" width="70"></t-table-column>
36
          <t-table-column prop="taskName" label="任务名称" width="110"></t-table-column>
37
          <t-table-column prop="taskId" label="任务编号" width="120"></t-table-column>
38
          <t-table-column prop="matchingType" label="匹配模型" width="120"></t-table-column>
39
          <t-table-column prop="executionDevice" label="执行设备" width="220"></t-table-column>
40
          <t-table-column prop="configurationTime" label="配置时间" width="180"></t-table-column>
41
          <t-table-column prop="status" style="background-color:#000" label="状态" width="120">
36
          <t-table-column prop="aiTaskName" label="任务名称" width="110"></t-table-column>
37
          <t-table-column prop="aiTaskCode" label="任务编号" width="120"></t-table-column>
38
          <t-table-column prop="aiIdenModel" label="匹配模型" width="120"></t-table-column>
39
          <t-table-column prop="executeDeviceString" label="执行设备" width="220"></t-table-column>
40
          <t-table-column prop="doneDate" label="配置时间" width="200">
42
            <template v-slot="{row}">
41
            <template v-slot="{row}">
43
              <div :class="getTypecellClass(row.status)" class="tag-cell">
44
                <span class="status-ball"></span>{{ row.status }}
42
              {{ row.doneDate|formatDateTime }}
43
            </template>
44
          </t-table-column>
45
          <t-table-column prop="aiTaskStatus" align="center" style="background-color:#000" label="状态" width="120">
46
            <template v-slot="{row}">
47
              <div :class="getTypecellClass(row.aiTaskStatus)" class="tag-cell">
48
                <span class="status-ball"></span>{{ row.aiTaskStatus }}
45
              </div>
49
              </div>
46
            </template>
50
            </template>
47
          </t-table-column>
51
          </t-table-column>
69
73
70
<script>
74
<script>
71
import sysapi from '@/api/system'
75
import sysapi from '@/api/system'
76
import formatDateTime from '@/utils/formatDateTime.js'
72
// import sendOrderModal from './components/modal/sendordermodal.vue'
77
// import sendOrderModal from './components/modal/sendordermodal.vue'
73
export default {
78
export default {
79
  filters: {
80
    formatDateTime
81
  },
74
  components: {
82
  components: {
75
    // sendOrderModal
83
    // sendOrderModal
76
  },
84
  },
103
    }
111
    }
104
  },
112
  },
105
  created () {
113
  created () {
106
    this.getTaskName()
107
    this.getmatchingType()
114
    this.getTaskName() // 获取任务名称下拉框
115
    this.getmatchingType() // 获取匹配模型下拉框
116
    this.getAiTaskData() // 查询任务列表
108
  },
117
  },
109
  methods: {
118
  methods: {
119
    getAiTaskData() {
120
      sysapi.getAiTaskList({params: {aiTaskId: 9}}).then(res => {
121
        this.taskDataList = res.data.data.data
122
        console.log(this.taskDataList)
123
      })
124
    },
125
    // 获取任务名称下拉框
110
    getTaskName() {
126
    getTaskName() {
111
      sysapi.getCharSpecList('AI_TASK_STATUS').then(res => {
127
      sysapi.getCharSpecList('AI_TASK_STATUS').then(res => {
112
        this.taskStatusList = res.data
128
        this.taskStatusList = res.data
113
      })
129
      })
114
    },
130
    },
131
    // 获取匹配模型下拉框
115
    getmatchingType() {
132
    getmatchingType() {
116
      sysapi.getCharSpecList('AI_MATCHER_MODE').then(res => {
117
        console.log(res);
133
      sysapi.getAiTaskModelList().then(res => {
134
        console.log(res)
118
        this.matchingTypeList = res.data
135
        this.matchingTypeList = res.data
119
      })
136
      })
120
    },
137
    },