manage-client 3.2.28 → 3.2.29-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

@@ -6,7 +6,7 @@ import MagGetSaleParam from './stores/MagGetSaleParams'
 
 /** **************************收费组件注册******************************/
 
-export default function (filiale) {
+export default function () {
   Vue.prototype.$echarts = echarts
   Vue.use(MagLoadParams)
   Vue.use(MagGetSaleParam)
@@ -16,16 +16,16 @@ export default function (filiale) {
     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) })
   // 用气分析图表分析
@@ -47,8 +47,6 @@ export default function (filiale) {
 
   // 异常汇总分析
   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) })
   // 异常分析明细查询
@@ -67,12 +65,6 @@ export default function (filiale) {
   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) })
@@ -85,33 +77,21 @@ export default function (filiale) {
   // 数据采集
   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) })
-  // 物联网表用气量统计表
-  Vue.component('use-gas-statistics', (resolve) => { require(['./components/webmeter/gasStatistics/GasStatistics'], resolve) })
-  // 物联网表欠费查询
-  Vue.component('arrearage-query', (resolve) => { require(['./components/webmeter/newwebmeter/ArrearageQuery'], 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])
-    }
-  }
+  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/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

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

package/src/components/BasisEcharts/BarChart.vue

@@ -1,247 +0,0 @@
-
-<template>
-  <div>
-    <div class="text-1" :id="canvas">
-      <div :id="charts"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    name: "barChart",
-
-    /*
-      折线图
-     1.必须要传的参数:xdata,sdata,legendData
-
-     2.规范值
-     传入参数 例
-          xdata:[1,2,3,4]
-          sdata:[
-            [2,4,6,8],
-            [1,3,5,7]
-          ]
-          legendData:['第一个','第二个']
-          legendData的长度等于sdata的长度
-          sdata的每一个数组的长度要和  xdata的长度相等
-
-    3.参数含义
-    xdata   :  x轴数据
-    sdata   :  展示的数据
-    legend : 展示那些显示那些不显示
-    title   :  标题
-    yname   :  y轴名称
-    xname   :  y轴名称
-    settime   :  tooltip 轮播的时间 默认 1500
-    showtooltip : 是否展示 提示框 默认展示
-    smooth : 曲线 平滑线 默认曲线
-    showtitle : 标题是否展示
-    showyname: y轴名称是否显示
-     */
-    props: [
-      'xdata',
-      'sdata',
-      'legend',
-      'title',
-      'yname',
-      'settime',
-      'showtooltip',
-      'smooth',
-      'showtitle',
-      'showyname',
-      'showxname',
-      'xname'
-    ],
-    data() {
-      return {
-        canvas: 'canvas_'+new Date().getTime()+'_'+Math.random()*10,
-        charts: 'charts_'+new Date().getTime()+'_'+Math.random()*10,
-        xc: '',
-        timer: '',
-        time:1500,  // 轮播提示的时间 默认 1500
-        showtTip:true,   // 轮播提示框 默认展示
-        csmooth:false,  // 线的类型  true 为平滑线 反之曲线
-        cshowtitle:true, //标题 默认展示
-        cshowyname:true , //y轴名称 默认展示
-        cshowxname:true , //x轴名称 默认展示
-      }
-    },
-    beforeDestroy() {
-      //清除定时器
-      clearInterval(this.timer);
-    },
-    methods: {
-      setBar() {
-        console.log('进入画图~~~~~~~~~~~~~~~~~~~')
-        const  width=document.getElementById(this.canvas).offsetWidth
-        let fontSize=0
-        if(width<600){
-          fontSize=14
-        }else if(width<1200) {
-          fontSize=18
-        }else{
-          fontSize=22
-        }
-        console.log('字体大小')
-        console.log(width)
-        console.log(fontSize)
-        this.xc = this.$echarts.init(document.getElementById(this.charts))
-        if(this.settime!==undefined){
-          this.time=this.settime
-        }
-        if(this.showtooltip!==undefined){ // 判断提示框
-          this.showtTip=this.showtooltip
-        }
-        if(this.csmooth!==undefined){ // 判断平滑线 折线
-          this.csmooth=this.smooth
-        }
-        if(this.showtitle!==undefined){ // 判断标题
-          this.cshowtitle=this.showtitle
-        }
-        if(this.showyname!==undefined){ // 判断是否展示y轴名称
-          this.cshowyname=this.showyname
-        }
-        if(this.showxname!==undefined){ // 判断是否展示x轴名称
-          this.cshowxname=this.showxname
-        }
-        if(this.cyname!==undefined){ // 判断平滑线 折线
-          this.cyname=this.yname
-        }
-        var serieData = []
-        var legend = this.legend
-        for (let i = 0; i < legend.length; i++) {
-          var series= {
-            name: legend[i],
-            type: 'bar',
-            barWidth: '25%',
-            data: this.sdata[i]
-          }
-          serieData.push(series)
-        }
-        this.xc.setOption({
-          title: {
-            text: this.title,
-            left:'center',
-            textStyle:{
-              fontSize:fontSize
-            },
-            show:this.cshowtitle
-          },
-          tooltip: {
-            show:this.showtTip,
-            alwaysShowContent: true,
-            backgroundColor: 'rgba(2, 59, 63, 0.45)',
-            // borderColor :'rgba(13, 109, 180)',
-            borderWidth: 0,
-            hideDelay: 100,
-            textStyle: {
-              fontSize: fontSize
-            },
-            confine: false,
-            formatter: function (params) {
-              var result = ''
-              params.forEach(function (item) {
-                result += item.marker + " " + item.seriesName + " &nbsp;&nbsp;&nbsp; <sapn style='color:#e1e52a;font-weight: bolder'>" + item.value + "</sapn></br>";
-              });
-              return "<div style='text-align: center;height: 1px;font-weight: normal'>" + params[0].axisValue + '</div><br/>' + result
-            },
-            trigger: 'axis',
-            axisPointer: {type: 'line', lineStyle: {width: 0}},
-            extraCssText: 'width: auto;height: auto;'
-          },
-          legend: {
-            // padding:[50,40,0,200], // 上右下左
-            data: this.legend,
-            textStyle:{
-              fontSize:fontSize
-            },
-            left:'20%',
-            top:'10%'
-          },
-          grid: {
-            left: '6%',
-            right: '15%',
-            bottom: '4%',
-            top:'20%',
-            containLabel: true
-          },
-          xAxis: [
-            {
-              name:this.cshowxname===true?this.xname:'',
-              type: 'category',
-              boundaryGap: true,
-
-              axisTick:{
-                show:false
-              },
-              axisLabel:{
-                fontSize:fontSize
-              },
-              nameTextStyle:{
-                fontSize:fontSize,
-                padding:[0,100,15,-12], // 上右下左
-              },
-              data:this.xdata
-            }
-
-          ],
-          yAxis: [
-            {
-
-              name:this.cshowyname===true?this.yname:'',
-              type: 'value',
-              nameTextStyle:{
-                fontSize:fontSize,
-                padding:[0,0,15,60], // 上右下左
-              },
-              axisLabel:{
-                fontSize:fontSize,
-                formatter: function (params) {
-                  if (params > 9999) {
-                    return params / 10000 + "万"
-                  }
-                  else
-                    return params
-                }
-              },
-              axisTick:{
-                show:false
-              },
-
-            }
-          ],
-          series: serieData
-        })
-        // let idx = -1;
-        // var dataLen = this.sdata[0].length
-        // this.timer = setInterval(() => {
-        //   idx = (idx + 1) % dataLen;
-        //   this.xc.dispatchAction({
-        //     type: 'showTip',
-        //     seriesIndex: 1,
-        //     dataIndex: idx
-        //   });
-        //
-        // }, this.time)
-      },
-
-    },
-    watch: {
-      'sdata' () {
-        // 清除定时器
-        clearInterval(this.timer)
-        this.setBar()
-      }
-    },
-    ready () {
-      this.setBar()
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>