init

src/page/check/chose.vue

@@ -134,9 +134,9 @@
         >
           <el-option
             v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.areaName"
+            :value="item.provinceItem"
           >
           </el-option>
         </el-select>
@@ -149,7 +149,7 @@
         >
         </el-input>
         <el-button
-          style="height: 32px; line-height: 13px"
+          style="height: 32px; line-height: 13px;margin-left:10px;"
           type="primary"
           size="medium"
           @click="screenzkhousePage"
@@ -318,7 +318,7 @@ export default {
     findArea() {
       this.$api.api.findArea().then((res) => {
         console.log(res);
-        this.options = res.data.records;
+        this.options = res.data;
       });
     },
     zkhousePage() {
@@ -342,7 +342,7 @@ export default {
       if (this.info.selectHouseType == 2) {
         this.$api.api
           .findHouseByArea({
-            id: this.area,
+            provinceItem: this.area,
             ...obj
           })
           .then((res) => {

src/views/Equipment/equipmentDetailList.vue

@@ -10,6 +10,16 @@
         "
       >
         <span class="demonstration">楼盘名称：</span>
+        <!-- <el-select
+          v-model="selValue"
+          @change="selChange"
+          style="width: 100px"
+          placeholder="请选择"
+        >
+          <el-option label="代理商" v-if="orgType == 0" value="0"></el-option>
+          <el-option label="公司" v-if="orgType != 2" value="1"></el-option>
+          <el-option label="楼盘" value="2"></el-option>
+        </el-select> -->
         <div style="width: 200px">
           <!--				<el-input  v-model="page.accountName"></el-input>-->
           <el-select
@@ -687,6 +697,7 @@ export default {
       houseId: "",
       timeType: 0,
       orgType: localStorage.getItem("orgType"),
+      selValue:'0',
       time: "",
       compareFlag: "0",
       selectTime: "",
@@ -814,6 +825,15 @@ export default {
     // this.getTableList()
   },
   methods: {
+      selChange() {
+      this.choicValue = "";
+      this.timeType = 4;
+      // this.getList();
+      this.getTableList();
+      this.getdetail();
+      // 获取对比列表
+      this.getcompare();
+    },
     // 没有对比时的折线图
     getNoCompare(){
       this.compareFlag = 0;
@@ -844,6 +864,7 @@ export default {
       this.selectTime1 = "";
       this.compareList = [];
       this.$set(this, "time", null);
+      this.getcompare();
     },
     goinfo(row, idx) {
       console.log(row, "信息");
@@ -1038,7 +1059,7 @@ export default {
       this.compareFlag = 0;
       let obj = {
         current: this.pageNum,
-        pageSize: this.pageSize,
+        size: this.pageSize,
         startDate: this.page.openTime,
         endDate: this.page.closeTime,
         houseId: this.houseId,
@@ -1056,7 +1077,7 @@ export default {
         .then((res) => {
           console.log(res,'获取数据')
           this.allCompare = res;
-          this.total = res.data.first.totalRecord;
+          this.total = res.data.firstPage.total;
           //	数据处理
           let arr = [];
           if (this.pageNum == 1) {
@@ -1070,15 +1091,15 @@ export default {
             };
             arr.push(obj1);
           }
-          res.data.first.records.map((item, index) => {
+          res.data.firstPage.records.map((item, index) => {
             let obj = {};
             //当他为0的时候
             obj.name =
-              res.data.first.records[index].createTime.substring(5, 10) +
+              res.data.firstPage.records[index].createTime.substring(5, 10) +
               "VS" +
-              res.data.second.records[index].createTime.substring(5, 10);
-            obj.first = res.data.first.records[index];
-            obj.second = res.data.second.records[index];
+              res.data.secondPage.records[index].createTime.substring(5, 10);
+            obj.first = res.data.firstPage.records[index];
+            obj.second = res.data.secondPage.records[index];
             obj.contrast = res.data.contrast[index];
             // obj.time=''
             // obj.time1=''
@@ -1241,7 +1262,7 @@ export default {
         // console.log(this.allCompare,"第一种");
         let timeDate = [];
         let arr1 = [];
-        this.allCompare.data.first.records.map(item=>{
+        this.allCompare.data.first.map(item=>{
           timeDate.push(item.createTime.substring(5))
           arr1.push(item[str])
         })

src/views/Equipment/index.vue

@@ -1200,6 +1200,7 @@ export default {
       this.$api.api
         .findHouseByUser({
           orgType: localStorage.getItem("orgType"),
+          houseTypes:'0,1,2,3'
         })
         .then((res) => {
           // console.log(res)

src/views/Equipment/state.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
-            <div class="app-titel" style="margin-left: 15px">
+      <div class="app-titel" style="margin-left: 15px" v-if="orgType!=3">
         <el-select
           v-model="selValue"
           @change="selChange1"
@@ -919,9 +919,9 @@ export default {
           // orgCode: localStorage.getItem("orgCode"),
           // agentId: localStorage.getItem("agentId"),
           // houseId: localStorage.getItem("houseId"),
-          agentId: this.selValue == 0 ? this.choicValue : 'null',
-          orgCode: this.selValue == 1 ? this.choicValue : 'null',
-          houseId: this.selValue == 2 ? this.choicValue : 'null',
+          agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.choicValue : 'null',
+          orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.choicValue : 'null',
+          houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.choicValue : 'null',
           orgType: localStorage.getItem("orgType"),
           ...this.searchForm,
         })

src/views/building/Count.vue

@@ -158,14 +158,14 @@
             clearable
           ></el-cascader>
         </div>
-          <div class="div-lab" v-if="activeTotal == 0">
+          <div class="div-lab" v-if="orgType == 0">
           <div class="label" style="min-width:70px;">系统运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
         </div>
-        <!-- <div class="div-lab" v-if="activeTotal == 0">
-          <div class="label" style="min-width:70px;">系统运营：</div>
+        <div class="div-lab" v-if="orgType == 1">
+          <div class="label" style="min-width:70px;">售后运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
-        </div> -->
+        </div>
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <div style="margin-left: 20px">

vue.config.js

@@ -3,8 +3,8 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.169: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' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑