Sfoglia il codice sorgente

feat:修改视频监控数据接口

(cherry picked from commit f59f077db635d5529143b2030954f7e23c2084de)
xiayu3 4 anni fa
parent
commit
b4fce4e26f

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

193
    getDailyTable() {
193
    getDailyTable() {
194
      this.loadDailyTable = true
194
      this.loadDailyTable = true
195
      atdapi.getDayAttendance({params: this.dailyForm}).then(res => {
195
      atdapi.getDayAttendance({params: this.dailyForm}).then(res => {
196
        console.log(res.data)
197
        let tableData = res.data.data
196
        let tableData = res.data.data
198
        this.dailyTableData = []
197
        this.dailyTableData = []
199
        tableData.forEach(element => {
198
        tableData.forEach(element => {
218
      atdapi.getAttendanceDetail({
217
      atdapi.getAttendanceDetail({
219
        params: { userid, beginDay, endDay }
218
        params: { userid, beginDay, endDay }
220
      }).then(res => {
219
      }).then(res => {
221
        console.log(res)
222
        const { detail } = res.data
220
        const { detail } = res.data
223
        this.modalData.detail = detail
221
        this.modalData.detail = detail
224
      }).finally(() => {
222
      }).finally(() => {

+ 19 - 6
security-protection-platform/src/modules/videoSurveillance/index.vue

7
    <div class="page-top">
7
    <div class="page-top">
8
      <span>风场:</span>
8
      <span>风场:</span>
9
      <t-select v-model="gateFieldData" @change="getWindFieldData">
9
      <t-select v-model="gateFieldData" @change="getWindFieldData">
10
        <t-option v-for="(item,index) in organizationData" :key="index" :value="item.id">{{ item.org }}</t-option>
10
        <t-option v-for="(item,index) in organizationList" :key="index" :value="item.id">{{ item.org }}</t-option>
11
      </t-select>
11
      </t-select>
12
    </div>
12
    </div>
13
    <div v-if="tabType==='gate'" >
13
    <div v-if="tabType==='gate'" >
46
</template>
46
</template>
47
<script>
47
<script>
48
import sysapi from '@/api/videoSurveillance'
48
import sysapi from '@/api/videoSurveillance'
49
import commonapi from '@/api/common'
49
export default {
50
export default {
50
  filters: {
51
  filters: {
51
    handleText(value) {
52
    handleText(value) {
65
      roomPageSize: 10, // 集控室分页数据
66
      roomPageSize: 10, // 集控室分页数据
66
      roomTotal: 100, // 集控室分页总数
67
      roomTotal: 100, // 集控室分页总数
67
      tabType: 'gate',
68
      tabType: 'gate',
68
      organizationData: [], // 风场数据
69
      organizationList: [], // 风场数据
69
      gateFieldData: 101101,
70
      gateFieldData: 101101,
70
      gateList: [],
71
      gateList: [],
71
      roomList: []
72
      roomList: []
72
    }
73
    }
73
  },
74
  },
74
  mounted() {
75
  mounted() {
75
    // 获取风场列表
76
    sysapi.getOrganizationData().then(res => {
77
      this.organizationData = res.data.organizations
78
    })
76
    this.getWindFiledList() // 获取风场列表
79
    this.getWindFieldData()
77
    this.getWindFieldData()
80
    this.getCenterRoomData()
78
    this.getCenterRoomData()
81
  },
79
  },
90
        this.tabType = 'room'
88
        this.tabType = 'room'
91
      }
89
      }
92
    },
90
    },
91
    getWindFiledList() {
92
      commonapi.getDepartments().then(resp => {
93
        this.organizationList = []
94
        console.log(resp)
95
        this.organizationList = resp.data.map(item => {
96
          return {
97
            org: item.name,
98
            id: item.id
99
          }
100
        })
101
      }, err => {
102
        this.$Message.danger('获取风场列表失败!')
103
        console.log(err)
104
      })
105
    },
93
    // 获得风场大门数据
106
    // 获得风场大门数据
94
    getWindFieldData() {
107
    getWindFieldData() {
95
      let obj = {
108
      let obj = {