init

src/page/wel.vue

@@ -954,15 +954,19 @@ export default {
   },
   methods: {
     jumpto(ind){
+       let  num = 24 * 3600 * 1000 * 29;
+       let dang=this.getCurrentTime()
+       let timevt=this.timestampToTime(new Date(dang).getTime() + num);
+       let newtime=[dang,timevt]
         if(ind==1){
           this.$router.push({
             path: "/Customer/AgentManagement",
-            query: { residueTime: 30 },
+            query: { residueTime: newtime,serviceStatus:0 },
           });
         }else if(ind==2){
            this.$router.push({
             path: "/building/index",
-            query: { residueTime: 30 },
+            query: {  residueTime: newtime,serviceStatus:0 },
           });
         }else if(ind==3){
            this.$router.push({
@@ -975,6 +979,21 @@ export default {
             query: { flag: 2 },
           });
         }
+    },
+    timestampToTime(timestamp) {
+      var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var yyyy = date.getFullYear() + "-";
+      var MM =(date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1): date.getMonth() + 1) + "-";
+      var dd =(date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
+      return yyyy + MM + dd;
+    },
+    getCurrentTime() {
+        //获取当前时间并打印
+    　　let yy = new Date().getFullYear();
+    　　let mm = new Date().getMonth()+1;
+    　　let dd = new Date().getDate();
+    　  let gettime = yy+'-'+mm+'-'+dd
+    　  return gettime
     },
        //切换楼盘
     houseChange() {

src/views/Customer/AgentManagement.vue

@@ -625,7 +625,7 @@ export default {
           { required: true, message: "请填写密码", trigger: "change" },
           { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
         ],
-      }
+      },
 
     };
   },
@@ -641,7 +641,13 @@ export default {
     this.cus_ag_open = this.permissions["cus_ag_open"];
   },
   mounted() {
-    console.log(this.$route.query.residueTime,'跳转代餐')
+      if(this.$route.query.serviceStatus){
+        this.timelist=this.$route.query.residueTime;
+        this.contractStartDate=this.timelist[0];
+        this.contractEndDate=this.timelist[1];
+        this.serviceStatus=this.$route.query.serviceStatus;
+      }
+
     this.getAgentList()
   },
   methods: {
@@ -963,7 +969,6 @@ export default {
           operationalName:this.operationalName,
 
         }).then((res) => {
-          console.log(res.data);
          this.tableData=res.data.records;
           this.total=res.data.total
         });

src/views/Customer/SalesStage.vue

@@ -151,21 +151,16 @@ computed: {
           } else {
             this.houseId = res.data[0].id;
           }
-          // this.houseId = res.data[0].id;
           // 获取列表
           this.findbypage();
         });
     },
     findbypage() {
       let obj = {
-        // current: this.currentPage,
-        // size: this.size,
         houseId: this.houseId,
       };
       this.$api.api.lifeTrackDefineList(obj).then((res) => {
-        // console.log(res)
         this.tableData = res.data;
-        // this.total = res.data.total;
       });
     },
     //删除

src/views/Customer/index.vue

@@ -178,6 +178,27 @@
                   </el-option>
                 </el-select>
            </div>
+                     <div class="div-labox" >
+              <div class="labeltext">客户阶段：</div>
+               <el-select
+                  v-model="searchForm.clientStage"
+                  clearable
+                  filterable
+                  placeholder="请选择"
+                  class="div-inpbox"
+                >
+                  <el-option
+                    v-for="item in clientStagelist"
+                    :key="item.id"
+                    :label="item.stageName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+           </div>
+
+
+
        </div>
        <div class="app-topbox">
            <div class="div-labox" >
@@ -220,15 +241,9 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="recording" label="客户阶段" align="center">
+        <el-table-column prop="clientStageName" label="客户阶段" align="center">
           <template slot-scope="{ row }">
-            {{
-              row.recording == 0
-                ? "没有录音"
-                : row.recording == 1
-                ? "部分录音"
-                : "完整录音"
-            }}
+            {{row.clientStageName|| '--'}}
           </template>
         </el-table-column>
         <el-table-column prop="visitRecord" label="到访次数" align="center">
@@ -400,7 +415,10 @@ export default {
         dateType: "0",
         projectId: "",
         timeType: "0",
+        clientStage:''
       },
+      clientStagelist:[],
+
     };
   },
   computed: {
@@ -466,7 +484,7 @@ export default {
         staDate: "",
         endDate: "",
         dateType: "0",
-        // projectId: "",
+        searchForm: "",
         timeType: "0",
         projectId:this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id,
       };
@@ -477,7 +495,18 @@ export default {
       this.findKeywords();
       // 获取置业顾问列表
       this.findUserListByHouseId();
+      this.getclientStage()
+    },
+    getclientStage() {
+      let obj = {
+        houseId: this.searchForm.projectId,
+      };
+      this.$api.api.lifeTrackDefineList(obj).then((res) => {
+        this.clientStagelist = res.data;
+      });
     },
+
+
     timeChange(e) {
       this.searchForm.dateType=null
       this.searchForm.staDate = e[0];
@@ -498,7 +527,6 @@ export default {
           type: this.type,
         })
         .then((res) => {
-          console.log(res);
           this.keywordsList = res.data;
         });
     },
@@ -508,7 +536,6 @@ export default {
           orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
-          // console.log(res)
           this.houseList = res.data;
           if(localStorage.getItem('orgType')==3){
             this.searchForm.projectId=localStorage.getItem('houseId')
@@ -516,7 +543,6 @@ export default {
             this.searchForm.projectId = res.data[0].id;
           }
           this.houseChange();
-          // this.tabtimetap(0);
         });
     },
     // 置业顾问列表
@@ -525,7 +551,6 @@ export default {
         orgType: localStorage.getItem("orgType"),
         projectId: this.searchForm.projectId,
       });
-      console.log(result);
       this.accountList = result.data;
     },
     handleSizeChange(val) {

src/views/Equipment/equipmentDetailList.vue

@@ -1300,7 +1300,7 @@ export default {
             item.index = index + 1;
           });
           this.tableData = res.data.records;
-          this.page.total = res.data.current;
+          this.page.total = res.data.total;
         }
       });
     },

src/views/Statistics/TrendAnalysis.vue

@@ -734,6 +734,7 @@ export default {
       this.selectTime = "";
       this.selectTime1 = "";
       this.timeSelect(e);
+      console.log(e,'asdasdajdasjdgasdghasdgsajdggh');
     },
     timeSelect(e) {
       if (this.timeType == -1) {

src/views/Statistics/dataScreeAge.vue

@@ -75,7 +75,7 @@
         <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 }}
+            {{ secondTab.receptionQuantityInToday || 0 }}
           </div>
         </div>
         <div class="grid-content" style="cursor: pointer;" @click="secondChange('2')">

src/views/Statistics/dataScreeOrg.vue

@@ -149,7 +149,7 @@
         <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 }}
+            {{ secondTab.receptionQuantityInToday || 0 }}
           </div>
         </div>
         <!-- <div class="grid-content" @click="secondChange('2')">

src/views/Statistics/dataScreeSys.vue

@@ -174,7 +174,7 @@
         <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 }}
+            {{ secondTab.receptionQuantityInToday || 0 }}
           </div>
         </div>
         <div class="grid-content" style="cursor: pointer;" @click="secondChange('2')">

src/views/Statistics/trend.vue

@@ -410,7 +410,6 @@ export default {
   methods: {
     // 获取tab2
     receptionOverviewOfSystem() {
-      console.log(this.time);
       let obj = {
         startDate: this.dateType ? "" : this.customtime[0],
         endDate: this.dateType ? "" : this.customtime[1],
@@ -422,12 +421,7 @@ export default {
         houseId: this.selValue == 2 ? this.choicValue : null,
       };
       this.$api.api.receptionOverviewOfSystem(obj).then((res) => {
-        console.log(res);
-        // 数据处理
-        // 判断是否选择了对比
-        // return
         this.compare = res.data.firstData;
-
         if (this.selectTime1) {
           // 有对比
           this.compare1 = res.data.secondData;
@@ -560,26 +554,30 @@ export default {
       this.timeSelect(e);
     },
     timeSelect(e) {
-      //	获取今天昨天近一周
-      //	获取一天的时间戳
-      let num = 24 * 3600 * 1000;
-      //	获取当前时间戳转换为日期格式
-      if (this.dateType == 4) {
-        num = 24 * 3600 * 1000 * 6;
-      }
-      if (this.dateType == 5) {
-        num = 24 * 3600 * 1000 * 14;
-      }
-      if (this.dateType == 6) {
-        num = 24 * 3600 * 1000 * 29;
+       if (this.dateType == null) {
+        this.selectTime = e;
+        this.selectTime1 = this.timestampToTime(
+          new Date(e).getTime() +
+            new Date(this.customtime[1]).getTime() -
+            new Date(this.customtime[0]).getTime()
+        );
+      }else{
+           let num = 24 * 3600 * 1000;
+          if (this.dateType == 4) {
+            num = 24 * 3600 * 1000 * 6;
+          }
+          if (this.dateType == 5) {
+            num = 24 * 3600 * 1000 * 14;
+          }
+          if (this.dateType == 6) {
+            num = 24 * 3600 * 1000 * 29;
+          }
+          this.selectTime = e;
+          this.selectTime1 = this.timestampToTime(new Date(e).getTime() + num);
       }
-      this.selectTime = e;
-      this.selectTime1 = this.timestampToTime(new Date(e).getTime() + num);
-      console.log(this.selectTime, this.selectTime1);
-      this.Confirmthecontrast = true;
-      // this.page.openTime = this.customtime[0];
-      // this.page.closeTime = this.customtime[1];
-      this.receptionOverviewOfSystem();
+         console.log(this.selectTime, this.selectTime1);
+        this.Confirmthecontrast = true;
+          this.receptionOverviewOfSystem();
     },
     getList() {
       console.log(this.selValue);
@@ -626,10 +624,8 @@ export default {
       this.selectTime1 = "";
       this.$set(this, "time", null);
       if (!e) return;
-      // this.page.openTime = this.customtime[0];
-      // this.page.closeTime = this.customtime[1];
       this.Confirmthecontrast = false;
-      // this.trendtrendAnalysis()
+       this.receptionOverviewOfSystem();
     },
     selChange() {
       this.choicValue = "";
@@ -637,7 +633,6 @@ export default {
       this.getList();
     },
     valuechange() {
-      // console.log(this.choicValue);
       this.receptionOverviewOfSystem();
     },
     radioChange() {
@@ -665,7 +660,6 @@ export default {
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
      echarts.init(document.getElementById(str)).dispose(); // 销毁实例
-     console.log(arr, str, timeDate, Strname)
       var chartDom = document.getElementById(str);
       var myChart = echarts.init(chartDom);
       var option;

src/views/building/index.vue

@@ -741,7 +741,12 @@ export default {
     this.cus_build_index_open = this.permissions["cus_build_index_open"];
   },
   mounted() {
-    console.log(this.$route.query.residueTime,'跳转代餐')
+      if(this.$route.query.serviceStatus){
+        this.starTime=this.$route.query.residueTime;
+        this.searchForm.startWorking=this.starTime[0];
+        this.searchForm.endWorking=this.starTime[1];
+        this.searchForm.serviceStatus=this.$route.query.serviceStatus;
+      }
     this.orgType = localStorage.getItem("orgType");
     // 获取公司列表数据
     this.getOrgList();

vue.config.js

@@ -3,9 +3,9 @@
  * 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.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑