diff --git a/src/api/construction/manage/hoistManage.js b/src/api/construction/manage/hoistManage.js index b05db09..5aeddd1 100644 --- a/src/api/construction/manage/hoistManage.js +++ b/src/api/construction/manage/hoistManage.js @@ -6,4 +6,58 @@ export function getDzWarnList(query) { method: 'get', params: query }) +} + +/* 近电感应设备列表 */ +export function getJdList(query) { + return request({ + url: '/bracelet/consControl/getJdList', + method: 'get', + params: query + }) +} + +/* 线路属性 */ +export function getLineStats(query) { + return request({ + url: '/system/select/getLineStats', + method: 'get', + params: query + }) +} + +/* 线路属性的电压等级 */ +export function getVoltageLevelByLineStats(query) { + return request({ + url: '/system/select/getVoltageLevelByLineStats', + method: 'get', + params: query + }) +} + +/* 添加近电感应配置 */ +export function configJdDevice(data) { + return request({ + url: '/bracelet/consControl/configJdDevice', + method: 'post', + data:data + }) +} + +/* 查询近电感应设备配置 */ +export function getConfigJdDevice(query) { + return request({ + url: '/bracelet/consControl/getConfigJdDevice', + method: 'get', + params: query + }) +} + +/* 近电感应设备预警信息 */ +export function getJdWarnList(query) { + return request({ + url: '/bracelet/consControl/getJdWarnList', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/assets/images/config.png b/src/assets/images/config.png new file mode 100644 index 0000000..6851201 Binary files /dev/null and b/src/assets/images/config.png differ diff --git a/src/assets/images/jd_dev.png b/src/assets/images/jd_dev.png new file mode 100644 index 0000000..545cb96 Binary files /dev/null and b/src/assets/images/jd_dev.png differ diff --git a/src/assets/images/video/back.png b/src/assets/images/video/back.png new file mode 100644 index 0000000..a3cd716 Binary files /dev/null and b/src/assets/images/video/back.png differ diff --git a/src/assets/images/video/back3.png b/src/assets/images/video/back3.png new file mode 100644 index 0000000..43f5106 Binary files /dev/null and b/src/assets/images/video/back3.png differ diff --git a/src/assets/images/video/left_btn.png b/src/assets/images/video/left_btn.png new file mode 100644 index 0000000..2bdcefc Binary files /dev/null and b/src/assets/images/video/left_btn.png differ diff --git a/src/utils/request.js b/src/utils/request.js index f70b994..2250d20 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -62,7 +62,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + const interval = 3000; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; console.warn(`[${s_url}]: ` + message) diff --git a/src/views/base/team/index.vue b/src/views/base/team/index.vue index c2dc11a..06ee054 100644 --- a/src/views/base/team/index.vue +++ b/src/views/base/team/index.vue @@ -15,6 +15,7 @@ placeholder="请输入班组名称" clearable @keyup.enter.native="handleQuery" + maxlength="30" /> @@ -23,6 +24,7 @@ placeholder="请输入班组长" clearable @keyup.enter.native="handleQuery" + maxlength="30" /> @@ -274,7 +282,7 @@ @@ -385,6 +393,7 @@ // 表单参数 form: {}, teamUserList:[],//新增编辑弹窗-班组成员 + leaderData:{},//新增编辑弹窗-班组长 chosenUser:[],//人员列表右侧-选中人员 peopleDataList:[],//接口获取-所有人员列表 peopleList:[],//人员列表左侧-表格渲染 @@ -411,7 +420,7 @@ created() { this.getProList(); - this.getPersonList(); + this.getList(); }, methods: { @@ -422,12 +431,12 @@ }); }, // 获取人员列表 - getPersonList(){ + getPersonList(teamId){ let param = { - type:1,//1.全部人员 2.未分配人员 3.已分配人员 4.班组长 + type:4,//1.全部人员 2.未分配人员 3.已分配人员 4.班组长 roleCode: this.$store.getters.roleCode, departId: this.$store.getters.departId, - teamId: this.$store.getters.teamId, + teamId: teamId } getPersonList(param).then(response => { this.personList = response.data; @@ -440,8 +449,21 @@ if(item.id==val){ this.form.teamLeader = item.name; this.form.leaderPhone = item.phone; + this.leaderData=item; } }) + this.leaderData.isLeader=0;//是否班组长，0是1否 + if(this.teamUserList.length==0){ + this.teamUserList.push(this.leaderData) + }else{ + var index = this.teamUserList.findIndex(uItem => {return uItem.isLeader == 0}) + if(index>-1){ + this.teamUserList.splice(index,1) + this.teamUserList.unshift(this.leaderData) + }else{ + this.teamUserList.unshift(this.leaderData) + } + } }, /** 查询班组列表 */ getList() { @@ -594,21 +616,15 @@ }, //选择人员弹窗-确认 submitPeople(){ - // let arrs=[...this.chosenUser,...this.teamUserList]; - // //根据id去重 - // let map=new Map(); - // for(let item of arrs){ - // if(!map.has(item.id)){ - // map.set(item.id,item) - // } - // } - // let newArr=[...map.values()]; + // console.log(this.teamUserList) + // console.log(this.chosenUser) this.teamUserList = this.chosenUser; - + this.teamUserList.unshift(this.leaderData) this.openPeople = false; }, /** 新增按钮操作 */ handleAdd() { + this.getPersonList(""); this.reset(); this.checkList = [] this.open = true; @@ -618,12 +634,20 @@ handleUpdate(row) { this.reset(); const teamId = row.teamId + this.getPersonList(teamId); getTeamInfo({id:teamId}).then(response => { this.form = response.data; + this.personList.forEach(item=>{ + if(item.id==this.form.teamLeaderId){ + this.leaderData=item; + this.leaderData.isLeader=0; + } + }) this.$set(this.form,'proId',response.data.proId+'') this.checkList = response.data.checkList; // this.$set(this.form,'sex',response.data.sex+'') this.teamUserList = response.data.checkList.slice(); + this.teamUserList.unshift(this.leaderData) this.open = true; this.title = "修改班组"; }); diff --git a/src/views/construction/manage/hoistManage/hoistManage.vue b/src/views/construction/manage/hoistManage/hoistManage.vue index 436588e..6e30bcf 100644 --- a/src/views/construction/manage/hoistManage/hoistManage.vue +++ b/src/views/construction/manage/hoistManage/hoistManage.vue @@ -3,7 +3,7 @@
+ style="margin: 10px 10px 10px 0;width: 80%;" @keydown.enter="searchData"> 查询
@@ -19,7 +19,6 @@
-
@@ -45,124 +44,137 @@
-
-
-
- - -
-
-
配置{{ index + 1 }}
- - - - 交流 - 直流 - - - - - ≤10kV - 20~35kV - 66~110kV - 220kV - 330kV - 500kV - 700kV - 1000kV - - - - -  米 - - - 删除配置 +
+
+
+ 近电感应设备 + {{ item.devName }} +
+
+ 电量 + 电量 + 电量 + {{ item.electricQuantity }}% +
+
配置
- +
+ +
+
+ + + + + + + + +
+
+ + +
+
+

配置{{ index + 1 }}

+ + + {{ item.name }} + + + + + {{ item.name }} + + + {{ item.name }} + + + + + + + + +
+
+
+ +
+ 确定 + 添加配置 + 取消 +