manage-client 3.3.171 → 3.3.172

package/src/filiale/tongchuan/InspectListGas.vue

@@ -240,7 +240,7 @@
                 </div>
 
 
-                <div  v-if="$parent.$parent.meter_classify == '卡表' || $parent.$parent.meter_classify == '物联网表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                <div   class="col-sm-2 flex-row" style="white-space: nowrap">
                   <label  class="font_normal_body">&emsp;期间次数</label>
                   <div class="row">
                     <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
@@ -250,17 +250,7 @@
                            condition="sellcishu <= {} " placeholder="">
                   </div>
                 </div>
-                <div  v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-                  <label  class="font_normal_body">&emsp;期间次数</label>
-                  <div class="row">
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
-                           condition="sellcishu >= {} " placeholder="">
-                    <label   class="font_normal_body">  ≤ x ≤ </label>
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
-                           condition="sellcishu <= {} " placeholder="">
-                  </div>
-                </div>
-                <div v-if="$parent.$parent.meter_classify == '卡表'  || $parent.$parent.meter_classify == '物联网表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                <div  class="col-sm-2 flex-row" style="white-space: nowrap">
                   <label  class="font_normal_body">期间购气量</label>
                   <div class="row">
                     <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmin"
@@ -270,16 +260,6 @@
                            condition="sellpregas <= {} " placeholder="">
                   </div>
                 </div>
-                <div v-if="$parent.$parent.meter_classify == '机表'"  class="col-sm-2 flex-row" style="white-space: nowrap">
-                  <label class="font_normal_body">期间用气量</label>
-                  <div class="row">
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
-                           condition="sellpregas >= {} " placeholder="">
-                    <label   class="font_normal_body">  ≤ x ≤ </label>
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
-                           condition="sellpregas <= {} " placeholder="">
-                  </div>
-                </div>
 
 
               </div>
@@ -312,9 +292,8 @@
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
-                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify =='物联网表'"><nobr>期间购气次数</nobr></th>
-                <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
-                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify == '物联网表'"><nobr>期间购气量</nobr></th>
+                <th><nobr>期间购气次数</nobr></th>
+                <th><nobr>期间购气量</nobr></th>
                 <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
@@ -357,7 +336,7 @@
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
             <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
-            <td v-if="meter_classify == '卡表' || meter_classify == '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
+            <td  style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
             <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
             <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
           </tr>
@@ -564,16 +543,10 @@
         if(this.meter_classify == '物联网表'){
           this.model.url= 'api/af-revenue/sql/getwulw_listgas'
         }
-        if (this.meter_classify == '卡表') {
-          if (!this.$refs.paged.$refs.cri.model.sellcishumin && !this.$refs.paged.$refs.cri.model.sellcishumax) {
-            args.condition = args.condition + "and sellcishu > 0"
-          }
-        }
-        if (this.meter_classify == '机表') {
-          if (!this.$refs.paged.$refs.cri.model.handsellcishumin && !this.$refs.paged.$refs.cri.model.handsellcishumax) {
-            args.condition = args.condition + "and sellcishu > 0"
-          }
+        if (!this.$refs.paged.$refs.cri.model.sellcishumin && !this.$refs.paged.$refs.cri.model.sellcishumax) {
+          args.condition = args.condition + "and sellcishu > 0"
         }
+
         console.log(this.$login.f)
         if(this.$refs.paged.$refs.cri.model.startDate){
           this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
@@ -671,7 +644,7 @@
         }
       },
       f_meter_classify(){
-        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
+        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '物联网表', value: '物联网表'} ]
         // return [{label: '卡表', value: '卡表'}]
       },
       Gasproperties2() {

package/src/main.js

@@ -1,68 +1,76 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/shexian/sale'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-ShanXianSaleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import FilialeSaleManage from './filiale/meihekou/sale'
+// import webmeterManage from './webmeterManage'
+// import FilialeWebmeterManage from './filiale/yuncheng/webmeterManage'
+// import reportManage from './reportManage'
+// import FilialeReportManage from './filiale/WEINAN/reportManage'
+// import newmanage from './newmanage'
+// import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+// // 开启 nginx 加密
+// Vue.mmType = 'nginx'
+// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+//
+// Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+FilialeSaleManage()
+// webmeterManage()
+// FilialeWebmeterManage()
+// ManageHome()
+// newmanage()
+// reportManage()
+// FilialeReportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 22 14:41:19 CST 2024
-gradle.version=7.4