[FE]:提交用户管理界面弹窗内容以及接口更新

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

@@ -66,8 +66,11 @@ const api = {
  // 审核用户照片
  auditEmployeePicture (params) {
    return $default.post('/sp/employeeManagement/auditEmployeePicture', params)
  },
  // 编辑用户信息
  editUserDetail(params) {
    return $default.post('/sp/employeeManagement/modifyEmployee', params)
  }
}
function nest (items, code = '-1', link = 'parentCode') {
  return items.filter(item => item[link] === code).map(item => ({ ...item, departments: nest(items, item.code) }))

security-protection-platform/src/modules/system/devicemana/components/modal/addDeviceModal.vue

@@ -23,7 +23,7 @@
      </t-form-item>
      <t-form-item label="图片上传：">
        <div style="display:flex;flex-direction:row">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" name="picture" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
            <div style="width: 180px;height:180px;line-height: 180px">
              <t-icon icon="plus-outline" size="40"></t-icon>
            </div>
@@ -187,10 +187,9 @@ export default {
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      this.imgUrl = res.data.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
      this.imgUrl = res.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.pictureUrl
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
    },
    $_onUploadRemoveFile () { },

security-protection-platform/src/modules/usermana/components/modal/addUser.vue

@@ -16,7 +16,7 @@
        </t-select>
      </t-form-item>
      <t-form-item v-if="addUserModal.apartments!==''" label="部门：" prop="organizeCode">
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" node-key="id"></t-select-tree>
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" node-value="code" node-key="code"></t-select-tree>
      </t-form-item>
      <t-form-item label="职务：" prop="mainJobPosition">
        <t-select v-model="addUserModal.mainJobPosition" placeholder="请选择职务" clearable>
@@ -29,25 +29,28 @@
      <t-form-item label="手机：" prop="mainWirelessCall">
        <t-input v-model="addUserModal.mainWirelessCall" placeholder="请输入11位手机号"></t-input>
      </t-form-item>
      <t-form-item label="人脸图片：" prop="facePicture">
        <t-upload
          ref="uploader"
          :show-uploaded="true"
          :allowed-ext="['jpg','jpeg','png']"
          :max-size="2048"
          :before-upload="$_onUploadBeforeUpload"
          :data="{picture:'11d'}"
          multiple
          style="width:120px;height:160px;background-color:#FFFFFF;"
          type="drag"
          action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
          class="demo-upload-list"
        >
          <div class="picture-upload">
            <t-icon class="upload-icon" icon="plus-outline"></t-icon>
            <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
          </div>
        </t-upload>
      <t-form-item label="人脸图片：" style="display:flex" prop="facePicture">
        <div style="display:flex">
          <t-upload
            ref="uploader"
            :show-uploaded="false"
            :allowed-ext="['jpg','jpeg','png']"
            :max-size="2048"
            :before-upload="$_onUploadBeforeUpload"
            multiple
            style="width:120px;height:160px;background-color:#FFFFFF;"
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            class="demo-upload-list"
            @success = "$_onUploadSuccess"
          >
            <div class="picture-upload">
              <t-icon class="upload-icon" icon="plus-outline"></t-icon>
              <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
            </div>
          </t-upload>
          <img v-show="showPicture" :src="showPicture" style="width:120px;height:160px;margin-left:12px"/>
        </div>
        <span style="color:rgba(0, 0, 0, 0.45);font-size:12px">照片格式：jpg、png或bmp文件，且不超过2M</span>
      </t-form-item>
    </t-form>
@@ -61,6 +64,7 @@
<script>
import sysapi from '@/api/usermana'
import formatDateTime from '@/utils/formatDateTime.js'
export default {
  props: {
    visible: {
@@ -71,20 +75,27 @@ export default {
    companyList: {
      type: Array,
      default: () => []
    },
    // 回显数据列表
    editUserModal: {
      type: Object,
      default: () => []
    }
  },
  data() {
    // 手机号验证
    // const VALIDATEPASSCHECK = (rule, value, callback) => {
    //   if (value === '') {
    //     callback(new Error('请输入11位手机号'))
    //   } else if (value.length > 0 & value.length !== 11) {
    //     callback(new Error('手机号格式不正确'))
    //   } else {
    //     callback()
    //   }
    // }
    const VALIDATEPASSCHECK = (rule, value, callback) => {
      if (value === '') {
        callback(new Error('请输入11位手机号'))
      } else if (value.length > 0 & value.length !== 11) {
        callback(new Error('手机号需为11位'))
      } else {
        callback()
      }
    }
    return {
      // 按钮是否加载中
      loadingSubmit: false,
      // 是否为编辑状态
      isEdit: false,
      // 部门列表
@@ -92,6 +103,8 @@ export default {
      // 职务列表
      uploadList: [],
      jobPoisitonList: [],
      // 回显图片
      showPicture: '',
      // 新增用户表单
      addUserModal: {
        name: '',
@@ -121,10 +134,10 @@ export default {
          { required: true, message: '职务不能为空', trigger: 'change' }
        ],
        birthday: [
          { required: true, message: '年龄不能为空', trigger: 'blur' }
          { required: true, message: '年龄不能为空' }
        ],
        mainWirelessCall: [
          { required: true, message: '请输入11位手机号', trigger: 'blur' }
          { validator: VALIDATEPASSCHECK, required: true, trigger: 'blur' }
        ],
        facePicture: [
          { required: true, message: '图片不能为空', trigger: 'blur' }
@@ -149,8 +162,15 @@ export default {
      this.addUserModal.organizeCode = ''
      // 查询部门列表
      this.queryCycleChildOrg(val)
    },
    editUserModal () {
      this.getCompanyList()
    }
  },
  created() {
    // console.log(this.editUserModal)
    // this.addUserModal.apartments = this.editUserModal.field4
  },
  mounted() {
    this.getJobPositionList()
  },
@@ -166,14 +186,14 @@ export default {
            organizeCode: this.addUserModal.organizeCode, // 部门CODE
            mainWirelessCall: this.addUserModal.mainWirelessCall, // 手机号码
            mainJobPosition: this.addUserModal.mainJobPosition, // 职务
            field1: this.addUserModal.facePicture, // 照片标识
            field1: this.addUserModal.field1, // 照片标识
            field4: this.addUserModal.apartments, // 公司ID
            birthday: Math.round(new Date() / 1000) // 生日(时间戳)
            birthday: this.addUserModal.birthday // 生日(时间戳)
          }
          sysapi.creteEmployee({params: obj}).then(res => {
            console.log(res)
          sysapi.creteEmployee(obj).then(res => {
            if (res.data.success === true) {
              this.$Message.success('新增成功')
              this.$Message.success('提交成功')
              this.$refs['addUserModal'].resetFields()
            } else {
              console.log(res.data.fail.message)
              this.$Message.success(res.data.fail.message)
@@ -188,6 +208,21 @@ export default {
      this.imgUrl = ''
      this.isVisibled = false
    },
    getCompanyList() {
      this.$nextTick(() => {
        this.addUserModal = {
          'name': this.editUserModal.employeeName, // 员工姓名
          'code': this.editUserModal.employeeCode, // 员工编号
          'organizeCode': this.editUserModal.organizationCode, // 部门CODE
          'mainWirelessCall': this.editUserModal.mainWirelessCall, // 手机号码
          'mainJobPosition': this.editUserModal.employeePosition, // 职务
          'field1': this.editUserModal.field1, // 照片标识
          'apartments': this.editUserModal.field4, // 公司ID
          'birthday': formatDateTime(new Date(this.editUserModal.birthday - 0)) // 生日(时间戳)
        }
        // this.isEdit = true
      })
    },
    // 查询职务列表
    async getJobPositionList() {
      const res = await sysapi.getJobPositionList()
@@ -212,7 +247,7 @@ export default {
          if (item.pid === '-1') {
            delete item.pid
          }
          item.id = item.orgId
          // item.id = item.orgId
          data1.some((item1) => {
            if (item.pid === item1.id) {
              item.pid = item1.orgId
@@ -237,7 +272,8 @@ export default {
            orgId: item.id + '',
            id: item.code,
            label: item.name,
            pid: item.parentCode
            pid: item.parentCode,
            code: item.code
          })
          this.nextDepartment(item.departments, arr)
        })
@@ -257,11 +293,9 @@ export default {
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      this.imgUrl = res.data.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
      this.showPicture = res.data.headerPictureUrl
      this.addUserModal.field1 = res.data.pictureUrl
    },
    $_onUploadRemoveFile () { },
    $_onUploadExceededSize () { },

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

@@ -52,7 +52,7 @@
          </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="editDeviceData(row.id)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteUserData(row)">删除</a>
              <a v-if="row.field2!='5'" href="javascript:;" style="color:#0089D4;" @click="auditdata(row.id,row.companyName)">人脸审核</a>
            </template>
@@ -64,7 +64,7 @@
        </t-pager>
      </div>
    </t-card>
    <add-user-modal :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
    <add-user-modal :edit-user-modal="currentEditDevice" :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
    <auditModal :auditshow.sync="auditshow" :auditid="auditid" :company-name="companyName" @refeshUserList="getUserList"></auditModal>
  </div>
</template>
@@ -249,6 +249,7 @@ export default {
    },
    // 删除数据
    deleteUserData (row) {
      console.log(row)
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
@@ -307,10 +308,12 @@ export default {
    showAddDeviceModal () {
      this.addDeviceModal = true
    },
    // 编辑新增用户信息
    async editDeviceData (id) {
      const res = await sysapi.getDeviceInfo(id)
      const res = await sysapi.getOneEmployee({params: {employeeId: id}})
      if (res.status === 200) {
        this.currentEditDevice = res.data
        this.currentEditDevice = res.data.data
        console.log(this.currentEditDevice);
      } else {
        this.$Message.danger('设备数据获取失败！')
      }

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

@@ -126,7 +126,7 @@ export default {
          btn1.className = 'aidicon aidicon-piechart-outline'
          btn1.setAttribute('title', '视频回放')
          btn1.addEventListener('click', () => {
            this.handleReview(this.videoList[index].id)
            this.handleReview(this.videoList[index].resourceToolId)
          })
          item.appendChild(txt)
          item.appendChild(btn)
@@ -170,7 +170,6 @@ export default {
      }
      if (res.status === 200) {
        this.replayList = res.data.data
        console.log(this.replayList)
      } else {
        this.$Message.danger('视频列表数据获取失败！')
      }