Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject

src/page/wel.vue

@@ -99,7 +99,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">销讲执行率(%)</div>
+              <div class="pageboxtitle1">执行率排名(%)</div>
               <div class="pageboxtitle2">
                 <div class="span1">{{cardlist.datalist.fraction || 0}}</div>
                 <div class="span2">
@@ -119,7 +119,7 @@
         </div>
         <div style=" margin-top: 20px;" class="page-container">
             <div class="pagechen">
-              <div class="pageboxtitle1">违禁预警(个)</div>
+              <div class="pageboxtitle1">违禁接待次数(个)</div>
               <div class="pageboxtitle2">
                   <div class="span1">{{cardlist.datalist.prohibitedCustomer || 0}}</div>
               <div class="span2">
@@ -137,7 +137,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">违禁占比(%)</div>
+              <div class="pageboxtitle1">违禁执行占比(%)</div>
               <div class="pageboxtitle2">
                   <div class="span1">{{cardlist.datalist.prohibitedZb || 0}}</div>
               <div class="span2">
@@ -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

@@ -10,6 +10,7 @@
             @change="confirmtime()"
             v-model="timelist"
             type="daterange"
+            style="width:250px;"
             range-separator="-"
             :default-time="['00:00:00', '23:59:59']"
             value-format="yyyy-MM-dd"
@@ -19,7 +20,7 @@
         </div>
         <div class="label">服务状态：</div>
         <div>
-          <el-select v-model="serviceStatus" placeholder="请选择">
+          <el-select v-model="serviceStatus" placeholder="请选择" class="div-inp">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -33,23 +34,23 @@
       <div class="app-titel" style="margin-top: 15px">
         <div class="label">代理商：</div>
         <div>
-         <el-input  maxlength="30" clearable  v-model="agentName"></el-input>
+         <el-input class="div-inp"  maxlength="30" clearable  v-model="agentName"></el-input>
         </div>
         <div class="label">运营人员：</div>
         <div >
-          <el-input maxlength="10" clearable v-model="operationalName"></el-input>
+          <el-input maxlength="10" class="div-inp" clearable v-model="operationalName"></el-input>
         </div>
       </div>
 
       <div class="app-titel" style="margin-top: 15px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
         <div>
-          <el-button v-if="cus_ag_add" @click="infoadd()" style="background: #2671e2; color: #ffffff"
+          <el-button v-if="cus_ag_add" @click="infoadd()" type="primary"
             >新增</el-button
           >
         </div>
         <div style="margin-left: 20px">
-          <el-button @click="Screening()" style="background: #2671e2; color: #ffffff">筛选</el-button
+          <el-button @click="Screening()" type="primary">筛选</el-button
           >
         </div>
         <div style="margin-left: 20px">
@@ -159,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
@@ -205,7 +206,7 @@
           </el-form-item>
 
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="addagentobj.address"></el-input>
+              <el-input v-model="addagentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationalPeople">
               <el-select v-model="addagentobj.operationalPeople" placeholder="请选择">
@@ -236,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
@@ -278,7 +279,7 @@
           </el-select>
           </el-form-item>
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="editoragentobj.address"></el-input>
+              <el-input v-model="editoragentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationalPeople">
               <el-select v-model="editoragentobj.operationalPeople" placeholder="请选择">
@@ -469,17 +470,18 @@ export default {
             { required: true, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
-            { required: true, message: '请输入详细地址', trigger: 'blur' },
+            // { required: true, message: '请输入详细地址', trigger: 'blur' },
           ],
           // operationalPeople: [
           //   { required: true, message: '请选择运营人员', trigger: 'blur' },
           // ],
           managerPhone: [
-            // { required: true, message: '请输入管理员账号', trigger: 'blur' },
+            { required: true, message: '请输入管理员账号', trigger: 'blur' },
             { validator: validatePass, trigger: "blur" },
           ],
           managerPassword: [
-            { required: true, message: '请输入管理员账号密码', trigger: 'blur' },
+           { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
           ],
           linkmanPhone: [
             { required: true, message: '请输入联系人手机号', trigger: 'blur' },
@@ -531,12 +533,13 @@ export default {
       },
       ruleser:{
            managerPhone: [
-            // { required: true, message: '请输入管理员账号', trigger: 'blur' },
+            { required: true, message: '请输入管理员账号', trigger: 'blur' },
             { validator: validatePass, trigger: "blur" },
           ],
-          managerPassword: [
-            { required: true, message: '请输入管理员账号密码', trigger: 'blur' },
-          ],
+        managerPassword: [
+          { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+        ],
       }
 
     };
@@ -806,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(){
@@ -819,6 +828,7 @@ export default {
         this.serviceStatus='';
         this.agentName='';
         this.operationalName='';
+        this.pageNum=1
         this.getAgentList()
     },
     //筛选
@@ -889,6 +899,8 @@ export default {
       color: #32363d;
       line-height: 14px;
       margin-left: 15px;
+      min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;
@@ -908,4 +920,12 @@ export default {
     }
   }
 }
+.div-lab {
+  display: flex;
+  margin: 5px;
+
+}
+.div-inp {
+  width: 250px;
+}
 </style>

src/views/Customer/CompanyRecord.vue

@@ -21,12 +21,12 @@
       <div class="app-titel" style="margin-top: 15px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
         <div>
-          <el-button v-if="cus_crd_add" @click="infoadd()" style="background: #2671e2; color: #ffffff"
+          <el-button v-if="cus_crd_add" @click="infoadd()" type="primary"
             >新增</el-button
           >
         </div>
         <div style="margin-left: 20px">
-          <el-button @click="Screening()" style="background: #2671e2; color: #ffffff"
+          <el-button @click="Screening()" type="primary"
             >筛选</el-button
           >
         </div>
@@ -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>
@@ -155,7 +155,7 @@
           </el-select>
           </el-form-item>
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="addagentobj.address"></el-input>
+              <el-input v-model="addagentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationStaff">
               <el-select v-model="addagentobj.operationStaff" placeholder="请选择">
@@ -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,14 +386,14 @@ 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' },
             { min: 1, max: 10, message: '最多输入10个汉字', trigger: 'blur' }
           ],
           contactNumber: [
-            // { required: true, message: '请输入联系人手机号', trigger: 'blur' },
+            { required: true, message: '请输入联系人手机号', trigger: 'blur' },
             // { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
              { validator: validatePass1, trigger: "blur" },
           ],
@@ -404,18 +404,20 @@ export default {
             { required: true, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
-            { required: true, message: '请输入详细地址', trigger: 'blur' },
+            // { required: false, message: '请输入详细地址', trigger: 'blur' },
             { min: 1, max: 50, message: '最多输入50个汉字', trigger: 'blur' },
           ],
           // operationStaff: [
           //   { required: true, message: '请选择运营人员', trigger: 'blur' },
           // ],
           managerPhone: [
+             { required: true, message: "请填写账号", trigger: "change" },
              { validator: validatePass, trigger: "blur" },
           ],
-          managerPassword: [
-            { required: true, message: '请输入管理员账号密码', trigger: 'blur' },
-          ],
+        managerPassword: [
+          { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+        ],
       },
       optionsparentId:[],//省份列表
       optionscityId:[],//市列表
@@ -445,11 +447,12 @@ export default {
       },
       ruleser:{
            managerPhone: [
-            // { required: true, message: '请输入管理员账号', trigger: 'blur' },
+            { required: true, message: '请输入管理员账号', trigger: 'blur' },
              { validator: validatePass, trigger: "blur" },
           ],
           managerPassword: [
-            { required: true, message: '请输入管理员账号密码', trigger: 'blur' },
+          { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
           ],
       },
       editoragentobj:{
@@ -486,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' },
@@ -868,6 +871,7 @@ export default {
         this.operatorName='';
         this.operationStaffName='';
         this.name='';
+        this.pageNum=1
         this.getcompanyList()
     },
     //筛选
@@ -939,6 +943,8 @@ export default {
       color: #32363d;
       line-height: 14px;
       margin-left: 15px;
+      min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Customer/Companymanagement.vue

@@ -25,8 +25,8 @@
             >新增</el-button
           >
         </div> -->
-        <div style="margin-left: 20px">
-          <el-button @click="Screening()" style="background: #2671e2; color: #ffffff"
+        <div>
+          <el-button  @click="Screening()"  type="primary"
             >筛选</el-button
           >
         </div>
@@ -771,6 +771,7 @@ export default {
         this.operatorName='';
         this.operationStaffName='';
         this.name='';
+        this.pageNum=1
         this.getcompanyList()
     },
     //筛选
@@ -842,6 +843,8 @@ export default {
       color: #32363d;
       line-height: 14px;
       margin-left: 15px;
+      min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Customer/SalesStage.vue

@@ -30,7 +30,7 @@
           <el-button
             v-if="cus_sal_add"
             @click="infoadd()"
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             >新增</el-button
           >
         </div>

src/views/Customer/index.vue

@@ -26,7 +26,7 @@
           </el-select>
         </div>
       </div>
-      <div class="app-titel" style="margin-top: 15px">
+      <div class="app-titel" style="margin-top: 15px;padding-left:30px;">
         <div class="label" style="margin-left: 20px; margin-right: 20px">
           <!-- 时间： -->
           <el-select
@@ -188,9 +188,9 @@
       <div class="app-titel" style="margin-top: 15px"></div>
 
       <div class="app-titel" style="margin-top: 15px">
-        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+        <div class="label" style="color: #ffffff">筛选相关：</div>
+        <div>
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -642,6 +642,7 @@ export default {
       line-height: 32px;
       margin-left: 15px;
       min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Equipment/batch.vue

@@ -9,14 +9,14 @@
              <el-input v-model="batchId" maxlength="20" clearable></el-input>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="Screening()">筛选</el-button
+          <el-button type="primary" @click="Screening()">筛选</el-button
           >
         </div>
         <div style="margin-left: 20px">
           <el-button @click="Screeningofempty()">清空筛选条件</el-button>
         </div>
          <div style="margin-left: 20px">
-          <el-button v-if="equ_batch_add" @click="editorinfo()" style="background: #2671e2; color: #ffffff"
+          <el-button v-if="equ_batch_add" @click="editorinfo()" type="primary"
             >添加批次</el-button
           >
         </div>
@@ -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

@@ -4,7 +4,7 @@
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
         <div class="div-lab">
-          <div class="label">添加时间</div>
+          <div class="label">添加时间:</div>
           <el-date-picker
             v-model="time"
             type="daterange"
@@ -47,7 +47,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">设备状态</div>
+          <div class="label">设备状态:</div>
           <el-select
             class="div-inp"
             clearable
@@ -87,7 +87,7 @@
         </div> -->
 
         <div class="div-lab">
-          <div class="label">领用状态</div>
+          <div class="label">领用状态:</div>
           <el-select
             class="div-inp"
             clearable
@@ -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(() => {
@@ -1412,7 +1413,7 @@ export default {
       color: #32363d;
       line-height: 32px;
       margin-left: 15px;
-      min-width: 100px;
+      min-width: 78px;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Equipment/record.vue

@@ -27,7 +27,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">领用状态</div>
+          <div class="label">领用状态:</div>
           <el-select
             class="div-inp"
             multiple
@@ -46,7 +46,7 @@
           </el-select>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -184,6 +184,7 @@ export default {
       this.equipReceiveFindByPage();
     },
     clascreen() {
+      this.currentPage = 1;
       this.searchForm.equipImei = "";
       this.searchForm.userName = "";
       this.searchForm.receiveType = "";
@@ -254,7 +255,7 @@ export default {
       color: #32363d;
       line-height: 32px;
       margin-left: 15px;
-      min-width: 100px;
+      min-width: 78px;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Equipment/state.vue

@@ -4,7 +4,7 @@
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
         <div class="div-lab">
-          <div class="label">添加时间</div>
+          <div class="label">添加时间:</div>
           <el-date-picker
             v-model="time"
             type="daterange"
@@ -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>
@@ -67,7 +67,7 @@
         </div> -->
 
         <div class="div-lab">
-          <div class="label">领用状态</div>
+          <div class="label">领用状态:</div>
           <el-select
             class="div-inp"
             clearable
@@ -87,7 +87,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">在线状态</div>
+          <div class="label">在线状态:</div>
           <el-select
             class="div-inp"
             clearable
@@ -107,7 +107,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">录音状态</div>
+          <div class="label">录音状态:</div>
           <el-select
             class="div-inp"
             clearable
@@ -127,7 +127,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">上传状态</div>
+          <div class="label">上传状态:</div>
           <el-select
             class="div-inp"
             filterable
@@ -147,7 +147,7 @@
         </div>
 
         <div class="div-lab">
-          <div class="label">关机状态</div>
+          <div class="label">关机状态:</div>
           <el-select
             class="div-inp"
             filterable
@@ -188,7 +188,7 @@
       <div class="app-titel" style="margin-top: 15px">
         <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -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) {
@@ -1228,7 +1229,7 @@ export default {
       color: #32363d;
       line-height: 32px;
       margin-left: 15px;
-      min-width: 100px;
+      min-width: 78px;
     }
     .toptimeqhuan {
       height: 30px;

src/views/File/index.vue

@@ -25,9 +25,9 @@
         </div>
       </div>
         <div class="app-titel" style="margin-top: 15px">
-        <div class="label" style="color: #ffffff">筛选相关：</div>
-        <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="noempty()">筛选</el-button>
+        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
+        <div style="margin-left: 16px">
+          <el-button type="primary" @click="noempty()">筛选</el-button>
         </div>
         <div style="margin-left: 20px">
           <el-button @click="empty()">清空筛选条件</el-button>

src/views/ReceivingRecords/index.vue

@@ -9,7 +9,7 @@
         >
           楼盘选择：
         </div>
-        <div>
+        <div style="margin-left: 8px;">
           <el-select
             v-model="searchForm.projectId"
             @change="houseChange"
@@ -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"
@@ -191,9 +193,9 @@
       <div class="app-titel" style="margin-top: 15px"></div>
 
       <div class="app-titel" style="margin-top: 15px">
-        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+        <div class="label" style="color: #ffffff">筛选相关：</div>
+        <div >
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -585,6 +587,7 @@ export default {
       line-height: 32px;
       margin-left: 15px;
       min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Scheduling/index.vue

@@ -50,9 +50,9 @@
         </div>
       </div>
       <div class="app-titel" style="margin-top: 15px">
-        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff"
+        <div class="label" style="color: #ffffff">筛选相关：</div>
+        <div>
+          <el-button type="primary"
             @click="screening()">筛选</el-button
           >
         </div>
@@ -60,17 +60,17 @@
           <el-button @click="reset()">清空筛选条件</el-button>
         </div>
         <div style="margin-left: 20px">
-          <el-button  v-if="sch_index_add" style="background: #2671e2; color: #ffffff"
+          <el-button  v-if="sch_index_add" type="primary"
            @click="addinfo()" >添加</el-button
           >
         </div>
         <div style="margin-left: 20px">
-          <el-button v-if="sch_index_del" :disabled='multipleSelection.length==0' style="background: #2671e2; color: #ffffff"
+          <el-button v-if="sch_index_del" :disabled='multipleSelection.length==0' type="primary"
            @click="alldel()" >批量删除</el-button
           >
         </div>
         <div  style="margin-left: 20px">
-          <el-button v-if="sch_index_sort" :disabled='multipleSelection.length==0' style="background: #2671e2; color: #ffffff"
+          <el-button v-if="sch_index_sort" :disabled='multipleSelection.length==0' type="primary"
             @click="showDailog"
             >批量排班</el-button
           >
@@ -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>
@@ -627,6 +627,8 @@ export default {
       color: #32363d;
       line-height: 14px;
       margin-left: 15px;
+      min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Statistics/BuildingContrast.vue

@@ -84,13 +84,13 @@
           </el-table-column>
            <el-table-column
             prop="fraction"
-            label="销讲执行率"
+            label="平均执行率"
             align="center"
           >
           </el-table-column>
            <el-table-column
             prop="prohibitedZb"
-            label="违禁占比"
+            label="违禁执行占比"
             align="center"
           >
           </el-table-column>
@@ -139,7 +139,7 @@
         </div>
         <div class="you">
           <div class="title">
-            <div class="text1">销讲执行率（TOP10）</div>
+            <div class="text1">平均执行率（TOP10）</div>
           </div>
           	<div class="hejisan">
             <div class="sanbox1" style="width: 50%;">

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>
@@ -201,7 +201,7 @@
     <div class="app-box-san">
       <div class="zuo">
          <div class="title">
-          <div class="text1">销讲执行率排名（TOP10））</div>
+          <div class="text1">平均执行率排名（TOP10））</div>
           <div class="text2">
             <el-select
               @change="teamAllLevelidtap()"
@@ -515,7 +515,7 @@ export default {
         });
       }
     },
-    //销讲执行率切换一级
+    //平均执行率切换一级
     async teamAllLevelidtap() {
       // this.teamData3();
        this.echarlist1=await this.accountRankTOP10(3,this.teamAllLevelid,'');

src/views/Statistics/EmployeesReceive.vue

@@ -43,7 +43,7 @@
                             <tr>
                                 <th class="theadtd">员工</th>
                                 <th class="theadtd">录音条数</th>
-                                <th class="theadtd">录音时长
+                                <th class="theadtd">接待时长
                                     <span class='thding'>
                                         <i class='sotoA' @click="ascending(-1)"></i>
                                         <i class='sotoB' @click="Descendingorder(-1)"></i>
@@ -92,7 +92,7 @@
                         <div class="table-tit">
                             <div>排名</div>
                             <div>员工</div>
-                            <div>录音时长</div>
+                            <div>接待时长</div>
                         </div>
                         <div class="table-cent" v-for="(itcen,inde) in quantitylist" :key='inde' >
                             <div style="display: flex;align-items: center;justify-content: center">

src/views/Statistics/Insightintothedetails.vue

@@ -91,7 +91,7 @@
 
           <el-table-column
             prop="mm"
-            label="录音时长(分钟)"
+            label="接待时长(分钟)"
             align="center"
           >
           </el-table-column>

src/views/Statistics/MentoringAbility.vue

@@ -28,7 +28,7 @@
         </el-date-picker>
       </div>
       <div style="margin-left: 26px" class="div-lab">
-        <div class="label">员工</div>
+        <div class="label">顾问</div>
         <el-select v-model="consultantlistid" @change="consultanttap" placeholder="请选择" class="div-inp">
           <el-option
             v-for="item in consultantlist"
@@ -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

@@ -16,7 +16,7 @@
         </div>
       </div> -->
       <div class="app-titel">
-        <div class="titel-text">接待时间</div>
+        <div class="titel-text">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: TimetoAhoose == 4 }" @click="tabtimetap(4)">近7天</div>
           <div :class="{ tophove: TimetoAhoose == 5 }" @click="tabtimetap(5)"> 近15天 </div>
@@ -74,7 +74,7 @@
     <div class="app-box-san">
         <div class="zuo">
           <div class="title">
-            <div class="text1">团队销讲趋势</div>
+            <div class="text1">团队执行率趋势</div>
               <div class="text2">
                 <el-select style="width: 90%; margin: 0 auto;" @change="Pinspeaktap(1)"  v-model="departmentsri" placeholder="请选择">
                   <el-option
@@ -100,7 +100,7 @@
         </div>
         <div class="you">
           <div class="title">
-            <div class="text1">员工销讲趋势</div>
+            <div class="text1">顾问执行率趋势</div>
              <div class="text2">
                <el-select style="width: 90%; margin: 0 auto;"  @change="Pinspeaktap(2)" v-model="consultantsri" placeholder="请选择">
                 <el-option
@@ -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/ReceptionStatistical.vue

@@ -95,7 +95,7 @@
         </el-table-column>
         <el-table-column prop="accountNum" label="接待顾问" align="center">
         </el-table-column>
-        <el-table-column prop="activeCustomer" label="有效录音" align="center">
+        <el-table-column prop="activeCustomer" label="有效接待" align="center">
         </el-table-column>
         <el-table-column
           prop="prohibitedCustomer"
@@ -180,7 +180,7 @@
           </el-table-column>
           <el-table-column
             prop="activeCustomer"
-            label="有效录音"
+            label="有效接待"
             align="center"
           >
           </el-table-column>

src/views/Statistics/TheTeamCompared.vue

@@ -86,7 +86,7 @@
         </div>
         <div class="you">
           <div class="title">
-            <div class="text1">录音时长排名</div>
+            <div class="text1">接待时长排名</div>
           </div>
           	<div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
@@ -295,7 +295,7 @@ export default {
     teamteamTable(){
       this.tablsitdata1=[
         {name:'序号'},{name:'团队'},{name:'接待量'},{name:'接待顾问'},{name:'有效接待'},{name:'违禁接待次数'},
-        {name:'录音时长（分）'},{name:'平均执行率'},{name:'违禁接待占比'},
+        {name:'接待时长（分）'},{name:'平均执行率'},{name:'违禁接待占比'},
       ]
       let pamaet={
         houseId:this.houseId,

src/views/Statistics/TrendAnalysis.vue

@@ -3,7 +3,7 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel">
-        <div class="titel-text">接待时间</div>
+        <div class="titel-text">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
             近7天
@@ -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

@@ -17,14 +17,14 @@
           >
           </el-option>
         </el-select> -->
-        <div class="titel-text">选择公司</div>
+        <div class="titel-text">选择公司:</div>
         <div style="margin-left: 26px" v-if="selValue == 1">
           <el-select
             v-model="choicValue"
             @change="valuechange"
             placeholder="默认为全部"
             clearable
-            filterable 
+            filterable
           >
             <el-option
               v-for="item in houseList"
@@ -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/Pinspeakwords.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
         <div id="app">
     <div class="content-left">
-        <div>
+        <div v-if="orgType!=3">
             <span style="color: red">*</span> 楼盘选择：
                 <el-select v-model="houseId" size="mini" @change="selectChange" clearable :disabled="disabledcet" placeholder="请选择">
                     <el-option v-for="item in houseList" :key="item.value" :label="item.label" :value="item.value">
@@ -167,6 +167,7 @@ export default {
       treeList: [], //树形数据
       newlist: [],
       nodelist: [],
+      orgType:localStorage.getItem('orgType'),
       dialogFormVisible: false, // 弹框
       dialogVisible: false,
       isshowage: false,
@@ -228,7 +229,9 @@ export default {
     },
     // 获取楼盘下拉的数据
     getHouse() {
-        this.$api.api.findHouseByUser().then((res) => {
+        this.$api.api.findHouseByUser({
+           orgType: localStorage.getItem("orgType"),
+        }).then((res) => {
             this.houseList = res.data.map((item) => {
               return {
                 value: item.id,
@@ -236,7 +239,12 @@ export default {
               };
             });
             if (this.houseId == "") {
-              this.houseId = this.houseList[0].value;
+              if(localStorage.getItem('orgType')==3){
+              this.houseId=localStorage.getItem('houseId')
+                }else{
+                  this.houseId = this.houseList[0].value;
+                }
+              // this.houseId = this.houseList[0].value;
             }
             this.templategetMarketingTree()
         })

src/views/Template/PinspeakwordsList.vue

@@ -37,10 +37,10 @@
           </el-select>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="Screening()">筛选</el-button>
+          <el-button  @click="Screening()" type="primary">筛选</el-button>
         </div>
          <div style="margin-left: 20px">
-          <el-button v-if="tem_pwl_add" @click="editorinfo()" style="background: #2671e2; color: #ffffff"
+          <el-button v-if="tem_pwl_add" @click="editorinfo()" type="primary"
             >添加模板</el-button
           >
         </div>
@@ -338,6 +338,8 @@ export default {
       color: #32363d;
       line-height: 14px;
       margin-left: 15px;
+      // min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Template/taboo.vue

@@ -28,7 +28,7 @@
         </div>
         <div style="margin-left: 20px">
           <el-button
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             @click="screening()"
             >筛选</el-button
           >
@@ -37,7 +37,7 @@
           <el-button
             v-if="tem_tab_add"
             @click="editorinfo()"
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             >新增</el-button
           >
         </div>
@@ -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

@@ -9,7 +9,7 @@
         <div>
           <el-select
             v-model="searchForm.houseId"
-            style="width: 200px"
+            style="width: 215px"
             @change="houseChange"
             placeholder="请选择"
             filterable
@@ -24,7 +24,7 @@
           </el-select>
         </div>
       </div>
-      <div class="app-titel" style="margin-top: 5px">
+      <div class="app-titel" style="margin-top: 10px">
         <div class="label">正确词：</div>
         <div>
           <el-input maxlength="8" clearable v-model="searchForm.correctWord"></el-input>
@@ -34,7 +34,7 @@
           <el-input maxlength="8" clearable v-model="searchForm.wrongWord"></el-input>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -44,7 +44,7 @@
         <div style="margin-left: 20px">
           <el-button
             @click="addinfo()"
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             v-if="tem_ww_add"
             >新增</el-button
           >
@@ -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() {
@@ -348,6 +349,7 @@ export default {
       line-height: 14px;
       width: 80px;
       margin-left: 15px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;

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>
@@ -109,7 +112,7 @@
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
+          <el-button type="primary" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -482,6 +485,7 @@ export default {
         staDate: "",
         endDate: "",
       };
+      this.currentPage = 1;
       this.houseStatistics();
     },
     houseStatistics() {
@@ -585,7 +589,7 @@ export default {
       color: #32363d;
       line-height: 32px;
       margin-left: 15px;
-      min-width: 100px;
+      // min-width: 100px;
     }
     .toptimeqhuan {
       height: 30px;

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

@@ -48,6 +48,7 @@
             v-model="starTime"
             class="div-inp"
             @change="timeChange1"
+            style="width:250px;"
             type="daterange"
             range-separator="-"
             :default-time="['00:00:00', '23:59:59']"
@@ -139,10 +140,10 @@
       </div> -->
       <div class="app-titel" style="margin-top: 10px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
-        <div>
+        <div style="margin-left: 5px;">
           <el-button
             @click="screen"
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             >筛选</el-button
           >
         </div>
@@ -152,7 +153,7 @@
         <div style="margin-left: auto; margin-right: 20px" v-if="orgType != 2">
           <el-button
             v-if="cus_build_index_add"
-            style="background: #2671e2; color: #ffffff"
+            type="primary"
             @click="addHouse"
             >新增</el-button
           >
@@ -299,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="合同起止日期"
@@ -342,7 +343,7 @@
           ></el-cascader>
         </el-form-item>
         <el-form-item label="详细地址" prop="address">
-          <el-input v-model="ruleForm.address"></el-input>
+          <el-input v-model="ruleForm.address"  type="textarea" maxlength="50"  show-word-limit></el-input>
         </el-form-item>
         <!-- <el-form-item
           label="运营人员"
@@ -372,6 +373,7 @@
         >
           <el-input
             v-model="ruleForm.managerPassword"
+            maxlength="18"
             type="passsword"
             show-password
             :disabled='passFlag'
@@ -698,7 +700,13 @@ export default {
         managerPhone: "",
       },
       accountRules: {
-        managerPhone: [{ validator: validatePass1, trigger: "change" }],
+        managerPhone: [
+          { required: true, message: "请填写账号", trigger: "change" },
+          { validator: validatePass1, trigger: "change" }],
+        managerPassword: [
+          { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+        ],
       },
       ruleForm: {
         orgCode: "", //公司标识
@@ -724,10 +732,17 @@ export default {
         propertyName: [
           { required: true, message: "请填写楼盘名称", trigger: "change" },
         ],
+        managerPassword: [
+          { required: true, message: "请填写密码", trigger: "change" },
+          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+        ],
         startWorking: [
           { required: true, message: "请选择时间", trigger: "change" },
         ],
-        managerPhone: [{ validator: validatePass1, trigger: "blur" }],
+        managerPhone: [
+            { required: true, message: "请填写账号", trigger: "change" },
+            { validator: validatePass1, trigger: "blur" }
+          ],
         linkmanPhone: [{ validator: validatePass, trigger: "blur" }],
       },
       operaForm: {
@@ -1143,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;
@@ -1207,6 +1229,7 @@ export default {
       line-height: 32px;
       margin-left: 15px;
       min-width: 100px;
+      text-align: right;
     }
     .toptimeqhuan {
       height: 30px;
@@ -1229,6 +1252,7 @@ export default {
 .div-lab {
   display: flex;
   margin: 5px;
+
 }
 .div-inp {
   width: 250px;

vue.config.js

@@ -3,7 +3,7 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
+const url = 'http://39.97.167.65:9999' //测试
 // const url = 'http://192.168.31.169:9999' //长龙
 const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑