init

src/page/check/chose.vue

@@ -475,6 +475,9 @@ export default {
       font-size: 16px;
       line-height: 30px;
       margin-top: 10px;
+       white-space: nowrap;
+      overflow:hidden; /*超出部分省略号显示*/
+      text-overflow:ellipsis; /*省略号显示*/
     }
     .text-2 {
       font-size: 14px;

src/page/wel.vue

@@ -331,7 +331,7 @@
 
     <div v-if="role!=3">
         <!-- 系统后台 -->
-        <div style="margin-bottom:10px;" v-if="role!=2">
+        <div style="margin-bottom:10px; cursor:pointer;" v-if="role!=2">
           <span style="font-weight:bold;font-size: 18px;">待处理</span>
           <div class="page-container">
 
@@ -976,7 +976,7 @@ export default {
         }else{
            this.$router.push({
             path: "/Equipment/state",
-            query: { flag: 2 },
+            query: { flag: 2,electricity:20},
           });
         }
     },

src/views/Customer/AgentManagement.vue

@@ -760,12 +760,15 @@ export default {
     },
     //确认编辑
     editor(){
-          if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
+        //   if(!this.resetFlag){
+        //     this.$message.error('平台用户与楼盘用户不能重复添加！')
+        //     return
+        // }
           this.$refs.editoragentobj.validate((valid) => {
           if (valid) {
+              if(!this.resetFlag){
+              return
+          }
              this.$api.http.editorAgent(this.editoragentobj).then((res) => {
                if(res.code==0){
                     this.dialogVisible2=false;
@@ -862,12 +865,15 @@ export default {
     },
     //确认新增
     add(){
-        if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
+        // if(!this.resetFlag){
+        //     this.$message.error('平台用户与楼盘用户不能重复添加！')
+        //     return
+        // }
          this.$refs.addagentobj.validate((valid) => {
           if (valid) {
+              if(!this.resetFlag){
+              return
+          }
              this.$api.http.AddAgent(this.addagentobj).then((res) => {
                if(res.code==0){
                     this.dialogVisible=false;

src/views/Customer/CompanyRecord.vue

@@ -113,9 +113,9 @@
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage4"
+              :current-page="pageNum"
               :page-sizes="[10, 30, 50]"
-              :page-size="pageSize"
+              :page-size="10"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total">
             </el-pagination>
@@ -497,7 +497,6 @@ export default {
       agentVisible:false,
       resetFlag:false,
       passFlag:false,
-      currentPage4:1,
       operatorName:'',//代理商名称
       operationStaffName:'',//运营人员名称
       name:'',//公司名称
@@ -731,12 +730,15 @@ export default {
     },
     //确认编辑
     editor(){
-                if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
+        //         if(!this.resetFlag){
+        //     this.$message.error('平台用户与楼盘用户不能重复添加！')
+        //     return
+        // }
          this.$refs.editoragentobj.validate((valid) => {
           if (valid) {
+              if(!this.resetFlag){
+              return
+          }
              this.$api.http.updateOrg(this.editoragentobj).then((res) => {
                if(res.code==0){
                     this.dialogVisible2=false;
@@ -934,12 +936,15 @@ export default {
 
     //确认新增
     add(){
-                if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
+        //         if(!this.resetFlag){
+        //     this.$message.error('平台用户与楼盘用户不能重复添加！')
+        //     return
+        // }
       this.$refs.addagentobj.validate((valid) => {
           if (valid) {
+              if(!this.resetFlag){
+              return
+          }
             this.addagentobj.pid=0;
              this.$api.http.AddaddOrg(this.addagentobj).then((res) => {
                if(res.code==0){

src/views/Equipment/state.vue

@@ -169,6 +169,10 @@
           <div class="label">领用人：</div>
           <el-input type="text" v-model="searchForm.userName"></el-input>
         </div>
+        <div class="div-lab">
+          <div class="label">设备电量：</div>
+          <el-input type="text" v-model="searchForm.electricity"></el-input>
+        </div>
       </div>
 
       <!-- <div class="app-titel" style="margin-top: 15px">
@@ -636,7 +640,8 @@ export default {
         simAudioUploadStatus: "", //上传状态
         offStatus: "", //关机状态
         onLine: "",
-        userName:''
+        userName:'',
+        electricity:''
       },
       bindRules: {
         houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
@@ -722,6 +727,7 @@ export default {
     }else{
       this.searchForm.onLine='1'
     }
+    this.searchForm.electricity=this.$route.query.electricity
    }
     // asd
     this.getTableList();
@@ -946,7 +952,8 @@ export default {
         simAudioUploadStatus: "", //上传状态
         offStatus: "", //关机状态
         onLine: "",
-        userName:''
+        userName:'',
+        electricity:''
       };
       this.time=[]
       this.currentPage = 1;

src/views/Statistics/Insightintothedetails.vue

@@ -1,6 +1,6 @@
-<template>
+<template >
 
-  <div class="box-center">
+  <div class="box-center"  style="cursor:pointer;">
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 15px">

src/views/Statistics/dataScreeSys.vue

@@ -238,7 +238,7 @@
             活跃用户数
           </div>
           <div class="text2" :class="{ tophovese: cardindex == 4 }">
-            {{ thirdTab.activeEquipmentQuantity || 0 }}
+            {{ thirdTab.activeUserQuantity || 0 }}
           </div>
         </div>
         <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('5')">

src/views/Statistics/houseDataSys.vue

@@ -329,7 +329,7 @@ export default {
           this.compare1.activeHouseQuantityList.map((item) => {
             arr2.push(item.data);
           });
-          this.compare2.contrastList.map((item) => {
+          this.compare2.contrastList2.map((item) => {
             arr3.push(item);
           });
         } else if (idx == 2) {

src/views/Statistics/trend.vue

@@ -270,7 +270,7 @@
             class="text1"
             :class="{ tophovese: secindex == 'activeCustomerRate' }"
           >
-            有效接待占比
+            有效接待占比/%
           </div>
           <div
             class="text2"
@@ -300,7 +300,7 @@
           style="height: auto; padding-bottom: 10px"
         >
           <div class="text1" :class="{ tophovese: secindex == 'fraction' }">
-            平均执行率
+            平均执行率/%
           </div>
           <div class="text2" :class="{ tophovese: secindex == 'fraction' }">
             {{ compare.fraction || 0 }}

src/views/Template/PinspeakwordsList.vue

@@ -167,10 +167,10 @@ export default {
               }
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          });
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消'
+          // });
         });
     },
     //启用
@@ -199,10 +199,10 @@ export default {
               }
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          });
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消'
+          // });
         });
     },
     //筛选

src/views/admin/user/index.vue

@@ -357,6 +357,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <el-pagination
         style="text-align: center; margin-top: 18px"
         background
@@ -369,6 +370,7 @@
         :total="page.total"
       >
       </el-pagination>
+      </div>
     </div>
 
     <el-dialog
@@ -960,6 +962,8 @@
         <el-button type="primary" @click="addHouse">确 定</el-button>
       </div>
     </el-dialog>
+
+    <div style="width: 100%;height: 40px;"></div>
   </div>
 </template>
 

src/views/building/index.vue

@@ -196,10 +196,13 @@
         <el-table-column :show-overflow-tooltip="true"  width="120px" prop="address" label="楼盘地址" align="center">
         </el-table-column>
 
-        <el-table-column prop='linkman' label="联系人姓名" align="center">
-        </el-table-column>
-          <el-table-column prop='linkmanPhone' label="联系人手机号" align="center">
+        <el-table-column width="110px" prop='linkman' label="联系人信息" align="center">
+           <template slot-scope="{ row }">
+            {{ row.linkman +'-' +row.linkmanPhone || "-" }}
+          </template>
         </el-table-column>
+          <!-- <el-table-column prop='linkmanPhone' label="联系人手机号" align="center">
+        </el-table-column> -->
 
         <el-table-column prop="managerPhone" label="管理员账号" align="center">
           <template slot-scope="{ row }">