diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index ffdf0a0..c803fdb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -568,3 +568,35 @@ method: 'get', }); } +// 分页查询项目通知 +export function projectNoticePage(query) { + return request({ + url: '/business/projectNotice/page', + method: 'get', + params: query, + }); +} +// 项目通知 新增 +export function projectNoticeAdd(data) { + return request({ + url: '/business/projectNotice/add', + method: 'post', + data: data, + }); +} +// 项目通知 修改 +export function projectNoticeEdit(data) { + return request({ + url: '/business/projectNotice/edit', + method: 'put', + data: data, + }); +} + +// 项目通知 删除 +export function projectNoticeDel(id) { + return request({ + url: '/business/projectNotice/' + id, + method: 'delete', + }); +} diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index ffdf0a0..c803fdb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -568,3 +568,35 @@ method: 'get', }); } +// 分页查询项目通知 +export function projectNoticePage(query) { + return request({ + url: '/business/projectNotice/page', + method: 'get', + params: query, + }); +} +// 项目通知 新增 +export function projectNoticeAdd(data) { + return request({ + url: '/business/projectNotice/add', + method: 'post', + data: data, + }); +} +// 项目通知 修改 +export function projectNoticeEdit(data) { + return request({ + url: '/business/projectNotice/edit', + method: 'put', + data: data, + }); +} + +// 项目通知 删除 +export function projectNoticeDel(id) { + return request({ + url: '/business/projectNotice/' + id, + method: 'delete', + }); +} diff --git a/src/views/project/processControl/constructionPermits/operate.vue b/src/views/project/processControl/constructionPermits/operate.vue index aeb4be8..b11ae8a 100644 --- a/src/views/project/processControl/constructionPermits/operate.vue +++ b/src/views/project/processControl/constructionPermits/operate.vue @@ -548,7 +548,7 @@ }); } console.log(form.projectProcessAttachmentSaveRequestList); - form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); + // form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); } setTimeout(() => { diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index ffdf0a0..c803fdb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -568,3 +568,35 @@ method: 'get', }); } +// 分页查询项目通知 +export function projectNoticePage(query) { + return request({ + url: '/business/projectNotice/page', + method: 'get', + params: query, + }); +} +// 项目通知 新增 +export function projectNoticeAdd(data) { + return request({ + url: '/business/projectNotice/add', + method: 'post', + data: data, + }); +} +// 项目通知 修改 +export function projectNoticeEdit(data) { + return request({ + url: '/business/projectNotice/edit', + method: 'put', + data: data, + }); +} + +// 项目通知 删除 +export function projectNoticeDel(id) { + return request({ + url: '/business/projectNotice/' + id, + method: 'delete', + }); +} diff --git a/src/views/project/processControl/constructionPermits/operate.vue b/src/views/project/processControl/constructionPermits/operate.vue index aeb4be8..b11ae8a 100644 --- a/src/views/project/processControl/constructionPermits/operate.vue +++ b/src/views/project/processControl/constructionPermits/operate.vue @@ -548,7 +548,7 @@ }); } console.log(form.projectProcessAttachmentSaveRequestList); - form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); + // form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); } setTimeout(() => { diff --git a/src/views/project/projectInformation/operate.vue b/src/views/project/projectInformation/operate.vue index 7e2413b..2beb7a9 100644 --- a/src/views/project/projectInformation/operate.vue +++ b/src/views/project/projectInformation/operate.vue @@ -99,16 +99,14 @@ - - - + - - + + @@ -126,11 +124,11 @@ - + @@ -389,6 +387,8 @@ const { proxy } = getCurrentInstance(); const emit = defineEmits(['close']); const { drainage_partition, task_type, project_operation_pattern, build_status, project_drainage_zone } = useDicts(proxy); + +const { project_manage_level } = proxy.useDict('project_manage_level'); const props = defineProps({ curRow: { type: Object, @@ -417,7 +417,7 @@ }); const { curRow, opts } = props; const form = reactive({ - projectLevel: '1', + projectLevel: '', projectTypeId: '', projectName: '', projectAbbreviation: '', @@ -433,10 +433,11 @@ exemptFileSaveRequestList: [], projectLocationName: '', planCondition: '', + projectrange: '', projectLibraryType: '', taskType: '', projectOverview: '', - qjImageUrl: [], + projectpicture: [], investFileName: '', totalInvest: '', govermentInvest: '', diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index ffdf0a0..c803fdb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -568,3 +568,35 @@ method: 'get', }); } +// 分页查询项目通知 +export function projectNoticePage(query) { + return request({ + url: '/business/projectNotice/page', + method: 'get', + params: query, + }); +} +// 项目通知 新增 +export function projectNoticeAdd(data) { + return request({ + url: '/business/projectNotice/add', + method: 'post', + data: data, + }); +} +// 项目通知 修改 +export function projectNoticeEdit(data) { + return request({ + url: '/business/projectNotice/edit', + method: 'put', + data: data, + }); +} + +// 项目通知 删除 +export function projectNoticeDel(id) { + return request({ + url: '/business/projectNotice/' + id, + method: 'delete', + }); +} diff --git a/src/views/project/processControl/constructionPermits/operate.vue b/src/views/project/processControl/constructionPermits/operate.vue index aeb4be8..b11ae8a 100644 --- a/src/views/project/processControl/constructionPermits/operate.vue +++ b/src/views/project/processControl/constructionPermits/operate.vue @@ -548,7 +548,7 @@ }); } console.log(form.projectProcessAttachmentSaveRequestList); - form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); + // form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); } setTimeout(() => { diff --git a/src/views/project/projectInformation/operate.vue b/src/views/project/projectInformation/operate.vue index 7e2413b..2beb7a9 100644 --- a/src/views/project/projectInformation/operate.vue +++ b/src/views/project/projectInformation/operate.vue @@ -99,16 +99,14 @@ - - - + - - + + @@ -126,11 +124,11 @@ - + @@ -389,6 +387,8 @@ const { proxy } = getCurrentInstance(); const emit = defineEmits(['close']); const { drainage_partition, task_type, project_operation_pattern, build_status, project_drainage_zone } = useDicts(proxy); + +const { project_manage_level } = proxy.useDict('project_manage_level'); const props = defineProps({ curRow: { type: Object, @@ -417,7 +417,7 @@ }); const { curRow, opts } = props; const form = reactive({ - projectLevel: '1', + projectLevel: '', projectTypeId: '', projectName: '', projectAbbreviation: '', @@ -433,10 +433,11 @@ exemptFileSaveRequestList: [], projectLocationName: '', planCondition: '', + projectrange: '', projectLibraryType: '', taskType: '', projectOverview: '', - qjImageUrl: [], + projectpicture: [], investFileName: '', totalInvest: '', govermentInvest: '', diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue index bdbcf21..b7958ee 100644 --- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue +++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue @@ -11,17 +11,19 @@ import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器 import gsap from 'gsap'; import { CSSRulePlugin } from 'gsap/CSSRulePlugin'; - +import { projectInfoNewById } from '@/api/project/projectInformationNew'; +import bus from '@/bus'; const { proxy } = getCurrentInstance(); gsap.registerPlugin(CSSRulePlugin); // 引入css插件,完成某些css动画 const AllData = ref({ show: false, numer: '0%', - imgUrl: '/threeModal/baoGH.JPG', //渲染的目标图片 + imgUrl: '', //渲染的目标图片 imgWidth: 1200, //渲染宽度px imgHeight: 560, //渲染高度px }); + // 初始化模型 const SceneModal = new THREE.Scene(); const CameraModal = new THREE.PerspectiveCamera(30, AllData.value.imgWidth / AllData.value.imgHeight, 0.1, 5000); @@ -120,42 +122,50 @@ Renderer.clear(); // 清除画布 Renderer.render(SceneModal, CameraModal); }; - -let event = {}; -// 单张纹理图的加载 -event.onLoad = function () { - console.log('图片加载完成'); - AllData.value.show = false; -}; -event.onProgress = function (url, num, total) { - console.log('图片加载完成:', url); - console.log('图片加载进度:', num); - console.log('图片总数:', total); - let value = ((num / total) * 100).toFixed(2) + '%'; - console.log('加载进度的百分比：', value); - AllData.value.numer = value; -}; -event.onError = function (e) { - console.log('图片加载出现错误'); - console.log(e); - AllData.value.show = false; -}; - -// 设置加载管理器 -const loadingManager = new THREE.LoadingManager(event.onLoad, event.onProgress, event.onError); -const textureLoader = new THREE.TextureLoader(loadingManager); -var material = new THREE.MeshBasicMaterial(); //材质 -var texture = textureLoader.load(AllData.value.imgUrl); -material.map = texture; -// var skyBox = new THREE.Mesh(new THREE.SphereBufferGeometry(600, 600, 600), material); -var skyBox = new THREE.Mesh(new THREE.SphereGeometry(600, 600, 600), material); - -skyBox.geometry.scale(1, 1, -1); -SceneModal.add(skyBox); - +async function projectInfoNew(p) { + let { data } = await projectInfoNewById(p); + if (data.projectpicture.length != 0) { + AllData.value.imgUrl = data.projectpicture[0].url; + } else { + // proxy.$modal.msgWarning('请上传全景图'); + // AllData.value.imgUrl = '暂无数据'; + } + let event = {}; + // 单张纹理图的加载 + event.onLoad = function () { + console.log('图片加载完成'); + AllData.value.show = false; + }; + event.onProgress = function (url, num, total) { + console.log('图片加载完成:', url); + console.log('图片加载进度:', num); + console.log('图片总数:', total); + let value = ((num / total) * 100).toFixed(2) + '%'; + console.log('加载进度的百分比：', value); + AllData.value.numer = value; + }; + event.onError = function (e) { + console.log('图片加载出现错误'); + console.log(e); + AllData.value.show = false; + }; + // 设置加载管理器 + const loadingManager = new THREE.LoadingManager(event.onLoad, event.onProgress, event.onError); + const textureLoader = new THREE.TextureLoader(loadingManager); + var material = new THREE.MeshBasicMaterial(); //材质 + var texture = textureLoader.load(AllData.value.imgUrl); + material.map = texture; + // var skyBox = new THREE.Mesh(new THREE.SphereBufferGeometry(600, 600, 600), material); + var skyBox = new THREE.Mesh(new THREE.SphereGeometry(600, 600, 600), material); + skyBox.geometry.scale(1, 1, -1); + SceneModal.add(skyBox); +} onMounted(() => { - initThreeScene(); - Render(); + bus.on('getProjectDate', v => { + initThreeScene(); + Render(); + projectInfoNew(v.id); + }); }); onBeforeUnmount(() => { SceneModal.remove(skyBox); //删除组 diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index ffdf0a0..c803fdb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -568,3 +568,35 @@ method: 'get', }); } +// 分页查询项目通知 +export function projectNoticePage(query) { + return request({ + url: '/business/projectNotice/page', + method: 'get', + params: query, + }); +} +// 项目通知 新增 +export function projectNoticeAdd(data) { + return request({ + url: '/business/projectNotice/add', + method: 'post', + data: data, + }); +} +// 项目通知 修改 +export function projectNoticeEdit(data) { + return request({ + url: '/business/projectNotice/edit', + method: 'put', + data: data, + }); +} + +// 项目通知 删除 +export function projectNoticeDel(id) { + return request({ + url: '/business/projectNotice/' + id, + method: 'delete', + }); +} diff --git a/src/views/project/processControl/constructionPermits/operate.vue b/src/views/project/processControl/constructionPermits/operate.vue index aeb4be8..b11ae8a 100644 --- a/src/views/project/processControl/constructionPermits/operate.vue +++ b/src/views/project/processControl/constructionPermits/operate.vue @@ -548,7 +548,7 @@ }); } console.log(form.projectProcessAttachmentSaveRequestList); - form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); + // form.projectProcessAttachmentSaveRequestList = form.projectProcessAttachmentSaveRequestList.slice(0, 2); } setTimeout(() => { diff --git a/src/views/project/projectInformation/operate.vue b/src/views/project/projectInformation/operate.vue index 7e2413b..2beb7a9 100644 --- a/src/views/project/projectInformation/operate.vue +++ b/src/views/project/projectInformation/operate.vue @@ -99,16 +99,14 @@ - - - + - - + + @@ -126,11 +124,11 @@ - + @@ -389,6 +387,8 @@ const { proxy } = getCurrentInstance(); const emit = defineEmits(['close']); const { drainage_partition, task_type, project_operation_pattern, build_status, project_drainage_zone } = useDicts(proxy); + +const { project_manage_level } = proxy.useDict('project_manage_level'); const props = defineProps({ curRow: { type: Object, @@ -417,7 +417,7 @@ }); const { curRow, opts } = props; const form = reactive({ - projectLevel: '1', + projectLevel: '', projectTypeId: '', projectName: '', projectAbbreviation: '', @@ -433,10 +433,11 @@ exemptFileSaveRequestList: [], projectLocationName: '', planCondition: '', + projectrange: '', projectLibraryType: '', taskType: '', projectOverview: '', - qjImageUrl: [], + projectpicture: [], investFileName: '', totalInvest: '', govermentInvest: '', diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue index bdbcf21..b7958ee 100644 --- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue +++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue @@ -11,17 +11,19 @@ import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器 import gsap from 'gsap'; import { CSSRulePlugin } from 'gsap/CSSRulePlugin'; - +import { projectInfoNewById } from '@/api/project/projectInformationNew'; +import bus from '@/bus'; const { proxy } = getCurrentInstance(); gsap.registerPlugin(CSSRulePlugin); // 引入css插件,完成某些css动画 const AllData = ref({ show: false, numer: '0%', - imgUrl: '/threeModal/baoGH.JPG', //渲染的目标图片 + imgUrl: '', //渲染的目标图片 imgWidth: 1200, //渲染宽度px imgHeight: 560, //渲染高度px }); + // 初始化模型 const SceneModal = new THREE.Scene(); const CameraModal = new THREE.PerspectiveCamera(30, AllData.value.imgWidth / AllData.value.imgHeight, 0.1, 5000); @@ -120,42 +122,50 @@ Renderer.clear(); // 清除画布 Renderer.render(SceneModal, CameraModal); }; - -let event = {}; -// 单张纹理图的加载 -event.onLoad = function () { - console.log('图片加载完成'); - AllData.value.show = false; -}; -event.onProgress = function (url, num, total) { - console.log('图片加载完成:', url); - console.log('图片加载进度:', num); - console.log('图片总数:', total); - let value = ((num / total) * 100).toFixed(2) + '%'; - console.log('加载进度的百分比：', value); - AllData.value.numer = value; -}; -event.onError = function (e) { - console.log('图片加载出现错误'); - console.log(e); - AllData.value.show = false; -}; - -// 设置加载管理器 -const loadingManager = new THREE.LoadingManager(event.onLoad, event.onProgress, event.onError); -const textureLoader = new THREE.TextureLoader(loadingManager); -var material = new THREE.MeshBasicMaterial(); //材质 -var texture = textureLoader.load(AllData.value.imgUrl); -material.map = texture; -// var skyBox = new THREE.Mesh(new THREE.SphereBufferGeometry(600, 600, 600), material); -var skyBox = new THREE.Mesh(new THREE.SphereGeometry(600, 600, 600), material); - -skyBox.geometry.scale(1, 1, -1); -SceneModal.add(skyBox); - +async function projectInfoNew(p) { + let { data } = await projectInfoNewById(p); + if (data.projectpicture.length != 0) { + AllData.value.imgUrl = data.projectpicture[0].url; + } else { + // proxy.$modal.msgWarning('请上传全景图'); + // AllData.value.imgUrl = '暂无数据'; + } + let event = {}; + // 单张纹理图的加载 + event.onLoad = function () { + console.log('图片加载完成'); + AllData.value.show = false; + }; + event.onProgress = function (url, num, total) { + console.log('图片加载完成:', url); + console.log('图片加载进度:', num); + console.log('图片总数:', total); + let value = ((num / total) * 100).toFixed(2) + '%'; + console.log('加载进度的百分比：', value); + AllData.value.numer = value; + }; + event.onError = function (e) { + console.log('图片加载出现错误'); + console.log(e); + AllData.value.show = false; + }; + // 设置加载管理器 + const loadingManager = new THREE.LoadingManager(event.onLoad, event.onProgress, event.onError); + const textureLoader = new THREE.TextureLoader(loadingManager); + var material = new THREE.MeshBasicMaterial(); //材质 + var texture = textureLoader.load(AllData.value.imgUrl); + material.map = texture; + // var skyBox = new THREE.Mesh(new THREE.SphereBufferGeometry(600, 600, 600), material); + var skyBox = new THREE.Mesh(new THREE.SphereGeometry(600, 600, 600), material); + skyBox.geometry.scale(1, 1, -1); + SceneModal.add(skyBox); +} onMounted(() => { - initThreeScene(); - Render(); + bus.on('getProjectDate', v => { + initThreeScene(); + Render(); + projectInfoNew(v.id); + }); }); onBeforeUnmount(() => { SceneModal.remove(skyBox); //删除组 diff --git a/src/views/system/MenuNotifi/Notification.vue b/src/views/system/MenuNotifi/Notification.vue index 86b3775..62f8798 100644 --- a/src/views/system/MenuNotifi/Notification.vue +++ b/src/views/system/MenuNotifi/Notification.vue @@ -7,23 +7,24 @@ - - + + - - + + - + @@ -35,25 +36,35 @@ - 新增 + 新增 - - - + + + + + + + - - + + @@ -69,13 +80,13 @@ - - - + + + - - + +