diff --git a/danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml b/danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml index f6650c81c6b679478d20caef609d2e2e77c96b83..8eff5984c157dbd7687fabcf01b768f78c2197a8 100644 --- a/danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml +++ b/danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml @@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(t.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') </if> </where> + group by t.user_id desc </select> <select id="selectTStaffById" parameterType="Long" resultMap="TStaffResult"> diff --git a/danger-manage-web/src/views/safetyManagement/staff/index.vue b/danger-manage-web/src/views/safetyManagement/staff/index.vue index 6f26f39699430f78eb8c64c4869faf606752ae0f..50bce34032ca20dfe7eca627f3f34ec7d316fb01 100644 --- a/danger-manage-web/src/views/safetyManagement/staff/index.vue +++ b/danger-manage-web/src/views/safetyManagement/staff/index.vue @@ -171,7 +171,7 @@ </el-form-item> </el-col> </el-row> - <el-row v-if="form.staffName==null"> + <el-row > <el-col :span="11"> <el-form-item label="è´¦å·" prop="userName"> <el-input v-model="form.userName" placeholder="请输账å·" /> diff --git a/danger-manage-web/vue.config.js b/danger-manage-web/vue.config.js index dda0c86cb659f821da39d3163e93a19462ac6d2b..4d20b96ded086fc55a926987f3957de375cc081d 100644 --- a/danger-manage-web/vue.config.js +++ b/danger-manage-web/vue.config.js @@ -34,9 +34,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: process.env.VUE_APP_TARGET, - // target: `http://192.168.2.16:8908/dangerManage`, - // target: `http://192.168.2.17:8908/dangerManage`, + //target: process.env.VUE_APP_TARGET, + target: `http://192.168.31.87:8908/dangerManage`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''