manage-client 3.1.13 → 3.1.14-ls

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -284,21 +284,34 @@
         </template>
       </data-grid>
     </criteria-paged>
-
   </div>
-<!--    <div class="flex-row" v-show="echarts" style="width: 100%;height: 90%;">-->
-<!--      <lost-contact-echarts :groupname="groupname[0]" :condition="condition"-->
-<!--                            :echarts="echarts"></lost-contact-echarts>-->
-<!--    </div>-->
-<!--&lt;!&ndash;  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">&ndash;&gt;-->
-<!--&lt;!&ndash;    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>&ndash;&gt;-->
-<!--&lt;!&ndash;  </div>&ndash;&gt;-->
-<!--  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">-->
-<!--    <lost-contact-eform :condition="condition"-->
-<!--                     ></lost-contact-eform>-->
+  <div v-show="echarts" style="height: 40px;width: 100%;">
+    <div style="display: inline-block;">
+      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
+    </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 class="span" v-show="echarts" style="width: 100%;height: 90%;">
+    <lost-contact-echarts :groupname="groupname[0]" :condition="condition"
+                         :echarts="echarts"></lost-contact-echarts>
+  </div>
+<!--  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">-->
+<!--    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>-->
 <!--  </div>-->
+  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
+    <lost-contact-eform :condition="condition"
+                     ></lost-contact-eform>
+  </div>
   </div>
-  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+  <div  class="basic-main" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
     <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
   </div>
 </template>
@@ -362,8 +375,9 @@
         getgroupname: [
           {label: '客户类型', value: 'f_user_type'},
           {label: '用气性质', value: 'f_gasproperties'},
-          {label: '分公司', value: 'f_orgname'},
+          {label: '分公司', value: 'f_orgid'},
           {label: '最长失联天数', value: 'max_days_type'},
+          {label: '合计失联天数', value: 'all_days_type'}
         ]
 
       }

package/src/components/webmeter/instruction/NewQueryInstructMain.vue

@@ -3,7 +3,7 @@
     <div v-show="listpage">
       <new-query-instruct @deal-msg="dealMsg"></new-query-instruct>
     </div>
-    <div  class="flex" v-if="!listpage">
+    <div  class="basic-main" v-if="!listpage">
       <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
     </div>
   </div>

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -263,7 +263,7 @@
                                :enddate="endDate"></new-exception-eform-total>
         </div>-->
     </div>
-    <div  class="flex" v-if="showdetail">
+    <div  class="basic-main" v-if="showdetail">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
     </div>
 </template>