diff --git a/.env.development b/.env.development index ab16fab..faff5a9 100644 --- a/.env.development +++ b/.env.development @@ -6,13 +6,15 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -# VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.210:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 -VITE_APP_BASE_API = 'http://192.168.110.188:8899' +# VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 -# VITE_APP_BASE_API = 'http://192.168.110.180:8899' +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' +#曾涛 +# VITE_APP_BASE_API = 'http://192.168.110.171:8899' # 无人机接口地址 diff --git a/package.json b/package.json index 67291cb..58746c4 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "await-to-js": "3.0.0", "axios": "1.7.8", "crypto-js": "4.2.0", + "date-fns": "^4.1.0", "diagram-js": "12.3.0", "didi": "9.0.2", "echarts": "5.5.0", diff --git a/public/assets/demo/Sunny.png b/public/assets/demo/Sunny.png new file mode 100644 index 0000000..14c94d4 Binary files /dev/null and b/public/assets/demo/Sunny.png differ diff --git a/public/assets/demo/avatar.png b/public/assets/demo/avatar.png new file mode 100644 index 0000000..68ae32a Binary files /dev/null and b/public/assets/demo/avatar.png differ diff --git a/public/assets/demo/back.png b/public/assets/demo/back.png new file mode 100644 index 0000000..6b6a2ac Binary files /dev/null and b/public/assets/demo/back.png differ diff --git a/public/assets/demo/back2.png b/public/assets/demo/back2.png new file mode 100644 index 0000000..19253bd Binary files /dev/null and b/public/assets/demo/back2.png differ diff --git a/public/assets/demo/back3.png b/public/assets/demo/back3.png new file mode 100644 index 0000000..538a083 Binary files /dev/null and b/public/assets/demo/back3.png differ diff --git a/public/assets/demo/back4.png b/public/assets/demo/back4.png new file mode 100644 index 0000000..c296fae Binary files /dev/null and b/public/assets/demo/back4.png differ diff --git a/public/assets/demo/fengshu.png b/public/assets/demo/fengshu.png new file mode 100644 index 0000000..23ea230 Binary files /dev/null and b/public/assets/demo/fengshu.png differ diff --git a/public/assets/demo/qiangdu.png b/public/assets/demo/qiangdu.png new file mode 100644 index 0000000..75c64f6 Binary files /dev/null and b/public/assets/demo/qiangdu.png differ diff --git a/public/assets/demo/rain.png b/public/assets/demo/rain.png new file mode 100644 index 0000000..e9263d6 Binary files /dev/null and b/public/assets/demo/rain.png differ diff --git a/public/assets/demo/rain1.png b/public/assets/demo/rain1.png new file mode 100644 index 0000000..592efea Binary files /dev/null and b/public/assets/demo/rain1.png differ diff --git a/public/assets/demo/rain_show.png b/public/assets/demo/rain_show.png new file mode 100644 index 0000000..4974324 Binary files /dev/null and b/public/assets/demo/rain_show.png differ diff --git a/public/assets/demo/riluo.png b/public/assets/demo/riluo.png new file mode 100644 index 0000000..401a9cf Binary files /dev/null and b/public/assets/demo/riluo.png differ diff --git a/public/assets/demo/sb1.png b/public/assets/demo/sb1.png new file mode 100644 index 0000000..33d2fc7 Binary files /dev/null and b/public/assets/demo/sb1.png differ diff --git a/public/assets/demo/sb2.png b/public/assets/demo/sb2.png new file mode 100644 index 0000000..965bc01 Binary files /dev/null and b/public/assets/demo/sb2.png differ diff --git a/public/assets/demo/sb3.png b/public/assets/demo/sb3.png new file mode 100644 index 0000000..9dd844f Binary files /dev/null and b/public/assets/demo/sb3.png differ diff --git a/public/assets/demo/sb4.png b/public/assets/demo/sb4.png new file mode 100644 index 0000000..c4e2ee1 Binary files /dev/null and b/public/assets/demo/sb4.png differ diff --git a/public/assets/demo/sbi1.png b/public/assets/demo/sbi1.png new file mode 100644 index 0000000..638af49 Binary files /dev/null and b/public/assets/demo/sbi1.png differ diff --git a/public/assets/demo/sbi2.png b/public/assets/demo/sbi2.png new file mode 100644 index 0000000..ef1af9c Binary files /dev/null and b/public/assets/demo/sbi2.png differ diff --git a/public/assets/demo/shidu.png b/public/assets/demo/shidu.png new file mode 100644 index 0000000..d318124 Binary files /dev/null and b/public/assets/demo/shidu.png differ diff --git a/public/assets/demo/sunny_s.png b/public/assets/demo/sunny_s.png new file mode 100644 index 0000000..f051d50 Binary files /dev/null and b/public/assets/demo/sunny_s.png differ diff --git a/public/assets/demo/wcl.png b/public/assets/demo/wcl.png new file mode 100644 index 0000000..7dd4161 Binary files /dev/null and b/public/assets/demo/wcl.png differ diff --git a/public/assets/demo/ycl.png b/public/assets/demo/ycl.png new file mode 100644 index 0000000..1808905 Binary files /dev/null and b/public/assets/demo/ycl.png differ diff --git a/public/assets/demo/yin.png b/public/assets/demo/yin.png new file mode 100644 index 0000000..afe131f Binary files /dev/null and b/public/assets/demo/yin.png differ diff --git a/public/assets/demo/zgjxx.png b/public/assets/demo/zgjxx.png new file mode 100644 index 0000000..019151e Binary files /dev/null and b/public/assets/demo/zgjxx.png differ diff --git a/public/assets/demo/zzcl.png b/public/assets/demo/zzcl.png new file mode 100644 index 0000000..ad406d9 Binary files /dev/null and b/public/assets/demo/zzcl.png differ diff --git a/src/api/materials/overallPlanMaterialSupply/index.ts b/src/api/materials/overallPlanMaterialSupply/index.ts index ae73e0b..f28216e 100644 --- a/src/api/materials/overallPlanMaterialSupply/index.ts +++ b/src/api/materials/overallPlanMaterialSupply/index.ts @@ -21,7 +21,7 @@ export const totalsupplyplan = (params: any): AxiosPromise => { export const totalSupplyplanDetails = (id: any): AxiosPromise => { return request({ url: '/design/totalsupplyplan/' + id, - method: 'get', + method: 'get' }); }; // 修改物资-总供应计划 @@ -33,4 +33,11 @@ export const materialChangeSupplyplan = (data: any): AxiosPromise => { }); }; - +// 总供应计划-批量编辑 +export const totalSupplyplanBatchEdit = (data: any): AxiosPromise => { + return request({ + url: '/design/totalsupplyplan/batchEdit', + method: 'put', + data + }); +}; diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts index 54a64b2..9f028ab 100644 --- a/src/api/system/post/index.ts +++ b/src/api/system/post/index.ts @@ -12,9 +12,9 @@ export function listPost(query: { pageNum: number; pageSize: number }): AxiosPro } // 查询岗位列表 -export function listTreeByProject(projectId: string): AxiosPromise { +export function listTreeByProject(): AxiosPromise { return request({ - url: '/system/dept/list/treeByProjectId/' + projectId, + url: '/system/dept/list/tree', method: 'get' }); } diff --git a/src/assets/demo/avatar.png b/src/assets/demo/avatar.png new file mode 100644 index 0000000..68ae32a Binary files /dev/null and b/src/assets/demo/avatar.png differ diff --git a/src/assets/demo/back.png b/src/assets/demo/back.png new file mode 100644 index 0000000..6b6a2ac Binary files /dev/null and b/src/assets/demo/back.png differ diff --git a/src/assets/demo/gaojing.png b/src/assets/demo/gaojing.png new file mode 100644 index 0000000..019151e Binary files /dev/null and b/src/assets/demo/gaojing.png differ diff --git a/src/assets/demo/rain.png b/src/assets/demo/rain.png new file mode 100644 index 0000000..592efea Binary files /dev/null and b/src/assets/demo/rain.png differ diff --git a/src/assets/demo/wcl.png b/src/assets/demo/wcl.png new file mode 100644 index 0000000..7dd4161 Binary files /dev/null and b/src/assets/demo/wcl.png differ diff --git a/src/assets/demo/yichuli.png b/src/assets/demo/yichuli.png new file mode 100644 index 0000000..1808905 Binary files /dev/null and b/src/assets/demo/yichuli.png differ diff --git a/src/assets/demo/zzcl.png b/src/assets/demo/zzcl.png new file mode 100644 index 0000000..ad406d9 Binary files /dev/null and b/src/assets/demo/zzcl.png differ diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue index 27204d5..71595ea 100644 --- a/src/views/cory/workMessage/index.vue +++ b/src/views/cory/workMessage/index.vue @@ -1,12 +1,15 @@