diff --git a/.env.development b/.env.development index 3391337..844c0d8 100644 --- a/.env.development +++ b/.env.development @@ -11,8 +11,10 @@ VITE_APP_BASE_API = 'http://58.17.134.85:8899' VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464' # VITE_APP_BASE_API_GO = 'http://192.168.110.188:8919' -# 无人机接口地址 +# ws +VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket' +# 无人机接口地址 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512' # 应用访问路径 例如使用前缀 /admin/ diff --git a/package.json b/package.json index 536398b..00923e0 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "date-fns": "^4.1.0", "diagram-js": "12.3.0", "didi": "9.0.2", - "echarts": "5.5.0", + "echarts": "^5.5.0", "echarts-gl": "^2.0.9", "element-plus": "2.8.8", "esbuild": "^0.25.0", diff --git a/public/assets/demo/Weather.png b/public/assets/demo/Weather.png new file mode 100644 index 0000000..3ea913e Binary files /dev/null and b/public/assets/demo/Weather.png differ diff --git a/public/assets/demo/beUnder.png b/public/assets/demo/beUnder.png new file mode 100644 index 0000000..e21b397 Binary files /dev/null and b/public/assets/demo/beUnder.png differ diff --git a/public/assets/demo/bigRain.png b/public/assets/demo/bigRain.png new file mode 100644 index 0000000..f2a2d07 Binary files /dev/null and b/public/assets/demo/bigRain.png differ diff --git a/public/assets/demo/bigSnow.png b/public/assets/demo/bigSnow.png new file mode 100644 index 0000000..fed9e8b Binary files /dev/null and b/public/assets/demo/bigSnow.png differ diff --git a/public/assets/demo/cloudy.png b/public/assets/demo/cloudy.png new file mode 100644 index 0000000..bd3dc45 Binary files /dev/null and b/public/assets/demo/cloudy.png differ diff --git a/public/assets/demo/contract.png b/public/assets/demo/contract.png new file mode 100644 index 0000000..a7c6947 Binary files /dev/null and b/public/assets/demo/contract.png differ diff --git a/public/assets/demo/fog.png b/public/assets/demo/fog.png new file mode 100644 index 0000000..7fd2eef Binary files /dev/null and b/public/assets/demo/fog.png differ diff --git a/public/assets/demo/haze.png b/public/assets/demo/haze.png new file mode 100644 index 0000000..76caa46 Binary files /dev/null and b/public/assets/demo/haze.png differ diff --git a/public/assets/demo/manyCloud.png b/public/assets/demo/manyCloud.png new file mode 100644 index 0000000..d54b94b Binary files /dev/null and b/public/assets/demo/manyCloud.png differ diff --git a/public/assets/demo/nightSunny.png b/public/assets/demo/nightSunny.png new file mode 100644 index 0000000..457338a Binary files /dev/null and b/public/assets/demo/nightSunny.png differ diff --git a/public/assets/demo/rainSnow.png b/public/assets/demo/rainSnow.png new file mode 100644 index 0000000..c995451 Binary files /dev/null and b/public/assets/demo/rainSnow.png differ diff --git a/public/assets/demo/sandstorm.png b/public/assets/demo/sandstorm.png new file mode 100644 index 0000000..e878513 Binary files /dev/null and b/public/assets/demo/sandstorm.png differ diff --git a/public/assets/demo/smallRain.png b/public/assets/demo/smallRain.png new file mode 100644 index 0000000..cb7eb52 Binary files /dev/null and b/public/assets/demo/smallRain.png differ diff --git a/public/assets/demo/smallSnow.png b/public/assets/demo/smallSnow.png new file mode 100644 index 0000000..5bc7dd8 Binary files /dev/null and b/public/assets/demo/smallSnow.png differ diff --git a/public/assets/demo/sunny copy.png b/public/assets/demo/sunny copy.png new file mode 100644 index 0000000..a1c65ac Binary files /dev/null and b/public/assets/demo/sunny copy.png differ diff --git a/public/assets/demo/thunderstorm.png b/public/assets/demo/thunderstorm.png new file mode 100644 index 0000000..c819388 Binary files /dev/null and b/public/assets/demo/thunderstorm.png differ diff --git a/public/assets/demo/todayConstruction.png b/public/assets/demo/todayConstruction.png new file mode 100644 index 0000000..720ede2 Binary files /dev/null and b/public/assets/demo/todayConstruction.png differ diff --git a/public/assets/demo/totalCapacity.png b/public/assets/demo/totalCapacity.png new file mode 100644 index 0000000..8b83b68 Binary files /dev/null and b/public/assets/demo/totalCapacity.png differ diff --git a/src/api/enterpriseLarge/index.ts b/src/api/enterpriseLarge/index.ts index d94bf2c..da891e7 100644 --- a/src/api/enterpriseLarge/index.ts +++ b/src/api/enterpriseLarge/index.ts @@ -11,3 +11,34 @@ export const keyIndex = () => { method: 'get' }); }; + +/** + * 每个项目的出勤人数 + */ + +export const projectAttendanceCount = () => { + return request({ + url: '/enterprise/big/screen/projectAttendanceCount', + method: 'get' + }); +}; +/** + * 人数统计 + */ + +export const peopleCount = () => { + return request({ + url: '/enterprise/big/screen/peopleCount', + method: 'get' + }); +}; +/** + * 出勤人数统计 + */ + +export const allAttendanceCount = () => { + return request({ + url: '/enterprise/big/screen/allAttendanceCount', + method: 'get' + }); +}; diff --git a/src/api/equipment/index.ts b/src/api/equipment/index.ts index 7a5992d..61c8d22 100644 --- a/src/api/equipment/index.ts +++ b/src/api/equipment/index.ts @@ -106,6 +106,6 @@ export const getFootNote = (data) => { return request({ url: 'gps/equipmentSon/getList', method: 'get', - data: data + params: data }); }; diff --git a/src/api/equipment/types.ts b/src/api/equipment/types.ts index 71ec89b..92cf7e5 100644 --- a/src/api/equipment/types.ts +++ b/src/api/equipment/types.ts @@ -122,6 +122,11 @@ export interface EquipmentQuery extends PageQuery { */ type?: string | number; + /** + * 展示用户/设备数据：1=用户数据，0=设备数据 + */ + gpsType?: string | number; + /** * 用户id */ diff --git a/src/api/materials/materialReceive/types.ts b/src/api/materials/materialReceive/types.ts index bcd7850..c277afc 100644 --- a/src/api/materials/materialReceive/types.ts +++ b/src/api/materials/materialReceive/types.ts @@ -53,7 +53,6 @@ export interface MaterialReceiveVO { * 备注 */ remark: string; - } export interface MaterialReceiveForm extends BaseEntity { @@ -156,11 +155,13 @@ export interface MaterialReceiveForm extends BaseEntity { * 备注 */ remark?: string; - + /** + * 附件 + */ + attachmentId?: string | number; } export interface MaterialReceiveQuery extends PageQuery { - /** * 项目id */ @@ -201,11 +202,8 @@ export interface MaterialReceiveQuery extends PageQuery { */ supplierUnit?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/mechanical/mechanicalrewriting/index.ts b/src/api/mechanical/mechanicalrewriting/index.ts new file mode 100644 index 0000000..89305ef --- /dev/null +++ b/src/api/mechanical/mechanicalrewriting/index.ts @@ -0,0 +1,72 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MechanicalrewritingVO, MechanicalrewritingForm, MechanicalrewritingQuery } from '@/api/mechanical/mechanicalrewriting/types'; + +/** + * 查询机械台账列表 + * @param query + * @returns {*} + */ + +export const listMechanicalrewriting = (query?: MechanicalrewritingQuery): AxiosPromise => { + return request({ + url: '/mechanical/mechanicalrewriting/list', + method: 'get', + params: query + }); +}; + +/** + * 查询机械台账详细 + * @param id + */ +export const getMechanicalrewriting = (id: string | number): AxiosPromise => { + return request({ + url: '/mechanical/mechanicalrewriting/' + id, + method: 'get' + }); +}; + +/** + * 新增机械台账 + * @param data + */ +export const addMechanicalrewriting = (data: MechanicalrewritingForm) => { + return request({ + url: '/mechanical/mechanicalrewriting', + method: 'post', + data: data + }); +}; + +/** + * 修改机械台账 + * @param data + */ +export const updateMechanicalrewriting = (data: MechanicalrewritingForm) => { + return request({ + url: '/mechanical/mechanicalrewriting', + method: 'put', + data: data + }); +}; + +/** + * 删除机械台账 + * @param id + */ +export const delMechanicalrewriting = (id: string | number | Array) => { + return request({ + url: '/mechanical/mechanicalrewriting/' + id, + method: 'delete' + }); +}; + +//获取类型 +export const getType = (query?: any) => { + return request({ + url: '/mechanical/mechanicaltype/getTree', + method: 'get', + params: query + }); +}; diff --git a/src/api/mechanical/mechanicalrewriting/types.ts b/src/api/mechanical/mechanicalrewriting/types.ts new file mode 100644 index 0000000..d673aeb --- /dev/null +++ b/src/api/mechanical/mechanicalrewriting/types.ts @@ -0,0 +1,306 @@ +export interface MechanicalrewritingVO { + /** + * 自增ID + */ + id: string | number; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 班组名称 + */ + teamName: string; + + /** + * 设备名称 + */ + devicename: string; + + /** + * 设备类型 + */ + deviceType: string; + + /** + * 设备编号 + */ + deviceNumber: string; + + /** + * 入场日期 + */ + entryTime: string; + + /** + * 规格型号 + */ + specification: string; + + /** + * 生产能力 + */ + production: string; + + /** + * 车牌号码 + */ + plateNumber: string; + + /** + * 设备管理员 + */ + deviceKeeper: string; + + /** + * 车辆行驶证 + */ + drivingLicence: string; + + /** + * 新旧程度 + */ + degree: string; + + /** + * 车辆容量 + */ + vehicleCapacity: string; + + /** + * 车辆净重 + */ + suttle: string; + + /** + * 铭牌 + */ + nameplate: string; + + /** + * 合格证书 + */ + qualification: string; + + /** + * 设备照片 + */ + equipmentPhoto: string; + + /** + * 检验报告 + */ + verificationReport: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface MechanicalrewritingForm extends BaseEntity { + /** + * 自增ID + */ + id?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 设备名称 + */ + devicename?: string; + + /** + * 设备类型 + */ + deviceType?: string; + + /** + * 设备编号 + */ + deviceNumber?: string; + + /** + * 入场日期 + */ + entryTime?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 生产能力 + */ + production?: string; + + /** + * 车牌号码 + */ + plateNumber?: string; + + /** + * 设备管理员 + */ + deviceKeeper?: string; + + /** + * 车辆行驶证 + */ + drivingLicence?: string; + + /** + * 新旧程度 + */ + degree?: string; + + /** + * 车辆容量 + */ + vehicleCapacity?: string; + + /** + * 车辆净重 + */ + suttle?: string; + + /** + * 铭牌 + */ + nameplate?: string; + + /** + * 合格证书 + */ + qualification?: string; + + /** + * 设备照片 + */ + equipmentPhoto?: string; + + /** + * 检验报告 + */ + verificationReport?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface MechanicalrewritingQuery extends PageQuery { + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 设备名称 + */ + devicename?: string; + + /** + * 设备类型 + */ + deviceType?: string; + + /** + * 设备编号 + */ + deviceNumber?: string; + + /** + * 入场日期 + */ + entryTime?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 生产能力 + */ + production?: string; + + /** + * 车牌号码 + */ + plateNumber?: string; + + /** + * 设备管理员 + */ + deviceKeeper?: string; + + /** + * 车辆行驶证 + */ + drivingLicence?: string; + + /** + * 新旧程度 + */ + degree?: string; + + /** + * 车辆容量 + */ + vehicleCapacity?: string; + + /** + * 车辆净重 + */ + suttle?: string; + + /** + * 铭牌 + */ + nameplate?: string; + + /** + * 合格证书 + */ + qualification?: string; + + /** + * 设备照片 + */ + equipmentPhoto?: string; + + /** + * 检验报告 + */ + verificationReport?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/mechanical/mechanicaltype/index.ts b/src/api/mechanical/mechanicaltype/index.ts new file mode 100644 index 0000000..4ccce04 --- /dev/null +++ b/src/api/mechanical/mechanicaltype/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MechanicaltypeVO, MechanicaltypeForm, MechanicaltypeQuery } from '@/api/mechanical/mechanicaltype/types'; + +/** + * 查询设备类型列表 + * @param query + * @returns {*} + */ + +export const listMechanicaltype = (query?: MechanicaltypeQuery): AxiosPromise => { + return request({ + url: '/mechanical/mechanicaltype/list', + method: 'get', + params: query + }); +}; + +/** + * 查询设备类型详细 + * @param id + */ +export const getMechanicaltype = (id: string | number): AxiosPromise => { + return request({ + url: '/mechanical/mechanicaltype/' + id, + method: 'get' + }); +}; + +/** + * 新增设备类型 + * @param data + */ +export const addMechanicaltype = (data: MechanicaltypeForm) => { + return request({ + url: '/mechanical/mechanicaltype', + method: 'post', + data: data + }); +}; + +/** + * 修改设备类型 + * @param data + */ +export const updateMechanicaltype = (data: MechanicaltypeForm) => { + return request({ + url: '/mechanical/mechanicaltype', + method: 'put', + data: data + }); +}; + +/** + * 删除设备类型 + * @param id + */ +export const delMechanicaltype = (id: string | number | Array) => { + return request({ + url: '/mechanical/mechanicaltype/' + id, + method: 'delete' + }); +}; diff --git a/src/api/mechanical/mechanicaltype/types.ts b/src/api/mechanical/mechanicaltype/types.ts new file mode 100644 index 0000000..9672600 --- /dev/null +++ b/src/api/mechanical/mechanicaltype/types.ts @@ -0,0 +1,129 @@ +export interface MechanicaltypeVO { + /** + * 自增ID + */ + id: string | number; + + /** + * 编码 + */ + code: string; + + /** + * 父编码 + */ + pcode: string; + + /** + * 大 + */ + largeclass: string; + + /** + * 中 + */ + middleclass: string | number; + + /** + * 子类 + */ + subclass: string; + + /** + * 备注 + */ + remark: string; + + /** + * 全名 + */ + fullName: string; + /** + * 类型 + */ + deviceType?: string; +} + +export interface MechanicaltypeForm extends BaseEntity { + /** + * 自增ID + */ + id?: string | number; + + /** + * 编码 + */ + code?: string; + + /** + * 父编码 + */ + pcode?: string; + + /** + * 大 + */ + largeclass?: string; + + /** + * 中 + */ + middleclass?: string | number; + + /** + * 子类 + */ + subclass?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 全名 + */ + fullName?: string; + + /** + * 类型 + */ + deviceType?: string; +} + +export interface MechanicaltypeQuery extends PageQuery { + /** + * 编码 + */ + code?: string; + + /** + * 父编码 + */ + pcode?: string; + + /** + * 大 + */ + largeclass?: string; + + /** + * 中 + */ + middleclass?: string | number; + + /** + * 子类 + */ + subclass?: string; + + /** + * 全名 + */ + fullName?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/outputApi/index.ts b/src/api/outputApi/index.ts index 8d1a75a..d99bf79 100644 --- a/src/api/outputApi/index.ts +++ b/src/api/outputApi/index.ts @@ -23,7 +23,7 @@ export const projectProgress = (query?: any): any => { export const outpuProgress = (query?: any): any => { return request({ - url: '/enterprise/big/screen/projectOutputValueComparison', + url: '/enterprise/big/screen/projectProgressCapacity', method: 'get', params: query }); diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts index 8698eff..2ea0534 100644 --- a/src/api/workflow/task/types.ts +++ b/src/api/workflow/task/types.ts @@ -31,6 +31,7 @@ export interface FlowTaskVO { version?: string; applyNode?: boolean; buttonList?: buttonList[]; + projectName?: string; } export interface buttonList { diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index 254e520..d74d7b8 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -12,7 +12,8 @@ export default { businessId: routerJumpVo.businessId, type: routerJumpVo.type, planMonth: routerJumpVo.planMonth, - taskId: routerJumpVo.taskId + taskId: routerJumpVo.taskId, + projectName: routerJumpVo.projectName } }); } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 3e7a71d..5b54a55 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -4,6 +4,7 @@ export interface RouterJumpVo { type: string; formCustom: string; formPath: string; + projectName?: string; } export interface StartProcessBo { diff --git a/src/assets/images/man.png b/src/assets/images/man.png new file mode 100644 index 0000000..a583fa4 Binary files /dev/null and b/src/assets/images/man.png differ diff --git a/src/assets/images/map.png b/src/assets/images/map.png new file mode 100644 index 0000000..7d3db53 Binary files /dev/null and b/src/assets/images/map.png differ diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 4699d12..e18badf 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -46,6 +46,7 @@ import { OssVO } from '@/api/system/oss/types'; import { propTypes } from '@/utils/propTypes'; import { globalHeaders } from '@/utils/request'; import { compressAccurately } from 'image-conversion'; +import { bool } from 'vue-types'; const props = defineProps({ modelValue: { @@ -81,7 +82,7 @@ const props = defineProps({ compressTargetSize: propTypes.number.def(300), idCardType: { type: String, - default: false + default: '' } }); diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue index 545e96a..bccde71 100644 --- a/src/components/Process/approvalButton.vue +++ b/src/components/Process/approvalButton.vue @@ -1,15 +1,18 @@ \ No newline at end of file + 1: '24px', + 2: '18px' +}; + diff --git a/src/views/design/Professional/indexEdit.vue b/src/views/design/Professional/indexEdit.vue index ffa705e..33a8055 100644 --- a/src/views/design/Professional/indexEdit.vue +++ b/src/views/design/Professional/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index cec0ad5..4010b73 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -7,7 +7,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/src/views/design/billofQuantities/indexEdit0.vue b/src/views/design/billofQuantities/indexEdit0.vue index 993d64f..3bf713e 100644 --- a/src/views/design/billofQuantities/indexEdit0.vue +++ b/src/views/design/billofQuantities/indexEdit0.vue @@ -11,6 +11,7 @@ :id="form.versions" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/billofQuantities/indexEdit1.vue b/src/views/design/billofQuantities/indexEdit1.vue index 97076a8..a976575 100644 --- a/src/views/design/billofQuantities/indexEdit1.vue +++ b/src/views/design/billofQuantities/indexEdit1.vue @@ -11,6 +11,7 @@ :id="form.versions" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/billofQuantities/indexEdit2.vue b/src/views/design/billofQuantities/indexEdit2.vue index c4b1ed9..52b28c4 100644 --- a/src/views/design/billofQuantities/indexEdit2.vue +++ b/src/views/design/billofQuantities/indexEdit2.vue @@ -11,6 +11,7 @@ :id="form.versions" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/billofQuantities/indexEdit3.vue b/src/views/design/billofQuantities/indexEdit3.vue index 094df79..bf820fa 100644 --- a/src/views/design/billofQuantities/indexEdit3.vue +++ b/src/views/design/billofQuantities/indexEdit3.vue @@ -11,6 +11,7 @@ :id="form.versions" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/condition/indexEdit.vue b/src/views/design/condition/indexEdit.vue index bce10c7..86884ca 100644 --- a/src/views/design/condition/indexEdit.vue +++ b/src/views/design/condition/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index 7e0c7e5..8774de4 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index 53ab0ec..5b09590 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/drawingreview/indexEdit.vue b/src/views/design/drawingreview/indexEdit.vue index fbf54dc..00e1b9a 100644 --- a/src/views/design/drawingreview/indexEdit.vue +++ b/src/views/design/drawingreview/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.design" :status="form.auditStatus" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/prelimScheme/indexEdit.vue b/src/views/design/prelimScheme/indexEdit.vue index fc190bf..4784d13 100644 --- a/src/views/design/prelimScheme/indexEdit.vue +++ b/src/views/design/prelimScheme/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/received/indexEdit.vue b/src/views/design/received/indexEdit.vue index 6b144fa..ab8fb99 100644 --- a/src/views/design/received/indexEdit.vue +++ b/src/views/design/received/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/scheme/indexEdit.vue b/src/views/design/scheme/indexEdit.vue index a5cac2d..1e5df4f 100644 --- a/src/views/design/scheme/indexEdit.vue +++ b/src/views/design/scheme/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/specialScheme/indexEdit.vue b/src/views/design/specialScheme/indexEdit.vue index ab759e6..4eaad77 100644 --- a/src/views/design/specialScheme/indexEdit.vue +++ b/src/views/design/specialScheme/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/technicalStandard/indexEdit.vue b/src/views/design/technicalStandard/indexEdit.vue index 365257f..a329899 100644 --- a/src/views/design/technicalStandard/indexEdit.vue +++ b/src/views/design/technicalStandard/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.status" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/design/volumeCatalog/blueprintEdit.vue b/src/views/design/volumeCatalog/blueprintEdit.vue index 41a4d6d..8be80ca 100644 --- a/src/views/design/volumeCatalog/blueprintEdit.vue +++ b/src/views/design/volumeCatalog/blueprintEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.auditStatus" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> @@ -205,7 +206,7 @@ const approvalVerifyOpen = async () => { // 图纸评审验证 判断是否需要设计验证 if (form.value.isWindow) { console.log(routeParams.value.businessId); - + submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId); } else { submitVerifyRef.value.openDialog(routeParams.value.taskId); diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue index 095104c..33d1068 100644 --- a/src/views/design/volumeCatalog/indexEdit.vue +++ b/src/views/design/volumeCatalog/indexEdit.vue @@ -11,6 +11,7 @@ :id="form.id" :status="form.auditStatus" :pageType="routeParams.type" + :projectName="routeParams.projectName" /> diff --git a/src/views/dhr_demo/InspectionManagement.vue b/src/views/dhr_demo/InspectionManagement.vue new file mode 100644 index 0000000..69c9de5 --- /dev/null +++ b/src/views/dhr_demo/InspectionManagement.vue @@ -0,0 +1,756 @@ + + + + + diff --git a/src/views/dhr_demo/index.vue b/src/views/dhr_demo/index.vue new file mode 100644 index 0000000..11d5bf9 --- /dev/null +++ b/src/views/dhr_demo/index.vue @@ -0,0 +1,700 @@ + + + + + diff --git a/src/views/dhr_demo/xunjianjihua.vue b/src/views/dhr_demo/xunjianjihua.vue new file mode 100644 index 0000000..a0eb98c --- /dev/null +++ b/src/views/dhr_demo/xunjianjihua.vue @@ -0,0 +1,672 @@ + + + + + diff --git a/src/views/dhr_demo/xunjianrenwu.vue b/src/views/dhr_demo/xunjianrenwu.vue new file mode 100644 index 0000000..d4f5f47 --- /dev/null +++ b/src/views/dhr_demo/xunjianrenwu.vue @@ -0,0 +1,892 @@ + + + + + diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue index c71a8cd..f13f2c4 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue @@ -4,7 +4,7 @@
- + <Title title="风险预警" style="font-size: 22px"> <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px" />
@@ -48,6 +48,7 @@ const loading = ref(false); const tableData = ref([]); const risk_level_type = ref(); const safety_inspection_type = ref(); +const router = useRouter(); // 新增：获取项目地理信息数据 const getProjectGisData = async () => { try { @@ -159,6 +160,7 @@ const initEcharts = () => {
${data.name}
地点：${data.projectSite}
经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}
+ `; } if (params.seriesType === 'map') { @@ -196,6 +198,17 @@ const initEcharts = () => { }; myChart.setOption(option); + // 添加点击事件监听 - 这是关键修改部分 + myChart.on('click', function (params: any) { + // 检查点击的是散点图系列 + if (params.componentType === 'series' && params.seriesType === 'scatter') { + // 跳转到项目详情页 + navigateToProjectDetail(); + } + }); +}; +const navigateToProjectDetail = () => { + window.open('http://xny.yj-3d.com:7788/ProjectScreen', '_blank'); }; const risk_level_type1 = ref([]); const safety_inspection_type1 = ref([]); diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue index d911f88..de77cbe 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue @@ -11,8 +11,8 @@
-
煤科建管-新能源项目数智化管理平台
-
Coal Science Construction Management - New Energy Project Digital Intelligent Management Platform
+
新能源项目数智化管理平台
+
New Energy Project Digital Intelligent Management Platform
@@ -25,7 +25,7 @@ class="weather-item" :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }" > - +
{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°
{{ item.week }}({{ item.date }})
@@ -214,6 +214,7 @@ onUnmounted(() => { .header_left_text { font-weight: 500; text-shadow: 0px 1.24px 6.21px rgba(25, 179, 250, 1); + font-size: 26px; } } diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue index 47717e6..6303cf4 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue @@ -1,7 +1,7 @@