Przeglądaj źródła

[FE]:Ai报警界面逻辑修改&AI任务界面接口数据更改

xiayu3 4 lat temu
rodzic
commit
9af7d91e54

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

@ -75,6 +75,14 @@ const api = {
75 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 87
  getDeviceData (data) {
80 88
    // return $http.get('/system/getDeviceData', data).catch((err) => { return err })

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

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

77 77
          <a href="javascript:void(0)" size="sm" style="color:#0089D4" @click="handleClick(scope,0)">详情</a>
@ -92,10 +92,10 @@
92 92
          <div class="detail">
93 93
            <label class="detail_title">状态:</label>
94 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 99
            </div>
100 100

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

115 115
          <div class="detail">
@ -121,14 +121,14 @@
121 121
            <div class="detail_content">{{ alarmDetailData.monitorSceneName }}</div>
122 122
          </div>
123 123

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

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

@ -145,9 +145,9 @@
145 145
          </div>
146 146
        </div>
147 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 149
            <div>报警处理 : </div>
150
            <div v-if="alarmDetailData.status=='INI'">
150
            <div v-if="alarmDetailData.statusZh=='INI'">
151 151
              <t-radio-group v-model="status">
152 152
                <t-radio label="RUN">
153 153

@ -161,7 +161,7 @@
161 161
              </t-radio-group>
162 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 165
              <t-radio-group v-model="status">
166 166
                <t-radio label="END">关闭</t-radio>
167 167
              </t-radio-group>
@ -193,7 +193,9 @@
193 193
import aialarmapi from '@/api/aialarm'
194 194
import formatDateTime from '@/utils/formatDateTime.js'
195 195
export default {
196

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

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

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

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

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

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

@ -33,15 +33,19 @@
33 33
      <div class="table-box">
34 34
        <t-table :data="taskDataList" line @selection-change="selectChange">
35 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 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 49
              </div>
46 50
            </template>
47 51
          </t-table-column>
@ -69,8 +73,12 @@
69 73
70 74
<script>
71 75
import sysapi from '@/api/system'
76
import formatDateTime from '@/utils/formatDateTime.js'
72 77
// import sendOrderModal from './components/modal/sendordermodal.vue'
73 78
export default {
79
  filters: {
80
    formatDateTime
81
  },
74 82
  components: {
75 83
    // sendOrderModal
76 84
  },
@ -103,18 +111,27 @@ export default {
103 111
    }
104 112
  },
105 113
  created () {
106
    this.getTaskName()
107
    this.getmatchingType()
114
    this.getTaskName() // 获取任务名称下拉框
115
    this.getmatchingType() // 获取匹配模型下拉框
116
    this.getAiTaskData() // 查询任务列表
108 117
  },
109 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 126
    getTaskName() {
111 127
      sysapi.getCharSpecList('AI_TASK_STATUS').then(res => {
112 128
        this.taskStatusList = res.data
113 129
      })
114 130
    },
131
    // 获取匹配模型下拉框
115 132
    getmatchingType() {
116
      sysapi.getCharSpecList('AI_MATCHER_MODE').then(res => {
117
        console.log(res);
133
      sysapi.getAiTaskModelList().then(res => {
134
        console.log(res)
118 135
        this.matchingTypeList = res.data
119 136
      })
120 137
    },