fixed:修改修改单位带来的一系列问题

src/views/BusDynamics/sjtjzl/colMap.js

@@ -55,4 +55,12 @@ colMap.set("dx4",currentYear+"企业用电(第四季度)");
 colMap.set("dx6",lastYear+"企业用电(第一季度)");
 colMap.set("dx7",lastYear+"企业用电(第二季度)");
 colMap.set("dx8",lastYear+"企业用电(第三季度)");
-colMap.set("dx9",lastYear+"企业用电(第四季度)");
+colMap.set("dx9",lastYear+"企业用电(第四季度)");
+colMap.set("dy1",currentYear+"企业营收(第一季度)");
+colMap.set("dy2",currentYear+"企业营收(第二季度)");
+colMap.set("dy3",currentYear+"企业营收(第三季度)");
+colMap.set("dy4",currentYear+"企业营收(第四季度)");
+colMap.set("dy6",lastYear+"企业营收(第一季度)");
+colMap.set("dy7",lastYear+"企业营收(第二季度)");
+colMap.set("dy8",lastYear+"企业营收(第三季度)");
+colMap.set("dy9",lastYear+"企业营收(第四季度)");

src/views/BusDynamics/sjtjzl/index.vue

@@ -210,6 +210,28 @@
           </template>
         </el-table-column>
       </template>
+
+      <template v-if="needShow.filter(key => key.includes('dy')).length >= 2">
+        <el-table-column label="企业营收" header-align="center">
+          <template v-for="(col, index) in needShow" :key="index">
+            <el-table-column v-if="col.includes('dy')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+          </template>
+        </el-table-column>
+      </template>
+      <template v-if="needShow.filter(key => key.includes('dy')).length < 2">
+        <template v-for="(col, index) in needShow" :key="index">
+          <el-table-column v-if="col.includes('dy')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+        </template>
+      </template>
+      <template v-if="needShow.filter(key => key.includes('dy')).length >= 2">
+        <el-table-column label="当前显示合计" width="180" align="right" prop="dy5">
+          <template #default="{row}">
+            {{
+              needShow.filter(key => key.includes('dy')).reduce((acc, cur) => Number(acc) + Number(row[cur]), 0).toFixed(2)
+            }}
+          </template>
+        </el-table-column>
+      </template>
     </el-table>
     <div style="padding-top: 30px">
       <el-pagination
@@ -486,6 +508,46 @@
               <el-checkbox v-model="form.dx9" :label="lastYear+'用电明细(第四季度)'" size="large"/>
             </el-form-item>
           </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy1" :label="currentYear+'企业营收(第一季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy2" :label="currentYear+'企业营收(第二季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy3" :label="currentYear+'企业营收(第三季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy4" :label="currentYear+'企业营收(第四季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy6" :label="lastYear+'企业营收(第一季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy7" :label="lastYear+'企业营收(第二季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy8" :label="lastYear+'企业营收(第三季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :sm="8">
+            <el-form-item>
+              <el-checkbox v-model="form.dy9" :label="lastYear+'企业营收(第四季度)'" size="large"/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-dialog>
@@ -553,7 +615,15 @@ const initCheck = {
   dx6:false,
   dx7:false,
   dx8:false,
-  dx9:false
+  dx9:false,
+  dy1:false,
+  dy2:false,
+  dy3:false,
+  dy4:false,
+  dy6:false,
+  dy7:false,
+  dy8:false,
+  dy9:false
 };
 const currentYear = ref(new Date().getFullYear());
 const lastYear = ref(currentYear.value - 1)
@@ -618,6 +688,7 @@ const getData = async () => {
     let c5 = 0;
     let dw5 = 0;
     let dx5 = 0;
+    let dy5 = 0;
     for (const k in item) {
       if(k.includes('b')){
         b5 += Number(item[k]);
@@ -631,6 +702,9 @@ const getData = async () => {
       if(k.includes('dx')){
         dx5 += Number(item[k]);
       }
+      if(k.includes('dy')){
+        dy5 += Number(item[k]);
+      }
       // if (k=='b1'||k=='b2'||k=='b3'||k=='b4') {
       //   if (item[k] != null) {
       //     b5 += Number(item[k]);
@@ -717,6 +791,9 @@ const getSummaries = (param) => {
       }else if (column.property == "dx1" || column.property == "dx2" || column.property == "dx3" || column.property == "dx4" || column.property == "dx5" || column.property == "dx6" || column.property == "dx7" || column.property == "dx8" || column.property == "dx9") {
         until = "度"
         sums[index] += until;
+      }else if (column.property == "dy1" || column.property == "dy2" || column.property == "dy3" || column.property == "dy4" || column.property == "dy5" || column.property == "dy6" || column.property == "dy7" || column.property == "dy8" || column.property == "dy9") {
+        until = "万元"
+        sums[index] += until;
       } else if (column.property == "dv"){
         sums[index] = " ";
       }

src/views/basicData/qyzjl/shzr/sbjn/index.vue

@@ -127,7 +127,7 @@
       <el-table-column label="统一社会信用代码" align="center" prop="unifiedSocialCreditCode" width="200" />
       <el-table-column label="企业名称" align="center" prop="enterpriseName" :show-overflow-tooltip="true" />
       <el-table-column label="企业职工基本养老保险近一年月均参保人数分档(人)" align="center" prop="avgInsuredPersonsBand" :show-overflow-tooltip="true" />
-      <el-table-column label="企业职工基本养老保险近一年月均单位缴费金额分档(元)" align="center" prop="avgMonthlyPaymentBand" :show-overflow-tooltip="true" />
+      <el-table-column label="企业职工基本养老保险近一年月均单位缴费金额分档(万元)" align="center" prop="avgMonthlyPaymentBand" :show-overflow-tooltip="true" />
       <el-table-column label="企业职工基本养老保险最近一次正常缴费月份" align="center" prop="lastNormalPaymentMonth" :show-overflow-tooltip="true" />
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
       <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->

src/views/visualization/index.vue

@@ -248,7 +248,7 @@ const getTaxTop10 = async () => {
       res = await getLastQuarterYoY2(specialQuarter2.value);
     }
     res.data = res.data.slice(0, 10);
-    res.data.forEach(w => w.lastQuarterCurrentTotal = (w.lastQuarterCurrentTotal / 10000).toFixed(2));
+    res.data.forEach(w => w.lastQuarterCurrentTotal = (w.lastQuarterCurrentTotal / 1).toFixed(2));
     res.data.sort((a, b) => b.lastQuarterCurrentTotal - a.lastQuarterCurrentTotal)
     RanKingData.value = res.data.map((q, index) => ({
       name: q.enterpriseName,
@@ -597,7 +597,7 @@ function obtaingetXiaoxiangCaiyinLoan() {
     sumUsingNumber[0].sum = a.reduce((a, c) => {
       return a + c;
     }, 0);
-    sumUsingNumber[0].number = state1Array.length;
+    sumUsingNumber[0].number = a.length;
   })
 }