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

src/page/check/chose.vue

@@ -127,6 +127,8 @@
         <el-select
           v-model="area"
           v-if="info.selectHouseType == 2"
+          clearable
+          filterable
           placeholder="请选择"
           class="div-inp"
         >

src/router/avue-router.js

@@ -77,22 +77,22 @@ RouterPlugin.install = function(router, store) {
         meta: propsConfig.meta || 'meta'
       }
       // console.log(propsConfig,propsDefault,'参数一');
-      console.log(this.routerList,'123');
+      // console.log(this.routerList,'123');
       // 当路由地址为空时返回
       if (aMenu.length === 0) return
       // 循环地址数组
       for (let i = 0; i < aMenu.length; i++) {
         const oMenu = aMenu[i]
-        console.log(oMenu[propsDefault.path],'这里是地址');
+        // console.log(oMenu[propsDefault.path],'这里是地址');
         // 在这里时还可以进行下一步，但是this.routerList[]值不知何处取得
-        console.log(this.routerList.includes(oMenu[propsDefault.path]));
+        // console.log(this.routerList.includes(oMenu[propsDefault.path]));
         // 判断路由地址的是否包括routerList[building] 如果没有则返回 为去重操作？
-        // if (this.routerList.includes(oMenu[propsDefault.path])) return
+        if (this.routerList.includes(oMenu[propsDefault.path])) return
         // console.log(3);
         // 定义地址
         const path = (() => {
           // 此为获得的路由地址
-          console.log(oMenu[propsDefault.path]);
+          // console.log(oMenu[propsDefault.path]);
           if (!oMenu[propsDefault.path]) {
             // 如果没有返回
             return
@@ -162,7 +162,6 @@ RouterPlugin.install = function(router, store) {
             return this.formatRoutes(children, false)
           })()
         }
-        console.log(2);
         // 将路由地址放入aRouter
         aRouter.push(oRouter)
       }
@@ -178,9 +177,11 @@ RouterPlugin.install = function(router, store) {
         // 如果不是则返回
         return aRouter
       }
-      console.log(aRouter,'内容');
+      // 在这里将数据重新赋值为空 就可以了 关键不知道为啥，案例来说可以？
+      this.routerList=[]
+      // console.log(aRouter,'内容');
     }
   }
 }
-console.log(RouterPlugin,'配置');
+// console.log(RouterPlugin,'配置');
 export default RouterPlugin

src/views/Customer/AgentManagement.vue

@@ -20,7 +20,7 @@
         </div>
         <div class="label">服务状态：</div>
         <div>
-          <el-select v-model="serviceStatus" placeholder="请选择" class="div-inp">
+          <el-select v-model="serviceStatus"  clearable filterable placeholder="请选择" class="div-inp">
             <el-option
               v-for="item in options"
               :key="item.value"

src/views/Customer/CompanyRecord.vue

@@ -761,10 +761,10 @@ export default {
                  }
             })
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消删除'
+          // });
         });
     },
 

src/views/Customer/Companymanagement.vue

@@ -674,7 +674,8 @@ export default {
          this.optionsoperationStaff=[];
          if(idx==1){
           this.$api.http.getAllOperationsStaffByAgent({
-              orgCode:row.orgCode
+              orgCode:row.orgCode,
+              agentId:localStorage.getItem('agentId')
             }).then((res) => {
               this.optionsoperationStaff= res.data
               this.operaVisible=true

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -105,6 +105,11 @@
           </el-table-column>
           <el-table-column prop="closeTime" label="离线时间" align="center">
           </el-table-column>
+          <el-table-column prop="offlineTime" label="离线时长" align="center">
+            <template slot-scope="{row}">
+              {{row.offlineTime||'--'}}
+            </template>
+          </el-table-column>
           <el-table-column prop="offStatusName" label="离线原因" align="center">
           </el-table-column>
         </el-table>
@@ -381,7 +386,7 @@ export default {
     },
     screening() {
       this.page.pageNum = 1;
-      this.page.pageSize = 6;
+      // this.page.pageSize = 6;
       this.getTableList();
     },
     goinfo(row) {
@@ -394,7 +399,7 @@ export default {
     empty() {
       this.page = {
         pageNum: 1,
-        pageSize: 6,
+        pageSize: 10,
         openTime: "",
         closeTime: "",
         // houseName: this.houseList[0].id,

src/views/ReceivingRecords/index.vue

@@ -341,11 +341,11 @@ export default {
       options5: [
         {
           value: "1",
-          label: "已标注",
+          label: "已标记",
         },
         {
           value: "0",
-          label: "未标注",
+          label: "未标记",
         },
       ],
       currentPage: 1,

src/views/Statistics/dataScreeAge.vue

@@ -341,6 +341,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -350,6 +353,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据

src/views/Statistics/dataScreeOrg.vue

@@ -314,6 +314,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -323,6 +326,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据

src/views/Statistics/dataScreeSys.vue

@@ -339,6 +339,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -348,6 +351,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据

src/views/admin/role/index.vue

@@ -282,7 +282,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="角色描述:" prop="roleDesc">
-          <el-input v-model="form.roleDesc" type="textarea"></el-input>
+          <el-input v-model="form.roleDesc" type="textarea" maxlength="50"  show-word-limit ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/admin/user/index.vue

@@ -708,7 +708,7 @@
         <div style="line-height: 15px; margin-right: 10px">绑定方式</div>
         <el-radio-group v-model="bindFlag" @change="radioChange">
           <el-radio label="0">指定楼盘绑定</el-radio>
-          <el-radio label="1">按区域绑定</el-radio>
+          <el-radio v-if="code.userRoleType!=6" label="1">按区域绑定</el-radio>
         </el-radio-group>
       </div>
       <div v-if="bindFlag == 0" class="con">
@@ -1734,10 +1734,12 @@ export default {
         console.log("这里是单个楼盘勾选");
         this.bindFlag = "0";
       }
-      if (row.selectHouseType == 2) {
+      else if (row.selectHouseType == 2) {
         this.bindFlag = "1";
         console.log("这里是区域选择");
         this.userAreaFind(row.accountId, row.username);
+      }else{
+        this.bindFlag = "0";
       }
       this.gethouseList();
       // 获取区域列表

src/views/building/index.vue

@@ -1033,7 +1033,7 @@ export default {
     },
     del(row) {
       console.log(row, "删除");
-      this.$confirm(`是否删除区域?`, "提示", {
+      this.$confirm(`是否删除此楼盘?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         distinguishCancelAndClose: true,