Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

# Conflicts:
#	dsk-operate-ui/src/views/macro/urban/index.vue

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -275,9 +275,8 @@
 <script>
   import {encodeStr} from "@/assets/js/common.js"
   import dataRegion from '@/assets/json/dataRegion'
-  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim } from '@/api/macro/macro'
   import api from '@/api/enterpriseData/enterpriseData.js';
-  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim,location,cancelClaim } from '@/api/macro/macro'
+  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim,location } from '@/api/macro/macro'
   import { infoHeader } from '@/api/detail/party-a/index'
   import Region from '../component/region'
 export default {
@@ -715,17 +714,6 @@ export default {
           })
         }
       })
-    },
-    handleCancelClaim(item){
-      // cancelClaim(encodeURIComponent(item.companyName),{
-      //   headers: {
-      //     "content-type": "application/json;charset=UTF-8",
-      //   },
-      // }).then(res => {
-      //   if(res.code === 200){
-      //     this.querySubmit()
-      //   }
-      // })
     }
   },
 }