Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security

security-protection-platform/src/api/access/index.js

@@ -8,6 +8,13 @@ const api = {
  getaccesstype () {
    return $http.get('/access/getaccesstype')
  },
  getOneInAndOutRecord (params) {
    return $default.get('/sp/inAndOutRecord/queryOneInAndOutRecord', params)
  },
  // 获取公司
  getcompanyTypesList () {
    return $default.get('sp/employeeManagement/queryCompanyList')
  }
}

security-protection-platform/src/api/videoSurveillance/index.js

@@ -11,6 +11,9 @@ const api = {
  getVideoSurveillanceData (params) {
    return $default.get('/sp/monitorSceneTerminal/queryMonitorSceneTerminalRel', params)
  },
  getVideoSurveillanceDataForPage (params) {
    return $default.get('/sp/monitorSceneTerminal/queryMonitorSceneTerminalRelForPage', params)
  },
  // 获取监控场景列表
  getDepartments () {
    return $default.get('/sp/workEmployee/queryAllOrganize')

security-protection-platform/src/modules/access/index.vue

@@ -2,14 +2,15 @@
  <div class="access">
    <div class="access_header">
      <div>
        <span class="title">开始时间 : </span>
        <t-date-picker :confirm="false" v-model="searchdata.beginTime" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
        <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
      </div>
      <div>
        <span class="title">结束时间 : </span>
        <t-date-picker :confirm="false" v-model="searchdata.endTime" placeholder="请选择结束时间" style="width:200px;height:32px"></t-date-picker>
        <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:200px;height:32px"></t-date-picker>
      </div>
      <!-- <div>
@@ -21,7 +22,7 @@
      </div> -->
      <div class="alarm_people">
        <span class="title">员工 : </span>
        <t-input v-model="searchdata.relateEmployeeNameAsLike" placeholder="员工姓名、编号关键字" style="width: 200px"></t-input>
        <t-input v-model="searchdata.nameAsLike" placeholder="员工姓名" style="width: 200px"></t-input>
      </div>
    </div>
@@ -42,18 +43,17 @@
    <t-table :data="data" line @selection-change="handleSelectionChange">
      <t-table-column type="selection" width="34px"></t-table-column>
      <t-table-column label="姓名" prop="relateEmployeeRoleName" width="60px">
      <t-table-column label="姓名" prop="employeeName" width="60px">
      </t-table-column>
      <t-table-column label="员工编号" prop="code" width="80px">
      <t-table-column label="员工编号" prop="employeeCode" width="80px">
      </t-table-column>
      <t-table-column label="公司" prop="orgName" width="94px">
      <t-table-column label="公司" prop="companyname" width="94px">
      </t-table-column>
      <t-table-column label="部门" prop="orgName" width="94px">
      <t-table-column label="部门" prop="organizationName" width="94px">
      </t-table-column>
      <t-table-column label="职务" prop="mainJobPosition" width="80px">
      <t-table-column label="职务" prop="employeePositionZh" width="80px">
      </t-table-column>
      <t-table-column l="相似度" prop="similarity" width="75px">
      <t-table-column prop="simi" l="相似度" width="75px">
      </t-table-column>
      <t-table-column label="进出时间" prop="taskExecuteTime" width="160px">
      </t-table-column>
@@ -61,7 +61,7 @@
      </t-table-column>
      <t-table-column label="终端名称" prop="resourceToolName" width="97px">
      </t-table-column>
      <t-table-column label="终端编号" prop="resourceToolCode" width="72px">
      <t-table-column label="终端编号" prop="resourceToolCode" width="90px">
      </t-table-column>
      <t-table-column label="操作" width="80px">
        <template slot-scope="scope">
@@ -72,7 +72,7 @@
    </t-table>
    <!-- 分页 -->
    <t-pager :total="total" :current="page" show-elevator class="pager" @on-change="onChange"></t-pager>
    <t-pager :total="total" :current="page" :page-size="limit" show-elevator class="pager" @on-change="onChange"></t-pager>
    <!-- 模态框 -->
    <t-modal :visibled.sync="detail_modal" title="识别详情" width="840px" height="538px">
@@ -82,36 +82,42 @@
          <div class="detail_item1">
            <div>抓拍图片</div>
            <div>
              <img :src="rowdata.idenVideoUrl" alt="" srcset="" style="width:100%;height:100%">
              <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%">
            </div>
          </div>
          <div class="detail_item2">
            <div>识别结果</div>
            <div>
              <div>
                <img :src="rowdata.idenPictureUrl" alt="" srcset="" style="width:120px;height:160px;border-radius: 5px; ">
                <!-- 修改-->
                <img src="" alt="" srcset="" style="width:120px;height:160px;border-radius: 5px; ">
                <div class="bottomimg">抓拍图片</div>
              </div>
              <div>
                <!-- 修改-->
                <img src="http://img95.699pic.com/photo/50028/0321.jpg_wh300.jpg" alt="" srcset="">
              </div>
              <div>
                <img :src="rowdata.headerUrl" alt="" srcset="" style="width:100%;height:160px; border-radius: 5px;">
                <img :src="rowdata.alarmInfo.headerImage" alt="" srcset="" style="width:100%;height:160px; border-radius: 5px;">
                <div class="bottomimg">人脸底库</div>
              </div>
            </div>
            <div class="describe">
              <div>
                <t-icon icon="user-outline"></t-icon> {{ rowdata.relateEmployeeRoleName }}（{{ rowdata.code }}）
                <t-icon icon="user-outline"></t-icon>
                {{ rowdata.alarmInfo.employeeName }}（{{ rowdata.alarmInfo.employeeCode }}）
              </div>
              <div>
                <t-icon icon="map-marker"></t-icon> {{ rowdata.terminalPosition }}
                <t-icon icon="map-marker"></t-icon>
                {{ rowdata.alarmInfo.terminalPosition || '--' }}
              </div>
              <div>
                <t-icon icon="clock-outline"></t-icon> {{ rowdata.taskExecuteTime }}
                <t-icon icon="clock-outline"></t-icon>
                {{ rowdata.alarmInfo.taskExecuteTime }}
              </div>
              <div>
                <t-icon icon="team-outline"></t-icon> 相似度：{{ rowdata.similarity }}
                <t-icon icon="team-outline"></t-icon> 相似度：
                {{ rowdata.alarmInfo.simi }}
              </div>
            </div>
          </div>
@@ -127,9 +133,9 @@
<script>
import accessapi from '@/api/access'
import formatDateTime from '@/utils/formatDateTime.js'
export default {
  data () {
    return {
      // 进出类型
@@ -141,14 +147,19 @@ export default {
      // 模态框显示
      detail_modal: false,
      // 当前行数据
      rowdata: {},
      rowdata: {
        alarmInfo: {},
        pictureInfo: {}
      },
      // 公司列表
      companyTypesList: [],
      // 查询的参数
      searchdata: {
        relateEmployeeNameAsLike: '',
        beginTime: '',
        endTime: ''
        nameAsLike: '',
        beginDay: '',
        endDay: ''
      },
      // 一页的数据
      data: [
@@ -163,18 +174,42 @@ export default {
  mounted () {
    // this.gettype()
    this.search()
    this.getcompanyTypesList()
    // this.search()
  },
  methods: {
    // 表格中的选择数据
    handleSelectionChange (val) {
      this.selectdata = val
    },
    // 获取公司
    async getcompanyTypesList () {
      var res = await accessapi.getcompanyTypesList()
      // console.log('公司信息是', res)
      if (res.status === 200) {
        this.companyTypesList = res.data.data
        this.search()
      } else {
        this.$Message.danger('获取数据失败')
      }
    },
    // 点击详情
    handleClick (scope) {
      this.detail_modal = true
      this.rowdata = scope.row
      console.log(this.rowdata)
    async handleClick (scope) {
      // this.rowdata = scope.row
      // console.log(this.rowdata)
      // console.log('id是', scope.row.aiIdenLogId)
      var res = await accessapi.getOneInAndOutRecord({ params: { aiIdenLogId: scope.row.aiIdenLogId } })
      if (res.data.success) {
        this.detail_modal = true
        // this.rowdata = res.data.data
        this.rowdata.pictureInfo = res.data.data.pictureInfo
        this.rowdata.alarmInfo = res.data.data.alarmInfo
        // console.log(res.data.data)
        // console.log('详情数据是', this.rowdata)
      } else {
        this.$Message.danger('获取数据失败')
      }
    },
    // 分页
    onChange (val) {
@@ -200,7 +235,7 @@ export default {
    // 查询数据
    async search () {
      // 检验数据
      var flag = this.startreend(this.searchdata.beginTime, this.searchdata.endTime)
      var flag = this.startreend(this.searchdata.beginDay, this.searchdata.endDay)
      if (flag) {
        // console.log(this.page)
        // console.log(this.searchdata)
@@ -208,21 +243,49 @@ export default {
        var params = this.searchdata
        params.pageNumber = this.page
        params.pageSize = this.limit
        console.log(params)
        // console.log(params)
        var res = await accessapi.getaccesslist({ params: params })
        // console.log(res)
        if (res.status === 200) {
          console.log(res)
          // console.log(res)
          this.data = res.data.data.data
          this.data = this.data.map((item) => { item.taskExecuteTime = formatDateTime(item.taskExecuteTime); return item })
          console.log(this.data)
          this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
          this.data = this.data.map((item) => {
            // 处理进出时间
            // item.taskExecuteTime = formatDateTime(item.taskExecuteTime)
            // 处理相似度
            // item.simi = this.percentagedata(item.simi)
            // console.log('公司的数据是', this.companyTypesList)
            // console.log('公司id', item)
            // console.log('公司名字是', this.companyTypesList.filter((item1) => { return item1.id === 10000 }))
            item.companyinfo = this.companyTypesList.filter((item1) => { return item1.id === item.companyId })
            if (item.companyinfo.length > 0) {
              item.companyname = item.companyinfo[0].name
            } else {
              item.companyname = ''
            }
            return item
          })
          // this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
          // console.log(this.total)
          this.total = res.data.data.total
          // console.log('数据是', this.data)
        }
      } else {
        this.$Message.danger('开始时间不能在结束时间的后面')
      }
    },
    percentagedata (point) {
      if (point === 0) {
        return 0
      }
      var str = Number(point * 100).toFixed(1)
      str += '%'
      return str
    },
    // 重置数据
    reset () {
      for (var index in this.searchdata) {

security-protection-platform/src/modules/aialarm/index.vue

@@ -82,7 +82,7 @@
    </t-table>
    <!-- 分页 -->
    <t-pager :total="total" :current="page" show-elevator class="pager" @on-change="onChange"></t-pager>
    <t-pager :total="total" :current="page" :page-size="limit" show-elevator class="pager" @on-change="onChange"></t-pager>
    <!-- 模态框-->
    <t-modal :visibled.sync="details_modal" :title="clickdetail==0?'报警详情':'报警处理'" width="732px">
@@ -123,12 +123,12 @@
          <div class="detail">
            <label class="detail_title">处理人：</label>
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName }}</div>
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName|| '--' }}</div>
          </div>
          <div class="detail">
            <label class="detail_title">处理时间：</label>
            <div>{{ alarmDetailData.disposeDate }}</div>
            <div>{{ alarmDetailData.disposeDate || '--' }}</div>
          </div>
        </div>
@@ -317,6 +317,7 @@ export default {
        // console.log(this.status)
      } else {
        this.$Message.warning('请选择按钮')
        this.loading = false
      }
    },
@@ -389,8 +390,9 @@ export default {
          this.data = res.data.data.data
          this.data = this.data.map((item) => { item.aiIdenTime = formatDateTime(item.aiIdenTime); return item })
          console.log(this.data)
          this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
          console.log('数据是', res)
          // this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
          this.total = res.data.data.total
        } else {
          this.$Message.danger('数据获取失败')
        }

security-protection-platform/src/modules/attendance/components/AttendanceDialog/index.vue

@@ -28,6 +28,9 @@
        </div>
      </div>
    </div>
    <div slot="footer" class="modal-foot">
      <t-button @click="_visibled=false">关闭</t-button>
    </div>
    <attrndance-calendar :range="data.range" :data="data.detail" />
  </t-modal>
</template>
@@ -44,7 +47,7 @@ export default {
    },
    data: {
      type: Object,
      default() {
      default () {
        return {}
      }
    },
@@ -53,21 +56,21 @@ export default {
      default: true
    }
  },
  data() {
  data () {
    return {
    }
  },
  computed: {
    _visibled: {
      get() {
      get () {
        return this.visibled
      },
      set(val) {
      set (val) {
        this.$emit('update:visibled', val)
      }
    },
    attendanceTime() {
    attendanceTime () {
      const dateStart = this.data.range ? this.data.range[0] : Date.now()
      const dateEnd = this.data.range ? this.data.range[1] : Date.now()
      return `${formatDateTime(new Date(dateStart), 'yyyy-MM-dd')} ~ ${formatDateTime(new Date(dateEnd), 'yyyy-MM-dd')}`
@@ -77,138 +80,138 @@ export default {
</script>
<style lang="scss">
.modal-state{
.modal-state {
  margin-top: 22px;
  display: flex;
  margin-left: auto;
  align-items: center;
  .square-differ{
  .square-differ {
    margin-left: 20px;
    width: 12px;
    height: 12px;
    background-color: rgba(237, 163, 15, 0.1);
  }
  .square{
  .square {
    width: 12px;
    height: 12px;
    background-color: #ffffff;
    border: 1px solid rgba(232, 232, 232, 1);
  }
}
.modal-head{
.modal-head {
  display: flex;
  margin-bottom: 24px;
  .modal-head-left{
  .modal-head-left {
    width: 256px;
    margin-left: 4px;
    height: 114px;
    display: flex;
    align-items: center;
    .modal-img{
      width:72px;
      height:72px;
    .modal-img {
      width: 72px;
      height: 72px;
    }
    .modal-detail{
    .modal-detail {
      margin-left: 16px;
      display: flex;
      flex-direction: column;
      .modal-head-txt{
        .head-name-txt
        {
        margin-bottom: 12px;
        font-size: 14px;
      .modal-head-txt {
        .head-name-txt {
          margin-bottom: 12px;
          font-size: 14px;
        }
        width: 120px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.45);
      }
      .head-name-txt{
      .head-name-txt {
        font-weight: 600;
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
    }
    .divice-line{
    .divice-line {
      width: 1px;
      margin-left: 24px;
      background-color: #E8E8E8;
      background-color: #e8e8e8;
      height: 114px;
    }
  }
}
.modal-head-right{
.modal-foot {
  padding-right: 10px;
}
.modal-head-right {
  display: flex;
  width: 100%;
  .leaveTime{
  .leaveTime {
    display: flex;
    flex-direction: column;
    margin-top: 46px;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt
      {
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
    }
  }
  .absenteeism{
  .absenteeism {
    display: flex;
    flex-direction: column;
    margin-left: auto;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    }
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
    }
  }
  .keep-column{
  .keep-column {
    display: flex;
    flex-direction: column;
    margin-left: 24px;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);

security-protection-platform/src/modules/dashboard/index.vue

@@ -39,15 +39,28 @@
        <div :style="`background-image: url(${titleImgBg})`" class="title" style="width: 370px;">
          <span class="title-span">重点区域监控</span>
        </div>
        <video-player ref="videoPlayer" :options="videoOptions" :playsinline="true" class="vjs-custom-skin videoPlayer"></video-player>
        <!--        <video-player ref="videoPlayer" :options="videoOptions" :playsinline="true" class="vjs-custom-skin videoPlayer"></video-player>-->
        <videoPlayer
          ref="videoPlayer"
          :options="videoOptions"
          :playsinline="true"
          class="vjs-custom-skin videoPlayer"
        />
        <div class="videoPlayers">
          <div v-for="(item,index) in videoOptionsList" class="videoPlayer-sm" @click="videoSwitchover(item)">
            <video-player ref="videoPlayer"
                          :options="item.options"
                          :playsinline="true"
                          :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;border: ${1-index}px solid #009bf3;`"
                          class="vjs-custom-skin videoPlayer">
            </video-player>
            <!--            <video-player ref="videoPlayer"-->
            <!--                          :options="item.options"-->
            <!--                          :playsinline="true"-->
            <!--                          :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;border: ${1-index}px solid #009bf3;`"-->
            <!--                          class="vjs-custom-skin videoPlayer">-->
            <!--            </video-player>-->
            <videoPlayer
              ref="videoPlayer"
              :options="videoOptions"
              :playsinline="true"
              :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;border: ${1-index}px solid #009bf3;`"
              class="vjs-custom-skin videoPlayer"
            />
            <div style="color: white;text-align: center;">{{ item.name }}</div>
          </div>
        </div>
@@ -56,7 +69,22 @@
        <div :style="`background-image: url(${titleImgBg})`" class="title" style="width: 330px;">
          <span class="title-span">人员进出识别</span>
        </div>
        <img src="@/assets/images/indexT2.png" style="width: 95%;height: 95%;padding-left: 15px;padding-top: 10px;">
        <div v-for="(item,index) in distinguishData" :style="`background-image: url(${border})`" class="distinguish">
          <div class="distinguish-title"> {{ item.name }} </div>
          <div class="distinguish-row">
            <div class="similarity">
              <p style="opacity: 1;font-size: 12px">70%</p>
            </div>
            <img src="@/assets/images/indexT1.png" class="distinguish-col">
            <img src="@/assets/images/indexT1.png" class="distinguish-col">
            <div style="width: 40%;margin-top: 4%;height: 79%;">
              <div class="distinguish-col-row">王小明(00220)</div>
              <div class="distinguish-col-row">已佩戴口罩</div>
              <div class="distinguish-col-row">2021.01.05 12:11:00</div>
            </div>
          </div>
        </div>
        <!--        <img src="@/assets/images/indexT2.png" style="width: 95%;height: 95%;padding-left: 15px;padding-top: 10px;">-->
      </div>
    </div>
  </div>
@@ -66,13 +94,15 @@
import imgBg from '@/assets/images/indexTop.png'
import titleImgBg from '@/assets/images/indexTitle.png'
import polygon from '@/assets/images/polygon.png'
import border from '@/assets/images/border.png'
import echarts from 'echarts'
import dasapi from '@/api/dashboard'
import sysapi from '@/api/system'
import 'video.js/dist/video-js.css'
import 'vue-video-player/src/custom-theme.css'
import { videoPlayer } from 'vue-video-player'
// import { videoPlayer } from 'vue-video-player'
import 'videojs-flash'
import VideoPlayer from '@/components/VideoPlayer'
export default {
  filters: {
@@ -107,22 +137,55 @@ export default {
    }
  },
  components: {
    videoPlayer
    VideoPlayer
  },
  data() {
    return {
      nowDate: new Date(),
      videoOptions: {},
      videoOptions: {
        autoplay: true, // 如果true,浏览器准备好时开始回放。
        muted: true, // 默认情况下将会消除任何音频。
        loop: false, // 导致视频一结束就重新开始。
        preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
        language: 'zh-CN',
        aspectRatio: '16:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
        // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
        // 是否流体自适应容器宽高
        fluid: true,
        // // 设置视频播放器的显示宽度（以像素为单位）
        // width: '100px',
        // // 设置视频播放器的显示高度（以像素为单位）
        // height: '400px',
        sources: [{
          withCredentials: false,
          type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
          src: 'http://10.19.90.34:1080/live/1.m3u8' // url地址
        }],
        flash: { hls: { withCredentials: false } },
        html5: { hls: { withCredentials: false } },
        notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
        controlBar: {
          timeDivider: false,
          durationDisplay: false,
          remainingTimeDisplay: false,
          fullscreenToggle: false // 全屏按钮
        }
      },
      videoOptionsList: [],
      imgBg: imgBg,
      titleImgBg: titleImgBg,
      polygon: polygon,
      border: border,
      attendanceData: [],
      population: 0,
      alarmDataX: [],
      alarmDataY: [],
      topData: [],
      topData1: []
      topData1: [],
      distinguishData: [{name: '1风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
        {name: '2风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
        {name: '3风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
        {name: '2风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'}]
    }
  },
  computed: {
@@ -139,32 +202,32 @@ export default {
  methods: {
    initVideo() {
      sysapi.getTerminalRel(2).then(res => {
        this.videoOptions = {
          live: true,
          autoplay: true,
          fluid: false,
          height: document.documentElement.clientHeight * 0.60,
          notSupportedMessage: '暂时无法播放',
          controlBar: {
            timeDivider: false,
            durationDisplay: false,
            remainingTimeDisplay: false,
            fullscreenToggle: true // 全屏按钮
          },
          techOrder: ['flash'],
          flash: {
            hls: { withCredentials: false },
            swf: 'static/video-js.swf' // 引入静态文件swf
          },
          sources: [{ // 流配置，数组形式，会根据兼容顺序自动切换
            type: 'rtmp/mp4',
            src: res.data.data[0].videoUrl
          }]
        }
        // this.videoOptions = {
        //   live: true,
        //   autoplay: true,
        //   fluid: false,
        //   height: document.documentElement.clientHeight * 0.60,
        //   notSupportedMessage: '暂时无法播放',
        //   controlBar: {
        //     timeDivider: false,
        //     durationDisplay: false,
        //     remainingTimeDisplay: false,
        //     fullscreenToggle: true // 全屏按钮
        //   },
        //   techOrder: ['flash'],
        //   flash: {
        //     hls: { withCredentials: false },
        //     swf: 'static/video-js.swf' // 引入静态文件swf
        //   },
        //   sources: [{ // 流配置，数组形式，会根据兼容顺序自动切换
        //     type: 'rtmp/mp4',
        //     src: res.data.data[0].videoUrl
        //   }]
        // }
        this.videoOptionsList = []
        res.data.data.forEach(e => {
          this.videoOptionsList.push({
            options:{
            options: {
              live: true,
              autoplay: true,
              fluid: false,
@@ -186,11 +249,11 @@ export default {
        })
      })
    },
    videoSwitchover(itme){
    videoSwitchover(itme) {
      this.videoOptions.sources = itme.options.sources
    },
    gotoSystem() {
      this.$router.push({name:'videoSurveillance'})
      this.$router.push({name: 'videoSurveillance'})
    },
    initAttendance() {
      this.attendanceData = dasapi.queryAttendanceChart().then(res => {
@@ -222,7 +285,7 @@ export default {
    init24Top() {
      this.topData = dasapi.queryAlarmAnalysisTopList().then(res => {
        this.topData = []
        for (var i = 0; i < 4; i++) {
        for (var i = 0; i < 5; i++) {
          if (res.data[i]) {
            this.topData.push(res.data[i])
          }
@@ -302,10 +365,10 @@ export default {
      var option = null
      var gridWidth = 320 // 可以根据canvas的宽度和grid的right,left,width进行计算
      var fontsize = 12 // 字体大小
      var wordNum = parseInt((gridWidth / this.alarmDataX.length) / fontsize);
      var wordNum = parseInt((gridWidth / this.alarmDataX.length) / fontsize)
      var flag = 0
      this.alarmDataX.forEach(value => {
        if (value){
        if (value) {
          var strs = value.split('')
          var str = ''
          for (var i = 0, s; s = strs[i++];) {
@@ -352,6 +415,7 @@ export default {
        yAxis: [
          {
            type: 'value',
            minInterval: 1,
            axisLabel: {
              show: true,
              textStyle: {
@@ -383,7 +447,7 @@ export default {
                  show: true, // 是否展示
                  position: 'top', // 在上方显示
                  formatter: function(name) {
                    return name.value + '人'
                    return name.value + '个'
                  },
                  textStyle: {
                    fontSize: 14,
@@ -470,7 +534,7 @@ export default {
          .top4-row{
            border: 0 none;
            border-bottom: 2px dotted #00466b;
            height: 20%;
            height: 16%;
            .col-6{
              display: flex;
              .polygon{
@@ -479,7 +543,7 @@ export default {
                align-items: center;
                text-align: center;
                height: 100%;
                width: 16%;
                width: 15%;
              }
            }
          }
@@ -499,6 +563,60 @@ export default {
      border-radius: 5px;
      background-color: #011d40; /* 浏览器不支持的时候显示 */
      box-shadow: 0 0 30px -10px #009bf3 inset;
      .distinguish{
        -moz-background-size:100% 100%;
        background-size:100% 100%;
        width: 88%;
        height: 22%;
        margin-left: 6%;
        margin-top: 3%;
        padding-left: 1%;
        padding-right: 1%;
        padding-top: 1%;
        padding-bottom: 1%;
        .distinguish-title{
          align-items: center;
          text-align: center;
          height: 28px;
          width: 100%;
          margin: 0 auto;
          font-size: 16px;
          color: #00d8f3;
          //background-color: #003C74; 100%
          background: linear-gradient(to right, #011d40,#003C74,#011D40);
        }
        .distinguish-row{
          display: flex;
          color: #00d8f3;
          width: 100%;
          height: 100%;
          position: relative;
          .similarity{
            position: absolute;
            left:22%;
            top:27%;
            border: 2px solid  #00d8f3;
            width: 30px;
            height: 30px;
            background: #090404;
            opacity: 0.5;
            border-radius: 50%;
            padding-top: 1%;
          }
          .distinguish-col{
            width: 27%;
            margin-top: 2%;
            height: 70%;
          }
          .distinguish-col-row{
            padding-left: 5%;
            height: 30%;
            width: 130%;
            color: white;
            font-size: 14px;
          }
        }
      }
    }
  }
  .title{

security-protection-platform/src/modules/system/attendance/components/SchedulePanel/ShiftDialog.vue

@@ -31,7 +31,7 @@
    <div slot="footer">
      <t-button @click="visibled=false">取消</t-button>
      <t-button :loading="loadingSubmit" type="primary" @click="handleSubmit">保存</t-button>
      <t-button :loading="loadingSubmit" color="primary" @click="handleSubmit">保存</t-button>
    </div>
  </t-modal>
</template>

security-protection-platform/src/modules/system/attendance/components/SchedulePanel/index.vue

@@ -1,7 +1,9 @@
<template>
  <div>
    <t-loading v-model="loading" />
    <t-button color="primary" style="margin-bottom:30px;" @click="handleCreate">新增</t-button>
    <t-button color="primary" style="margin-bottom:30px;" @click="handleCreate">
      <t-icon icon="plus-circle-outline" size="16"></t-icon> 新增
    </t-button>
    <div class="schedule-card-block">
      <schedule-card v-for="item in schedules" :key="item.scheduleId" :data="item" @edit="handleEdit" @deleted="flushPage()" />
      <div v-if="!loading && schedules.length === 0" class="schedule-card-block__empty">点击 “新增” 按钮增加班次</div>

security-protection-platform/src/modules/videoSurveillance/index.vue

@@ -56,7 +56,7 @@ export default {
      videoOptions: [],
      videoCurrent: 1, // 大门分页数据
      videoPageSize: 10, // 大门分页数据
      videoTotal: 100, // 大门分页总数
      videoTotal: 0, // 大门分页总数
      tabId: 1,
      paramsObj: { // 接口请求数据
        page: 0,
@@ -173,7 +173,7 @@ export default {
      this.videoList = []
      this.tabId = id
      this.videoCurrent = 1
      this.getVideoSurveillanceData(id)
      this.getVideoSurveillanceData()
    },
    // 获取风场下拉框列表
    async getWindFiledList () {
@@ -188,12 +188,12 @@ export default {
    },
    handlefullscreenchange(val) {
      // 因为我是又封装了一个组件，打印val会有相应所需的属性，全屏状态为：isFullscreen_
      console.log(val);
      val.isFullscreen_ = !val.isFullscreen_
      // this.$emit('fullscreenchange', val)
    },
    // 获得风场大门数据
    getVideoSurveillanceData (id) {
    getVideoSurveillanceData () {
      var id = this.tabId
      this.paramsObj.page = this.videoCurrent
      sysapi.getVideoSurveillanceData({ params: { monitorSceneId: id } }).then(res => {
        this.videoList = res.data.data
@@ -239,8 +239,8 @@ export default {
    },
    // 风场大门分页
    onChangeGate (val) {
      this.videoList = []
      this.videoCurrent = val
      this.getVideoSurveillanceData()
    }
  }
}

security-protection-platform/src/modules/workorder/components/modal/workorderinfomodal.vue

@@ -15,7 +15,7 @@
    </div>
    <div v-if="status" class="approval-info row">
      <div class="col-6">审批人：<span>{{ data.approver }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result==='0'?'失败':'成功' }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result==='0'?'拒绝':'同意' }}</span></div>
      <div class="col-12">审批时间：<span>{{ data.approveTime }}</span></div>
      <div class="col-12">审批意见：<span>{{ data.comments }}</span></div>
    </div>