init

src/views/Equipment/equipmentDetailList.vue

@@ -925,6 +925,7 @@ export default {
       this.$api.api
         .findHouseByUser({
           orgType: localStorage.getItem("orgType"),
+          agentId:localStorage.getItem("agentId")
         })
         .then((res) => {
           this.houseList = res.data;

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -423,6 +423,7 @@ export default {
         method: "get",
         params:{
           orgType:this.orgType,
+          agentId:localStorage.getItem("agentId")
         }
       }).then((res) => {
         // console.log(res.data.obj)

src/views/Statistics/BuildingContrast.vue

@@ -88,12 +88,18 @@
             label="平均执行率"
             align="center"
           >
+           <template slot-scope="{row}">
+            {{row.fraction}}%
+          </template>
           </el-table-column>
            <el-table-column
             prop="prohibitedZb"
             label="违禁接待占比"
             align="center"
           >
+           <template slot-scope="{row}">
+            {{row.prohibitedZb}}%
+          </template>
           </el-table-column>
         </el-table>
         <div style="display: flex;justify-content:flex-end;margin-top: 10px;">

src/views/Statistics/MentoringAbility.vue

@@ -245,6 +245,9 @@
           label="违禁接待次数"
           align="center"
         >
+          <template slot-scope="{row}">
+            {{row.prohibitedCustomer}}次
+          </template>
         </el-table-column>
         <el-table-column
           v-if="tabFlag == 1"
@@ -252,6 +255,9 @@
           label="违禁接待占比"
           align="center"
         >
+         <template slot-scope="{row}">
+            {{row.prohibitedZb}}次
+          </template>
         <!-- </el-table-column>
           <el-table-column
           v-if="tabFlag == 1"
@@ -298,7 +304,9 @@
         </el-table-column>
         <el-table-column  v-for="(item,idx) in tablist" :key="idx" :prop="item.props"  :label="item.label" align="center">
           <template slot-scope="{row}">
-            {{row[item.props]}}%
+            <span v-if="tabFlag == 1">  {{row[item.props]}}次</span>
+            <span v-else>  {{row[item.props]}}%</span>
+            <!-- {{row[item.props]}}% -->
           </template>
         </el-table-column>
       </el-table>

src/views/Statistics/ReceptionOverview.vue

@@ -581,9 +581,10 @@ export default {
         this.$api.http.overviewfindList({
           houseId:this.houseId,
         }).then((res) => {
-            this.departmentlist=[{name:'全部',deptId:''}]
-            this.departmentlist=this.departmentlist.concat(res.data);
-            this.departmentsri='';
+            // this.departmentlist=[{name:'全部',deptId:''}]
+            // this.departmentlist=this.departmentlist.concat(res.data);
+            this.departmentlist=res.data;
+            this.departmentsri=this.departmentlist[0].deptId;
         })
         this.overviewteamOrAccountSellingTrends()
     },

src/views/Statistics/TheTeamCompared.vue

@@ -63,8 +63,8 @@
                <td class="theadtd">{{item.activeCustomer||0}}</td>
                <td class="theadtd">{{item.prohibitedCustomer||0}}</td>
                <td class="theadtd">{{Math.floor(item.sumDuration/60) ||0}}</td>
-               <td class="theadtd">{{item.fraction ||0}}</td>
-               <td class="theadtd">{{item.prohibitedZb||0}}</td>
+               <td class="theadtd">{{item.fraction ||0}}%</td>
+               <td class="theadtd">{{item.prohibitedZb||0}}%</td>
                <td class="theadtd" v-for="(che,ind) in item.resultsList" :key='ind'>{{che.zxl}}%</td>
             </tr>
 

src/views/Statistics/TrendAnalysis.vue

@@ -766,6 +766,10 @@ export default {
       this.selectTime = "";
       this.selectTime1 = "";
       this.$set(this, "time", null);
+      if(!this.checked){
+        this.trendtrendAnalysis()
+        this.Confirmthecontrast=false
+      }
     },
     //选择自定义时间
     confirmtime(e) {

src/views/Statistics/dataScreeAge.vue

@@ -140,14 +140,14 @@
             {{ thirdTab.houseQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
+        <!-- <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
           <div class="text1" :class="{ tophovese: cardindex == 2 }">
             服务期内楼盘数
           </div>
           <div class="text2" :class="{ tophovese: cardindex == 2 }">
             {{ thirdTab.houseQofEnough || 0 }}
           </div>
-        </div>
+        </div> -->
         <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
           <div class="text1" :class="{ tophovese: cardindex == 4 }">
             活跃用户数

src/views/Statistics/dataScreeSys.vue

@@ -57,20 +57,22 @@
     <!-- 二 -->
     <div class="app-box-er">
       <div class="container">
-        <div class="grid-content">
+
+        <div v-if="agentissow" class="grid-content">
           <div class="text1">代理商数</div>
           <div class="text2">{{ firstTab.agentQuantity || 0 }}</div>
         </div>
-        <div class="grid-content">
+        <div v-if="agentissow" class="grid-content">
           <div class="text1">服务期内代理商数</div>
           <div class="text2">{{ firstTab.agentQofEnough || 0 }}</div>
         </div>
-        <div class="grid-content">
+        <div v-if="agentissow" class="grid-content">
           <div class="text1">过期代理商数</div>
           <div class="text2">
             {{ firstTab.agentQofUnenough || 0 }}
           </div>
         </div>
+
         <div class="grid-content">
           <div class="text1">楼盘总数</div>
           <div class="text2">{{ firstTab.houseQuantity || 0 }}</div>
@@ -217,14 +219,14 @@
             {{ thirdTab.houseQuantity || 0 }}
           </div>
         </div>
-        <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
+        <!-- <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('2')">
           <div class="text1" :class="{ tophovese: cardindex == 2 }">
             服务期内楼盘数
           </div>
           <div class="text2" :class="{ tophovese: cardindex == 2 }">
             {{ thirdTab.houseQofEnough || 0 }}
           </div>
-        </div>
+        </div> -->
         <!-- <div class="grid-content" @click="Overviewxlick('3')">
           <div class="text1" :class="{ tophovese: cardindex == 3 }">
             销售设备数
@@ -309,6 +311,7 @@ export default {
           value: "1",
         },
       ],
+      agentissow:true
     };
   },
   mounted() {
@@ -318,9 +321,20 @@ export default {
   methods: {
     valuechange() {
       this.dateType = 4;
-      this.cardindex=1
-      this.secindex=1
-      // console.log(this.choicValue);
+      this.cardindex=1;
+      this.secindex=1;
+       if(this.choicValue==''){
+
+       }
+       if(this.selValue==1){
+        this.agentissow=false;
+      }else{
+         if(this.choicValue==''){
+            this.agentissow=true;
+         }else{
+            this.agentissow=false;
+         }
+      }
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
       this.dataOverviewWithSystemWithLook();
@@ -332,6 +346,15 @@ export default {
       this.cardindex=1
       this.secindex=1
       this.getList();
+      if(this.selValue==1){
+        this.agentissow=false;
+      }else{
+         if(this.choicValue==''){
+            this.agentissow=true;
+         }else{
+            this.agentissow=false;
+         }
+      }
     },
     // 获取下拉框数据
     getList() {

src/views/Statistics/houseDataSys.vue

@@ -262,16 +262,19 @@ export default {
           orgCode: this.selValue == 1 ? this.choicValue : null,
         })
         .then((res) => {
-          // console.log(res);
           // 数据处理
           // 判断是否选择了对比
           this.compare = res.data.firstData;
 
           if (this.selectTime1) {
+            console.log("4444")
             // 有对比
             this.compare1 = res.data.secondData;
             // 将得到的三者的数据进行组装为一个数组
             this.compare2 = res.data.thirdData;
+          }else{
+            this.compare1=[]
+            this.compare2=[]
           }
           this.getChars(1);
         });
@@ -283,7 +286,6 @@ export default {
         let arr1 = [];
         // 判断是第几个然后对数据进行渲染
         // 先处理时间
-        // console.log(timeDate);
         if (idx == 1) {
           Strname = ["活跃楼盘数"];
           this.compare.activeHouseQuantityList.map((item) => {
@@ -307,7 +309,6 @@ export default {
         ];
         this.SwitchCARDS(arr, "main", timeDate, Strname);
       } else {
-        console.log(223);
         let Strname = ["时段一", "时段二"];
         let timeDate = [];
         // 判断是第几个然后对数据进行渲染
@@ -372,7 +373,6 @@ export default {
           tableData.push(obj)
         });
         this.tableData=tableData
-        // console.log(tableData);
       }
     },
     //时间tab切换
@@ -412,29 +412,33 @@ 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.houseTrends();
+
     },
     getList() {
-      console.log(this.selValue);
       // 当为楼盘选择时
       if (this.selValue == 1) {
         this.$api.api
@@ -481,7 +485,6 @@ export default {
       this.getList();
     },
     valuechange() {
-      // console.log(this.choicValue);
       this.houseDataAll();
       this.houseTrends();
     },
@@ -489,6 +492,9 @@ export default {
       this.selectTime = "";
       this.selectTime1 = "";
       this.$set(this, "time", null);
+      if(!this.checked){
+         this.houseTrends();
+      }
     },
     timestampToTime(timestamp) {
       var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
@@ -508,9 +514,11 @@ export default {
     },
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
-      // console.log(arr,str,timeDate,Strname);
+      console.log(arr);
       var chartDom = document.getElementById(str);
+      echarts.init(chartDom).dispose()
       var myChart = echarts.init(chartDom);
+
       var option;
 
       option = {

src/views/Statistics/trend.vue

@@ -639,6 +639,9 @@ export default {
       this.selectTime = "";
       this.selectTime1 = "";
       this.$set(this, "time", null);
+        if(!this.checked){
+        this.receptionOverviewOfSystem();
+      }
     },
     timestampToTime(timestamp) {
       var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000

src/views/Template/Pinspeakwords.vue

@@ -50,13 +50,13 @@
           <el-row :gutter="20">
             <el-col :span="12">
              <el-form-item label="一级大类名称:" v-if="level==0" :label-width="formLabelWidth">
-				<el-input v-model="addForm.name" 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==1" :label-width="formLabelWidth">
-				<el-input v-model="addForm.name" 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" autocomplete="off"></el-input>
+				<el-input v-model="addForm.name" maxlength="8" autocomplete="off"></el-input>
 			</el-form-item>
             </el-col>
           </el-row>
@@ -145,7 +145,7 @@
         <div style="display: flex;align-items: center;height: 40px;">
             <div>类名：</div>
             <div>
-              <el-input  type="text" v-model="frosasd.name" autocomplete="off"></el-input>
+              <el-input  type="text" maxlength="8" v-model="frosasd.name" autocomplete="off"></el-input>
             </div>
         </div>
 

src/views/Template/wrongword.vue

@@ -114,6 +114,21 @@
         <el-button type="primary" @click="addSure()">保存</el-button>
       </div>
     </el-dialog>
+
+     <el-dialog
+      title="删除"
+      :visible.sync="dialogVisible2"
+    >
+    <div class="delclass">
+       <div> <el-radio v-model="radiovalue" label="0">直接删除</el-radio></div>
+       <div style="margin-top:10px;"> <el-radio v-model="radiovalue" label="1">删除，同时恢复历史纠错内容</el-radio></div>
+    </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible2 = false">取 消</el-button>
+        <el-button type="primary" @click="delSure()">保存</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -152,6 +167,10 @@ export default {
           { required: true, message: "请填写错误词", trigger: "change" },
         ],
       },
+      dialogVisible2:false,
+      radiovalue:'0',
+      delid:''
+
     };
   },
   computed: {
@@ -172,29 +191,44 @@ export default {
       this.editFlag = true;
       this.dialogVisible = true;
     },
-    del(row) {
-      console.log(row, "删除");
-      this.$confirm(`是否删除该常错词?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        distinguishCancelAndClose: true,
-        type: "warning",
-      }).then(() => {
+    delSure(){
         axios({
-          url: `/autoSR/zk/correct/del`,
-          method: "post",
-          data: {
-            id: row.id,
-          },
+          url: `/autoSR/zk/correct/deleteCorrectWord?id=`+this.delid+'&deleteType='+this.radiovalue,
+          method: "GET",
         }).then((res) => {
           if (res.code == 0) {
-            this.$message.success("删除成功");
+            this.$message.success("操作成功");
+            this.dialogVisible2=false;
             this.correctFindbypage();
           } else {
             this.$message.warning(res.resMsg);
           }
-        });
-      });
+        })
+    },
+    del(row) {
+      this.delid=row.id;
+      this.dialogVisible2=true;
+      // this.$confirm(`是否删除该常错词?`, "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   distinguishCancelAndClose: true,
+      //   type: "warning",
+      // }).then(() => {
+      //   axios({
+      //     url: `/autoSR/zk/correct/del`,
+      //     method: "post",
+      //     data: {
+      //       id: row.id,
+      //     },
+      //   }).then((res) => {
+      //     if (res.code == 0) {
+      //       this.$message.success("删除成功");
+      //       this.correctFindbypage();
+      //     } else {
+      //       this.$message.warning(res.resMsg);
+      //     }
+      //   });
+      // });
     },
     reset() {
       this.$refs.ruleForm.resetFields();
@@ -318,6 +352,11 @@ export default {
   min-width: 1000px;
   padding-bottom: 100px;
 }
+.delclass{
+  width: 400px;
+  // border: 1px solid red;
+  margin: 0 auto;
+}
 .cen-tab {
   width: 100%;
   padding: 15px;

src/views/building/index.vue

@@ -297,7 +297,7 @@
 
       >
         <el-form-item label="公司" prop="orgCode" v-if="orgType != 2">
-          <el-select v-model="ruleForm.orgCode" filterable  placeholder="请选择公司">
+          <el-select :disabled="editFlag==true"  v-model="ruleForm.orgCode" filterable  placeholder="请选择公司">
             <el-option
               v-for="item in orgList"
               :key="item.id"

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' //王笑