优化

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()

src/views/home/components/ProvincialCompany.vue

@@ -148,12 +148,20 @@
               </div>
               <!-- 工具总数：非0/非空变色 + 跳转 -->
               <div
-                v-else-if="column.prop === 'toolNum'"
+                v-else-if="column.prop === 'toolCodeNum'"
-                :class="{ 'table-active-color': isEffectiveValue(scope.row.toolNum) }"
+                :class="{ 'table-active-color': isEffectiveValue(scope.row.toolCodeNum) }"
-                @click="handleTableJump('tool', scope.row)"
+                @click="handleTableJump('toolCode', scope.row)"
                 style="cursor: pointer; user-select: none;"
               >
-                {{ scope.row.toolNum }}
+                {{ scope.row.toolCodeNum }}
+              </div>
+              <div
+                v-else-if="column.prop === 'toolNoCodeNum'"
+                :class="{ 'table-active-color': isEffectiveValue(scope.row.toolNoCodeNum) }"
+                @click="handleTableJump('toolNum', scope.row)"
+                style="cursor: pointer; user-select: none;"
+              >
+                {{ scope.row.toolNoCodeNum }}
               </div>
               <!-- 其他列保持原样 -->
               <div v-else>
@@ -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',
+          path: '/equipment/codeToolsLedger',
-          query: { company: rowData.companyName, total: rowData.toolNum }
+          // query: { company: rowData.companyName, total: rowData.toolNum }
+        });
+      } else if (type === 'toolNum') {
+        this.$router.push({
+          path: '/equipment/toolsLedger',
         });
       }
     },

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) => {

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) {
+        if (!params.data) return
-          let city =
+        this.$router.push({
-            params.data.deptName == '安徽送变电工程有限公司' ? '安徽送变电' : params.data.name.replace(/市$/, '')
+          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)
+        //   console.log('🚀 ~ initChart ~ this.$router:', this.$router)
-          this.$router.push({
+        //   this.$router.push({
-            path: '/screen/cityWidescreen',
+        //     path: '/screen/cityWidescreen',
-            query: {
+        //     query: {
-              cityName: city,
+        //       cityName: city,
-            },
+        //     },
-          })
+        //   })
-        }
+        // }
       })
       myChart.on('mouseover', (params) => {
         // console.log('🚀 ~ 移入 ~ params:', params)