Merge branch 'master' of https://gitee.com/dchuai/Huaihua-High-tech-Zone

src/views/BusDynamics/OPCMonitoring/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div ref="echartsRef" style="width: 100%; height: 80vh;"></div>
 </template>
-   
+
 <script setup>
 import { onMounted, ref } from 'vue';
 import * as echarts from 'echarts';
@@ -82,12 +82,18 @@ const fetchData = async () => {
 /** 查询社保 */
 function getEchartsData() {
     getOutputValueData(queryParams.value).then((res) => {
-        console.log(res)
+
+        if(res.data){
+          res.data.forEach(item=>{
+            item.industrialOutputValueLastYear = Number(item.industrialOutputValueLastYear);
+            return item;
+          })
+        }
         const response = res.data
 
         const namesArray = response.map(obj => obj.detailedUnitName);
         const valuesArray = response.map(obj => obj.industrialOutputValue);
-        const valuesLastArray = response.map(obj => obj.industrialOutputValueLastYear);
+        const valuesLastArray = response.map(obj => obj.industrialOutputValueLastYear).sort((a, b) => a-b);
 
         console.log(namesArray, valuesArray, valuesLastArray)
 
@@ -119,12 +125,12 @@ function getEchartsData() {
             },
             series: [
                 {
-                    name: '2023',
+                    name: '2024',
                     type: 'bar',
                     data: valuesArray
                 },
                 {
-                    name: '2024',
+                    name: '2023',
                     type: 'bar',
                     data: valuesLastArray
                 }
@@ -144,7 +150,7 @@ onMounted(() => {
     getEchartsData();
 });
 </script>
-   
+
 <style>
 /* 样式内容 */
 </style>

src/views/BusDynamics/TaxMonitoring/index.vue

@@ -24,11 +24,9 @@ const echartsRef = ref(null);
 /** 查询社保 */
 function getEchartsData() {
     getSocialSecurity(queryParams.value).then((res) => {
-        console.log(res)
         const response = res.data
-
         const namesArray = response.map(obj => obj.enterpriseName);
-        const valuesArray = response.map(obj => obj.avgMonthlyPaymentBand);
+        const valuesArray = response.map(obj => obj.avgMonthlyPaymentBand).sort((a, b) => a-b);
 
         console.log(namesArray, valuesArray)
 

src/views/basicData/HetcData/TOTECInformation/index.vue

@@ -149,6 +149,7 @@
 <!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="案号" align="center" prop="caseNumber" :show-overflow-tooltip='true' />
       <el-table-column label="被执行人" align="center" prop="debtor" :show-overflow-tooltip='true' />
+      <el-table-column label="统一社会信用代码" align="center" prop="unifiedSocialCreditCode" width="200" />
       <el-table-column label="执行标的" align="center" prop="executionTarget" :show-overflow-tooltip='true' />
       <el-table-column label="未履行金额" align="center" prop="unfulfilledAmount" :show-overflow-tooltip='true' />
       <el-table-column label="执行法院" align="center" prop="executingCourt" :show-overflow-tooltip='true' />
@@ -162,7 +163,7 @@
           <span>{{ parseTime(scope.row.filingDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="统一社会信用代码" align="center" prop="unifiedSocialCreditCode" width="200" />
+
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template #default="scope">-->
 <!--          <el-button-->

src/views/basicData/OpeCapability/hydmxb/index.vue

@@ -82,7 +82,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName" :show-overflow-tooltip='true'/>
       <el-table-column label="统一社会信用代码" align="center" prop="unifiedSocialCreditCode" width="200"/>
-      <el-table-column label="贷款金额" align="center" prop="loanAmount" :show-overflow-tooltip='true'/>
+      <el-table-column label="贷款金额(万元)" align="center" prop="loanAmount" :show-overflow-tooltip='true'/>
       <el-table-column label="借款日期" align="center" prop="borrowingDate" width="180" />
 <!--      <el-table-column label="借款日期" align="center" prop="borrowingDate" width="180">-->
 <!--        <template #default="scope">-->

src/views/basicData/OpeCapability/ledger/index.vue

@@ -177,7 +177,7 @@
 <!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="企业名称" align="center" prop="enterpriseName" :show-overflow-tooltip='true' />
       <el-table-column label="统一社会信用代码" align="center" prop="unifiedSocialCreditCode" width="200" />
-      <el-table-column label="贷款金额" align="center" prop="loanAmount" :show-overflow-tooltip='true' />
+      <el-table-column label="贷款金额(万元)" align="center" prop="loanAmount" :show-overflow-tooltip='true' />
       <el-table-column label="借款日期" align="center" prop="borrowingDate" width="180" :show-overflow-tooltip='true'>
         <template #default="scope">
           <span>{{ parseTime(scope.row.borrowingDate, '{y}-{m}-{d}') }}</span>
@@ -188,7 +188,7 @@
           <span>{{ parseTime(scope.row.maturityDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="贷款利率" align="center" prop="loanInterestRate" :show-overflow-tooltip='true' />
+      <el-table-column label="贷款利率(%)" align="center" prop="loanInterestRate" :show-overflow-tooltip='true' />
       <el-table-column label="合作银行" align="center" prop="cooperativeBank" :show-overflow-tooltip='true' />
       <el-table-column label="是否偿还" align="center" prop="isRepaid" :show-overflow-tooltip='true' />
       <el-table-column label="当前在贷余额" align="center" prop="currentLoanBalance" :show-overflow-tooltip='true' />