设备管理修改添加

master
maxw@mesnac.com 7 months ago
parent 269142336a
commit bed8a3577b

@ -83,6 +83,14 @@ public class DmsMobileController extends BaseController {
List<DmsBaseOutsrcInfo> baseOutsrcInfos = dmsBaseOutsrcInfoService.selectDmsBaseOutsrcInfoList(queryBaseOutsrcInfo); List<DmsBaseOutsrcInfo> baseOutsrcInfos = dmsBaseOutsrcInfoService.selectDmsBaseOutsrcInfoList(queryBaseOutsrcInfo);
return success(baseOutsrcInfos); return success(baseOutsrcInfos);
} }
/**
*
*/
@GetMapping("/likeDeviceName")
public AjaxResult likeDeviceName(String deviceName) {
List<DmsBaseDeviceLedger> deviceLedgerList = baseDeviceLedgerService.likeDeviceName(deviceName);
return success(deviceLedgerList);
}
/** /**

@ -2,6 +2,7 @@ package com.hw.dms.mapper;
import java.util.List; import java.util.List;
import com.hw.dms.domain.DmsBaseDeviceLedger; import com.hw.dms.domain.DmsBaseDeviceLedger;
import org.apache.ibatis.annotations.Param;
/** /**
* Mapper * Mapper
@ -69,4 +70,5 @@ public interface DmsBaseDeviceLedgerMapper
*/ */
public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode); public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode);
List<DmsBaseDeviceLedger> likeDeviceName(@Param("deviceName") String deviceName);
} }

@ -78,4 +78,6 @@ public interface IDmsBaseDeviceLedgerService
* @return * @return
*/ */
public int printLabels(String[] deviceCodes); public int printLabels(String[] deviceCodes);
List<DmsBaseDeviceLedger> likeDeviceName(String deviceName);
} }

@ -140,6 +140,12 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi
} }
@Override
public List<DmsBaseDeviceLedger> likeDeviceName(String deviceName) {
List<DmsBaseDeviceLedger> list = dmsBaseDeviceLedgerMapper.likeDeviceName(deviceName);
return list;
}
/** /**
* *
* *

@ -116,7 +116,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
@Override @Override
public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) { public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
Date curretnDate = new Date(); Date curretnDate = new Date();
String userName = SecurityUtils.getUsername(); String userName = SecurityUtils.getNickname();
dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID); dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID);
dmsBillsFaultInstance.setApplyUser(userName); dmsBillsFaultInstance.setApplyUser(userName);
dmsBillsFaultInstance.setApplyTime(curretnDate); dmsBillsFaultInstance.setApplyTime(curretnDate);
@ -158,7 +158,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
*/ */
@Override @Override
public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) { public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
String username = SecurityUtils.getUsername(); String username = SecurityUtils.getNickname();
if (dmsBillsFaultInstance.getRepairConfirm()!=null){ if (dmsBillsFaultInstance.getRepairConfirm()!=null){
dmsBillsFaultInstance.setConfirmer(username); dmsBillsFaultInstance.setConfirmer(username);
} }

@ -60,15 +60,25 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
queryInstanceFile.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId()); queryInstanceFile.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile); List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile);
dmsFaultInstanceActivity1.setDmsInstanceFileList(dmsInstanceFiles); dmsFaultInstanceActivity1.setDmsInstanceFileList(dmsInstanceFiles);
DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
queryInstanceFile1.setTargetType("2");
queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>(); List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
if (dmsFaultInstanceActivities.size()>1){
DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
queryInstanceFile1.setTargetType("2");
queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
}
// DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
// DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
// queryInstanceFile1.setTargetType("2");
// queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
// List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
// dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
// List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity1); dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity1);
dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2); // dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
return dmsFaultInstanceActivities1; return dmsFaultInstanceActivities1;
} }

@ -130,4 +130,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDmsBaseDeviceLedgerVo"/> <include refid="selectDmsBaseDeviceLedgerVo"/>
where device_code = #{deviceCode} where device_code = #{deviceCode}
</select> </select>
<select id="likeDeviceName" resultType="com.hw.dms.domain.DmsBaseDeviceLedger"
parameterType="java.lang.String">
select
x.*
from
`hwjy-cloud`.dms_base_device_ledger x
where
x.device_name like concat('%',#{deviceName},'%')
</select>
</mapper> </mapper>

@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsBillsFaultInstanceList" parameterType="DmsBillsFaultInstance" resultMap="DmsBillsFaultInstanceResult"> <select id="selectDmsBillsFaultInstanceList" parameterType="DmsBillsFaultInstance" resultMap="DmsBillsFaultInstanceResult">
<include refid="selectDmsBillsFaultInstanceVo"/> <include refid="selectDmsBillsFaultInstanceVo"/>
<where> <where>
approveStatus != '4'
<if test="faultSourceType != null and faultSourceType != ''"> and fault_source_type = #{faultSourceType}</if> <if test="faultSourceType != null and faultSourceType != ''"> and fault_source_type = #{faultSourceType}</if>
<if test="faultSourceId != null "> and fault_source_id = #{faultSourceId}</if> <if test="faultSourceId != null "> and fault_source_id = #{faultSourceId}</if>
<if test="repairInstanceId != null "> and repair_instance_id = #{repairInstanceId}</if> <if test="repairInstanceId != null "> and repair_instance_id = #{repairInstanceId}</if>

@ -1,6 +1,7 @@
package com.hw.ems.report.service; package com.hw.ems.report.service;
import com.hw.ems.base.domain.BaseLineLoss; import com.hw.ems.base.domain.BaseLineLoss;
import com.hw.ems.record.domain.RecordDnbInstant;
import com.hw.ems.report.domain.ExportReport; import com.hw.ems.report.domain.ExportReport;
import java.util.List; import java.util.List;
@ -114,4 +115,6 @@ public interface IDataAnalysisService {
*/ */
// //@DS("#header.poolName") // //@DS("#header.poolName")
public List<Map<String, Object>> energyStatisticsDataObject(Map paramMap); public List<Map<String, Object>> energyStatisticsDataObject(Map paramMap);
List<RecordDnbInstant> queryData(Map paramMap);
} }

@ -9,6 +9,13 @@ export function listUser(data) {
data: data, data: data,
}) })
} }
export function listLine(data) {
return request({
url: '/ems/record/dnbInstant/listLine',
method: 'post',
data: data,
})
}
// 查询部门下拉树结构 // 查询部门下拉树结构
export function treeDat() { export function treeDat() {
return request({ return request({

@ -154,7 +154,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标准编号" prop="standardCode"> <el-form-item label="标准编号" prop="standardCode">
<el-input v-model="form.standardCode" placeholder="请输入标准编号,如a001" /> <el-input v-model="form.standardCode" placeholder="请输入标准编号,如jy-xjbz-001" />
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standardName"> <el-form-item label="标准名称" prop="standardName">
<el-input v-model="form.standardName" placeholder="请输入标准名称,如巡检标准" /> <el-input v-model="form.standardName" placeholder="请输入标准名称,如巡检标准" />

@ -148,7 +148,7 @@
</el-table-column> </el-table-column>
<el-table-column label="审批" align="center" class-name="small-padding fixed-width"> <el-table-column label="审批" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <span v-if="scope.row.approveStatus!='2'"> <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleUpadateApprove(scope.row.repairInstanceId,'2')" @click="handleUpadateApprove(scope.row.repairInstanceId,'2')"
@ -158,6 +158,15 @@
type="text" type="text"
@click="handleUpadateApprove(scope.row.repairInstanceId,'3')" @click="handleUpadateApprove(scope.row.repairInstanceId,'3')"
>审批失败</el-button> >审批失败</el-button>
</span>
<span v-if="scope.row.approveStatus=='3'">
<el-button
size="mini"
type="text"
@click="handleUpadateApprove(scope.row.repairInstanceId,'4')"
>关闭</el-button>
</span>
<!-- <span v-if="scope.row.repairInstanceId==='2'"></span>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -56,28 +56,28 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!--el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['dms:dmsBillsInstance:add']" <!-- v-hasPermi="['dms:dmsBillsInstance:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['dms:dmsBillsInstance:edit']" <!-- v-hasPermi="['dms:dmsBillsInstance:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -100,7 +100,7 @@
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row--> </el-row>
<el-table v-loading="loading" :data="dmsBillsInstanceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBillsInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

@ -33,28 +33,28 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!--el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['dms:dmsBillsMaintInstance:add']" <!-- v-hasPermi="['dms:dmsBillsMaintInstance:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['dms:dmsBillsMaintInstance:edit']" <!-- v-hasPermi="['dms:dmsBillsMaintInstance:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -77,7 +77,7 @@
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row--> </el-row>
<el-table v-loading="loading" :data="dmsBillsMaintInstanceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBillsMaintInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

@ -303,8 +303,18 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="执行人员" prop="performer"> <!-- <el-form-item label="执行人员" prop="performer">-->
<el-input v-model="form.performer" placeholder="请输入执行人员" /> <!-- <el-input v-model="form.performer" placeholder="请输入执行人员" />-->
<!-- </el-form-item>-->
<el-form-item label="执行人员" prop="performer" >
<el-select v-model="form.performer" placeholder="请选择执行人">
<el-option
v-for="item in userList"
:key="item.userId.toString()"
:label="item.nickName"
:value="item.nickName">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否标识1-是0-否" prop="isFlag">--> <!-- <el-form-item label="是否标识1-是0-否" prop="isFlag">-->
<!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识1-是0-否" />--> <!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识1-是0-否" />-->
@ -328,6 +338,7 @@
import { listDmsPlanInspect, getDmsPlanInspect, delDmsPlanInspect, addDmsPlanInspect, updateDmsPlanInspect } from "@/api/dms/dmsPlanInspect"; import { listDmsPlanInspect, getDmsPlanInspect, delDmsPlanInspect, addDmsPlanInspect, updateDmsPlanInspect } from "@/api/dms/dmsPlanInspect";
import {getdmsBaseInspectRouteList} from '@/api/dms/dmsBaseInspectRoute' import {getdmsBaseInspectRouteList} from '@/api/dms/dmsBaseInspectRoute'
import Crontab from '@/components/Crontab/index' import Crontab from '@/components/Crontab/index'
import {findUserList} from "@/api/system/user";
export default { export default {
components: { Crontab }, components: { Crontab },
@ -344,6 +355,7 @@ export default {
loading: true, loading: true,
// //
ids: [], ids: [],
userList: [],
// //
single: true, single: true,
// //
@ -394,8 +406,15 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getRoute(); this.getRoute();
this.getUser();
}, },
methods: { methods: {
getUser() {
findUserList(null).then(response => {
this.userList = response.data;
console.log(this.userList)
});
},
/** cron表达式按钮操作 */ /** cron表达式按钮操作 */
handleShowCron() { handleShowCron() {
this.expression = this.form.cronExpression; this.expression = this.form.cronExpression;

@ -207,9 +207,19 @@
<el-form-item label="保养组别" prop="maintGroup"> <el-form-item label="保养组别" prop="maintGroup">
<el-input v-model="form.maintGroup" placeholder="请输入保养组别,如A组" /> <el-input v-model="form.maintGroup" placeholder="请输入保养组别,如A组" />
</el-form-item> </el-form-item>
<el-form-item label="保养负责人" prop="maintSupervisor"> <el-form-item label="保养负责人" prop="maintSupervisor" >
<el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" /> <el-select v-model="form.maintSupervisor" placeholder="请选择保养负责人">
<el-option
v-for="item in userList"
:key="item.userId.toString()"
:label="item.nickName"
:value="item.nickName">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="保养负责人" prop="maintSupervisor">-->
<!-- <el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="本次保养时间" prop="maintTime">--> <!-- <el-form-item label="本次保养时间" prop="maintTime">-->
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.maintTime"--> <!-- v-model="form.maintTime"-->
@ -294,7 +304,10 @@ import { listMaint, getMaint, delMaint, addMaint, updateMaint } from "@/api/dms/
import { listLedger } from '@/api/dms/ledger' import { listLedger } from '@/api/dms/ledger'
import { listStation } from '@/api/dms/station' import { listStation } from '@/api/dms/station'
import { listStandard } from '@/api/dms/standard' import { listStandard } from '@/api/dms/standard'
import {findUserList} from "@//api/system/user";
import Crontab from '@/components/Crontab/index' import Crontab from '@/components/Crontab/index'
import {listDmsBaseInspectStandard} from "@/api/dms/dmsBaseInspectStandard";
import {listUser} from "@/api/system/user";
export default { export default {
components: { Crontab }, components: { Crontab },
name: "Maint", name: "Maint",
@ -321,6 +334,7 @@ export default {
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
userList: [],
// //
maintList: [], maintList: [],
stationList:[], stationList:[],
@ -373,8 +387,15 @@ export default {
this.getDevice(); this.getDevice();
this.getStation(); this.getStation();
this.getStandard(); this.getStandard();
this.getUser();
}, },
methods: { methods: {
getUser() {
findUserList(null).then(response => {
this.userList = response.data;
console.log(this.userList)
});
},
/** cron表达式按钮操作 */ /** cron表达式按钮操作 */
handleShowCron() { handleShowCron() {
this.expression = this.form.cronExpression; this.expression = this.form.cronExpression;

@ -154,7 +154,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标准编号" prop="maintStandardCode"> <el-form-item label="标准编号" prop="maintStandardCode">
<el-input v-model="form.maintStandardCode" placeholder="请输入标准编号,如a001" /> <el-input v-model="form.maintStandardCode" placeholder="请输入标准编号,如jy-bybz-001" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="设备类型ID" prop="deviceTypeId">--> <!-- <el-form-item label="设备类型ID" prop="deviceTypeId">-->
<!-- <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID关联dms_base_device_type的device_type_id" />--> <!-- <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID关联dms_base_device_type的device_type_id" />-->

Loading…
Cancel
Save