manage-client 3.2.84-1 → 3.2.85-aode

package/src/components/webmeter/newwebmeter/UserInstructList.vue

@@ -7,7 +7,19 @@
             <criteria @condition-changed='$parent.search' partial='criteria' v-ref:cri>
               <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
                 <div class="row" width="100%">
-
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表&ensp;钢&ensp;号</label>
+                    <input   style="width:60%" class="input_search" condition="uf.f_meternumber like '%{}%'" placeholder='表钢号' type="text"
+                           v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
+                    >
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">组织机构</label>
+                    <res-select :initresid="$parent.$parent.orgid"
+                                @res-select="$parent.$parent.getRes"
+                                restype='organization'style="width: 60%">
+                    </res-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户编号</label>
                     <input   style="width:60%" class="input_search" condition="u.f_userinfo_code   like '%{}%'" placeholder='客户编号' type="text"
@@ -19,18 +31,6 @@
                     <input   style="width:60%" class="input_search" condition="u.f_user_name like '%{}%'" placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户地址</label>
-                    <input   style="width:60%" class="input_search" condition="a.f_address like '%{}%'" placeholder='地址' type="text"
-                             v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
-                    >
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input   style="width:60%" class="input_search" condition="uf.f_meternumber like '%{}%'" placeholder='表钢号' type="text"
-                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
-                    >
-                  </div>
                   <div class="span" style="float:right;">
                     <button @click="search()" class="button_search button_spacing">查询</button>
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
@@ -38,21 +38,16 @@
                                   :field="$parent.$parent.getfield"
                                   sqlurl="rs/logic/exportfile" sql-name="webmeter_getNewInstructChanceList" template-name='指令分析'
                                   :choose-col="true"></export-excel>
-                    <button @click="$parent.$parent.showEcharts()" class="button_export button_spacing">显示图表</button>
+<!--                    <button @click="$parent.$parent.showEcharts()" class="button_export button_spacing">显示图表</button>-->
                     <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                   </div>
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
-
                   <div class="col-sm-2 form-group">
-                    <!--                    <label class="font_normal_body">组织机构</label>-->
-                    <!--                    <res-select :initresid="$parent.$parent.orgid"-->
-                    <!--                                @res-select="$parent.$parent.getRes"-->
-                    <!--                                restype='organization'style="width: 60%">-->
-                    <!--                    </res-select>-->
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getRes"
-                                :initresid='$parent.$parent.orgid'></right-tree>
+                    <label class="font_normal_body">客户地址</label>
+                    <input   style="width:60%" class="input_search" condition="a.f_address like '%{}%'" placeholder='地址' type="text"
+                           v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
+                    >
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">用户类型</label>
@@ -61,7 +56,6 @@
                               close-on-select
                               style="width:60%"
                               condition="uf.f_user_type = '{}'"
-                              @change="$parent.$parent.userTypeChange()"
                               id="f_user_type"
                               placeholder='用户类型'
                               v-model="model.f_user_type">
@@ -69,7 +63,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">用气性质</label>
-                    <v-select :options='$parent.$parent.gasproperties'
+                    <v-select :options='$parent.$parent.Gasproperties'
                               :value.sync="model.f_gasproperties"
                               close-on-select
                               style="width:60%"
@@ -121,8 +115,8 @@
                   <th style="text-align:center" title="指令下发总表具数">
                     <nobr>指令下发总表具数</nobr>
                   </th>
-                  <th style="text-align:center" title="表具成功率=指令上报成功表具数/指令上报总表具数">
-                    <nobr>表具成功率</nobr>
+                  <th style="text-align:center" title="表具指令成功率=指令上报成功表具数/指令上报总表具数">
+                    <nobr>表具指令成功率</nobr>
                   </th>
                   <th style="text-align:center" title="成功指令数">
                     <nobr>成功指令数</nobr>
@@ -133,8 +127,8 @@
                   <th style="text-align:center" title="指令成功率=成功指令数/总指令数">
                     <nobr>指令成功率</nobr>
                   </th>
-                  <th style="text-align:center" title="综合表具成功率=指令下发总表具数/在用户数">
-                    <nobr>综合表具成功率</nobr>
+                  <th style="text-align:center" title="综合指令成功率=指令下发总表具数/在用户数">
+                    <nobr>综合指令成功率</nobr>
                   </th>
                 </tr>
               </template>
@@ -186,7 +180,6 @@
   import getLodop from '../../../plugins/LodopFuncs'
   import UserInstructEchartsList from './UserInstructEchartsList'
   import plugins from '../../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
   export default {
     title: '指令分析',
@@ -200,7 +193,6 @@
         }),
         condition: '1=1',
         startDate: '',
-        gasproperties:[{label: '全部', value: ''}],
         endDate: '',
         getfield:{"f_insert_date":"上报日期","zaiyong":"在用户数",
           "tingyong":"停用户数",
@@ -218,24 +210,11 @@
       }
     },
     ready() {
-      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
       this.getdata()
     },
     methods: {
-      userTypeChange () {
-        this.gasproperties=[{label: '全部', value: ''}]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-
-          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          // this.gasproperties.push({label: '全部', value: ''})
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
-        }
-      },
       search1(){
         this.$refs.paged.$refs.cri.search()
       },
@@ -285,12 +264,9 @@
         this.condition = args.condition
         this.model.search(args.condition, args.model)
       },
-      getRes (obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+      getRes(obj) {
+        this.orgCondtionStr = plugins.convertToIn(obj)
       }
-      // getRes(obj) {
-      //   this.orgCondtionStr = plugins.convertToIn(obj)
-      // }
     },
     computed: {
       getCondition() {
@@ -311,6 +287,9 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      Gasproperties() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
       Getuserstyle() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
       }

package/src/components/webmeter/newwebmeter/signAnalysisEcharts.vue

@@ -1,23 +1,15 @@
 <template lang="html">
-  <div class="basic-main" style="height: 98%;">
-    <div class="row" style="height: 40px;width: 100%;" v-show="echarts">
-      <div class="col-sm-2" style="display: inline-block;">
-        <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
-      </div>
-      <!--图显示模板-->
-      <div class="row col-sm-3 mystyle" style="display: inline-block;">
-        <label class="font_normal_body">图表统计项</label>
-        <v-select :options='$parent.getgroupname' :value.sync="groupname"
-                  close-on-select
-                  id="groupname"
-                  placeholder='分组项'
-                  v-model="groupname"
-                  value-single="true"></v-select>
-      </div>
-    </div>
-    <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-      <div id="signInfo"></div>
-    </div>
+  <div class="mystyle" style="display: inline-block;">
+    <label class="font_normal_body">图表统计项</label>
+  <v-select style="width:60%" id="groupname" v-model="groupname"
+            placeholder='分组项'
+            value-single="true"
+            :value.sync="groupname"
+            :options='getgroupname'
+            close-on-select></v-select>
+  </div>
+  <div>
+    <div id="signInfo"></div>
   </div>
 </template>
 
@@ -55,12 +47,12 @@
   }
 
   function selectArray(res, str) {
-    let j = 0;
-    let sum = 0;
-    let data = []
+    var j = 0;
+    var sum = 0;
+    var data = []
     //上一轮是否在data中添加成功
-    let mark = false
-    for (let i = 0; i < res.length; i++) {
+    var mark = false
+    for (var i = 0; i < res.length; i++) {
       if (i != 0) {
         if (res[i].f_parameter_date == res[i - 1].f_parameter_date) {
           if (res[i].f_parameter_name == str) {
@@ -167,8 +159,8 @@
         } else {
           name = '日'
         }
-        let series = [];
-        for (let i = 0; i < gettip.length; i++) {
+        var series = [];
+        for (var i = 0; i < gettip.length; i++) {
           series.push({
             name: gettip[i],
             type: 'bar',

package/src/components/webmeter/newwebmeter/signAnalysisEform.vue

@@ -1,5 +1,5 @@
 <template lang="html">
-  <div class="basic-main" style="height: 98%;">
+  <div class="span" >
     <div class="mystyle2 ">
       <label class="control-label">汇总项</label>
       <input type="checkbox" id="year" value="year"  v-model="nameForSql"/>

package/src/components/webmeter/newwebmeter/signAnalysisListMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id='app' class="basic-main" style="height: 98%;" v-show="(!echarts)&&(!isActiveTotalForm)">
+  <div id='app' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
     <criteria-paged :model="model" :pager='true' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -21,7 +21,7 @@
               <div class="col-sm-2">
                 <label class="font_normal_body">客户编号</label>
                 <input @keyup.enter="search"  style="width:60%" type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="u.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                       condition="u.f_userinfo_code like '{}%'" v-next-el='f_userinfo_code' v-el:meternumber
                 >
               </div>
               <div class="col-sm-2">
@@ -37,7 +37,7 @@
                               :field="$parent.$parent.getfield"
                               sqlurl="rs/logic/exportfile" sql-name="selectSignAnalysisList" template-name='标记分析'
                               :choose-col="true"></export-excel>
-                  <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+<!--                  <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
                   <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showEform()">显示汇总</button>
                 <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
               </div>
@@ -161,15 +161,15 @@
       </data-grid>
     </criteria-paged>
   </div>
-<!--  <div style="height: 40px;width: 100%;" v-show="echarts">-->
-<!--&lt;!&ndash;    <div style="display: inline-block;">&ndash;&gt;-->
-<!--&lt;!&ndash;      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>&ndash;&gt;-->
-<!--&lt;!&ndash;    </div>&ndash;&gt;-->
-<!--    &lt;!&ndash;      图显示模板&ndash;&gt;-->
+  <div style="height: 40px;width: 100%;" v-show="echarts">
+    <div style="display: inline-block;">
+      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
+    </div>
+    <!--      图显示模板-->
 
-<!--  </div>-->
-  <div style="width: 100%;height: 100%;" v-show="echarts">
-    <sign-analysis-echarts  :condition="condition" :startdate="startDate" :groupname="groupname[0]"
+  </div>
+  <div style="width: 100%;height: 90%;" v-show="echarts">
+    <sign-analysis-echarts  :condition="condition" :startdate="startDate"
                            :enddate="endDate" :echarts="echarts"></sign-analysis-echarts>
   </div>
 <!--  <div style="height: 40px;width: 100%;" v-show="isActiveTotalForm">-->
@@ -187,7 +187,7 @@
 <!--              close-on-select></v-select>-->
 <!--  </div>-->
 <!--</div>-->
-  <div style="width: 100%;height: 100%;" v-show="isActiveTotalForm">
+  <div style="width: 100%;height: 90%;" v-show="isActiveTotalForm">
     <sign-analysis-eform :signtype="signtype[0]" :condition="condition"></sign-analysis-eform>
   </div>
 </template>
@@ -205,12 +205,11 @@
     data() {
       return {
         model: new PagedList('rs/sql/selectSignAnalysisList', 20),
-        groupname: ['year'],
-        getgroupname: [
+        groupNameByDate: [],
+        getGroupNameByDate: [
           {label: '年份', value: 'year'},
           {label: '月份', value: 'month'},
-          {label: '周', value: 'week'},
-          {label: '天', value: 'day'}
+          {label: '周', value: 'week'}
         ],
         orgid:[this.$login.f.orgid],
         criteriaShow:false,