diff --git a/src/api/itemManagement/applicationExamine.js b/src/api/itemManagement/applicationExamine.js index 35c9ee8..6e62357 100644 --- a/src/api/itemManagement/applicationExamine.js +++ b/src/api/itemManagement/applicationExamine.js @@ -20,4 +20,12 @@ export const remove = (params) => { method: 'get', params }) +} +export const exportExcel = (params) => { + return request({ + url: '/api/blade-desk/goodsApply/export', + responseType: 'blob', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/api/itemManagement/basicInformation.js b/src/api/itemManagement/basicInformation.js new file mode 100644 index 0000000..476bbae --- /dev/null +++ b/src/api/itemManagement/basicInformation.js @@ -0,0 +1,37 @@ +import request from '@/router/axios'; + +export const findPage = (params) => { + return request({ + url: '/api/blade-desk/goodsInfo/findPage', + method: 'get', + params + }) +} +export const detail = (params) => { + return request({ + url: '/api/blade-desk/goodsInfo/detail', + method: 'get', + params + }) +} +export const save = (data) => { + return request({ + url: '/api/blade-desk/goodsInfo/save', + method: 'post', + data + }) +} +export const remove = (params) => { + return request({ + url: '/api/blade-desk/goodsInfo/remove', + method: 'get', + params + }) +} +export const check = (params) => { + return request({ + url: '/api/blade-desk/goodsInfo/check', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/api/itemManagement/procurementInformation.js b/src/api/itemManagement/procurementInformation.js new file mode 100644 index 0000000..842db9b --- /dev/null +++ b/src/api/itemManagement/procurementInformation.js @@ -0,0 +1,67 @@ +import request from '@/router/axios'; + +export const findPage = (params) => { + return request({ + url: '/api/blade-desk/purchaseInfo/findPage', + method: 'get', + params + }) +} +export const detail = (params) => { + return request({ + url: '/api/blade-desk/purchaseInfo/detail', + method: 'get', + params + }) +} +export const save = (data) => { + return request({ + url: '/api/blade-desk/purchaseInfo/save', + method: 'post', + data + }) +} +export const remove = (params) => { + return request({ + url: '/api/blade-desk/purchaseInfo/remove', + method: 'get', + params + }) +} + +export const findDeptInventoryPage = (params) => { + return request({ + url: '/api/blade-desk/goodsInfo/findDeptInventoryPage', + method: 'get', + params + }) +} +export const purchaseDetailSave = (data) => { + return request({ + url: '/api/blade-desk/purchaseDetail/store', + method: 'post', + data + }) +} +export const update = (data) => { + return request({ + url: '/api/blade-desk/purchaseInfo/update', + method: 'post', + data + }) +} +export const back = (data) => { + return request({ + url: '/api/blade-desk/purchaseInfo/back', + method: 'post', + data + }) +} +export const purchaseInfoExport = (params) => { + return request({ + url: '/api/blade-desk/purchaseInfo/export', + // responseType: "blob", + method: 'get', + params + }) +} diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue index 10f877b..412e91b 100644 --- a/src/components/monitoring/firefighting.vue +++ b/src/components/monitoring/firefighting.vue @@ -627,12 +627,20 @@ export default { this.$message.error("设备暂未配置监控！"); return } + let query = [] + const data = res.data.data + data.forEach(item => { + query.push({ + id: item.thirdId, + name: item.name, + jurisdiction: 1, + }) + }); + console.log('query', query) const { href } = this.$router.resolve({ - path: "/garden/monitoring", + path: "/garden/fireMonitoring", query: { - id: row.thirdId, - name: row.name, - jurisdiction: row.agentViewHis, + list: JSON.stringify(query) }, }); window.open(href, "_blank"); @@ -893,7 +901,7 @@ export default { } else { // bfHelper.resetStatus(2); bfHelper.clearDrawableContainer(); - id = bfHelper.disposeId(item.area, item.build, item.modelId); + let id = bfHelper.disposeId(item.area, item.build, item.modelId); // let id = disposeId(item.area, item.build, item.modelId); this.addLabel( id, diff --git a/src/page/itemManagement/applicationExamine/index.vue b/src/page/itemManagement/applicationExamine/index.vue index c7051ee..2cb8c7e 100644 --- a/src/page/itemManagement/applicationExamine/index.vue +++ b/src/page/itemManagement/applicationExamine/index.vue @@ -116,6 +116,7 @@
+ 导出 批量删除
@@ -193,6 +194,16 @@ + + + @@ -530,10 +541,12 @@ + + \ No newline at end of file diff --git a/src/page/itemManagement/itemList/index.vue b/src/page/itemManagement/itemList/index.vue index 505cb01..28957ec 100644 --- a/src/page/itemManagement/itemList/index.vue +++ b/src/page/itemManagement/itemList/index.vue @@ -16,9 +16,9 @@ > + :value="item.dictValue"> @@ -41,9 +41,9 @@ > + :value="item.dictValue"> @@ -136,7 +136,7 @@
登记入库 - 批量删除 + 批量删除
@@ -273,6 +273,11 @@ :visible.sync="registerDialogVisible" width="50%" :before-close="registerHandleClose"> + + 添加物品 + :value="item.dictValue"> @@ -311,7 +316,7 @@ @@ -326,31 +331,10 @@ - - - - - - - - + :value="item.dictValue"> @@ -380,7 +364,7 @@ @@ -389,7 +373,7 @@ @@ -398,7 +382,7 @@ @@ -407,73 +391,94 @@ v-if="dialogFormType != 'apply'" > + + + + + + + + @@ -553,14 +558,166 @@ >确 定
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ -
物品信息
@@ -612,16 +769,23 @@
-
申领提交人：{{ item.applyName }}
-
提交时间：{{ item.applyTime }}
-
所属部门：{{ item.deptName }}
+
申领提交人：{{ item.applyName }}
+
提交时间：{{ item.applyTime }}
+
所属部门：{{ item.deptName }}
-
{{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}：{{ item.type == '申领出库' ? item.approveName : item.inName }}
-
提交时间：{{ item.type == '申领出库' ? item.approveTime : item.inTime }}
+
{{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}：{{ item.type == '申领出库' ? item.approveName : item.inName }}
+
提交时间：{{ item.type == '申领出库' ? item.approveTime : item.inTime }}
@@ -633,6 +797,7 @@ @@ -1279,7 +1504,7 @@ align-items: center; padding: 0 20px; .time{ - margin: 0 30px; + // margin: 0 30px; } } .green{ @@ -1288,4 +1513,29 @@ .red{ color: #E14B33; } + + .status-box{ + width: 62px; + height: 25px; + display: flex; + align-items: center; + justify-content: center; + // cursor: pointer; + } + .status-box-blue{ + background: rgba(43, 142, 229, 0.2); + color: #2B8EE5; + } + .status-box-green{ + background: rgba(30, 185, 76, 0.2); + color: #1EB94C; + } + .status-box-red{ + background: rgba(225, 75, 51, 0.2); + color: #E14B33; + } + .status-box-grey{ + background: rgba(151, 151, 151, 0.2); + color: #333333; + } \ No newline at end of file diff --git a/src/page/itemManagement/procurementInformation/index.vue b/src/page/itemManagement/procurementInformation/index.vue new file mode 100644 index 0000000..c8115dd --- /dev/null +++ b/src/page/itemManagement/procurementInformation/index.vue @@ -0,0 +1,1370 @@ + + + + + \ No newline at end of file diff --git a/src/router/views/index.js b/src/router/views/index.js index ee12a96..d07c2f3 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -21,6 +21,15 @@ export default [{ }, component: () => import( /* webpackChunkName: "views" */ '@/views/garden/monitoring') + }, { + path: 'fireMonitoring', + name: '消防监控', + meta: { + i18n: 'dashboard', + menu: false, + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/garden/fireMonitoring') }] }, { path: '/garden', @@ -290,6 +299,15 @@ export default [{ component: () => import( /* webpackChunkName: "views" */ '@/page/itemManagement/itemList') }, + { + path: 'basicInformation', + name: '物品信息录入', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/page/itemManagement/basicInformation') + }, { path: 'applicationExamine', name: '申领审核', @@ -299,6 +317,15 @@ export default [{ component: () => import( /* webpackChunkName: "views" */ '@/page/itemManagement/applicationExamine') }, + { + path: 'procurementInformation', + name: '采购信息', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/page/itemManagement/procurementInformation') + }, ] }, { diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js index ed0dfb2..b3d663c 100644 --- a/src/util/bfHelper.js +++ b/src/util/bfHelper.js @@ -2937,24 +2937,24 @@ const onSDKLoadSucceeded = (viewMetaData) => { cameraState = { aspect: 0.001889763779527559, coordinateSystem: "world", - far: 960.4647787185954, + far: 454.2824723672335, fov: 45, name: "persp", - near: 105.04157557288553, + near: 58.40582500438439, position: { - x: 114.92308877241895, - y: -391.5429803033385, - z: 219.8457809478254, + x: -49.48996254567479, + y: -573.8289828452667, + z: 24.494430089748876, }, target: { - x: -8.729420142852026, - y: 863.9220428858905, - z: -496.6656824418152, + x: -30.486414787489626, + y: 324.40589707957854, + z: 10.522870646587355, }, up: { - x: -0.000048407478040169157, - y: 0.0004914893345691443, - z: 0.0008695372045373162, + x: 0.0000003288926028793064, + y: 0.000015545622356942871, + z: 0.0009998791054198458, }, version: 1, zoom: 1, diff --git a/src/views/equipment/monitoringList.vue b/src/views/equipment/monitoringList.vue index 1266d7f..51cef01 100644 --- a/src/views/equipment/monitoringList.vue +++ b/src/views/equipment/monitoringList.vue @@ -35,6 +35,7 @@
确认添加 + 返回
@@ -145,6 +146,11 @@ import { nextTick } from 'vue'; this.multipleSelection = this.managementList await this.findPage() }, + + back() { + // this.$router.go(-1) + this.$router.push({path: '/equipment/monitoringManagement', query: {fireCode: this.$route.query.fireCode}}) + }, // 查询列表数据 async findPage() { const res = await getList(this.currentPage, this.pageSize, this.queryForm, '0400') @@ -218,6 +224,7 @@ import { nextTick } from 'vue'; type: 'success' }) // this.findPage() + sessionStorage.removeItem('data') this.$router.push({path: '/equipment/monitoringManagement', query: {fireCode: this.$route.query.fireCode}}) }).catch(err => { this.$message({ diff --git a/src/views/equipment/monitoringManagement.vue b/src/views/equipment/monitoringManagement.vue index 7c049d3..f86d81d 100644 --- a/src/views/equipment/monitoringManagement.vue +++ b/src/views/equipment/monitoringManagement.vue @@ -1,10 +1,10 @@ @@ -85,7 +85,7 @@ export default { }, getData() { getProductElectric(this.choseDate, this.chooseDateValue).then(res => { - let myChart = this.$echarts.init(document.getElementById('pie')) + let myChart = this.$echarts.init(document.getElementById('electricity_pie')) // const data = { // conRate: '0.5', // proRate: '0.5' @@ -159,7 +159,7 @@ export default { position: relative; overflow: hidden; // margin-right: 1.562rem; - #pie{ + #electricity_pie{ width: 100%; height: 21rem; margin-left: 10px;