manage-client 3.2.24 → 3.2.26-aode

package/src/stores/MagGetSaleParams.js

@@ -9,35 +9,14 @@ let MagGetSaleParam = {
   prices: [],
   adjustables: [],
   inputtors : [],
-  smallareas:[],
   async initinputtor(){
     let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
-      condition:" 1=1"
-    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+        condition:" 1=1"
+      }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
     if(res.data){
       MagGetSaleParam.inputtors = res.data;
     }
   },
-  async getsmallarea(filiale){
-    let smallareas=[]
-    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
-    if(filiale){
-      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
-    }
-    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
-    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
-      }}, {resolveMsg: null, rejectMsg: '获取区域出错！！！'})
-    if(res.data){
-      res.data.forEach((item) => {
-        var param={
-          label:item.f_small_area,
-          value:item.f_small_area
-        }
-        smallareas.push(param)
-      })
-    }
-    return  smallareas
-  },
   getresinputtor(orgid){
     let inputtors = []
     if(MagGetSaleParam.inputtors.length>0){
@@ -53,6 +32,7 @@ let MagGetSaleParam = {
     }
     return inputtors;
   },
+
   // 开启卡监听
   organizeData (fromSystem) {
     if(Vue.android){
@@ -120,7 +100,8 @@ let MagGetSaleParam = {
     if (object){
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
+          object.f_gasproperties === item.f_gasproperties &&
           item.f_price_type === object.f_price_type &&
           item.f_filialeid === object.filter) {
           let value = {
@@ -133,7 +114,8 @@ let MagGetSaleParam = {
     }else{
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
+          object.f_gasproperties === item.f_gasproperties &&
           item.f_price_type === object.f_price_type) {
           let value = {
             label: item.f_price_name,

package/src/webmeterManage.js

@@ -1,113 +1,97 @@
-import Vue from 'vue'
-
-import echarts from 'echarts'
-import MagLoadParams from './stores/MagLoadParams'
-import MagGetSaleParam from './stores/MagGetSaleParams'
-
-/** **************************收费组件注册******************************/
-
-export default function (filiale) {
-  Vue.prototype.$echarts = echarts
-  Vue.use(MagLoadParams)
-  Vue.use(MagGetSaleParam)
-
-  // 数据采集
-  Vue.component('data-collection', (resolve) => {
-    require(['./components/webmeter/dataCollection/DataCollection'], resolve)
-  })
-
-
-
-  /** **************************指标统计**********************************/
-  // 指标统计主页
-  Vue.component('indicator-statistics-main', (resolve) => { require(['./components/webmeter/indicatorStatisticsMain'], resolve) })
-  // 指标统计图表
-  Vue.component('indicator-statistics-echars', (resolve) => { require(['./components/webmeter/indicatorStatisticsEchars'], resolve) })
-
-  // 用气分析明细查询
-  Vue.component('new-webmeter-user-gasAll', (resolve) => { require(['./components/webmeter/DrillData/UserGasAll'], resolve) })
-  // 用气分析汇总查询
-  Vue.component('user-gas-eform', (resolve) => { require(['./components/webmeter/DrillData/UserGasEform'], resolve) })
-  // 用气分析图表分析
-  Vue.component('user-gas-echarts', (resolve) => { require(['./components/webmeter/DrillData/UserGasEcharts'], resolve) })
-  // 失联分析明细查询
-  Vue.component('lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysis'], resolve) })
-
-  // 失联查询页面
-  Vue.component('lost-contact-analysis-manage', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisManage'], resolve) })
-  // 用户失联
-  Vue.component('user-lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/UserLostContactAnalysis'], resolve) })
-  // 失联查询
-  Vue.component('lost-contact-analysis-list', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisList'], resolve) })
-
-  // 失联分析图表分析
-  Vue.component('lost-contact-echarts', (resolve) => { require(['./components/webmeter/DrillData/LostContactEcharts'], resolve) })
-  // 失联分析Eform
-  Vue.component('lost-contact-eform', (resolve) => { require(['./components/webmeter/DrillData/LostContactEform'], resolve) })
-
-  // 异常汇总分析
-  Vue.component('Total-exception-by-meter', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeter'], resolve) })
-  // 异常汇总分析
-  Vue.component('meter-exception-list', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/MeterExceptionList'], resolve) })
-  // 异常汇总分析汇总
-  Vue.component('new-exception-eform-total', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEformTotal'], resolve) })
-  // 异常分析明细查询
-  Vue.component('new-meter-exception', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewMeterException'], resolve) })
-  // 异常分析明细汇总
-  Vue.component('new-exception-eform', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEform'], resolve) })
-  // 异常分析通用图表
-  Vue.component('new-exception-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEcharsTotal'], resolve) })
-
-  // 上报统计分析--抄表分析
-  Vue.component('user-gas-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasList'], resolve) })
-  // 用气分析图表分析（抄表）
-  Vue.component('user-gas-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasEchartsList'], resolve) })
-
-  // 上报统计分析--指令分析
-  Vue.component('user-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructList'], resolve) })
-  // 指令分析图表分析
-  Vue.component('user-instruct-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructEchartsList'], resolve) })
-  // 上报统计分析--指令分析
-  Vue.component('price-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructList'], resolve) })
-  // 指令分析图表分析
-  Vue.component('price-instruct-detail', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructDetail'], resolve) })
-  // 指令分析图表分析
-  Vue.component('price-instruct-manage', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructManage'], resolve) })
-  //
-  //标记分析主表
-  Vue.component('sign-analysis-list-main', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisListMain'], resolve) })
-  //标记分析图表
-  Vue.component('sign-analysis-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEcharts'], resolve) })
-  //标记分析汇总
-  Vue.component('sign-analysis-eform', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEform'], resolve) })
-  // 数据采集
-  Vue.component('new-webmeter-hand-plan-main',(resolve) => { require(['./components/webmeter/handplan/NewWebmeterHandPlanMain'], resolve)})
-  // 数据采集
-  Vue.component('new-webmeter-handplan',(resolve) => { require(['./components/webmeter/handplan/NewWebMeterHandPlan'], resolve)})
-
-// 物联网表大屏分析
-  Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
-// 上报查询
-  Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/reportList'], resolve) })
-  // =========================================物联网表==========================================================
-  // 表具查看
- //  Vue.component('web-meter-Manage', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterListMain'], resolve) })
- //  Vue.component('new-meter-list', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterList'], resolve) })
-  // 指令查看
-  Vue.component('instruct-Manage', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstructMain'], resolve) })
-  Vue.component('new-query-instruct', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstruct'], resolve) })
-  // 物联网表上报数据查询
-  Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ReportDataQuery'], resolve) })
-  //充值指令查询
-  Vue.component('recharge-instruct-query', (resolve) => {require(['./components/webmeter/recharge/RechargeList'], resolve) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
-
-
+import Vue from 'vue'
+
+import echarts from 'echarts'
+import MagLoadParams from './stores/MagLoadParams'
+import MagGetSaleParam from './stores/MagGetSaleParams'
+
+/** **************************收费组件注册******************************/
+
+export default function () {
+  Vue.prototype.$echarts = echarts
+  Vue.use(MagLoadParams)
+  Vue.use(MagGetSaleParam)
+
+  // 数据采集
+  Vue.component('data-collection', (resolve) => {
+    require(['./components/webmeter/dataCollection/DataCollection'], resolve)
+  })
+
+  /** **************************指标统计**********************************/
+  //指标统计主页
+  Vue.component('indicator-statistics-main', (resolve) => { require(['./components/webmeter/indicatorStatisticsMain'], resolve) })
+  //指标统计图表
+  Vue.component('indicator-statistics-echars', (resolve) => { require(['./components/webmeter/indicatorStatisticsEchars'], resolve) })
+
+  // 用气分析明细查询
+  Vue.component('new-webmeter-user-gasAll', (resolve) => { require(['./components/webmeter/DrillData/UserGasAll'], resolve) })
+    // 用气分析明细查询
+    Vue.component('new-user-gasAll', (resolve) => { require(['./components/webmeter/DrillData/NEWUserGasAll'], resolve) })
+  // 用气分析汇总查询
+  Vue.component('user-gas-eform', (resolve) => { require(['./components/webmeter/DrillData/UserGasEform'], resolve) })
+  // 用气分析图表分析
+  Vue.component('user-gas-echarts', (resolve) => { require(['./components/webmeter/DrillData/UserGasEcharts'], resolve) })
+  // 失联分析明细查询
+  Vue.component('lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysis'], resolve) })
+
+  // 失联查询页面
+  Vue.component('lost-contact-analysis-manage', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisManage'], resolve) })
+  // 用户失联
+  Vue.component('user-lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/UserLostContactAnalysis'], resolve) })
+  // 失联查询
+  Vue.component('lost-contact-analysis-list', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisList'], resolve) })
+
+  // 失联分析图表分析
+  Vue.component('lost-contact-echarts', (resolve) => { require(['./components/webmeter/DrillData/LostContactEcharts'], resolve) })
+  // 失联分析Eform
+  Vue.component('lost-contact-eform', (resolve) => { require(['./components/webmeter/DrillData/LostContactEform'], resolve) })
+
+  // 异常汇总分析
+  Vue.component('Total-exception-by-meter', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeter'], resolve) })
+  // 异常汇总分析汇总
+  Vue.component('new-exception-eform-total', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEformTotal'], resolve) })
+  // 异常分析明细查询
+  Vue.component('new-meter-exception', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewMeterException'], resolve) })
+  // 异常分析明细汇总
+  Vue.component('new-exception-eform', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEform'], resolve) })
+  // 异常分析通用图表
+  Vue.component('new-exception-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEcharsTotal'], resolve) })
+
+  // 上报统计分析--抄表分析
+  Vue.component('user-gas-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasList'], resolve) })
+  // 用气分析图表分析（抄表）
+  Vue.component('user-gas-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasEchartsList'], resolve) })
+
+  // 上报统计分析--指令分析
+  Vue.component('user-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructList'], resolve) })
+  // 指令分析图表分析
+  Vue.component('user-instruct-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructEchartsList'], resolve) })
+  //
+  //标记分析主表
+  Vue.component('sign-analysis-list-main', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisListMain'], resolve) })
+  //标记分析图表
+  Vue.component('sign-analysis-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEcharts'], resolve) })
+  //标记分析汇总
+  Vue.component('sign-analysis-eform', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEform'], resolve) })
+  // 数据采集
+  Vue.component('new-webmeter-hand-plan-main',(resolve) => { require(['./components/webmeter/handplan/NewWebmeterHandPlanMain'], resolve)})
+  // 数据采集
+  Vue.component('new-webmeter-handplan',(resolve) => { require(['./components/webmeter/handplan/NewWebMeterHandPlan'], resolve)})
+
+//物联网表大屏分析
+  Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
+// 上报查询
+  Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/reportList'], resolve) })
+  // 物联网表上报数据查询
+  Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/newwebmeter/ReportDataQuery'], resolve) })
+
+  // 物联网表结算数据查询
+  Vue.component('webmeter-handplan-detailed-query', (resolve) => { require(['./components/webmeter/WebmeterHandplanQuery'], resolve) })
+
+  // 物联网表结算数据查询
+  Vue.component('new-handplan-query', (resolve) => { require(['./components/webmeter/NewWebmeterHandplanQuery'], resolve) })
+
+
+
+}
+
+

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Oct 26 16:02:57 CST 2020
-gradle.version=6.1.1

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/gradlew.bat

@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega