BIM配置修改
parent
3abf9dd40e
commit
d8ce658341
|
@ -238,6 +238,19 @@ public class ProProjectInfo extends BaseEntity
|
|||
@Excel(name = "删除标识")
|
||||
private Long isDel;
|
||||
|
||||
/**
|
||||
* BIM 设置
|
||||
*/
|
||||
private String bimConfig;
|
||||
|
||||
public String getBimConfig() {
|
||||
return bimConfig;
|
||||
}
|
||||
|
||||
public void setBimConfig(String bimConfig) {
|
||||
this.bimConfig = bimConfig;
|
||||
}
|
||||
|
||||
private ProProjectInfoSetting setting;
|
||||
private List<ProProjectInfoDepts> projectDeptsList;
|
||||
|
||||
|
|
|
@ -91,4 +91,20 @@ public interface ProProjectInfoMapper
|
|||
* @param sysRoleDept
|
||||
*/
|
||||
public void insertProRoleDept(SysRoleDept sysRoleDept);
|
||||
|
||||
/**
|
||||
* 查询项目BIM信息
|
||||
*
|
||||
* @param id 项目信息主键
|
||||
* @return 项目信息
|
||||
*/
|
||||
public String getProjectBimConfig(Long id);
|
||||
|
||||
/**
|
||||
* 更新项目BIM信息
|
||||
*
|
||||
* @param proProjectInfo 项目信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProjectBimConfig(ProProjectInfo proProjectInfo);
|
||||
}
|
||||
|
|
|
@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectStatus" column="project_status" />
|
||||
<result property="projectSort" column="project_sort" />
|
||||
<result property="isDel" column="is_del" />
|
||||
<result property="bimConfig" column="bim_config" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
|
@ -82,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<sql id="selectProProjectInfoVo">
|
||||
select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id, pi.project_name, pi.project_code,
|
||||
pi.tech_leader,pi.tech_leader_phone,pi.province,pi.city,pi.district,
|
||||
pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark
|
||||
pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time
|
||||
, pi.remark,pi.bim_config
|
||||
from pro_project_info pi
|
||||
left join sys_dept sd on sd.dept_id = pi.com_id
|
||||
</sql>
|
||||
|
@ -123,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time,
|
||||
pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status,
|
||||
pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,
|
||||
pd.id pd_id,pd.dept_type pd_type,pd.dept_name pd_name,pd.dept_code pd_code,pd.leader pd_leader,pd.phone pd_phone,
|
||||
pd.id pd_id,pd.dept_type pd_type,pd.dept_name pd_name,pd.dept_code pd_code,pd.leader pd_leader,pd.phone pd_phone,pi.bim_config
|
||||
ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane,ac.vendors_code
|
||||
from pro_project_info pi
|
||||
left join sys_dept sd on sd.dept_id = pi.com_id
|
||||
|
@ -284,6 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="bimConfig != null">bim_config = #{bimConfig},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
@ -396,7 +399,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment,
|
||||
pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time,
|
||||
pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status,
|
||||
pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,
|
||||
pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,pi.bim_config,
|
||||
ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane,cfg.vendors_code
|
||||
from pro_project_info pi
|
||||
left join pro_project_info_setting ps on pi.id=ps.project_id
|
||||
|
@ -429,4 +432,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="currentUserId != null "> order by psu.sort_by, pi.id desc</if>
|
||||
</select>
|
||||
|
||||
<select id="getProjectBimConfig" parameterType="Long" resultType="String">
|
||||
select bim_config from pro_project_info where id = #{id}
|
||||
</select>
|
||||
|
||||
<update id="updateProjectBimConfig" parameterType="ProProjectInfo">
|
||||
update pro_project_info set bim_config = #{bimConfig} where id = #{id}
|
||||
</update>
|
||||
|
||||
</mapper>
|
|
@ -151,4 +151,16 @@ public class ProProjectInfoController extends BaseController
|
|||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@GetMapping("/getProjectBimConfig/{id}")
|
||||
public AjaxResult getProjectBimConfig(@PathVariable("id") Long id)
|
||||
{
|
||||
return success(proProjectInfoService.getProjectBimConfig(id));
|
||||
}
|
||||
|
||||
@PostMapping("/updateProjectBimConfig")
|
||||
public AjaxResult updateProjectBimConfig(@RequestBody ProProjectInfo proProjectInfo)
|
||||
{
|
||||
return toAjax(proProjectInfoService.updateProjectBimConfig(proProjectInfo));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -77,4 +77,18 @@ public interface IProProjectInfoService
|
|||
* @return
|
||||
*/
|
||||
public List<ProProjectInfo> selectMyProjectList(com.yanzhu.manage.domain.ProProjectInfo proProjectInfo);
|
||||
|
||||
/**
|
||||
* 查询项目BIM信息
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
String getProjectBimConfig(Long id);
|
||||
|
||||
/**
|
||||
* 更新项目BIM信息
|
||||
* @param proProjectInfo
|
||||
* @return
|
||||
*/
|
||||
int updateProjectBimConfig(ProProjectInfo proProjectInfo);
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ import java.util.stream.Collectors;
|
|||
* @date 2024-08-25
|
||||
*/
|
||||
@Service
|
||||
public class ProProjectInfoServiceImpl implements IProProjectInfoService
|
||||
public class ProProjectInfoServiceImpl implements IProProjectInfoService
|
||||
{
|
||||
@Autowired
|
||||
private WxMaService wxMaService;
|
||||
|
@ -100,6 +100,28 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
|
|||
return proProjectInfoMapper.selectMyProjectList(proProjectInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目BIM信息
|
||||
*
|
||||
* @param id 项目信息主键
|
||||
* @return 项目信息
|
||||
*/
|
||||
@Override
|
||||
public String getProjectBimConfig(Long id) {
|
||||
return proProjectInfoMapper.getProjectBimConfig(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新项目BIM信息
|
||||
*
|
||||
* @param proProjectInfo 项目信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateProjectBimConfig(ProProjectInfo proProjectInfo) {
|
||||
return proProjectInfoMapper.updateProjectBimConfig(proProjectInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目信息
|
||||
*
|
||||
|
|
|
@ -50,4 +50,24 @@ export function delProProjectInfo(id) {
|
|||
url: '/manage/proProjectInfo/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 获取项目BIM配置信息
|
||||
export function getProjectBimConfig(id){
|
||||
return request({
|
||||
url: '/manage/proProjectInfo/getProjectBimConfig/'+id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 获取项目BIM配置信息
|
||||
export function updateProjectBimConfig(id,data){
|
||||
return request({
|
||||
url: '/manage/proProjectInfo/updateProjectBimConfig',
|
||||
method: 'post',
|
||||
data: {
|
||||
id:id,
|
||||
bimConfig:JSON.stringify(data)
|
||||
}
|
||||
})
|
||||
}
|
|
@ -42,8 +42,8 @@ export default {
|
|||
openStatus: 2,
|
||||
},
|
||||
form: {
|
||||
longitude: '108.88',
|
||||
latitude: '34.2',
|
||||
longitude: '34.2',
|
||||
latitude: '108.88',
|
||||
},
|
||||
formRules: {
|
||||
longitude: [{ required: true, message: '请输入经度值' }],
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
<template>
|
||||
<el-dialog title="项目BIM设置" width="600" :modal-append-to-body="false" :close-on-click-modal="false" v-model="show"
|
||||
class="bim-config-dialog footer-center">
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import useUserStore from "@/store/modules/user";
|
||||
import { getProjectBimConfig,updateProjectBimConfig } from "@/api/manage/proProjectInfo.js";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
show: false,
|
||||
currentPrjId: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showDialog() {
|
||||
this.userStore = useUserStore();
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.show = true
|
||||
this.loadData();
|
||||
},
|
||||
loadData(){
|
||||
getProjectBimConfig(this.currentPrjId).then(d=>{
|
||||
debugger;
|
||||
console.log(d)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style></style>
|
|
@ -24,6 +24,7 @@
|
|||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" v-if="data.isAdmin" @click="handleAdd">绑定模型</el-button>
|
||||
<el-button type="primary" plain icon="Plus" v-if="data.isAdmin" @click="handleUpload">上传模型</el-button>
|
||||
<el-button type="primary" plain icon="Plus" v-if="data.isAdmin" @click="doBimConfig">BIM设置</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
@ -101,6 +102,7 @@
|
|||
<modelSelectDialog ref="selDlg" @select="doModelSelect" />
|
||||
<uploadModelDialog ref="uploadDlg" />
|
||||
<modelDialog ref="mDlg"></modelDialog>
|
||||
<bimConfigDialog ref="configDlg"></bimConfigDialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -113,6 +115,7 @@ import { onMounted } from "vue";
|
|||
import modelSelectDialog from "./modelSelectDialog.vue";
|
||||
import uploadModelDialog from "./uploadModelDialog.vue";
|
||||
import modelDialog from "./modelDialog2.vue";
|
||||
import bimConfigDialog from "./bimConfigDialog.vue";
|
||||
import { fileSize } from "@/utils";
|
||||
const { proxy } = getCurrentInstance();
|
||||
const unitInfos = [
|
||||
|
@ -137,6 +140,7 @@ const title = ref("");
|
|||
const selDlg = ref();
|
||||
const uploadDlg = ref();
|
||||
const mDlg = ref();
|
||||
const configDlg = ref();
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
|
@ -167,6 +171,10 @@ const data = reactive({
|
|||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
function doBimConfig(){
|
||||
configDlg.value.showDialog();
|
||||
}
|
||||
function showModel(row) {
|
||||
mDlg.value.showDialog(JSON.parse(row.gisJson));
|
||||
}
|
||||
|
|
|
@ -398,8 +398,8 @@ export default {
|
|||
if (that.srs.split(":").length == 2) {
|
||||
let current = that.srs.split(":")[1].split(",");
|
||||
if (current.length == 2) {
|
||||
_paras.longitude = (Math.PI / 180) * current[1];
|
||||
_paras.latitude = (Math.PI / 180) * current[0];
|
||||
_paras.longitude = (Math.PI / 180) * current[0];
|
||||
_paras.latitude = (Math.PI / 180) * current[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -437,6 +437,7 @@ export default {
|
|||
// _paras.draco = that.draco;
|
||||
// _paras.compressionLevel = values.compressionLevel;
|
||||
_paras.isLod = that.isLod;
|
||||
_paras.srs = ""
|
||||
if (_paras.isLod) {
|
||||
_paras.lodNAryTreeXYZ = [
|
||||
that.modelValue.xCount,
|
||||
|
|
Loading…
Reference in New Issue