Merge remote-tracking branch 'origin/dev-security' into dev-security

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

@@ -75,6 +75,14 @@ const api = {
      return resp
    })
  },
  // 获取ai任务模型下拉框列表
  getAiTaskModelList() {
    return $default.get('/sp/sysConfigAiTask/queryAiTaskModelList')
  },
  // 获取ai任务列表
  getAiTaskList(params) {
    return $default.get('/sp/sysConfigAiTask/queryPageAiTask?', params)
  },
  // 获取设备列表数据
  getDeviceData (data) {
    // return $http.get('/system/getDeviceData', data).catch((err) => { return err })

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

@@ -71,7 +71,7 @@
      </t-table-column>
      <t-table-column label="处理时间" prop="processTime" width="160px">
      </t-table-column>
      <t-table-column label="操作">
      <t-table-column label="操作" width="120">
        <template slot-scope="scope">
          <a href="javascript:void(0)" size="sm" style="color:#0089D4" @click="handleClick(scope,0)">详情</a>
@@ -92,10 +92,10 @@
          <div class="detail">
            <label class="detail_title">状态：</label>
            <div class="detail_content">
              <t-tag v-if="alarmDetailData.status==='未确认'" state="warning">未确认</t-tag>
              <t-tag v-if="alarmDetailData.status==='已处理'" state="success">已处理</t-tag>
              <t-tag v-if="alarmDetailData.status==='处理中'" state="info">处理中</t-tag>
              <t-tag v-if="alarmDetailData.status==='误报'" state="danger">误报</t-tag>
              <t-tag v-if="alarmDetailData.statusZh==='未确认'" state="warning">未确认</t-tag>
              <t-tag v-if="alarmDetailData.statusZh==='已处理'" state="success">已处理</t-tag>
              <t-tag v-if="alarmDetailData.statusZh==='处理中'" state="info">处理中</t-tag>
              <t-tag v-if="alarmDetailData.statusZh==='误报'" state="danger">误报</t-tag>
            </div>
          </div>
@@ -109,7 +109,7 @@
          </div>
          <div class="detail">
            <label class="detail_title">报警时间：</label>
            <div class="detail_content">{{ alarmDetailData.aiIdenTime }}</div>
            <div class="detail_content">{{ alarmDetailData.aiIdenTime|formatDateTime }}</div>
          </div>
          <div class="detail">
@@ -121,14 +121,14 @@
            <div class="detail_content">{{ alarmDetailData.monitorSceneName }}</div>
          </div>
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
          <div class="detail">
            <label class="detail_title">处理人：</label>
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName }}</div>
          </div>
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
          <div class="detail">
            <label class="detail_title">处理时间：</label>
            <div>{{ alarmDetailData.doneDate }}</div>
            <div>{{ alarmDetailData.disposeDate }}</div>
          </div>
        </div>
@@ -147,9 +147,9 @@
          </div>
        </div>
        <div v-if="clickdetail==1">
          <div v-if="alarmDetailData.status!='END'" class="radio">
          <div v-if="alarmDetailData.statusZh!='END'" class="radio">
            <div>报警处理 : </div>
            <div v-if="alarmDetailData.status=='INI'">
            <div v-if="alarmDetailData.statusZh=='INI'">
              <t-radio-group v-model="status">
                <t-radio label="RUN">
@@ -163,7 +163,7 @@
              </t-radio-group>
            </div>
            <div v-if="alarmDetailData.status=='RUN'||alarmDetailData.status=='FAL'">
            <div v-if="alarmDetailData.statusZh=='RUN'||alarmDetailData.statusZh=='FAL'">
              <t-radio-group v-model="status">
                <t-radio label="END">关闭</t-radio>
              </t-radio-group>
@@ -195,7 +195,9 @@
import aialarmapi from '@/api/aialarm'
import formatDateTime from '@/utils/formatDateTime.js'
export default {
  filters: {
    formatDateTime
  },
  data () {
    return {
      searchdata: {

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

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

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

@@ -5,8 +5,8 @@
        <!-- 日报 -->
        <t-tab-panel label="日报" panel-id="tab-1">
          <div class="row mt-32">
            <div class="col-3">
              <span>日期:</span>
            <div class="keep-row">
              <span>日期：</span>
              <t-date-picker v-model="dailyForm.workDay" style="width:200px" placeholder="请选择日期"></t-date-picker>
            </div>
            <div class="keep-row">
@@ -15,6 +15,7 @@
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchDay">查询</t-button>
              <t-button @click="resetDailyData">重置</t-button>
            </div>
          </div>
          <t-table :data="dailyTableData" :loading="loadDailyTable" size="sm" line class="table-detail">
@@ -34,8 +35,8 @@
        <!-- 月报 -->
        <t-tab-panel label="月报" panel-id="tab-2">
          <div class="row mt-32">
            <div class="col-3">
              <span>月份:</span>
            <div class="keep-row">
              <span>月份：</span>
              <t-date-picker v-model="monthlyForm.month" style="width:200px" type="month" placeholder="请选择月份"></t-date-picker>
            </div>
            <div class="keep-row">
@@ -44,6 +45,7 @@
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchMonth">查询</t-button>
              <t-button @click="resetMonthData">重置</t-button>
            </div>
          </div>
          <t-button class="export-excel" color="primary">
@@ -147,16 +149,12 @@ export default {
      }
    }
  },
  mounted () {
    this.getDailyTable()
  },
  methods: {
    handleDailyInited () {
      this.getDailyTable()
      // this.getDailyTable()
    },
    changeTabs (tabName) {
      this.tabName = tabName
      this.getMonthTable()
    },
    // 搜索
    handSearchDay () {
@@ -176,6 +174,30 @@ export default {
      this.monthlyForm.current = val
      this.getMonthTable()
    },
    // 重置日报数据
    resetDailyData() {
      let now = new Date()
      this.dailyForm = {
        workDay: formatDateTime(now, 'yyyy-MM-dd'),
        userid: null,
        depId: '',
        orgId: '',
        current: 1,
        pageSize: 10
      }
    },
    // 重置月报数据
    resetMonthData() {
      let now = new Date()
      this.monthlyForm = {
        month: formatDateTime(new Date().setMonth(now.getMonth() - 1), 'yyyy-MM'),
        userid: null,
        depId: '',
        orgId: '',
        current: 1,
        pageSize: 10
      }
    },
    // 获得月报表格数据
    getMonthTable () {
      this.loadMonthTable = true
@@ -243,6 +265,7 @@ export default {
  .keep-row {
    display: flex;
    align-items: center;
    margin-left: 24px;
  }
  .search-btn {
    margin-left: auto;

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

@@ -33,15 +33,19 @@
      <div class="table-box">
        <t-table :data="taskDataList" line @selection-change="selectChange">
          <t-table-column type="selection" width="70"></t-table-column>
          <t-table-column prop="taskName" label="任务名称" width="110"></t-table-column>
          <t-table-column prop="taskId" label="任务编号" width="120"></t-table-column>
          <t-table-column prop="matchingType" label="匹配模型" width="120"></t-table-column>
          <t-table-column prop="executionDevice" label="执行设备" width="220"></t-table-column>
          <t-table-column prop="configurationTime" label="配置时间" width="180"></t-table-column>
          <t-table-column prop="status" style="background-color:#000" label="状态" width="120">
          <t-table-column prop="aiTaskName" label="任务名称" width="110"></t-table-column>
          <t-table-column prop="aiTaskCode" label="任务编号" width="120"></t-table-column>
          <t-table-column prop="aiIdenModel" label="匹配模型" width="120"></t-table-column>
          <t-table-column prop="executeDeviceString" label="执行设备" width="220"></t-table-column>
          <t-table-column prop="doneDate" label="配置时间" width="200">
            <template v-slot="{row}">
              <div :class="getTypecellClass(row.status)" class="tag-cell">
                <span class="status-ball"></span>{{ row.status }}
              {{ row.doneDate|formatDateTime }}
            </template>
          </t-table-column>
          <t-table-column prop="aiTaskStatus" align="center" style="background-color:#000" label="状态" width="120">
            <template v-slot="{row}">
              <div :class="getTypecellClass(row.aiTaskStatus)" class="tag-cell">
                <span class="status-ball"></span>{{ row.aiTaskStatus }}
              </div>
            </template>
          </t-table-column>
@@ -69,8 +73,12 @@
<script>
import sysapi from '@/api/system'
import formatDateTime from '@/utils/formatDateTime.js'
// import sendOrderModal from './components/modal/sendordermodal.vue'
export default {
  filters: {
    formatDateTime
  },
  components: {
    // sendOrderModal
  },
@@ -103,18 +111,27 @@ export default {
    }
  },
  created () {
    this.getTaskName()
    this.getmatchingType()
    this.getTaskName() // 获取任务名称下拉框
    this.getmatchingType() // 获取匹配模型下拉框
    this.getAiTaskData() // 查询任务列表
  },
  methods: {
    getAiTaskData() {
      sysapi.getAiTaskList({params: {aiTaskId: 9}}).then(res => {
        this.taskDataList = res.data.data.data
        console.log(this.taskDataList)
      })
    },
    // 获取任务名称下拉框
    getTaskName() {
      sysapi.getCharSpecList('AI_TASK_STATUS').then(res => {
        this.taskStatusList = res.data
      })
    },
    // 获取匹配模型下拉框
    getmatchingType() {
      sysapi.getCharSpecList('AI_MATCHER_MODE').then(res => {
        console.log(res);
      sysapi.getAiTaskModelList().then(res => {
        console.log(res)
        this.matchingTypeList = res.data
      })
    },

security-protection-platform/src/modules/userRights/organizationmana/index.vue

@@ -1,12 +0,0 @@
<template>
  <div>组织管理页面</div>
</template>
<script>
export default {
}
</script>
<style>
</style>

security-protection-platform/src/modules/userRights/usermana/index.vue

@@ -1,48 +0,0 @@
<template>
  <div>
    <div>123</div>
    <button @click="showaudit">点击</button>
    <audit :auditshow.sync="auditshow"></audit>
  </div>
</template>
<script>
import audit from './components/modal/audit'
export default {
  components: {
    audit
  },
  data () {
    return {
      auditshow: false
    }
  },
  methods: {
    showaudit () {
      // console.log(123)
      this.auditshow = true
    }
  }
}
</script>
  <style>
.video {
  width: 425px;
  height: 300px;
  border: 1px solid black;
}
.vjs-control-bar .vjs-picture-in-picture-control .vjs-control .vjs-button {
  width: 0;
}
.vjs-seek-to-live-control .vjs-control {
  width: 0;
}
</style>

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

@@ -0,0 +1,279 @@
<template>
  <div class="usermana-page">
    <t-card class="page-card">
      <div class="select-confidtion-box row">
        <div class="col-3">公司：
          <t-select v-model="companyTypeId" width="200px">
            <t-option v-for="item in companyTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
          </t-select>
        </div>
        <div class="col-3">部门：
          <t-select v-model="departmentTypeId" width="200px">
            <t-option v-for="item in departmentTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
          </t-select>
        </div>
        <div class="col-3">姓名：
          <t-select v-model="staffTypeId" width="200px">
            <t-option v-for="item in staffTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
          </t-select>
        </div>
        <div class="col-2 offset-1 select-button-box" align="end">
          <t-button color="primary" @click="selectHandle">查询</t-button>
          <t-button @click="resetData">重置</t-button>
        </div>
      </div>
      <div class="function-button-box">
        <t-button color="primary" @click="showAddDeviceModal">
          <t-icon icon="plus-circle-outline" size="16"></t-icon>新增
        </t-button>
        <t-button @click="multDeleteDeviceData">
          <t-icon icon="trash" size="16"></t-icon>删除
        </t-button>
      </div>
      <div class="table-box">
        <t-table :data="userDataList" line @selection-change="selectChange">
          <t-table-column type="selection" width="70"></t-table-column>
          <t-table-column prop="name" label="姓名" width="100"></t-table-column>
          <t-table-column prop="userId" label="员工编号" width="120"></t-table-column>
          <t-table-column prop="companyName" label="公司" width="150"></t-table-column>
          <t-table-column prop="departmentName" label="部门" width="150"></t-table-column>
          <t-table-column prop="post" label="职务" width="100"></t-table-column>
          <t-table-column prop="age" label="年龄" width="80"></t-table-column>
          <t-table-column prop="telephone" label="手机" width="120"></t-table-column>
          <t-table-column prop="status" label="人脸状态" width="120">
            <template v-slot="{row}">
              <t-tag v-if="row.status=== 'xxx'" state="primary">待审核</t-tag>
              <t-tag v-else state="success">已生效</t-tag>
            </template>
          </t-table-column>
          <t-table-column label="操作">
            <template v-slot="{row}">
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.resourceToolId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">删除</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">人脸审核</a>
            </template>
          </t-table-column>
        </t-table>
      </div>
      <div class="table-pager">
        <t-pager :current.sync="page" :total="total" :page-size="limit" :sizer-range="[10,20,50,100]" show-elevator show-sizer @on-size-change="onSizeChange" @on-change="onChange">>
        </t-pager>
      </div>
    </t-card>
  </div>
</template>
<script>
import sysapi from '@/api/system'
export default {
  data () {
    return {
      // 公司类型id
      companyTypeId: '',
      // 公司类型列表
      companyTypesList: [],
      // 部门类型id
      departmentTypeId: '',
      // 部门类型列表
      departmentTypesList: [],
      // 员工类型id
      staffTypeId: '',
      // 员工类型列表
      staffTypesList: [],
      // 用户数据列表
      userDataList: [],
      // 当前页
      page: 1,
      // 当前页的数据个数
      limit: 10,
      // 数据总数
      total: 100,
      // 批量删除的设备id
      deleteResourceToolId: [],
      // 当前设备数据
      currentDeviceData: {},
      // 显示/隐藏新增设备对话框
      addDeviceModal: false,
      currentEditDevice: {}
    }
  },
  created () {
    this.getDeviceData()
    this.getDeviceTypes()
  },
  methods: {
    // 获取设备列表数据
    async getDeviceData () {
    },
    // 向服务器发送请求获取设备类型列表数据
    async getDeviceTypes () {
      const res = await sysapi.getDeviceTypes()
      if (res.status === 200) {
        this.companyTypesList = res.data.data
      } else {
        this.$Message.danger('设备类型列表数据获取失败！')
      }
    },
    // 查询数据
    selectHandle () {
      this.page = 1
      this.getDeviceData()
    },
    // 重置查询数据
    resetData () {
      this.page = 1
      this.companyTypeId = ''
      this.staffTypeId = ''
      this.departmentTypeId = ''
      this.getDeviceData()
    },
    // 当前页改变 触发事件
    onChange (page) {
      this.page = page
      this.getDeviceData()
    },
    // 当前页数据总数改变 触发事件
    onSizeChange (pageSize) {
      this.limit = pageSize
      this.getDeviceData()
    },
    // 删除数据
    deleteDeviceData (row) {
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ resourceToolId: row.resourceToolId })
          if (res.status === 200) {
            this.getDeviceData()
            this.$Message.success('删除成功！')
          } else {
            this.$Message.danger('删除失败！')
          }
        },
        cancel: () => {
          this.$Message.info('已取消删除！')
        }
      })
    },
    // 当复选框发生改变时 触发事件
    selectChange (data) {
      const arr = []
      data.forEach(item => arr.push(item.resourceToolId))
      this.deleteResourceToolId = arr
    },
    // 批量删除数据
    multDeleteDeviceData () {
      if (this.deleteResourceToolId.length === 0) {
        return this.$Message.warning('请选择要删除的数据！')
      }
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ resourceToolId: this.deleteResourceToolId })
          if (res.status === 200) {
            this.getDeviceData()
            this.$Message.success('删除成功！')
          } else {
            this.$Message.danger('删除失败！')
          }
        },
        cancel: () => {
          this.$Message.info('已取消删除！')
        }
      })
    },
    // 获取设备详情数据
    async getDeviceInfo (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentDeviceData = res.data
      } else {
        this.$Message.danger('设备详情数据获取失败！')
      }
    },
    // 显示新增设备对话框
    showAddDeviceModal () {
      this.addDeviceModal = true
    },
    async editDeviceData (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentEditDevice = res.data
      } else {
        this.$Message.danger('设备数据获取失败！')
      }
      this.addDeviceModal = true
    }
  }
}
</script>
<style lang="scss">
.usermana-page {
  .card-block {
    padding: 0px 24px !important;
  }
  .tabs {
    overflow: inherit;
  }
  .tabs-list {
    .tabs-list__content {
      display: flex;
      justify-content: flex-end;
      margin-top: -10px;
      .tabs-list__nav {
        height: 32px;
        line-height: 16px;
      }
    }
    .tabs-tab {
      margin: 0;
      padding: 0 25px;
      font-size: 14px;
    }
    .tabs-tab.checked {
      border-bottom: 3px solid #2d98ff;
    }
  }
  .select-button-box {
    padding: 0;
    button {
      margin-left: 5px;
    }
  }
  .select-confidtion-box {
    margin: 24px 0;
    .col-3 {
      padding: 0;
    }
  }
  .function-button-box {
    line-height: 32px;
    button {
      margin-right: 12px;
      i {
        line-height: 32px;
        margin-right: 8px;
      }
    }
    a {
      color: #0089d4;
      i {
        line-height: 32px !important;
        margin-left: 4px;
      }
    }
  }
  .table-box {
    margin: 20px 0;
  }
  .table-pager {
    display: flex;
    justify-content: flex-end;
  }
}
</style>

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

@@ -1,5 +1,5 @@
<template>
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
  <t-modal :closable="false" :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="approval-modal-title">工单审批</div>
    </template>

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

@@ -1,5 +1,5 @@
<template>
  <t-modal :visibled.sync="cardReplacementModal" :mask-closable="false" width="600px" height="500px">
  <t-modal :closable="false" :visibled.sync="cardReplacementModal" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="card-modal-title">新增补卡</div>
    </template>

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

@@ -1,5 +1,5 @@
<template>
  <t-modal :visibled.sync="fieldServiceModal" :mask-closable="false" width="600px" height="500px">
  <t-modal :closable="false" :visibled.sync="fieldServiceModal" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="field-modal-title">新增外勤</div>
    </template>

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

@@ -1,5 +1,5 @@
<template>
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
  <t-modal :closable="false" :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="leave-modal-title">导入工单</div>
    </template>

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

@@ -1,6 +1,6 @@
<template>
  <!-- 请假对话框 -->
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
  <t-modal :visibled.sync="visibled" :mask-closable="false" :closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="leave-modal-title">新增请假</div>
    </template>

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

@@ -1,5 +1,5 @@
<template>
  <t-modal :visibled.sync="overtimeModal" :mask-closable="false" width="600px" height="500px">
  <t-modal :closable="false" :visibled.sync="overtimeModal" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="work-modal-title">新增加班</div>
    </template>

security-protection-platform/src/routes.js

@@ -133,22 +133,15 @@ export const constantRoutes = [
    ]
  },
  {
    path: '/userRights',
    path: '/usermana',
    component: Layout,
    meta: { title: '用户权限', icon: 'lock' },
    redirect: '/userRights/usermana',
    meta: { icon: 'lock' },
    children: [
      {
        name: 'organizationmana',
        path: 'organizationmana',
        component: () => import(/* webpackChunkName: "user_rights" */ './modules/userRights/organizationmana'),
        meta: { title: '组织管理' }
      },
      {
        name: 'usermana',
        path: 'usermana',
        component: () => import(/* webpackChunkName: "user_rights" */ './modules/userRights/usermana'),
        meta: { title: '用户管理' }
        path: '',
        component: () => import(/* webpackChunkName: "user_rights" */ './modules/usermana'),
        meta: { title: '用户管理', icon: 'lock' }
      }
    ]