manage-client 3.3.188 → 3.3.190

package/src/filiale/qianneng/WebmeterQuery.vue

@@ -33,6 +33,9 @@
     <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
       <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
     </tabs>
+    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
+      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
+    </tabs>
   </tab-button>
 
 </template>

package/src/filiale/shanxian/EchartsBox.vue

@@ -32,7 +32,7 @@
                       @res-select="getRes"
                       :initresid="model.id">
           </res-select>
-          <button class="button_search button_spacing" @click="changePage()">下一页</button>
+         <button class="button_search button_spacing" @click="changePage()">下一页</button>
         </div>
       </div>
     </div>
@@ -67,7 +67,7 @@
       </div>
     </div>
     <div style="height: 97%;" v-if="showPage === 2">
-      <iframe src="http://119.187.112.234:9528/#/delink?link=Y8I%2FK%2FiIq6HlCQCQx8xG%2FeAj2GQ%2Fg1nl7jXauckQJhZrEPV%2BRkyF3HthpF4LVC8pS6MDn5%2BLiEM7mYEgROEQtQ&user=qDn45GDQ0K0EVNcpZy2VoQxHult9RhbeRPXLrq%2BCQz152dmng0uyBYBWn7EjcF2YwD44XdF0gda5h6oFHwJqkg"
+      <iframe src="http://119.187.112.234:9528/#/delink?link=Xun1W4ColEjaBrsR7uQqq%2FlLRaqpur8ZLnbuwSovQJxkK%2F%2Bqs7bEbonCchQM%2BGwmojs%2BbvtBuc9zdBl3miXOZQ&user=yrh0a7xtbSypdtka86RCIhSxZUjIWE688Z%2BWgADSW%2BqCmrEPVvMXYtymOZkdto39pSXjNdw%2BOe25pTYGZkNuMw"
               width="100%" height="100%" style="border: none;" ></iframe>
       <!--      <div class="flex-row" style="flex: 1;height: 96%">-->
       <!--        <div style="flex: 1">-->

package/src/filiale/tongchuan/GasInspection.vue

@@ -261,6 +261,12 @@
             <th><nobr>最后抄表日期</nobr></th>
             <th><nobr>用气量</nobr></th>
             <th><nobr>用气金额</nobr></th>
+            <th><nobr>一阶气量</nobr></th>
+            <th><nobr>一阶金额</nobr></th>
+            <th><nobr>二阶气量</nobr></th>
+            <th><nobr>二阶金额</nobr></th>
+            <th><nobr>三阶气量</nobr></th>
+            <th><nobr>三阶金额</nobr></th>
             <th><nobr>欠费月数</nobr></th>
             <th><nobr>欠费条数</nobr></th>
             <th><nobr>欠费月平均气量</nobr></th>
@@ -291,6 +297,14 @@
           <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
+
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas3}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money3}}</nobr></th>
+
           <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_avg_gas}}</nobr></th>
@@ -304,6 +318,14 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">总用气量:&emsp;&emsp;{{sumsmodel.f_oughtamount}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总用气金额:&emsp;&emsp;{{sumsmodel.f_oughtfee}}</td>
+
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">一阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">一阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">二阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">二阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">三阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas3}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">三阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money3}}</td>
+
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费条数:&emsp;&emsp;{{sumsmodel.qianfei_num}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费气量:&emsp;{{sumsmodel.f_totalowe_gas}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费金额:&emsp;{{sumsmodel.f_totalowe_fee}}</td>
@@ -348,6 +370,12 @@
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{
           f_oughtamount:0,
           f_oughtfee:0,
+          f_stair_gas1:0,
+          f_stair_money1:0,
+          f_stair_gas2:0,
+          f_stair_money2:0,
+          f_stair_gas3:0,
+          f_stair_money3:0,
           qianfei_num:0,
           f_totalowe_gas:0,
           f_totalowe_fee:0
@@ -622,6 +650,12 @@
           'f_meter_base': '表底数',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额',
+          'f_stair_gas1': '一阶气量',
+          'f_stair_money1': '一阶金额',
+          'f_stair_gas2': '二阶气量',
+          'f_stair_money2': '二阶金额',
+          'f_stair_gas3': '三阶气量',
+          'f_stair_money3': '三阶金额',
           'qianfei_month_num': '欠费月数',
           'qianfei_num': '欠费条数',
           'qianfei_avg_gas': '欠费月平均气量',

package/src/webmeterManage.js

@@ -123,5 +123,8 @@ export default function () {
 
   // 石泉异常分析单页面
   Vue.component('total-exception-by-meter-sq', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeterShiQuan'], resolve) })
+
+  // 物联用户月度结算查询
+  Vue.component('webhand-month-gas', (resolve) => { require(['./components/webmeter/newwebmeter/WebhandMonthGas.vue'], resolve) })
 }
 

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Apr 17 11:12:27 CST 2024
-gradle.version=7.4