sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-08-18 23:16:21 +08:00
parent 63218f6340
commit 40616deade
18 changed files with 255 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/api/device/pitConfig.js
View File

@ -1,7 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询项目基坑监测配置 // 查询项目基坑监测配置列表
列表
export function listPitConfig(query) { export function listPitConfig(query) {
return request({ return request({
url: '/device/pitConfig/list', url: '/device/pitConfig/list',
@ -10,8 +9,7 @@ export function listPitConfig(query) {
}) })
} }
// 查询项目基坑监测配置 // 查询项目基坑监测配置详细
详细
export function getPitConfig(id) { export function getPitConfig(id) {
return request({ return request({
url: '/device/pitConfig/' + id, url: '/device/pitConfig/' + id,

187
ruoyi-ui/src/views/device/pitConfig/index.vue
View File

@ -1,25 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目ID" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter.native="handleQuery" /> <el-select v-model="queryParams.projectId" filterable placeholder="请选择项目" clearable
@change="doQuerySub('query')">
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="总包单位ID" prop="subDeptId"> <el-form-item label="总包单位" prop="subDeptId">
<el-input v-model="queryParams.subDeptId" placeholder="请输入总包单位ID" clearable @keyup.enter.native="handleQuery" /> <el-select v-model="queryParams.subDeptId" filterable placeholder="请选择总包单位" clearable>
</el-form-item> <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
<el-form-item label="厂商编号参考字典pitmonit_vendors" prop="vendorCode"> </el-option>
<el-input v-model="queryParams.vendorCode" placeholder="请输入厂商编号参考字典pitmonit_vendors" clearable </el-select>
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="1-启用,0-停用" prop="enabled">
<el-input v-model="queryParams.enabled" placeholder="请输入1-启用,0-停用" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="state">
<el-input v-model="queryParams.state" placeholder="请输入状态" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="${comment}" prop="isDel">
<el-input v-model="queryParams.isDel" placeholder="请输入${comment}" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -40,7 +33,7 @@
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['device:pitConfig:remove']">删除</el-button> v-hasPermi="['device:pitConfig:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5" v-if="1 == 2">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['device:pitConfig:export']">导出</el-button> v-hasPermi="['device:pitConfig:export']">导出</el-button>
</el-col> </el-col>
@ -49,15 +42,16 @@
<el-table v-loading="loading" :data="pitConfigList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="pitConfigList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="编号" align="center" prop="id" />
<el-table-column label="项目ID" align="center" prop="projectId" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="总包单位ID" align="center" prop="subDeptId" /> <el-table-column label="总包单位" align="center" prop="deptName" />
<el-table-column label="厂商编号参考字典pitmonit_vendors" align="center" prop="vendorCode" /> <el-table-column label="对接厂商" align="center" prop="vendorCode" />
<el-table-column label="厂商参数" align="center" prop="vendorParamter" /> <el-table-column label="是否启用" align="center" prop="enabled">
<el-table-column label="1-启用,0-停用" align="center" prop="enabled" /> <template slot-scope="scope">
<el-table-column label="状态" align="center" prop="state" /> <el-button type="text" v-if="scope.row.enabled == 1">启用</el-button>
<el-table-column label="备注" align="center" prop="remark" /> <el-button type="text" disabled v-if="scope.row.enabled == 0">停用</el-button>
<el-table-column label="${comment}" align="center" prop="isDel" /> </template>
</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 size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@ -73,38 +67,43 @@
<!-- 添加或修改项目基坑监测配置 <!-- 添加或修改项目基坑监测配置
对话框 --> 对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-drawer v-if="open" :visible.sync="open" direction="rtl" size="60%" :title="title">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding:0px 20px">
<el-form-item label="项目ID" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目ID" /> <el-select v-model="form.projectId" filterable placeholder="请选择项目" style="width:300px;" clearable @change="doQuerySub('dlg')">
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="总包单位ID" prop="subDeptId"> <el-form-item label="总包单位" prop="subDeptId">
<el-input v-model="form.subDeptId" placeholder="请输入总包单位ID" /> <el-select v-model="form.subDeptId" filterable placeholder="请选择总包单位" style="width:300px;" clearable>
<el-option v-for="(item, index) in dlgDepts" :key="index" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="厂商编号参考字典pitmonit_vendors" prop="vendorCode"> <el-tabs type="card" v-model="form.vendorCode">
<el-input v-model="form.vendorCode" placeholder="请输入厂商编号参考字典pitmonit_vendors" /> <el-tab-pane :label="it.label" :name="it.value" v-for="(it, idx) in dict.type.pitmonit_vendors" :key="idx">
</el-form-item> <el-form-item label="工程编号" prop="orgId">
<el-form-item label="厂商参数" prop="vendorParamter"> <el-input v-model="form.orgId"></el-input>
<el-input v-model="form.vendorParamter" type="textarea" placeholder="请输入内容" /> </el-form-item>
</el-form-item> <el-form-item label="用户名" prop="identifier">
<el-form-item label="1-启用,0-停用" prop="enabled"> <el-input v-model="form.identifier" auto-complete="off"></el-input>
<el-input v-model="form.enabled" placeholder="请输入1-启用,0-停用" /> </el-form-item>
</el-form-item> <el-form-item label="密码" prop="credential">
<el-form-item label="状态" prop="state"> <el-input v-model="form.credential" ></el-input>
<el-input v-model="form.state" placeholder="请输入状态" /> </el-form-item>
</el-form-item> </el-tab-pane>
<el-form-item label="备注" prop="remark"> </el-tabs>
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-form-item label="是否启用" prop="enabled">
</el-form-item> <el-switch v-model="form.enabled" active-color="#13ce66" inactive-color="#ccc">
<el-form-item label="${comment}" prop="isDel"> </el-switch>
<el-input v-model="form.isDel" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-drawer>
</div> </div>
</template> </template>
@ -113,6 +112,7 @@ import { listPitConfig, getPitConfig, delPitConfig, addPitConfig, updatePitConfi
export default { export default {
name: "PitConfig", name: "PitConfig",
dicts: ['pitmonit_vendors'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -149,13 +149,67 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
} },
projectOptions: [],
depts: [],
dlgDepts: []
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.init();
}, },
methods: { methods: {
doQuerySub(type) {
let prjId = type == "query" ? this.queryParams.projectId : this.form.projectId;
if (!prjId) {
if (type == "query") {
this.depts = [];
this.queryParams.subDeptId = ""
} else {
this.dlgDepts = [];
this.form.subDeptId = ""
}
return;
}
let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0) {
if (type == 'query') {
this.depts = tmps;
this.queryParams.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
} else {
this.dlgDepts = tmps;
this.form.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
}
return;
}
this.$api.publics.queryUnitList({
projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
this.prjDept2[prjId] = objs;
let tmps = objs;
if (type == 'query') {
this.depts = tmps;
this.queryParams.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
} else {
this.dlgDepts = tmps;
this.form.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
}
});
},
init() {
if (this.projectOptions && this.projectOptions.length > 0) {
return;
}
this.$api.publics.getMyProjectList({}).then((response) => {
this.projectOptions = response.rows;
});
},
/** 查询项目基坑监测配置列表 */ /** 查询项目基坑监测配置列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -178,7 +232,7 @@ export default {
subDeptId: null, subDeptId: null,
vendorCode: null, vendorCode: null,
vendorParamter: null, vendorParamter: null,
enabled: null, enabled: true,
state: null, state: null,
remark: null, remark: null,
isDel: null, isDel: null,
@ -210,6 +264,7 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加项目基坑监测配置"; this.title = "添加项目基坑监测配置";
this.form.vendorCode = this.dict.type.pitmonit_vendors[0].value;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -244,19 +299,19 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除项目基坑监测配置编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除项目基坑监测配置编号为"' + ids + '"的数据项？').then(function () {
return delPitConfig(ids); return delPitConfig(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => { }); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('device/pitConfig/export', { this.download('device/pitConfig/export', {
...this.queryParams ...this.queryParams
}, `pitConfig_${new Date().getTime()}.xlsx`) }, `pitConfig_${new Date().getTime()}.xlsx`)
}
} }
}
}; };
</script> </script>

9
ruoyi-ui/src/views/project/attendanceConfig/index.vue
View File

@ -133,8 +133,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.subDeptId = tmps[0].deptId; this.queryParams.subDeptId = tmps[0].deptId;
@ -144,14 +145,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.subDeptId = objs[0].deptId; this.queryParams.subDeptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -501,8 +501,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -512,14 +513,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/materialSeal/index.vue
View File

@ -370,8 +370,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -381,14 +382,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -420,8 +420,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -431,14 +432,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/projectFunVerify/index.vue
View File

@ -356,8 +356,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -367,14 +368,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -389,8 +389,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -400,14 +401,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/projectStandard/index.vue
View File

@ -183,8 +183,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.subDeptId = tmps[0].deptId; this.queryParams.subDeptId = tmps[0].deptId;
@ -194,14 +195,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.subDeptId = objs[0].deptId; this.queryParams.subDeptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/surProjectInsurance/index.vue
View File

@ -249,8 +249,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -260,14 +261,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

9
ruoyi-ui/src/views/project/surProjectSpecial/index.vue
View File

@ -297,8 +297,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId; this.queryParams.deptId = tmps[0].deptId;
@ -308,14 +309,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId; this.queryParams.deptId = objs[0].deptId;

10
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -290,9 +290,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
this.depts = tmps; if (tmps.length > 0 || !prjId) {
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.trainDeptIds = tmps[0].deptId; this.queryParams.trainDeptIds = tmps[0].deptId;
} else { } else {
@ -301,14 +301,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId; this.queryParams.trainDeptIds = objs[0].deptId;

9
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -287,8 +287,9 @@ export default {
}, },
methods: { methods: {
doQuerySub() { doQuerySub() {
let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : []; let prjId=this.queryParams.projectId;
if (tmps.length > 0) { let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
this.depts = tmps; this.depts = tmps;
if (tmps.length == 1) { if (tmps.length == 1) {
this.queryParams.trainDeptIds = tmps[0].deptId; this.queryParams.trainDeptIds = tmps[0].deptId;
@ -298,14 +299,14 @@ export default {
return; return;
} }
this.$api.publics.queryUnitList({ this.$api.publics.queryUnitList({
projectId: this.queryParams.projectId, projectId: prjId,
unitTypes: "2".split(","), unitTypes: "2".split(","),
}).then((d) => { }).then((d) => {
let objs = d.rows || []; let objs = d.rows || [];
if (!this.prjDept2) { if (!this.prjDept2) {
this.prjDept2 = {}; this.prjDept2 = {};
} }
this.prjDept2[this.queryParams.projectId] = objs; this.prjDept2[prjId] = objs;
this.depts = objs; this.depts = objs;
if (objs.length == 1) { if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId; this.queryParams.trainDeptIds = objs[0].deptId;

19
yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java
View File

@ -39,6 +39,25 @@ public class ProjectPitMonitCfg extends BaseEntity
@Excel(name = "1-启用,0-停用") @Excel(name = "1-启用,0-停用")
private Long enabled; private Long enabled;
private String projectName;
private String deptName;
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
/** 状态 */ /** 状态 */
@Excel(name = "状态") @Excel(name = "状态")
private Long state; private Long state;

25
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java
View File

@ -177,6 +177,31 @@ public class SurProject extends BaseEntity
@Excel(name = "项目区域名称") @Excel(name = "项目区域名称")
private String projectRegionalName; private String projectRegionalName;
/**
* 基坑平面图
*/
private String prjPlanUrl;
/**
* 效果图
*/
private String prjRenderingUrl;
public String getPrjPlanUrl() {
return prjPlanUrl;
}
public void setPrjPlanUrl(String prjPlanUrl) {
this.prjPlanUrl = prjPlanUrl;
}
public String getPrjRenderingUrl() {
return prjRenderingUrl;
}
public void setPrjRenderingUrl(String prjRenderingUrl) {
this.prjRenderingUrl = prjRenderingUrl;
}
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;

6
yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
View File

@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devShadow != null and devShadow != ''"> and devShadow = #{devShadow}</if> <if test="devShadow != null and devShadow != ''"> and devShadow = #{devShadow}</if>
<if test="devType != null and devType != ''"> and devType = #{devType}</if> <if test="devType != null and devType != ''"> and devType = #{devType}</if>
<if test="devTypeName != null and devTypeName != ''"> and devTypeName like concat('%', #{devTypeName}, '%')</if> <if test="devTypeName != null and devTypeName != ''"> and devTypeName like concat('%', #{devTypeName}, '%')</if>
<if test="key != null and key != ''"> and key = #{key}</if> <if test="key != null and key != ''"> and `key` = #{key}</if>
<if test="manufacturer != null and manufacturer != ''"> and manufacturer = #{manufacturer}</if> <if test="manufacturer != null and manufacturer != ''"> and manufacturer = #{manufacturer}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="orgId != null "> and orgId = #{orgId}</if> <if test="orgId != null "> and orgId = #{orgId}</if>
@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devShadow != null">devShadow,</if> <if test="devShadow != null">devShadow,</if>
<if test="devType != null">devType,</if> <if test="devType != null">devType,</if>
<if test="devTypeName != null">devTypeName,</if> <if test="devTypeName != null">devTypeName,</if>
<if test="key != null">key,</if> <if test="key != null">`key`,</if>
<if test="manufacturer != null">manufacturer,</if> <if test="manufacturer != null">manufacturer,</if>
<if test="name != null">name,</if> <if test="name != null">name,</if>
<if test="orgId != null">orgId,</if> <if test="orgId != null">orgId,</if>
@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devShadow != null">devShadow = #{devShadow},</if> <if test="devShadow != null">devShadow = #{devShadow},</if>
<if test="devType != null">devType = #{devType},</if> <if test="devType != null">devType = #{devType},</if>
<if test="devTypeName != null">devTypeName = #{devTypeName},</if> <if test="devTypeName != null">devTypeName = #{devTypeName},</if>
<if test="key != null">key = #{key},</if> <if test="key != null">`key` = #{key},</if>
<if test="manufacturer != null">manufacturer = #{manufacturer},</if> <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
<if test="name != null">name = #{name},</if> <if test="name != null">name = #{name},</if>
<if test="orgId != null">orgId = #{orgId},</if> <if test="orgId != null">orgId = #{orgId},</if>

12
yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
View File

@ -18,10 +18,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="projectName" column="projectName"/>
<result property="deptName" column="deptName"/>
</resultMap> </resultMap>
<sql id="selectSurProjectPitMonitCfgVo"> <sql id="selectSurProjectPitMonitCfgVo">
select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time from sur_project_pit_monit_cfg
select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time,projectName,deptName
from (
select a.*,p.projectName,b.unitName as deptName
from sur_project_pit_monit_cfg a
JOIN sur_project p on a.project_id =p.id
join sur_project_unit_info b on a.sub_dept_id=b.unitId and a.project_id=b.projectId ) sur_project_pit_monit_cfg
</sql> </sql>
<select id="selectSurProjectPitMonitCfgList" parameterType="SurProjectPitMonitCfg" resultMap="ProjectPitMonitCfgResult"> <select id="selectSurProjectPitMonitCfgList" parameterType="SurProjectPitMonitCfg" resultMap="ProjectPitMonitCfgResult">

20
yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
View File

@ -51,15 +51,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="projectSort" column="projectSort" /> <result property="projectSort" column="projectSort" />
<result property="progressVisible" column="progressVisible" /> <result property="progressVisible" column="progressVisible" />
<result property="projectRegionalName" column="projectRegionalName" /> <result property="projectRegionalName" column="projectRegionalName" />
<result property="prjPlanUrl" column="prjPlanUrl"/>
<result property="prjRenderingUrl" column="prjRenderingUrl"/>
</resultMap> </resultMap>
<sql id="selectSurProjectVo"> <sql id="selectSurProjectVo">
select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel, sp.projectRegional, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude, sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime, sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize, sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time, sp.update_by, sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name from sur_project sp select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel,
sp.projectRegional, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude,
sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime,
sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize,
sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time, sp.update_by,
sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name,
sp.prjPlanUrl,sp.prjRenderingUrl
from sur_project sp
left join sys_dept d on d.dept_id = sp.deptId left join sys_dept d on d.dept_id = sp.deptId
</sql> </sql>
<select id="selectSurProjectList" parameterType="SurProject" resultMap="SurProjectResult"> <select id="selectSurProjectList" parameterType="SurProject" resultMap="SurProjectResult">
select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel, sp.projectRegional, a.areaName as projectRegionalName, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude, sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime, sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize, sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time, sp.update_by, sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel, sp.projectRegional, a.areaName as projectRegionalName, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude, sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime, sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize, sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time,
sp.update_by, sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name,sp.prjPlanUrl,sp.prjRenderingUrl
from sur_project sp from sur_project sp
left join sys_dept d on d.dept_id = sp.deptId left join sys_dept d on d.dept_id = sp.deptId
left join china_area a on sp.projectRegional = a.id left join china_area a on sp.projectRegional = a.id
@ -183,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightType != null">weightType,</if> <if test="weightType != null">weightType,</if>
<if test="projectSort != null">projectSort,</if> <if test="projectSort != null">projectSort,</if>
<if test="progressVisible != null">progressVisible,</if> <if test="progressVisible != null">progressVisible,</if>
<if test="prjPlanUrl != null">prjPlanUrl,</if>
<if test="prjRenderingUrl != null">prjRenderingUrl,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@ -229,6 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightType != null">#{weightType},</if> <if test="weightType != null">#{weightType},</if>
<if test="projectSort != null">#{projectSort},</if> <if test="projectSort != null">#{projectSort},</if>
<if test="progressVisible != null">#{progressVisible},</if> <if test="progressVisible != null">#{progressVisible},</if>
<if test="prjPlanUrl != null">#{prjPlanUrl},</if>
<if test="prjRenderingUrl != null">#{prjRenderingUrl},</if>
</trim> </trim>
</insert> </insert>
@ -278,6 +292,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightType != null">weightType = #{weightType},</if> <if test="weightType != null">weightType = #{weightType},</if>
<if test="projectSort != null">projectSort = #{projectSort},</if> <if test="projectSort != null">projectSort = #{projectSort},</if>
<if test="progressVisible != null">progressVisible = #{progressVisible},</if> <if test="progressVisible != null">progressVisible = #{progressVisible},</if>
<if test="prjPlanUrl != null">prjPlanUrl = #{prjPlanUrl},</if>
<if test="prjRenderingUrl != null">prjRenderingUrl = #{prjRenderingUrl},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>