diff --git a/public/js/config.js b/public/js/config.js index e44b4daf..a1d887b1 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -15,8 +15,6 @@ COMPANY = 'zjwj'//中建五局 - - var PROJECT = { local_test: 'common', // 普通版 online_hq: 'hengqin', // 横琴 diff --git a/src/assets/images/zjsj/monitor.jpg b/src/assets/images/zjsj/monitor.jpg index ffa80491..a757a0ba 100644 Binary files a/src/assets/images/zjsj/monitor.jpg and b/src/assets/images/zjsj/monitor.jpg differ diff --git a/src/assets/js/api/materialManagement.js b/src/assets/js/api/materialManagement.js index d1d49e70..39df1148 100644 --- a/src/assets/js/api/materialManagement.js +++ b/src/assets/js/api/materialManagement.js @@ -61,4 +61,31 @@ export const gettGMaterialContractArrivalAcceptancePageApi = data => get('/xmgl/ export const addGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/add', data); export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/delete', data); export const editGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/edit', data); -export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data); \ No newline at end of file +export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data); + +//出入库管理_ + +export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/add', data); +export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data); +export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data); +export const gettGMaterialInOutWarehouseAPageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data); + + + +//设备管理_自有设备管理 +export const addGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/add', data); +export const deletGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/delete', data); +export const editGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/edit', data); +export const gettGMaterialDevicePageApi = data => get('/xmgl/gt/gtMaterialDevice/page', data); + +//设备管理_自有设备管理_维保记录 +export const addGMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/add', data); +export const deletGtMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/delete', data); +export const editGtMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/edit', data); +export const gettGMaterialDeviceMaintenanceRecordApi = data => get('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/list', data); + +//设备管理_自有设备管理_强制检验记录 +export const addGMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/add', data); +export const deletGtMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/delete', data); +export const editGtMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/edit', data); +export const gettGMaterialDeviceMandatoryInspectionRecordApi = data => get('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/list', data); \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e1cabcca..01f52648 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -80,8 +80,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 - axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 + axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8263e33e..c04da118 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -152,7 +152,7 @@ export default { },{ name: "监控统计" },{ - name: "报表导出" + name: "报表" },{ name: "设备管理" } diff --git a/src/store/index.js b/src/store/index.js index a6005bab..068d7d2e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -87,10 +87,10 @@ export default new Vuex.Store({ // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 - FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 - // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 + FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue index 79aff5bd..e63d4084 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue @@ -6,7 +6,7 @@
混凝土浇筑总量 - 20058.5m³ + 21187.78m³
@@ -43,6 +43,51 @@ export default { data() { return { dataList: [ + { + date: '2023/4/18', + building: '二层核心筒梁板 ', + quantity: 32.5 + }, + { + date: '2023/4/18', + building: '二层核心筒梁板 ', + quantity: 32.5 + }, + { + date: '2023/4/18', + building: '首层核心筒5.5-9.93标高段墙柱 ', + quantity: 247 + }, + { + date: '2023/4/18', + building: '首层核心筒5.5-9.93标高段墙柱 ', + quantity: 247 + }, + { + date: '2023/4/13', + building: '负三层外墙后浇带', + quantity: 5 + }, + { + date: '2023/4/13', + building: '负三层外墙后浇带', + quantity: 5 + }, + { + date: '2023/4/13', + building: '负三层外墙后浇带', + quantity: 5 + }, + { + date: '2023/4/11', + building: '首层核心筒5.5米剪力墙柱', + quantity: 277.64 + }, + { + date: '2023/4/11', + building: '首层核心筒5.5米剪力墙柱', + quantity: 277.64 + }, { date: '2023/3/26', building: '1-4轴×C-K轴首层梁板', @@ -679,7 +724,7 @@ export default { }, series: [ { - data: [3589, 311.5, 3007.5, 0, 0, 0, 0, 0, 0, 0, 0, 0], + data: [3589, 311.5, 3007.5, 1129.28, 0, 0, 0, 0, 0, 0, 0, 0], type: 'line', smooth: true, color: '#f56c35' diff --git a/src/views/projectFront/equipmentManagement/leasingEquipment.vue b/src/views/projectFront/equipmentManagement/leasingEquipment.vue index a513e53e..d29e811f 100644 --- a/src/views/projectFront/equipmentManagement/leasingEquipment.vue +++ b/src/views/projectFront/equipmentManagement/leasingEquipment.vue @@ -10,7 +10,7 @@ > @@ -21,66 +21,68 @@ {{ $t('message.deviceManage.refresh') }} - 新增 + 新增