init

src/page/wel.vue

@@ -266,7 +266,7 @@
 
           </div>
           <div class="you">
-            <div class="title">
+            <div class="title"  style="cursor: pointer;">
               <div class="text1" @click="tabclick('0')" :class="{ colostyle: classatec == 0 }">低电工牌</div>
               <div class="text1" @click="tabclick('1')" :class="{ colostyle: classatec == 1 }">离线工牌</div>
             </div>
@@ -594,7 +594,7 @@
 
         <div class="app-box-san">
           <div class="zuo">
-            <div class="title1">
+            <div class="title1"  style="cursor: pointer;">
               <div>{{role==2?'楼盘排名（top10）':'公司排名（top10）'}}</div>
               <div style="display:flex;">
                 <div class="text1" style="margin-right:10px;" @click="classatec1=0" :class="{ colostyle: classatec1 == 0 }">接待量</div>
@@ -643,7 +643,7 @@
 
           </div>
           <div class="you">
-            <div class="title1">
+            <div class="title1"  style="cursor: pointer;">
               <div>{{role==2?'顾问排名（top10）':'楼盘排名（top10）'}}</div>
               <div style="display:flex;">
                 <div class="text1" style="margin-right:10px;" @click="classatec2=0" :class="{ colostyle: classatec2 == 0 }">接待量</div>

src/views/Customer/AgentManagement.vue

@@ -160,7 +160,7 @@
     <el-dialog title="新增代理" :visible.sync="dialogVisible" >
       <el-form :model="addagentobj" label-position="labelPosition" :rules="rules"  ref="addagentobj" label-width="140px" style="width:60%; margin: 0 auto;">
           <el-form-item label="代理商名称：" prop="agentName">
-              <el-input v-model="addagentobj.agentName"></el-input>
+              <el-input v-model="addagentobj.agentName" maxlength="30" clearable></el-input>
           </el-form-item>
           <el-form-item label="合同起止日期：" prop="rulestimelist">
               <el-date-picker
@@ -237,7 +237,7 @@
    <el-dialog title="编辑" :visible.sync="dialogVisible2" >
       <el-form :model="editoragentobj" label-position="labelPosition" :rules="editorrules"  ref="editoragentobj" label-width="140px" style="width:60%; margin: 0 auto;">
           <el-form-item label="代理商名称：" prop="agentName">
-              <el-input  v-model="editoragentobj.agentName" maxlength="8" clearable></el-input>
+              <el-input  v-model="editoragentobj.agentName" maxlength="30" clearable></el-input>
           </el-form-item>
           <el-form-item label="合同起止日期：" prop="rulestimelist">
               <el-date-picker
@@ -809,10 +809,16 @@ export default {
         })
     },
       //时间选择
-    confirmtime(){
-        console.log(this.timelist)
-        this.contractStartDate=this.timelist[0];
-        this.contractEndDate=this.timelist[1];
+    confirmtime(e){
+        // console.log(this.timelist)
+        if(e){
+          this.contractStartDate=this.timelist[0];
+          this.contractEndDate=this.timelist[1];
+        }else{
+          this.contractStartDate='';
+          this.contractEndDate='';
+        }
+
     },
     //清空筛选
     Screeningofempty(){
@@ -822,6 +828,7 @@ export default {
         this.serviceStatus='';
         this.agentName='';
         this.operationalName='';
+        this.pageNum=1
         this.getAgentList()
     },
     //筛选

src/views/Customer/CompanyRecord.vue

@@ -129,7 +129,7 @@
               </el-select> -->
           <!-- </el-form-item> -->
            <el-form-item label="公司名称：" prop="name">
-              <el-input v-model="addagentobj.name"></el-input>
+              <el-input v-model="addagentobj.name" maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="联系人：" prop="contactPerson">
               <el-input v-model="addagentobj.contactPerson"></el-input>
@@ -192,7 +192,7 @@
               </el-select> -->
           <!-- </el-form-item> -->
            <el-form-item label="公司名称：" prop="name">
-              <el-input v-model="editoragentobj.name"></el-input>
+              <el-input v-model="editoragentobj.name" maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="联系人：" prop="contactPerson">
               <el-input v-model="editoragentobj.contactPerson"></el-input>
@@ -386,7 +386,7 @@ export default {
         //   ],
           name: [
             { required: true, message: '请输入公司名称', trigger: 'blur' },
-             { min: 1, max: 10, message: '最多输入10个汉字', trigger: 'blur' }
+            { min: 1, max: 30, message: '最多输入30个汉字', trigger: 'blur' },
           ],
          contactPerson: [
             { required: true, message: '请输入联系人名称', trigger: 'blur' },
@@ -489,7 +489,7 @@ export default {
           // ],
           name: [
             { required: true, message: '请输入公司名称', trigger: 'blur' },
-            { min: 1, max: 10, message: '最多输入10个汉字', trigger: 'blur' },
+            { min: 1, max: 30, message: '最多输入30个汉字', trigger: 'blur' },
           ],
          contactPerson: [
             { required: true, message: '请输入联系人名称', trigger: 'blur' },
@@ -871,6 +871,7 @@ export default {
         this.operatorName='';
         this.operationStaffName='';
         this.name='';
+        this.pageNum=1
         this.getcompanyList()
     },
     //筛选

src/views/Customer/Companymanagement.vue

@@ -771,6 +771,7 @@ export default {
         this.operatorName='';
         this.operationStaffName='';
         this.name='';
+        this.pageNum=1
         this.getcompanyList()
     },
     //筛选

src/views/Equipment/batch.vue

@@ -76,7 +76,7 @@
           </el-table-column>
          <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <div v-if="equ_batch_edit" style="color: #2671E2;" @click="clickbianji(scope.row)">修改</div>
+              <el-button v-if="equ_batch_edit" type="text" @click="clickbianji(scope.row)">修改</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -237,10 +237,12 @@ export default {
       //清空筛选
     Screeningofempty(){
         this.batchId='';
+        this.pageNum=1
         this.getcompanyList()
     },
     //筛选
     Screening(){
+      this.pageNum=1
       this.getcompanyList()
     },
        // 获取列表

src/views/Equipment/equipmentDetailList.vue

@@ -1426,6 +1426,7 @@ export default {
   border: 1px solid #e0e0e0;
   padding-bottom: 2px;
   padding-top: 4px;
+  cursor: pointer;
 }
 .alllist-text1 {
   width: 100%;

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box-center">
-    <div class="toptab">
+    <div class="toptab"  style="cursor: pointer;">
       <div
         @click="tapclickyab(0)"
         :class="{ activecllasscet: activeTotal == 0 }"

src/views/Equipment/index.vue

@@ -363,7 +363,7 @@
             <el-button type="text" @click="toinifodelete()">删除</el-button> -->
 
             <el-dropdown @command="handleCommand($event, row)">
-              <span style="color: #409eff; font-size: 12px; margin-left: 10px">
+              <span style="color: #409eff; font-size: 12px; margin-left: 10px;   cursor: pointer;">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -950,6 +950,7 @@ export default {
         uploadStatus: "", //上传状态
         offStatus: "", //关机状态
       };
+      this.currentPage = 1;
       this.equipmentManagement();
     },
     resetImei() {
@@ -1052,7 +1053,7 @@ export default {
                 type: "success",
                 message: "操作成功!",
               });
-              this.getTableList();
+              this.equipmentManagement();
             });
         })
         .catch(() => {

src/views/Equipment/record.vue

@@ -184,6 +184,7 @@ export default {
       this.equipReceiveFindByPage();
     },
     clascreen() {
+      this.currentPage = 1;
       this.searchForm.equipImei = "";
       this.searchForm.userName = "";
       this.searchForm.receiveType = "";

src/views/Equipment/state.vue

@@ -38,9 +38,9 @@
             >
               <el-option label="设备编号" value="1"></el-option>
               <!-- <el-option label="版本号" value="2"></el-option> -->
-              <el-option label="批次号" value="3"></el-option>
+              <!-- <el-option label="批次号" value="3"></el-option>
               <el-option label="代理商名称" value="4"></el-option>
-              <el-option label="公司名称" value="5"></el-option>
+              <el-option label="公司名称" value="5"></el-option> -->
               <el-option label="楼盘名称" value="6"></el-option>
             </el-select>
           </el-input>
@@ -347,7 +347,7 @@
               修改指示灯状态
             </div> -->
             <el-dropdown @command="handleCommand($event, row)">
-              <span style="color: #409eff; font-size: 12px; margin-left: 10px">
+              <span style="color: #409eff; font-size: 12px; margin-left: 10px;cursor: pointer;">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -938,6 +938,7 @@ export default {
         onLine: "",
       };
       this.time=[]
+      this.currentPage = 1;
       this.getTableList();
     },
     receive(row) {

src/views/ReceivingRecords/index.vue

@@ -30,22 +30,25 @@
         <div class="label" style="margin-left: 20px">时间：</div>
         <div class="toptimeqhuan">
           <div
+            style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 0 }"
             @click="tabtimetap(0)"
           >
             今日
           </div>
           <div
+            style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 1 }"
             @click="tabtimetap(1)"
           >
             昨日
           </div>
           <div
+           style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 2 }"
             @click="tabtimetap(2)"
           >
-            近七天
+            近7天
           </div>
         </div>
         <div>
@@ -137,7 +140,6 @@
             placeholder="请选择"
             class="div-inp"
             filterable
-            clearable
           >
             <el-option
               v-for="item in options5"

src/views/Scheduling/index.vue

@@ -112,10 +112,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <span style="color: #2671e2"  @click="switchstatus(scope.row,2)" v-if="scope.row.status == 0&&sch_index_pause">暂停接待</span>
-            <span style="color: #2671e2"  @click="switchstatus(scope.row,0)" v-if="scope.row.status == 2&&sch_index_pause">空闲</span>
-            <span style="color: #2671e2;  margin-left: 10px"  v-if="sch_index_job" @click="showDailog1(scope.row)">工作安排</span>
-            <span style="color: #2671e2; margin-left: 10px" v-if="sch_index_del" @click="del(scope.row)">删除</span>
+            <el-button  type="text" @click="switchstatus(scope.row,2)" v-if="scope.row.status == 0&&sch_index_pause">暂停接待</el-button>
+            <el-button  type="text" @click="switchstatus(scope.row,0)" v-if="scope.row.status == 2&&sch_index_pause">空闲</el-button>
+            <el-button  type="text" v-if="sch_index_job" @click="showDailog1(scope.row)">工作安排</el-button>
+            <el-button  type="text" v-if="sch_index_del" @click="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/Statistics/ConsultantBrand.vue

@@ -100,7 +100,7 @@
         <el-table-column
           v-if="tabFlag == 0"
           prop="fraction"
-          label="销奖执行率"
+          label="销讲执行率"
           align="center"
         >
         </el-table-column>

src/views/Statistics/MentoringAbility.vue

@@ -269,7 +269,7 @@
         </el-table-column>
         <el-table-column prop="remark" v-if="tabFlag == 1" label="...执行性次数" align="center">
         </el-table-column> -->
-        <el-table-column v-if="tabFlag == 0" prop="fraction" label="销奖执行率" align="center"> </el-table-column>
+        <el-table-column v-if="tabFlag == 0" prop="fraction" label="销讲执行率" align="center"> </el-table-column>
         <el-table-column  v-for="(item,idx) in tablist" :key="idx" :prop="item.props"  :label="item.label" align="center">
         </el-table-column>
       </el-table>

src/views/Statistics/ReceptionOverview.vue

@@ -971,6 +971,7 @@ export default {
   background: #ffffff;
   height: 90px;
   border: 1px solid #E0E0E0;
+  cursor: pointer;
   .text1{
     height: 16px;
     font-size: 16px;

src/views/Statistics/TrendAnalysis.vue

@@ -108,7 +108,7 @@
 
     <!-- 图表 -->
     <div class="app-box-er">
-      <div class="titletab">
+      <div class="titletab" style="cursor: pointer;">
         <div :class="{ claindex: aliasclass == 1 }" @click="tapChange(1)">项目</div>
         <div :class="{ claindex: aliasclass == 2 }" @click="tapChange(2)">团队</div>
         <div :class="{ claindex: aliasclass == 3 }" @click="tapChange(3)">顾问</div>

src/views/Statistics/dataScreeAge.vue

@@ -169,13 +169,13 @@
     <div class="app-box-er">
       <div style="line-height: 40px; font-weight: bold">今日实时状况</div>
       <div class="container">
-        <div class="grid-content" @click="secondChange('1')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('1')">
           <div class="text1" :class="{ tophovese: secindex == 1 }">接待量</div>
           <div class="text2" :class="{ tophovese: secindex == 1 }">
             {{ secondTab.receptionQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="secondChange('2')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('2')">
           <div class="text1" :class="{ tophovese: secindex == 2 }">
             活跃用户
           </div>
@@ -183,7 +183,7 @@
             {{ secondTab.activeUserQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="secondChange('3')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('3')">
           <div class="text1" :class="{ tophovese: secindex == 3 }">
             活跃设备
           </div>
@@ -229,7 +229,7 @@
         </div>
       </div>
       <div class="container">
-        <div class="grid-content" @click="Overviewxlick('1')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('1')">
           <div class="text1" :class="{ tophovese: cardindex == 1 }">
             购买服务楼盘数
           </div>
@@ -237,7 +237,7 @@
             {{ thirdTab.houseQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('2')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
           <div class="text1" :class="{ tophovese: cardindex == 2 }">
             服务期内楼盘数
           </div>
@@ -253,7 +253,7 @@
             {{ thirdTab.avgDuration || 0 }}
           </div>
         </div> -->
-        <div class="grid-content" @click="Overviewxlick('4')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
           <div class="text1" :class="{ tophovese: cardindex == 4 }">
             活跃设备数
           </div>
@@ -261,7 +261,7 @@
             {{ thirdTab.activeEquipmentQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('5')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('5')">
           <div class="text1" :class="{ tophovese: cardindex == 5 }">
             新增用户数
           </div>
@@ -269,13 +269,13 @@
             {{ thirdTab.userCountWithNewJoin || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('6')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('6')">
           <div class="text1" :class="{ tophovese: cardindex == 6 }">接待量</div>
           <div class="text2" :class="{ tophovese: cardindex == 6 }">
             {{ thirdTab.receptionQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('7')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('7')">
           <div class="text1" :class="{ tophovese: cardindex == 7 }">
             平均接待时长
           </div>
@@ -283,7 +283,7 @@
             {{ thirdTab.receptionTimeWithAvg || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('8')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('8')">
           <div class="text1" :class="{ tophovese: cardindex == 8 }">
             活跃设备数
           </div>

src/views/Statistics/dataScreeOrg.vue

@@ -144,7 +144,7 @@
     <div class="app-box-er">
       <div style="line-height: 40px; font-weight: bold">今日实时状况</div>
       <div class="container">
-        <div class="grid-content" @click="secondChange('1')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('1')">
           <div class="text1" :class="{ tophovese: secindex == 1 }">接待量</div>
           <div class="text2" :class="{ tophovese: secindex == 1 }">
             {{ secondTab.receptionQuantity || 0 }}
@@ -244,13 +244,13 @@
             {{ thirdTab.userCountWithNewJoin || 0 }}
           </div>
         </div> -->
-        <div class="grid-content" @click="Overviewxlick('6')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('6')">
           <div class="text1" :class="{ tophovese: cardindex == 6 }">接待量</div>
           <div class="text2" :class="{ tophovese: cardindex == 6 }">
             {{ thirdTab.receptionQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('7')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('7')">
           <div class="text1" :class="{ tophovese: cardindex == 7 }">
             平均接待时长
           </div>
@@ -258,7 +258,7 @@
             {{ thirdTab.receptionTimeWithAvg || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('8')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('8')">
           <div class="text1" :class="{ tophovese: cardindex == 8 }">
             活跃设备数
           </div>

src/views/Statistics/dataScreeSys.vue

@@ -22,7 +22,7 @@
             v-model="choicValue"
             @change="valuechange"
             placeholder="默认为全部"
-            filterable 
+            filterable
             clearable
           >
             <el-option
@@ -84,7 +84,7 @@
           <div class="text2">{{ firstTab.agentQuantity || 0 }}</div>
         </div>
         <div class="grid-content">
-          <div class="text1">服务器内代理商数</div>
+          <div class="text1">服务期内代理商数</div>
           <div class="text2">{{ firstTab.agentQofEnough || 0 }}</div>
         </div>
         <div class="grid-content">
@@ -98,7 +98,7 @@
           <div class="text2">{{ firstTab.houseQuantity || 0 }}</div>
         </div>
         <div class="grid-content">
-          <div class="text1">服务器内楼盘总数</div>
+          <div class="text1">服务期内楼盘总数</div>
           <div class="text2">{{ firstTab.houseQofEnough || 0 }}</div>
         </div>
         <div class="grid-content">
@@ -168,13 +168,13 @@
     <div class="app-box-er">
       <div style="line-height: 40px; font-weight: bold">今日实时状况</div>
       <div class="container">
-        <div class="grid-content" @click="secondChange('1')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('1')">
           <div class="text1" :class="{ tophovese: secindex == 1 }">接待量</div>
           <div class="text2" :class="{ tophovese: secindex == 1 }">
             {{ secondTab.receptionQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="secondChange('2')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('2')">
           <div class="text1" :class="{ tophovese: secindex == 2 }">
             活跃用户
           </div>
@@ -182,7 +182,7 @@
             {{ secondTab.activeUserQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="secondChange('3')">
+        <div class="grid-content" style="cursor: pointer;" @click="secondChange('3')">
           <div class="text1" :class="{ tophovese: secindex == 3 }">
             活跃设备
           </div>
@@ -228,15 +228,15 @@
         </div>
       </div>
       <div class="container">
-        <div class="grid-content" @click="Overviewxlick('1')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('1')">
           <div class="text1" :class="{ tophovese: cardindex == 1 }">
             购买服务楼盘数
           </div>
-          <div class="text2" :class="{ tophovese: cardindex == 1 }">
+          <div class="text2" style="cursor: pointer;" :class="{ tophovese: cardindex == 1 }">
             {{ thirdTab.houseQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('2')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
           <div class="text1" :class="{ tophovese: cardindex == 2 }">
             服务期内楼盘数
           </div>
@@ -252,7 +252,7 @@
             {{ thirdTab.avgDuration || 0 }}
           </div>
         </div> -->
-        <div class="grid-content" @click="Overviewxlick('4')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
           <div class="text1" :class="{ tophovese: cardindex == 4 }">
             活跃设备数
           </div>
@@ -260,7 +260,7 @@
             {{ thirdTab.activeEquipmentQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('5')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('5')">
           <div class="text1" :class="{ tophovese: cardindex == 5 }">
             新增用户数
           </div>
@@ -268,13 +268,13 @@
             {{ thirdTab.userCountWithNewJoin || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('6')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('6')">
           <div class="text1" :class="{ tophovese: cardindex == 6 }">接待量</div>
           <div class="text2" :class="{ tophovese: cardindex == 6 }">
             {{ thirdTab.receptionQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('7')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('7')">
           <div class="text1" :class="{ tophovese: cardindex == 7 }">
             平均接待时长
           </div>
@@ -282,7 +282,7 @@
             {{ thirdTab.receptionTimeWithAvg || 0 }}
           </div>
         </div>
-        <div class="grid-content" @click="Overviewxlick('8')">
+        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('8')">
           <div class="text1" :class="{ tophovese: cardindex == 8 }">
             活跃设备数
           </div>

src/views/Statistics/houseDataSys.vue

@@ -39,7 +39,7 @@
             v-model="choicValue"
             @change="valuechange"
             clearable
-            filterable 
+            filterable
             placeholder="默认为全部"
           >
             <el-option
@@ -145,7 +145,7 @@
       </div>
 
       <div class="container">
-        <div class="grid-content" @click="secondChange('1')" style="height:auto; padding-bottom:10px;">
+        <div class="grid-content" @click="secondChange('1')" style="height:auto; padding-bottom:10px;cursor: pointer;">
           <div class="text1" :class="{ tophovese: secindex == 1 }">
             活跃楼盘数
           </div>
@@ -161,7 +161,7 @@
             </div>
           </div>
         </div>
-        <div class="grid-content" @click="secondChange('2')"  style="height:auto;">
+        <div class="grid-content" @click="secondChange('2')"  style="height:auto;cursor: pointer;">
           <div class="text1" :class="{ tophovese: secindex == 2 }">
             服务器内楼盘数
           </div>

src/views/Statistics/trend.vue

@@ -58,7 +58,7 @@
             v-model="choicValue"
             @change="valuechange"
             clearable
-            filterable 
+            filterable
             placeholder="默认为全部"
           >
             <el-option
@@ -905,6 +905,7 @@ export default {
   background: #ffffff;
   height: 90px;
   border: 1px solid #e0e0e0;
+  cursor: pointer;
   .text1 {
     height: 16px;
     font-size: 16px;

src/views/Template/taboo.vue

@@ -59,12 +59,12 @@
         <!--  scope -->
         <el-table-column label="操作" align="center">
           <template slot-scope="scope" style="">
-            <span  v-if="tem_tab_edit" style="color: #2671e2" @click="bianji(scope.row)">编辑</span>
-            <span
+            <el-button  v-if="tem_tab_edit" type="text" @click="bianji(scope.row)">编辑</el-button>
+            <el-button
               v-if="tem_tab_del"
-              style="color: #2671e2; margin-left: 10px"
+              type="text"
               @click="del(scope.row)"
-              >删除</span
+              >删除</el-button
             >
           </template>
         </el-table-column>
@@ -226,6 +226,7 @@ export default {
     editorinfo() {
       this.dialogVisible = true;
       this.editFlag = false;
+      this.ruleForm.words=''
     },
     editor() {
       this.$refs.ruleForm.validate((valid) => {

src/views/Template/wrongword.vue

@@ -253,6 +253,7 @@ export default {
       this.searchForm.wrongWord = "";
       this.searchForm.correctWord = "";
       this.searchForm.houseId=this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id,
+      this.currentPage = 1;
       this.correctFindbypage();
     },
     houseChange() {

src/views/admin/dept/index.vue

@@ -231,6 +231,7 @@ export default {
     },
 
     editorinfo() {
+      this.ruleForm.name=''
       this.dialogVisible = true;
       this.editFlag = false;
     },

src/views/admin/user/index.vue

@@ -69,8 +69,8 @@
             ></el-input>
           </el-form-item> -->
           <el-form-item>
-            <el-button type="primary" @click="search">查询</el-button>
-            <el-button type="primary" @click="reset">重置</el-button>
+            <el-button type="primary" @click="search">筛选</el-button>
+            <el-button type="primary" @click="reset">清空筛选条件</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -168,8 +168,8 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="search1">查询</el-button>
-            <el-button type="primary" @click="reset1">重置</el-button>
+            <el-button type="primary" @click="search1">筛选</el-button>
+            <el-button type="primary" @click="reset1">清空筛选条件</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -1499,7 +1499,7 @@ export default {
       });
     },
     search() {
-      this.page.current1;
+      this.page.current=1;
       console.log(this.searchMsg, "搜索内容1");
       // return
       this.roleList();
@@ -1522,14 +1522,17 @@ export default {
       this.searchMsg1.username = "";
     },
     reset() {
+       this.page.current=1;
       this.searchMsg = {
         flag: "1",
         name: "", //用户名
         username: "", //登录名
         orgName: "", //所属组织
       };
+      this.roleList();
     },
     reset1() {
+       this.page.current=1;
       this.searchMsg1 = {
         flag: "1",
         name: "", //用户名
@@ -1539,6 +1542,7 @@ export default {
         lockFlag: "", //状态
         queryOrgType: "", //组织类型
       };
+      this.roleList();
     },
     // 绑定方式改变
     radioChange(e) {

src/views/building/Count.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="box-center">
-    <div class="toptab"  v-if="orgType!=2">
+    <div class="toptab" style="cursor: pointer;"  v-if="orgType!=2">
       <div
         @click="tapclickyab(0)"
         :class="{ activecllasscet: activeTotal == 0 }"
-        :style="{ background: activeTotal == 0 ? '#2671E2' : '#ffffff' }"
+        :style="{ background: activeTotal == 0 ? '#2671E2' : '#ffffff' } "
       >
         楼盘
       </div>
@@ -34,20 +34,23 @@
             <div
               :class="{ tophove: searchForm.dateType == 4 }"
               @click="tabtimetap(4)"
+              style="cursor: pointer;"
             >
-              近七天
+              近7天
             </div>
             <div
               :class="{ tophove: searchForm.dateType == 5 }"
               @click="tabtimetap(5)"
+               style="cursor: pointer;"
             >
-              近十五天
+              近15天
             </div>
             <div
               :class="{ tophove: searchForm.dateType == 6 }"
               @click="tabtimetap(6)"
+               style="cursor: pointer;"
             >
-              近三十天
+              近30天
             </div>
           </div>
           <div>
@@ -482,6 +485,7 @@ export default {
         staDate: "",
         endDate: "",
       };
+      this.currentPage = 1;
       this.houseStatistics();
     },
     houseStatistics() {

src/views/building/area.vue

@@ -3,7 +3,7 @@
     <div class="center-er">
       <div class="app-titel">
         <div class="app-titel-name">
-          <div style=" line-height: 32px">公司选择:</div>
+          <div style=" line-height: 32px">公司名称:</div>
           <div style="margin-left: 20px" v-if="orgType == 0">
             <el-select
               v-model="orgCode"
@@ -93,7 +93,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="add">{{
-            editFlag ? "编 辑" : "确 定"
+            editFlag ? "保 存" : "确 定"
           }}</el-button>
         </div>
       </el-dialog>

src/views/building/index.vue

@@ -140,7 +140,7 @@
       </div> -->
       <div class="app-titel" style="margin-top: 10px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
-        <div style="    margin-left: 5px;">
+        <div style="margin-left: 5px;">
           <el-button
             @click="screen"
             type="primary"
@@ -300,7 +300,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="楼盘名称" prop="propertyName">
-          <el-input v-model="ruleForm.propertyName" maxlength="8" clearable></el-input>
+          <el-input v-model="ruleForm.propertyName" maxlength="30" clearable></el-input>
         </el-form-item>
         <el-form-item
           label="合同起止日期"
@@ -1158,10 +1158,17 @@ export default {
         agentName: "",
         operationalPeople: "",
       };
+      this.currentPage=1
+      this.zkhousePage()
     },
     timeChange1(e) {
-      this.searchForm.startWorking = e[0];
-      this.searchForm.endWorking = e[1];
+      if(e){
+            this.searchForm.startWorking = e[0];
+            this.searchForm.endWorking = e[1];
+      }else{
+         this.searchForm.startWorking = '';
+         this.searchForm.endWorking = '';
+      }
     },
     tabtimetap(idx) {
       this.searchForm.residueTime = idx;