manage-client 3.2.81-aode → 3.2.81-jb

package/src/stores/MagGetSaleParams.js

@@ -9,14 +9,35 @@ 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){
@@ -32,7 +53,6 @@ let MagGetSaleParam = {
     }
     return inputtors;
   },
-
   // 开启卡监听
   organizeData (fromSystem) {
     if(Vue.android){
@@ -66,7 +86,7 @@ let MagGetSaleParam = {
     console.log(MagGetSaleParam.adjustables)
     if (val) {
       MagGetSaleParam.adjustables.forEach((item, next) => {
-        if (item.value.f_filialeids === val) {
+        if (item.value.f_orgid === val) {
         arr.push(item)
       }
     })
@@ -100,8 +120,7 @@ let MagGetSaleParam = {
     if (object){
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
+        if (item.f_state === '有效' &&
           item.f_price_type === object.f_price_type &&
           item.f_filialeid === object.filter) {
           let value = {
@@ -114,8 +133,7 @@ let MagGetSaleParam = {
     }else{
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
+        if (item.f_state === '有效' &&
           item.f_price_type === object.f_price_type) {
           let value = {
             label: item.f_price_name,

package/src/stores/yulin.js

@@ -0,0 +1,27 @@
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['exports', 'echarts'], factory);
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+        // CommonJS
+        factory(exports, require('echarts'));
+    } else {
+        // Browser globals
+        factory({}, root.echarts);
+    }
+}(this, function (exports, echarts) {
+    var log = function (msg) {
+        if (typeof console !== 'undefined') {
+            console && console.error && console.error(msg);
+        }
+    }
+    if (!echarts) {
+        log('ECharts is not Loaded');
+        return;
+    }
+    if (!echarts.registerMap) {
+        log('ECharts Map is not loaded')
+        return;
+    }
+    echarts.registerMap('榆林', {"type":"FeatureCollection","features":[{"id":"610800","geometry":{"type":"Polygon","coordinates":["@@VBXDJ@DAHK@IGYAGDEFCFAHBDBBBBJFFXJH@FCHGAIYQCE@CFILOTM`KN@LB`@L@@CECGKGEKCGEEMMQEQAKDGHI@CCKGMSKDKSSOg[_Ui@GFEJGFG@GGOCMKWGGWIACAEDOAOCKKSmeMG]WIEQC[E[@]CUGaWYKaiCKBCHITIDCJYR[BG@gDMFKBKAKGKOKKEECAADIZ[BE@GAGGIQOO[@KISIOEEICOAGCEEAGBGJIFGBIGGEKY_OUKIKAIGKIEGCI@MDMFIBEAECEIGYMCGK_CIKM@OBGZ]BEACFMDCXGR@BICKQQAC@QDKBI@MCI@ICGIIKAQ@IBE@SK@A@OHOCeBIHU@EEEGCiUIAI@ULIHGBMDcBSGKGEIG]I]SUGMEUBMAECGGGGCWEeCKCIGcaQYMSOIQEYAFSAMEMMGOASBYKk@MBUCUCEMGKAgFQCMKGIGOAMAS@YBQDMTaBKAIekAI@OLUDM@K@KISCO@G@KFUHITGFCLSDG@ECEQWAI@KDIHKLGHC^QZG^CNINELGNSLafoJGDGFEAGBCHCX[ReB[JM^U†YVEVIh]HIAKOQ…MQIGK@KFMLIjQLElERCLERQZSBGGOIEGCQ@OACCCGAIBEFKFGBEDSAY@GHIfkBGAGIIGKKGQIACDYAGKMKSCcDO@GAEGMGSCCGCIAcAICwEOCqAGAKCGECIEaO]AMAQBUHMNKVE`CN@PCZGJEDGAGCKIM_OAE@EDIVW@I@GCEICEAeBGECECKAQEMUQO]a]}‡OOYWoaGGCEAMDaCEGIEEgQQKOSEIUSS]MKICKA[BKAQEGGAGBENGhCFAFEBCAGCEMEQ@KD[VGDKBKB[AECECAEBIJOLIdKNOLUCAEIO@GBA@@GGEIAGCMBMDGGCICCBIACI@AJDFINBJMXQNID[Bg]UIO@OFGVALMHWFYXyP[DS@CAGKKUEGKEeIiMOEOAEFOLO@SFkvULOFSJIJC`BPSpMTCPCBHPBNLZFT@VCFGBKAECQMEAEKEACBU\\CPBFJRBVEJMLGJabBDJFRDJALIFKLCV@\\JFHBJ@LDJNRHZBZCNSJKBCFICEGC@ODK@GVGAGEICI@OFIJEDWHQDGDEHGdGLCBAA@WCCOIGGACHUHIGYMBAVAFEBAAEKIGEAC@CDEBSCiPSGGEKIEIMI]NcAANEDUEEBBHPXR^HTJDD@FOBALBTAFBEVFFAFIPERAVI@DFGDAA@CFKSCG@ILEJAJCB@HFLCJBHO@ADDLHJ@DMJA@C@OIIBSFKHAXLTADOPYFaIOOAIDI@SBOIWJeFYNOFMBKNGLET_NQLEJOFMBY@OHCLILCBYAKCKOMgEIIEKA[@IEOMGEW@IGWEECo{IeOUWIQABKHILIDGBMAAC@EBEHIFkBIEEOAAS@EDGBQIIESFWIEMAS@AAAUXC@KGCAMFMIECOBgLAAAEFK@KACGKIB]HMNIFKBcFC@ACK[EAG@MDIAELOBC@ES_[IIAAE@EDAJBHEFO@iHIDAAAE@GFEDGCMCAE@MHEEKCGMEECGCAKCIAQ@CCCEGcEKCCI@GHE@MGMCEBABALI@UGS@IEASA@CBCNOnUTEBC@@A@OPUAGCAIAAA@QCEACDQACIM@CHGLEBACW@GDALBL@NCBABmAG_B]FEASKCC@KACEAE@WFCAAAEKMQGGAAAIAAEA[TEBEAIQCCMBABCHC@QC@ADKJQBEOGQU@KJE`GNBDAJUFIHENAPGXCHIFM@CCCSGCE@KFQ@ESKCECKCGEAEHCAOGAC@CAECAC@IDCFBNCDC@QKSAEB]PYBEFERCBQAIMGBQP@DBLAJEDKDGFCDCPAFKFG@AAEIIEcKCBKHEAACAMEKMQBS@CEAE@OHC@ICKE@AHA@AKAGDAJABGCGOEDODCFA@CAIGA@ORGCCBKNMBQAIBEFGPENBFBDNB^IH@FDDDBFFDXFJFFDBHAHELEF@D@FTLDDATJT@FIRMNIRFVHVBNALHNDNKVKP[RKNGNAHEVBDNL@BCF_JSGEBQVGDkPADBBDDRHFBPCBDBNBBN@DBBV@FEDUJmdWHGXC\\@HALEPH^@VALKNOZIDG@CCAA@EFK@IACCA@CBK@AGCAIE@MNID[FS@CBABBFNXBFADQEAMKIUgCAKEIIMCGGEAqO[CWGGEcBKAEAg]@CHMLGLOFC\\GAGEKAEBEFETIFObIJCFI@CAQACA@MFC@@CDM@ECCEAEBEJABGAOE@INCD@@IAKCCKGESSCQKQMCQGGECEAIDGASQGAOBKBEL@PCNHVCFMDG@EAAICIGCK@KBEDCJCVQCJUAAMEG_AqEMU[MGSCE@CBGHCBGBSGMDCAGGGAKDKFUCSI{UAA@UAEA@EBIDE@ECKMAOAAEDC@CGE@AD@DCCCHA@@EGD@DMLAFGBMAOF@AAKCEC@ADMEGBBQGFIDCLDF@DEJ@FJ^APCPUh@RABQDB^InGXKPCBWGKH[AADBDBFHHDFALCDCD[@OFE@OMKQCAUBECOQQOCGCAI@E@@C@EJEBECY@CJ@BABCAEMESCEAKMBEPKPFFABA@CSaMBIAEHCDG@ECGFGABDCDCBDEAEBACGCBOMMDECIKAGDCB@DBDAFEHBFLD@NMDC@AEAIK@CBEJKAGfUDEBGMEEGKGMWCCQ@GBADBHABSLOBEAEA@C@ELMBIH@BACC@AH@DCBKAIFED@DCHA@EBIJSDACEFKNBATCFDNBBZAAUDGDAD@JF@RBFLDBA@GLEBCHEL@HGGGBEACBKKBCCE@@AC@BCACGFECCHE@CBBN@BECAECC@AB@BEG@CCI@BGAECFAEABETCFA@GKEQNMLCBCIOACNGFEJgPMFOAM@ODI@GGY@EJC@GIQeISGUOIIMIIAOIIAGEE@CCKCOAAA@ECJ]HUFGJEFMF]BOAYSS@IDObAFIFCFH@JLBHAH‡tSXUHYCeMSCMHKDcA“FMFCFYTOJGAEAaUIAABATAFCBQDHDBD@@C@ABBDD@DJBBD@CFDFEDFDAB@FC@ABBBCDDBCB@AA@@FCB@BDB@FCB@DAAABBBABADCD@DBBCBAHBB@BEHDDA@AF@BF@CF@DB@BDEDBDCDBHCDBFADC@BD@DC@CD@BDBCDFDEDAHIFBBHAJR@HDBEFCNGFEFJH@FEH@FAB@DCDBJEBEHLCHBLEB@QPALHD@BC@GCGDDDLBALADCDABDDHBFEBBBAAADA@@BCDADE@ABCFCDBBCJELQJNAHH@@DBDD@FDFLDD@DLHADBFADHDCDFBADBBABDFEDHF@BA@AFFBCDBDAFCFBDCBBDEB@FCBBDEB@HCBAJABC@EDF@ADED@FIAEFQJ]VWNIH@F@DFDVDPHHATEF@BB@D@DABBDAFBDCBALCB@FAACFBDGFBBADEB@BCD@FCAAFIDADKFKJELK\\GX@HEJBLJPBJCXAD@NThFTRŒBRAn@TDHNN^JHDlZ\\VJLFTJHFLFTDTDFDPFJAHGJsMWFgt\\GHBDDfAPHHDHFCH@DRLDDpnFBhGDDB\\IByJI\\FLhDJAVMFAJ@nJJ@PDZRNNHPDNDXCZH^JLpN|Hh@ZNN@@F@BE@KAIFADBBLLD@FAAKDAJ@FBD@FIFCHMLCL@hhLTH^TrC^OLvVNZD@P@FEKKBGfKjeVK„K\\IXAbIDBHF`CJCNKŠ]@@LJL@XGRCAANC\\QœO@CCg\\gAUBAX@HCJMDK@YBCNMDEEYS]@AR_FC~FJAXMJC€IPELENMLGZ@NDVPLF\\AJBJHJNHPFF\\L`FXBxCZELGJQHMFETGfAJBNFNHJDJBPA‚FlFfLœpVDŠVPAfOªyRCR@bHnN‚N\\VNHTBX@RARER@TDPLNX@PCRMhAlDL`hBPG^GTAX@œH~D€FPf†JNDL@NIXMPc„RBr@bORE`WXYBUTsJKfYBGFYDMJMPODAL@dRNBJBBBLZBHAVFHTJH@TEVJDBAHEPFFLJJNRrhBZ@BJixTXRrIR™h±ˆa`INANDJBHK^@DHFNDLHFLRTT\\@DIJUVBFBJRZHXNPNLf¢RH|fJHHLDFFZ@VCFKP@HDDVHJFFHPJRDFDXZRJNDRPftJF\\JVJDDJJJRPVBNDFPNLHZXRNhhXVXPL@LCrgbGDBJJRTdTJJ@DADMFQPIH_ZCDAFCNJT@PLVDFbJbHNDZ@JBLFDHHhBHLNzj@FAHDJNLdVZXNBBBXXLHJJHBHCTSjaH@NNZPHDFF^RFFPTFFHDDBF@LIFABFCF@BPPFLJJLLFLFL@Fh„JLPFAHGTLhIH]T@DNZfGHFTljBLP`^LPTRJFRD`XD@lnfPDBJLDJRNRD\\GRGHOJIz@FF[h]^ALTDNJPHHDDLTHNHFB^TFFBD@DIH[NIHUJQNOTEDUJICO@EDKJEHEP@BDBLGDB@LJPZHDFDDD@JCLOLGD@BCLEHG@EJCBEHCBGHIBEDADGHCNQD@BANAFBJ@PAJ@HCNDNCRJnFNFFFZFPHHDF@HCH@BBBJDDLHDDJDJHFBN@NBfVV@LDFFFBFFLDXFNLP@TBJEFBADGFGJG`EP@FGRQ^CREJINKTEBCFAHIPIHCBSAS@CBIPEVAPE^BBNHBJAJBDJFPFDFABNG®aJLL@\\MPQJGrDPABGYQMIFCVGHGPGHKLGBAAADABGRK@CF@JEFINGHGJCFGJCFGTEPKTEHCFCAEFABCFABGFILDTPZNDDFLFFLBDD@DEDSJHZRZBJJD^@\\GLCDCFIROVALBZRBDCJAJB@HBJADDDAPMLC@CJEbaDK@OBEDCNIFECCECCEFEBKLGLQJAFAHQDGJEJEJBDADCFEHEJA@ADABBH@@BD@HBDABBF@BDDABBH@DADDLBBBBADDFBRENIFAPJND@BBDFDRTPPBD@HBDPH@DCJBF@FEFDDD@LHAFBF@HCDDFAHHDADDHLLFHLH@BNHLTJFPBFFTV@JFHTBBF@FFLNHLHHBBDCDADNLLVLLBFADPJBD@FBBPNDLHJHDJ@HBFFNTFB^FTCJFL@RJRBJDPENHHDFF@DL@VNJL@FDDNDHFNAFBHF@BHD@JDBJ@BED@@B@DOF@DDBP@HCBGACBKDChHHCJ@RDPAHBRBTHNHBFBP^RFBFCDMDCXMAADIAAEABIEA@CHAEG@ECGI@@CDCDB@OG@@EEEFA@CCAEDEACC_SAGDIAAO@KEAECOEIRI@GGAEDE@GAMK@M@CCEOCEBIAGGQEBOISNIDC@GFGACEACEBIFGPBBD@BBDJDFFDBF@XO@ES]AEAGBGJMDCLMPGJ@RFFHBD"],"encodeOffsets":[[113793,40312]]},"properties":{"cp":[109.741193,38.290162],"name":"榆林市","childNum":1}}],"UTF8Encoding":true});
+}));

package/src/webmeterManage.js

@@ -6,26 +6,27 @@ import MagGetSaleParam from './stores/MagGetSaleParams'
 
 /** **************************收费组件注册******************************/
 
-export default function () {
+export default function (filiale) {
   Vue.prototype.$echarts = echarts
   Vue.use(MagLoadParams)
   Vue.use(MagGetSaleParam)
-
+  // 物联查询
+  Vue.component('webmeter-query', (resolve) => { require(['./components/webmeter/WebmeterQuery'], resolve) })
+  // 物联分析
+  Vue.component('webmeter-analyse', (resolve) => { require(['./components/webmeter/WebmeterAnalyse'], resolve) })
   // 数据采集
   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('new-webmeter-user-gas-all', (resolve) => { require(['./components/webmeter/DrillData/UserGasAll'], resolve) })
   // 用气分析汇总查询
   Vue.component('user-gas-eform', (resolve) => { require(['./components/webmeter/DrillData/UserGasEform'], resolve) })
   // 用气分析图表分析
@@ -46,7 +47,9 @@ export default function () {
   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('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) })
   // 异常分析明细查询
@@ -65,35 +68,52 @@ export default function () {
   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-hand-plan-main', (resolve) => { require(['./components/webmeter/handplan/NewWebmeterHandPlanMain'], resolve) })
   // 数据采集
-  Vue.component('new-webmeter-handplan',(resolve) => { require(['./components/webmeter/handplan/NewWebMeterHandPlan'], 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/newwebmeter/ReportDataQuery'], resolve) })
-  // 物联网表上报数据查询
-  Vue.component('new-webuser-hand', (resolve) => { require(['./components/webmeter/newwebmeter/NewWebUserHand'], resolve) })
-  // 物联网表结算数据查询
-  Vue.component('webmeter-handplan-detailed-query', (resolve) => { require(['./components/webmeter/WebmeterHandplanQuery'], resolve) })
-  Vue.component('webmeter-handplan-detailed-query-ck', (resolve) => { require(['./components/webmeter/WebmeterHandplanQuery2CK'], resolve) })
-
-  // 物联网表结算数据查询
-  Vue.component('new-handplan-query', (resolve) => { require(['./components/webmeter/NewWebmeterHandplanQuery'], 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) })
+  // 未上报查询
+  Vue.component('get-no-meteread-query', (resolve) => { require(['./components/webmeter/DrillData/GetNoMetereadData'], 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])
+    }
+  }
 }
 
-