manage-client 3.3.85-wn → 3.3.86

package/src/filiale/lixianV3/BusinessManage.vue

@@ -127,6 +127,9 @@
     <tabs header="发票查询"  v-if="permission('发票查询')">
       <invoice-details-query  @deal-msg="dealMsg" :data="data"></invoice-details-query>
     </tabs>
+    <tabs header="用气分析"  v-if="permission('用气分析')">
+      <gas-analysis-query  @deal-msg="dealMsg" :data="data"></gas-analysis-query>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/filiale/lixianV3/{GasYearRatioQuery.vue → GasAnalysisQuery.vue}

@@ -56,13 +56,13 @@
                   <label class="font_normal_body">气量百分比</label>
                   <input type="text" style="width:30%" class="input_search" title="大于等于"
                          v-model="model.f_gasprec_small"
-                         condition="f_gasprec >= '{}%' " placeholder="大于等于">
+                         condition="f_gasprec >= '{}' " placeholder="大于等于">
                   <input type="text" style="width:30%" class="input_search" title="小于等于"
                          v-model="model.f_gasprec_big"
-                         condition="f_gasprec <= '{}%' " placeholder="小于等于">
+                         condition="f_gasprec <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;增量&nbsp;&nbsp;&nbsp;</label>
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;增量&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <input type="text" style="width:30%" class="input_search" title="大于等于"
                          v-model="model.f_gasdiff_small"
                          condition="f_gasdiff >= '{}' " placeholder="大于等于">
@@ -119,7 +119,7 @@
                   <datepicker id="startDate" placeholder="旧月开始日期" style="width:60%"
                               v-model="model.oldmonthstart"
                               :value.sync="model.oldmonthstart"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
                 </div>
@@ -128,7 +128,7 @@
                   <datepicker id="endDate" placeholder="旧月结束时间" style="width:60%"
                               v-model="model.oldmonthend"
                               :value.sync="model.oldmonthend"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
                 </div>
@@ -216,7 +216,7 @@
                 <td style="text-align: center;">{{ row.f_oldgas }}</td>
                 <td style="text-align: center;">{{ row.f_newgas }}</td>
                 <td style="text-align: center;">{{ row.f_gasdiff }}</td>
-                <td style="text-align: center;">{{ row.f_gasprec }}</td>
+                <td style="text-align: center;">{{ row.f_gasprec }}%</td>
               </tr>
             </template>
             <template partial='foot'></template>
@@ -240,7 +240,7 @@ export default {
   title: '气量年比查询',
   data () {
     return {
-      model: new PagedList('rs/sql/useGasYearRatioQuery', 50, {
+      model: new PagedList('rs/sql/lixian_gasAnalysisQuery', 20, {
         oldmonthstart: 'this.model.oldmonthstart',
         oldmonthend: 'this.model.oldmonthend',
         newmonthstart: 'this.model.newmonthstart',
@@ -261,8 +261,8 @@ export default {
     }
   },
   ready () {
-    this.$refs.paged.$refs.cri.model.oldmonthend = this.$login.toStandardDateString() + ' 23:59:59'
-    this.$refs.paged.$refs.cri.model.newmonthend = this.$login.toStandardDateString() + ' 23:59:59'
+    this.$refs.paged.$refs.cri.model.oldmonthend = this.$login.toStandardDateString()
+    this.$refs.paged.$refs.cri.model.newmonthend = this.$login.toStandardDateString()
     console.log('this.$refs.paged.$refs.cri.model.oldmonthend',this.$refs.paged.$refs.cri.model.oldmonthend)
     console.log('this.$refs.paged.$refs.cri.model.newmonthend',this.$refs.paged.$refs.cri.model.newmonthend)
     //加载抄表册
@@ -285,7 +285,7 @@ export default {
       let otherInData = []
       otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
       let footerData = []
-      exportfield = this.getfield
+      let exportfield = this.getfield
       // footerData.push("合计");
       // let self = this;
       // for (var field in self.sumsmodel) {

package/src/filiale/lixianV3/sale.js

@@ -12,4 +12,6 @@ export default function () {
   Vue.component('change-meter-query', (resolve) => {
     require(['./ChangeMeterQuery'], resolve)
   })
+  // 用气分析
+  Vue.component('gas-analysis-query', (resolve) => { require(['./GasAnalysisQuery'], resolve) })
 }

package/src/main.js

@@ -1,72 +1,70 @@
-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/WEINAN/sale'
-// import webmeterManage from './webmeterManage'
-// import FilialeWebmeterManage from './filiale/wenxi/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'
-
-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 }
-})
-
+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/shanxian/sale'
+import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
+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()
+ShanXianWebmeterManage()
+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 }
+})
+