liumin
/
zkPCproject
0
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

init

newStyle
wangxiaohua 3 years ago
parent
6f38821896
commit
554200145e
17 changed files with 80 additions and 364 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/page/check/chose.vue
  2. +1
    -1
      src/page/check/index.vue
  3. +6
    -6
      src/page/login/index.vue
  4. +6
    -27
      src/page/wel.vue
  5. +1
    -11
      src/views/Equipment/equipmentDetailList.vue
  6. +1
    -21
      src/views/Equipment/equipmentOnlineRecordList.vue
  7. +30
    -7
      src/views/Receive/index.vue
  8. +2
    -2
      src/views/Scheduling/index.vue
  9. +14
    -17
      src/views/Statistics/ReceptionOverview.vue
  10. +2
    -111
      src/views/Statistics/dataScreeAge.vue
  11. +4
    -51
      src/views/Statistics/houseDataSys.vue
  12. +4
    -21
      src/views/Statistics/trend.vue
  13. +3
    -2
      src/views/Template/Pinspeakwords.vue
  14. +1
    -1
      src/views/Template/PinspeakwordsList.vue
  15. +1
    -0
      src/views/admin/user/index.vue
  16. +1
    -25
      src/views/building/Count.vue
  17. +2
    -60
      src/views/building/index.vue

+ 1
- 1
src/page/check/chose.vue View File

@@ -421,7 +421,7 @@ export default {

<style lang="scss" scoped >
.box-center {
min-width: 1500px;
min-width: 1200px;
height: 100vh;
background: #ffffff;
}


+ 1
- 1
src/page/check/index.vue View File

@@ -250,7 +250,7 @@ export default {

<style lang="scss" scoped >
.box-center {
min-width: 1500px;
min-width: 1200px;
height: 100vh;
background: #ffffff;
}


+ 6
- 6
src/page/login/index.vue View File

@@ -21,14 +21,14 @@
<userLogin v-if="activeName==='user'" />
<codeLogin v-else-if="activeName==='code'" />
<thirdLogin v-else-if="activeName==='third'" />
<!-- <div class="login-menu">
<a href="#"
@click.stop="activeName='user'">账号密码</a>
<div class="login-menu">
<!-- <a href="#"
@click.stop="activeName='user'">账号密码</a> -->
<a href="#"
@click.stop="activeName='code'">手机号登录</a>
<a href="#"
@click.stop="activeName='third'">第三方登录</a>
</div> -->
<!-- <a href="#"
@click.stop="activeName='third'">第三方登录</a> -->
</div>
</div>

</div>


+ 6
- 27
src/page/wel.vue View File

@@ -329,14 +329,6 @@
</div>
</div>



<!-- <div v-if="role==1" style=" width: 100%; text-align: center;line-height: 400px;font-size: 30px;">
代理商后台
</div>
<div v-if="role==2" style=" width: 100%; text-align: center;line-height: 400px;font-size: 30px;">
公司后台
</div> -->
<div v-if="role!=3">
<!-- 系统后台 -->
<div style="margin-bottom:10px;" v-if="role!=2">
@@ -370,15 +362,6 @@
{{sysTop.lowElectricityEquipmentQuantity||0}}
</div>
</div>

<!-- <div class="pagechen">
<div class="pageboxtitle1">维修更换设备</div>
<div class="pageboxtitle3">
{{sysTop.lowElectricityEquipmentQuantity||0}}
</div>
</div> -->
<div class="pagechen" style="background: none;box-shadow: none;}" v-if="role!=0">
</div>
</div>
</div>
<div style="font-weight:bold;font-size: 18px; margin:10px 0 ;">数据简报</div>
@@ -430,8 +413,7 @@
<div class="span1">{{sysSec.activeHouseQuantity || 0}}</div>
<div class="span2">
<span class="span2-1"> 环比:{{sysCompare.activeHouseQuantity || 0}}</span>
<!-- <span class="span2-2">{{cardlist.liftlist.activeCustomer || 0}}%</span> -->
<span class="span2-2" v-if="orderBy.activeHouseQuantity>0">
<span class="span2-2" v-if="orderBy.activeHouseQuantity>0">
<i class="el-icon-top" style="color: red;"></i>
{{orderBy.activeHouseQuantity || 0}}%
</span>
@@ -589,8 +571,6 @@
</div>
</div>
</div>
<!-- <div class="pagechen1"></div>
<div class="pagechen1" ></div> -->
</div>
</div>
<div v-if="role==2">
@@ -793,8 +773,7 @@
</div>
</div>
</div>
<!-- <div class="pagechen1"></div>
<div class="pagechen1" ></div> -->

</div>
</div>

@@ -1191,10 +1170,10 @@ export default {

<style scoped="scoped" lang="scss">
.box-center{

width: 100%;
// height: 100%;
padding: 15px;
min-width: 1300px;
min-width:1000px;
padding-bottom: 100px;
}
.page-container{
@@ -1203,14 +1182,14 @@ export default {
margin-top: 16px;
.pagechen1{
flex: 1;
min-width: 223px;
// min-width: 190px;
border-radius: 4px;
margin-right: 20px;
padding: 20px;
}
.pagechen{
flex: 1;
min-width: 223px;
// min-width: 190px;
background: #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
border-radius: 4px;


+ 1
- 11
src/views/Equipment/equipmentDetailList.vue View File

@@ -22,12 +22,6 @@
</el-option>
</el-select>
</div>
<!-- <div style="margin-left: 20px">
<el-button @click="screening()" style="background: #2671e2; color: #ffffff">筛选</el-button>
</div>
<div style="margin-left: 20px">
<el-button @click="empty()">清空筛选条件</el-button>
</div>-->
</div>
</div>

@@ -90,10 +84,6 @@
>
</el-date-picker>
</div>
<!-- <div style="margin-left: 10px" id="rankketcct" >-->
<!-- <input type="text" autocomplete="off" id="dt" placeholder="与其他时间段对比">-->
<!-- <div id="dd"></div>-->
<!-- </div>-->
</div>

<div class="kapiannox">
@@ -1370,7 +1360,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}
.toptimeqhuan {


+ 1
- 21
src/views/Equipment/equipmentOnlineRecordList.vue View File

@@ -363,17 +363,6 @@ export default {
// 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;
},
//时间补0
@@ -414,10 +403,6 @@ export default {
//时间选择
confirmtime() {
console.log(this.customtime);
// const d = new Date(this.customtime[0])
// this.page.openTime = d.getFullYear() + '-' + this.Zeropadding((d.getMonth() + 1)) + '-' + this.Zeropadding(d.getDate())
// const c = new Date(this.customtime[1])
// this.page.closeTime = c.getFullYear() + '-' + this.Zeropadding((c.getMonth() + 1)) + '-' + this.Zeropadding(c.getDate())
this.page.openTime = this.customtime[0];
this.page.closeTime = this.customtime[1];
},
@@ -452,11 +437,6 @@ export default {
// this.page.houseName = res.data[0].id;
}
this.getTableList();
// res.data.obj.results.forEach((item,index)=>{
// item.index=index+1
// })
// this.tableData=res.data.obj.results;
// this.page.total = res.data.obj.totalRecord;
});
},
//获取table数据、
@@ -506,7 +486,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}
.toptab {


+ 30
- 7
src/views/Receive/index.vue View File

@@ -701,8 +701,6 @@ export default {
Searchcontent:[],
inputtest:'',
info:{},
// zxldivhe:0,
// condivhe:0
};
},
mounted() {
@@ -710,12 +708,38 @@ export default {
this.AudioIdx=this.$route.query.AudioIdx;
this.info = getStore({ name: "userInfo" });
this.init()
// this.condivhe=document.querySelector("#center2").offsetHeight;
// this.zxldivhe=document.querySelector("#zxldiv").offsetHeight;
// console.log(this.condivhe,this.zxldivhe)

},
methods: {
//上一首
aplayerChange(str){
this.aplayer.destroy()
document.querySelector(".center2").scrollTop=0
if(str=='add'){
this.aplayerId++
if(this.aplayerId>=this.aplayerLength){
this.$message('没有下一首啦')
this.aplayerId--
this.bofangchushihua()
return
}else{
this.arr[this.aplayerId].audioContent!=''?this.transcriptionlist=JSON.parse(this.arr[this.aplayerId].audioContent):this.transcriptionlist=[]
this.recordPath=this.arr[this.aplayerId].recordPath;
}
}else{
this.aplayerId--
if(this.aplayerId<0){
this.$message('没有上一首啦')
this.aplayerId++
this.bofangchushihua()
return
}else {
this.arr[this.aplayerId].audioContent!=''?this.transcriptionlist=JSON.parse(this.arr[this.aplayerId].audioContent):this.transcriptionlist=[]
this.recordPath=this.arr[this.aplayerId].recordPath;
}
}
this.bofangchushihua()
this.aplayer.play()
},
//点击播放
tabseek(item){
this.centerindex=0;
@@ -1353,7 +1377,6 @@ export default {
};
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss" >
#avue-view{
overflow: hidden;


+ 2
- 2
src/views/Scheduling/index.vue View File

@@ -83,7 +83,7 @@
<el-table
:data="tableData"
stripe
@selection-change="handleSelectionChange"
style="width: 100%"
:header-cell-style="{ textAlign: 'center' }"
@@ -599,7 +599,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}
.cen-tab {


+ 14
- 17
src/views/Statistics/ReceptionOverview.vue View File

@@ -641,11 +641,21 @@ export default {

}]
};

if(this.cardindex==3){
option.tooltip={
trigger: 'axis',
formatter: '{b0}: {c0}'+'分钟'
};
}else{
option.tooltip={
trigger: 'axis',
formatter: '{b0}: {c0}'+'次'
};
}
if(this.cardindex==4){
option.tooltip={
trigger: 'axis',
formatter: '{b0}: {c0}'+'/%'
formatter: '{b0}: {c0}'+'%'
};
option.yAxis={
type: 'value',
@@ -701,19 +711,6 @@ export default {
},
};
}

if(this.cardindex==3){
option.tooltip={
trigger: 'axis',
formatter: '{b0}: {c0}'+'/分钟'
};
}else{
option.tooltip={
trigger: 'axis',
formatter: '{b0}: {c0}'+'/次'
};
}

option && myChart.setOption(option);
window.addEventListener("resize", () => { myChart.resize();});
},
@@ -725,7 +722,7 @@ export default {
let option= {
tooltip: {
trigger: 'axis',
formatter: '{b0}: {c0}'+'/%'
formatter: '{b0}: {c0}'+'%'
},
legend: {
data: ['执行率/%'],
@@ -799,7 +796,7 @@ export default {
let option= {
tooltip: {
trigger: 'axis',
formatter: '{b0}: {c0}'+'/%'
formatter: '{b0}: {c0}'+'%'
},
legend: {
data: ['执行率/%'],


+ 2
- 111
src/views/Statistics/dataScreeAge.vue View File

@@ -3,20 +3,6 @@
<!-- 头 -->
<div class="app-top">
<div class="app-titel">
<!-- <el-select
v-model="selValue"
@change="selChange"
style="width: 100px"
placeholder="请选择"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> -->
<div class="titel-text">选择公司:</div>
<div style="margin-left: 26px" v-if="selValue == 1">
<el-select
@@ -53,99 +39,23 @@
</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>

<!-- 二 -->
<div class="app-box-er">
<div class="container">
<!-- <div class="grid-content">
<div class="text1">代理商数</div>
<div class="text2">{{ firstTab.agentQuantity || 0 }}</div>
</div> -->
<div class="grid-content">
<div class="text1">服务期内楼盘总数</div>
<div class="text2">{{ firstTab.houseQofEnough || 0 }}</div>
</div>
<!-- <div class="grid-content">
<div class="text1">服务器内代理商数</div>
<div class="text2">{{ firstTab.agentQofEnough || 0 }}</div>
</div> -->
<!-- <div 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>
</div>
<!-- <div class="grid-content">
<div class="text1">服务器内楼盘总数</div>
<div class="text2">{{ firstTab.houseQofEnough || 0 }}</div>
</div> -->
<!-- <div class="grid-content">
<div class="text1">过期楼盘数</div>
<div class="text2">{{ firstTab.houseQofUnenough || 0 }}</div>
</div> -->
<!-- <div class="grid-content">
<div class="text1">设备总数</div>
<div class="text2">{{ firstTab.equipmentQuantity || 0 }}</div>
</div> -->
<div class="grid-content">
<div class="text1">累计销售设备数</div>
<div class="text2">{{ firstTab.equipmentQuantityWithSold || 0 }}</div>
</div>
<!-- <div class="grid-content">
<div class="text1">待售设备数</div>
<div class="text2">
{{ firstTab.equipmentQuantityWithNotSold || 0 }}
</div>
</div>
<div class="grid-content">
<div class="text1">待验收设备数</div>
<div class="text2">
{{ firstTab.equipmentQuantityWithNotAccept || 0 }}
</div>
</div>
<div class="grid-content">
<div class="text1">已报废设备数</div>
<div class="text2">{{ firstTab.damageEquipmentQuantity || 0 }}</div>
</div> -->
<!-- <div class="grid-content">
<div class="text1">正常设备数</div>
<div class="text2">{{ firstTab.normalequipmentQuantity || 0 }}</div>
</div>
<div class="grid-content">
<div class="text1">用户数</div>
<div class="text2">{{ firstTab.userQuantity || 0 }}</div>
</div>
<div class="grid-content">
<div class="text1">顾问数</div>
<div class="text2">{{ firstTab.accountQuantity || 0 }}</div>
</div> -->
<div class="grid-content">
<div class="text1">累计接待量</div>
<div class="text2">{{ firstTab.receptionQuantity || 0 }}</div>
@@ -156,18 +66,7 @@
{{ firstTab.customerQuantity || 0 }}
</div>
</div>
<!-- <div class="grid-content">
<div class="text1">接待时长(小时)</div>
<div class="text2">
{{ Math.floor(firstTab.receptionTime / 60) || 0 }}
</div>
</div>
<div class="grid-content">
<div class="text1">平均接待时长(分钟)</div>
<div class="text2">{{ firstTab.receptionTimeWithAvg || 0 }}</div>
</div> -->
</div>
<!-- <div id="main"></div> -->
</div>

<div class="app-box-er">
@@ -249,14 +148,6 @@
{{ thirdTab.houseQofEnough || 0 }}
</div>
</div>
<!-- <div class="grid-content" @click="Overviewxlick('3')">
<div class="text1" :class="{ tophovese: cardindex == 3 }">
销售设备数
</div>
<div class="text2" :class="{ tophovese: cardindex == 3 }">
{{ thirdTab.avgDuration || 0 }}
</div>
</div> -->
<div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
<div class="text1" :class="{ tophovese: cardindex == 4 }">
活跃用户数
@@ -697,14 +588,14 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width:1000px;
padding-bottom: 100px;
}

.container {
display: grid;
grid-template-columns: repeat(6, 16%);
grid-column-gap: 12px;
grid-column-gap: 8px;
grid-row-gap: 18px;
}



+ 4
- 51
src/views/Statistics/houseDataSys.vue View File

@@ -9,13 +9,6 @@
style="width: 100px"
placeholder="请选择"
>
<!-- <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> -->
<el-option label="代理商" v-if="orgType==0" value="0"></el-option>
<el-option label="公司" value="1"></el-option>
</el-select>
@@ -163,22 +156,6 @@
</div>
</div>
</div>
<!-- <div class="grid-content" @click="secondChange('2')" style="height:auto;cursor: pointer;">
<div class="text1" :class="{ tophovese: secindex == 2 }">
服务期内楼盘数
</div>
<div class="text2" :class="{ tophovese: secindex == 2 }">
{{ compare.houseQofEnough || 0 }}
</div>
<div class="text33" v-if="selectTime1">
<div>
对比时段: <span style="text-indent: 20px;">{{compare1.houseQofEnough||0}}</span>
</div>
<div :style="compare2.houseQofEnough>=0 ? 'color:green;': 'color:red;'">
{{compare2.houseQofEnough||0}}
</div>
</div>
</div> -->
</div>
<div id="main"></div>
</div>
@@ -205,18 +182,6 @@
</el-table-column>
</el-table>
</template>
<!-- <div style="display: flex; justify-content: flex-end; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currentPage3"
:page-sizes="[6, 10, 14, 20]"
:page-size="6"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
>
</el-pagination>
</div> -->
</div>
</div>
</template>
@@ -507,10 +472,9 @@ 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.trendtrendAnalysis()
this.houseTrends();
},
selChange() {
@@ -542,17 +506,6 @@ export default {
// 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;
},
//卡片下折线图
@@ -634,7 +587,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width:1000px;
padding-bottom: 100px;
}

@@ -647,7 +600,7 @@ export default {
.container1 {
display: grid;
grid-template-columns: repeat(3, 30%);
grid-column-gap: 66px;
grid-column-gap: 50px;
grid-row-gap: 18px;
}
// 进度条


+ 4
- 21
src/views/Statistics/trend.vue View File

@@ -9,13 +9,7 @@
style="width: 100px"
placeholder="请选择"
>
<!-- <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> -->

<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>
@@ -354,18 +348,7 @@
</el-table-column>
</el-table>
</template>
<!-- <div style="display: flex; justify-content: flex-end; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currentPage3"
:page-sizes="[6, 10, 14, 20]"
:page-size="6"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
>
</el-pagination>
</div> -->

</div>
</div>
</template>
@@ -818,14 +801,14 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}

.container {
display: grid;
grid-template-columns: repeat(6, 16%);
grid-column-gap: 12px;
grid-column-gap: 8px;
grid-row-gap: 18px;
}
.container1 {


+ 3
- 2
src/views/Template/Pinspeakwords.vue View File

@@ -120,7 +120,7 @@
<el-button type="primary" size="mini" @click="Removethesecondary(index,idx,asd)">删除</el-button>
</div>
</div>
<div class="sanji" style="width: 900px;" >
<div class="sanji" style="width: 80%;" >
<div style="display: flex;align-items: center;height: 40px;" v-for="(sanji,indx) in asd.children" :key="indx">
<div style="width:85% ;margin-left: 30px;">{{sanji.name||''}}</div>
<div style="margin-left: 10px;">
@@ -1029,7 +1029,7 @@ export default {
width: 100%;
padding: 15px;
padding-top: 0px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}
#app {
@@ -1039,6 +1039,7 @@ export default {
list-style: none;
display: flex;
background: #ffffff;
min-width: 1000px;
min-height: 80vh;
border-radius: 4px;
}


+ 1
- 1
src/views/Template/PinspeakwordsList.vue View File

@@ -310,7 +310,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 40px;
}
.cen-tab{


+ 1
- 0
src/views/admin/user/index.vue View File

@@ -1466,6 +1466,7 @@ export default {
// 由用户
this.$api.api
.userVerify({
houseId:localStorage.getItem('houseId'),
orgType: localStorage.getItem("orgType"),
accountId: res.data.sysUser.accountId,
username: res.data.sysUser.username,


+ 1
- 25
src/views/building/Count.vue View File

@@ -188,8 +188,6 @@
<el-table-column prop="area" label="地区" align="center">
</el-table-column>

<!-- <el-table-column prop="userName" label="运营人" align="center">
</el-table-column> -->
<el-table-column prop="linkman" label="负责人" align="center">
</el-table-column>
<el-table-column prop="onlineQuantity" label="在线设备" align="center">
@@ -227,17 +225,12 @@
>
</template>
</el-table-column>
<!-- <el-table-column prop="date" label="备注" align="center">
</el-table-column> -->
<!-- scope -->
</el-table>


<el-table v-if="activeTotal==2" :data="tableData" stripe style="width: 100%">
<el-table-column prop="orgName" label="公司名称" align="center">
</el-table-column>
<!-- <el-table-column prop="agentName" label="代理商" align="center">
</el-table-column> -->
<el-table-column prop="houseQuantityOfEnough" label="服务期内楼盘" align="center">
</el-table-column>
<el-table-column prop="onlineQuantity" label="在线设备" align="center">
@@ -276,9 +269,6 @@
<el-button type="text" @click="goDetail(row,2)">查看详情</el-button>
</template>
</el-table-column>
<!-- <el-table-column prop="date" label="备注" align="center">
</el-table-column> -->
<!-- scope -->
</el-table>

<el-table v-if="activeTotal==1" :data="tableData" stripe style="width: 100%">
@@ -312,9 +302,6 @@
<el-button type="text" @click="goDetail(row,1)">查看详情</el-button>
</template>
</el-table-column>
<!-- <el-table-column prop="date" label="备注" align="center">
</el-table-column> -->
<!-- scope -->
</el-table>
<div style="display: flex; justify-content: flex-end; margin-top: 10px">
<el-pagination
@@ -511,17 +498,6 @@ export default {
// 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;
},
locationsChange(e) {
@@ -614,7 +590,7 @@ export default {
.box-center {
width: 100%;
padding: 15px;
min-width: 1200px;
min-width: 1000px;
padding-bottom: 100px;
}
.toptab {


+ 2
- 60
src/views/building/index.vue View File

@@ -355,24 +355,6 @@
<el-form-item label="详细地址" prop="address">
<el-input v-model="ruleForm.address" type="textarea" maxlength="60" show-word-limit></el-input>
</el-form-item>
<!-- <el-form-item
label="运营人员"
prop="operationalPeople"
v-if="orgType == 0"
>
<el-select
v-model="ruleForm.operationalPeople"
placeholder="请选择运营人员"
>
<el-option
v-for="item in operationList"
:key="item.accountId"
:label="item.name"
:value="item.accountId"
>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="管理员账号" prop="managerPhone" v-if="!editFlag">
<el-input maxlength="11" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" v-model="ruleForm.managerPhone"></el-input>
</el-form-item>
@@ -435,47 +417,7 @@
<el-button type="primary" @click="changeSure">确 定</el-button>
</div>
</el-dialog>
<!-- <el-dialog title="新增用户" :visible.sync="dialogVisible1">
<el-form
:model="ruleForm1"
label-position="labelPosition"
ref="ruleForm1"
label-width="100px"
style="width: 60%; margin: 0 auto"
>
<el-form-item label="用户名：" prop="areaName">
<el-input v-model="ruleForm1.areaName"></el-input>
</el-form-item>
<el-form-item label="性别：" prop="areaName">
<el-radio-group v-model="ruleForm1.resource">
<el-radio label="男"></el-radio>
<el-radio label="女"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="登录手机：" prop="areaName">
<el-input v-model="ruleForm1.areaName"></el-input>
</el-form-item>
<el-form-item label="登录密码：" prop="areaName">
<el-input v-model="ruleForm1.areaName"></el-input>
</el-form-item>
<el-form-item label="角色：" prop="areaName">
<el-select v-model="ruleForm1.region" placeholder="请选择角色">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门：" prop="areaName">
<el-select v-model="ruleForm1.region" placeholder="请选择部门">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible2 = false">取 消</el-button>
<el-button type="primary">保存</el-button>
</div>
</el-dialog> -->


<el-dialog :title="sysFlag==0?'绑定系统运营':'绑定售后运营'" :visible.sync="operaVisible">
<el-form
@@ -579,7 +521,7 @@ export default {
if (res.data) {
// 由用户
this.$api.api.userVerify({
// orgType:localStorage.getItem('orgType'),
houseId:this.accountForm.id,
orgType:3,
accountId:res.data.sysUser.accountId,
username:res.data.sysUser.username,


Write Preview
Loading…
Cancel
Save