diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index 69bc0226..e59cee60 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -1668,6 +1668,16 @@ export default {
},
async created() {
+ const params = this.$route.query
+ this.queryParams.propertyUnitId = params?.deptId || ''
+ if (params && params.parentId) {
+ this.queryParams.propertyUnitIds.push(params.parentId)
+ if (params.deptId) {
+ this.queryParams.propertyUnitIds.push(params.deptId)
+ }
+ } else if (params && params.deptId) {
+ this.queryParams.propertyUnitIds.push(params.deptId)
+ }
this.getProvinceList()
this.getFirstLevel()
this.getManufacturerSelectList()
diff --git a/src/views/home/components/ProvincialCompany.vue b/src/views/home/components/ProvincialCompany.vue
index 673f402a..710a6dcb 100644
--- a/src/views/home/components/ProvincialCompany.vue
+++ b/src/views/home/components/ProvincialCompany.vue
@@ -148,12 +148,20 @@
- {{ scope.row.toolNum }}
+ {{ scope.row.toolCodeNum }}
+
+
+ {{ scope.row.toolNoCodeNum }}
@@ -243,13 +251,17 @@ export default {
path: '/equipment/equipment-ledger',
query: { company: rowData.companyName, total: rowData.maNum }
});
- } else if (type === 'tool') {
+ } else if (type === 'toolCode') {
console.log('跳转至工具详情页', {
toolTotal: rowData.toolNum
});
this.$router.push({
- path: '/toolsManage/toolsLedger',
- query: { company: rowData.companyName, total: rowData.toolNum }
+ path: '/equipment/codeToolsLedger',
+ // query: { company: rowData.companyName, total: rowData.toolNum }
+ });
+ } else if (type === 'toolNum') {
+ this.$router.push({
+ path: '/equipment/toolsLedger',
});
}
},
diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue
index fc503878..fead39f7 100644
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@@ -414,6 +414,14 @@ export default {
myChart.on('click', (params) => {
console.log('🚀 ~ 点击 ~ params-->:', params)
console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
+ if (!params.data) return
+ this.$router.push({
+ path: '/equipment/equipment-ledger',
+ query: {
+ parentId: params.data.parentId,
+ deptId: params.data.deptId,
+ },
+ })
if (params.seriesType === 'map3D' && params.data) {
let city =
params.data.deptName == '安徽送变电工程有限公司' ? '安徽送变电' : params.data.name.replace(/市$/, '')
@@ -425,7 +433,7 @@ export default {
// cityName: city,
// },
// })
- window.open(`${window.location.origin}/screen/cityScreen?cityName=${city}`, '_blank')
+ // window.open(`${window.location.origin}/screen/cityScreen?cityName=${city}`, '_blank')
}
})
myChart.on('mouseover', (params) => {
diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue
index 32e1f3e9..8e62fd61 100644
--- a/src/views/screen/wsScreenWidescreen/components/center/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue
@@ -414,18 +414,26 @@ export default {
myChart.on('click', (params) => {
console.log('🚀 ~ 点击 ~ params-->:', params)
console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
- if (params.seriesType === 'map3D' && params.data) {
- let city =
- params.data.deptName == '安徽送变电工程有限公司' ? '安徽送变电' : params.data.name.replace(/市$/, '')
+ if (!params.data) return
+ this.$router.push({
+ path: '/equipment/equipment-ledger',
+ query: {
+ parentId: params.data.parentId,
+ deptId: params.data.deptId,
+ },
+ })
+ // if (params.seriesType === 'map3D' && params.data) {
+ // let city =
+ // params.data.deptName == '安徽送变电工程有限公司' ? '安徽送变电' : params.data.name.replace(/市$/, '')
- console.log('🚀 ~ initChart ~ this.$router:', this.$router)
- this.$router.push({
- path: '/screen/cityWidescreen',
- query: {
- cityName: city,
- },
- })
- }
+ // console.log('🚀 ~ initChart ~ this.$router:', this.$router)
+ // this.$router.push({
+ // path: '/screen/cityWidescreen',
+ // query: {
+ // cityName: city,
+ // },
+ // })
+ // }
})
myChart.on('mouseover', (params) => {
// console.log('🚀 ~ 移入 ~ params:', params)