From abe8853a0161a0939a5e49269f37b01ba08310c7 Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Thu, 25 Nov 2021 16:16:52 +0800
Subject: [PATCH] init

---
 src/components/Calendar/calendar.vue     |  6 +-
 src/views/Customer/SalesStage.vue        |  5 +-
 src/views/Customer/label.vue             | 10 ++--
 src/views/Receive/index.vue              | 34 +++++------
 src/views/Scheduling/index.vue           | 26 +++++----
 src/views/Statistics/dataScreeAge.vue    | 59 +------------------
 src/views/Statistics/dataScreeOrg.vue    | 51 +----------------
 src/views/Statistics/dataScreeSys.vue    | 73 +-----------------------
 src/views/Statistics/index.vue           |  2 +-
 src/views/Template/PinspeakwordsList.vue |  5 +-
 src/views/admin/dept/index.vue           |  2 +-
 src/views/admin/user/index.vue           | 12 +++-
 src/views/building/Count.vue             | 41 +------------
 vue.config.js                            |  4 +-
 14 files changed, 64 insertions(+), 266 deletions(-)

diff --git a/src/components/Calendar/calendar.vue b/src/components/Calendar/calendar.vue
index de7d233..a4c61ad 100644
--- a/src/components/Calendar/calendar.vue
+++ b/src/components/Calendar/calendar.vue
@@ -125,7 +125,7 @@ wh_content_item_tag {
   color: #bfbfbf;
 }
 .wh_content_item .wh_isToday {
-  background: yellow;
+  /* background: yellow; */
   border-radius: 100px;
 }
 .wh_content_item .wh_chose_day {
@@ -146,12 +146,12 @@ wh_content_item_tag {
         </li>
       </div>
       <div class="wh_content">
-        <div class="wh_content_item" v-for="tag in textTop">
+        <div class="wh_content_item" v-for="(tag,i) in textTop" :key="i" >
           <div class="wh_top_tag">{{tag}}</div>
         </div>
       </div>
       <div class="wh_content">
-        <div class="wh_content_item" v-for="(item,index) in list" @click="clickDay(item,index)">
+        <div class="wh_content_item" v-for="(item,index) in list" :key="index" @click="clickDay(item,index)">
           <div
             class="wh_item_date"
             v-bind:class="[{ wh_isMark: item.isMark},{wh_other_dayhide:item.otherMonth!=='nowMonth'},{wh_want_dayhide:item.dayHide},{wh_isToday:item.isToday},{wh_chose_day:item.chooseDay},setClass(item)]"
diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue
index 1914dc6..6b6ecc3 100644
--- a/src/views/Customer/SalesStage.vue
+++ b/src/views/Customer/SalesStage.vue
@@ -190,10 +190,7 @@ computed: {
           });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+
         });
     },
     //新增
diff --git a/src/views/Customer/label.vue b/src/views/Customer/label.vue
index f68c002..fab3ab6 100644
--- a/src/views/Customer/label.vue
+++ b/src/views/Customer/label.vue
@@ -130,21 +130,21 @@
                 v-if="level == 0"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name"  maxlength="16" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="8" autocomplete="off"></el-input>
               </el-form-item>
               <el-form-item
                 label="二级名称:"
                 v-if="level == 2"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name"  maxlength="16" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="8" autocomplete="off"></el-input>
               </el-form-item>
               <el-form-item
                 label="三级名称:"
                 v-if="level == 3"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name"  maxlength="16" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="8" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -202,7 +202,7 @@
             类名：
           </div>
           <div>
-            <el-input  maxlength="20"
+            <el-input  maxlength="8"
               v-model="frosasd.name"
 
               type="text"
@@ -251,7 +251,7 @@
                 label="名称:"
                 :label-width="formLabelWidth"
               >
-                <el-input style="width:300px;" v-model="addForm2.name"  maxlength="16"  autocomplete="off"></el-input>
+                <el-input style="width:300px;" v-model="addForm2.name"  maxlength="8"  autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue
index 1683c5f..de251cc 100644
--- a/src/views/Receive/index.vue
+++ b/src/views/Receive/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box-center">
+  <div class="box-center"  style="cursor:pointer;">
 
     <div class="topbox">
       <div class="topzuo">
@@ -850,10 +850,10 @@ export default {
                 message: '删除成功!'
             });
         }).catch(() => {
-            this.$message({
-                type: 'info',
-                message: '已取消删除'
-            });
+            // this.$message({
+            //     type: 'info',
+            //     message: '已取消删除'
+            // });
         });
     },
     //获取文本
@@ -886,10 +886,10 @@ export default {
               this.init()
           })
         }).catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消操作",
+          // });
         });
         }else{
           this.dialogFormVisible13=true;
@@ -939,10 +939,10 @@ export default {
             this.init()
           })
         }).catch(() => {
-          that.$message({
-            type: "info",
-            message: "已取消操作",
-          });
+          // that.$message({
+          //   type: "info",
+          //   message: "已取消操作",
+          // });
         });
      }else{
         that.$confirm("加精,是否继续?", "提示", {
@@ -958,10 +958,10 @@ export default {
             this.init()
           })
         }).catch(() => {
-          that.$message({
-            type: "info",
-            message: "已取消加精",
-          });
+          // that.$message({
+          //   type: "info",
+          //   message: "已取消加精",
+          // });
         });
      }
     },
diff --git a/src/views/Scheduling/index.vue b/src/views/Scheduling/index.vue
index 3412fd4..15e669d 100644
--- a/src/views/Scheduling/index.vue
+++ b/src/views/Scheduling/index.vue
@@ -160,7 +160,7 @@
     <el-dialog title="新增" :visible.sync="showVisible">
       <div>
          <div style="text-align: center;">
-           <Calendar v-on:choseDay="clickDay" ref="calendar" v-on:changeMonth="changeDate" :markDate='arr' />
+           <Calendar v-on:choseDay="clickDay" ref="calendar" v-on:changeMonth="changeDate" :agoDayHide='timeAcc' :markDate='arr' />
           </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -218,7 +218,8 @@ export default {
       total: 0,
       roleId:'',
       arr1:[],
-      showFlag:false
+      showFlag:false,
+      timeAcc:''
     };
   },
     computed: {
@@ -236,6 +237,11 @@ export default {
   },
   mounted() {
     this.getHouse();
+
+    let newSjc=new Date().getTime()-86400000+'';
+    this.timeAcc=newSjc.substr(0,10)
+
+    console.log(this.timeAcc,'sadasdasdas')
   },
   methods: {
     switchstatus(row,i){
@@ -519,10 +525,10 @@ export default {
                  }
             })
             }).catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消删除'
-              });
+              // this.$message({
+              //   type: 'info',
+              //   message: '已取消删除'
+              // });
         });
     },
      alldel(){
@@ -557,10 +563,10 @@ export default {
                      }
                 })
                 }).catch(() => {
-                  this.$message({
-                    type: 'info',
-                    message: '已取消删除'
-                  });
+                  // this.$message({
+                  //   type: 'info',
+                  //   message: '已取消删除'
+                  // });
             });
         }
     },
diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue
index ebad42c..27ffacd 100644
--- a/src/views/Statistics/dataScreeAge.vue
+++ b/src/views/Statistics/dataScreeAge.vue
@@ -199,10 +199,7 @@ export default {
   data() {
     return {
       pickerOptions: {
-        disabledDate(time) {
-          //根据当前日期 --- 禁止选中之后的日期
-          // return time.getTime() > Date.now();
-        },
+        disabledDate(time) {},
       },
       firstTab: {},
       secondTab: {},
@@ -235,7 +232,6 @@ export default {
       this.dateType = 4;
       this.cardindex=1
       this.secindex=1
-      // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
       this.dataOverviewWithSystemWithLook();
@@ -372,9 +368,6 @@ export default {
       let Strname = [];
       let timeDate = [];
       let arr1 = [];
-      // 判断是第几个然后对数据进行渲染
-      // 先处理时间
-      // console.log(timeDate);
       if (idx == 1) {
         Strname = ["购买服务楼盘数"];
         this.thirdTab.buyHouseList.map((item) => {
@@ -451,63 +444,15 @@ export default {
     },
     confirmtime(e) {
       this.dateType = null;
-      if (!e) return;
-      console.log(e);
       this.dataOverviewWithSystemWithLook();
     },
     tabtimetap(i) {
       this.dateType = i;
-      // this.getTableList()
-      this.checked = false;
       this.selectTime = "";
       this.selectTime1 = "";
-      //给时间选择器赋值
-      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.customtime = [
-        this.timestampToTime(new Date().getTime() - num),
-        this.timestampToTime(new Date().getTime()),
-      ];
+      this.customtime=[]
       this.dataOverviewWithSystemWithLook();
-      // this.getTableList();
-      // this.getdetail();
-    },
-    timestampToTime(timestamp) {
-      var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-      // var  date = new Date(timestamp * 1000);//时间戳为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() + ' ';
-      var dd =
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-
-      // var HH = date.getHours() + ':';
-      // var HH = (date.getHours() < 10 ? '0'+(date.getHours()) : date.getHours()) + ':';
-      //
-      // // var mm = date.getMinutes() + ':';
-      // var mm = (date.getMinutes() < 10 ? '0'+(date.getMinutes()) : date.getMinutes()) + ':';
-      //
-      // // var ss = date.getSeconds();
-      // var ss = (date.getSeconds() < 10 ? '0'+(date.getSeconds()) : date.getSeconds());
 
-      // return yyyy+MM+dd+HH+mm+ss;
-      return yyyy + MM + dd;
     },
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue
index 6c71f20..50e0061 100644
--- a/src/views/Statistics/dataScreeOrg.vue
+++ b/src/views/Statistics/dataScreeOrg.vue
@@ -529,63 +529,14 @@ export default {
     },
     confirmtime(e) {
       this.dateType = null;
-      if (!e) return;
-      console.log(e);
       this.dataOverviewWithSystemWithLook();
     },
     tabtimetap(i) {
       this.dateType = i;
-      // this.getTableList()
-      this.checked = false;
       this.selectTime = "";
       this.selectTime1 = "";
-      //给时间选择器赋值
-      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.customtime = [
-        this.timestampToTime(new Date().getTime() - num),
-        this.timestampToTime(new Date().getTime()),
-      ];
+      this.customtime=[]
       this.dataOverviewWithSystemWithLook();
-      // this.getTableList();
-      // this.getdetail();
-    },
-    timestampToTime(timestamp) {
-      var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-      // var  date = new Date(timestamp * 1000);//时间戳为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() + ' ';
-      var dd =
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-
-      // var HH = date.getHours() + ':';
-      // var HH = (date.getHours() < 10 ? '0'+(date.getHours()) : date.getHours()) + ':';
-      //
-      // // var mm = date.getMinutes() + ':';
-      // var mm = (date.getMinutes() < 10 ? '0'+(date.getMinutes()) : date.getMinutes()) + ':';
-      //
-      // // var ss = date.getSeconds();
-      // var ss = (date.getSeconds() < 10 ? '0'+(date.getSeconds()) : date.getSeconds());
-
-      // return yyyy+MM+dd+HH+mm+ss;
-      return yyyy + MM + dd;
     },
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index ea1b7f8..a8688a5 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -52,28 +52,6 @@
           </el-select>
         </div>
       </div>
-      <!-- <div class="app-titel">
-        <div class="titel-text">接待时间</div>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">近7天</div>
-          <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)"> 近15天 </div>
-          <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">  近30天 </div>
-        </div>
-        <div style="margin-left: 26px">
-          <el-date-picker
-            @change="confirmtime()"
-            v-model="customtime"
-            type="daterange"
-            range-separator="-"
-            :default-time="['00:00:00', '23:59:59']"
-            value-format="yyyy-MM-dd"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :picker-options="pickerOptions"
-          >
-          </el-date-picker>
-        </div>
-      </div> -->
     </div>
 
     <!-- 二 -->
@@ -554,63 +532,16 @@ export default {
     },
     confirmtime(e) {
       this.dateType = null;
-      if (!e) return;
-      console.log(e);
+
       this.dataOverviewWithSystemWithLook();
     },
     tabtimetap(i) {
       this.dateType = i;
-      // this.getTableList()
-      this.checked = false;
       this.selectTime = "";
       this.selectTime1 = "";
-      //给时间选择器赋值
-      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.customtime = [
-        this.timestampToTime(new Date().getTime() - num),
-        this.timestampToTime(new Date().getTime()),
-      ];
+      this.customtime=[]
       this.dataOverviewWithSystemWithLook();
-      // this.getTableList();
-      // this.getdetail();
-    },
-    timestampToTime(timestamp) {
-      var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-      // var  date = new Date(timestamp * 1000);//时间戳为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() + ' ';
-      var dd =
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-
-      // var HH = date.getHours() + ':';
-      // var HH = (date.getHours() < 10 ? '0'+(date.getHours()) : date.getHours()) + ':';
-      //
-      // // var mm = date.getMinutes() + ':';
-      // var mm = (date.getMinutes() < 10 ? '0'+(date.getMinutes()) : date.getMinutes()) + ':';
-      //
-      // // var ss = date.getSeconds();
-      // var ss = (date.getSeconds() < 10 ? '0'+(date.getSeconds()) : date.getSeconds());
 
-      // return yyyy+MM+dd+HH+mm+ss;
-      return yyyy + MM + dd;
     },
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 033cda1..ee5a6d5 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box-center" ref="boxcenter">
+  <div class="box-center" ref="boxcenter"  style="cursor:pointer;">
     <!-- 头 -->
     <div class="app-top">
     <div class="app-titel2" style="margin-bottom: 10px">
diff --git a/src/views/Template/PinspeakwordsList.vue b/src/views/Template/PinspeakwordsList.vue
index 52a954c..14c9483 100644
--- a/src/views/Template/PinspeakwordsList.vue
+++ b/src/views/Template/PinspeakwordsList.vue
@@ -269,10 +269,7 @@ export default {
               }
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          });
+
         });
     },
     handleSizeChange(val) {
diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue
index 477fdfa..fa9825c 100644
--- a/src/views/admin/dept/index.vue
+++ b/src/views/admin/dept/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box-center">
+  <div class="box-center"  style="cursor:pointer;">
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index f4454e6..ce46a14 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -624,10 +624,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="部门:"  prop="deptId" v-if="orgFlag">
+        <el-form-item label="部门:"  prop="deptId" v-if="orgFlag">
           <el-select
+          @clear='cleartap()'
             v-model="formTwo.deptId"
-            filterable
+           filterable
+            clearable
             value-key="key"
             style="width: 370px"
             placeholder="请选择部门"
@@ -640,7 +642,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisibleTwo = false">取 消</el-button>
@@ -1279,6 +1281,10 @@ export default {
     );
   },
   methods: {
+    cleartap(){
+        this.formTwo.deptId='';
+        console.log(this.formTwo)
+    },
     // 区域改变
     managerChange() {
       console.log(this.managerStr);
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 37de3aa..7c6cf39 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -158,10 +158,6 @@
             clearable
           ></el-cascader>
         </div>
-        <!-- <div class="div-lab">
-          <div class="label">运营人：</div>
-          <el-input class="div-inp" v-model="searchForm.userName"></el-input>
-        </div> -->
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <div style="margin-left: 20px">
@@ -460,45 +456,14 @@ export default {
       this.searchForm.dateType = null;
       this.searchForm.startDate = e[0];
       this.searchForm.endDate = e[1];
-      // this.houseChange();
+      this.houseStatistics();
     },
     tabtimetap(idx) {
       this.searchForm.startDate = "";
       this.searchForm.endDate = "";
-      // this.$set(this, "time", null);
       this.searchForm.dateType = idx;
-      let num = 24 * 3600 * 1000;
-      //	获取当前时间戳转换为日期格式
-      if (idx == 4) {
-        num = 24 * 3600 * 1000 * 6;
-      }
-      if (idx == 5) {
-        num = 24 * 3600 * 1000 * 14;
-      }
-      if (idx == 6) {
-        num = 24 * 3600 * 1000 * 30;
-      }
-
-      this.time = [
-        this.timestampToTime(new Date().getTime() - num),
-        this.timestampToTime(new Date().getTime()),
-      ];
-    },
-    timestampToTime(timestamp) {
-      var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-      // var  date = new Date(timestamp * 1000);//时间戳为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() + ' ';
-      var dd =
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-      return yyyy + MM + dd;
+      this.time=[]
+      this.houseStatistics();
     },
     locationsChange(e) {
       console.log(e);
diff --git a/vue.config.js b/vue.config.js
index b514bbc..db6248b 100644
--- a/vue.config.js
+++ b/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' //王笑