+
-
+
- 新 增
+ 新 增
- 删 除
+ 删 除
- 审 核
+ 审 核
- 通 过
+ 通 过
- 拒 绝
+ 拒 绝
- 返 回
+ 返 回
- 角色配置
+ 角色配置
- 密码重置
+ 密码重置
- 平台配置
+ 平台配置
- 账号解封
+ 账号解封
- 导入
+ 导入
- 导出
+ 导出
-
- {{row.tenantName}}
+
+ {{ row.tenantName }}
-
- {{row.roleName}}
+
+ {{ row.roleName }}
-
- {{row.deptName}}
+
+ {{ row.deptName }}
-
- {{row.userTypeName}}
+
+ {{ row.userTypeName }}
-
- {{row.isMaintenanceClient == 0 ? '维修客户' : row.isMaintenanceClient == 1 ? '维保客户' : ''}}
+
+ {{ row.isMaintenanceClient == 0 ? '维修客户' : row.isMaintenanceClient == 1 ? '维保客户' : '' }}
-
+
-
+
-
+
@@ -169,32 +90,18 @@
-
-
-
- {{row.tenantName}}
+
+
+
+ {{ row.tenantName }}
-
- {{row.userTypeName}}
+
+ {{ row.userTypeName }}
@@ -204,936 +111,944 @@
diff --git a/src/views/systemRecords/editRecords.vue b/src/views/systemRecords/editRecords.vue
index 2e3e7db..4d3c72b 100644
--- a/src/views/systemRecords/editRecords.vue
+++ b/src/views/systemRecords/editRecords.vue
@@ -12,6 +12,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ value-format="yyyy-MM-dd"
:clearable="false">
@@ -25,8 +26,8 @@
-->
-
-
+
+
@@ -75,7 +76,7 @@ export default {
recordList:[],
role_id:'',
userCurrent:1,
- userSize:10,
+ userSize:10000,
userTotal:0
}
},
@@ -114,6 +115,7 @@ export default {
},
onReset(){
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+ this.form.person = ''
this.getList()
},
getList(){
@@ -121,7 +123,7 @@ export default {
logType:2, // 日志类型（1登录日志 2 修改日志）
startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // 开始时间（yyyy-MM-dd）
endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // 结束时间（yyyy-MM-dd）
- userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : ''
+ userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
// userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // 人员id
}
console.log('quwey------------>',query)
diff --git a/src/views/systemRecords/loginRecords.vue b/src/views/systemRecords/loginRecords.vue
index 3afda23..d799e9d 100644
--- a/src/views/systemRecords/loginRecords.vue
+++ b/src/views/systemRecords/loginRecords.vue
@@ -12,6 +12,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ value-format="yyyy-MM-dd"
:clearable="false">
@@ -25,8 +26,8 @@
-->
-
-
+
+
@@ -75,7 +76,7 @@ export default {
recordList:[],
role_id:'',
userCurrent:1,
- userSize:10,
+ userSize:1000,
userTotal:0
}
},
@@ -85,7 +86,6 @@ export default {
mounted(){
this.role_id = this.userInfo.role_id
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
- console.log('this.role_id',this.role_id)
this.getList()
if(this.role_id == '1123598816738675201'){
this.getUserList()
@@ -115,6 +115,7 @@ export default {
},
onReset(){
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+ this.form.person = ''
this.getList()
},
getList(){
@@ -123,11 +124,9 @@ export default {
startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // 开始时间（yyyy-MM-dd）
endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // 结束时间（yyyy-MM-dd）
// userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // 人员id
- userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : ''
+ userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
}
- console.log('quwey------------>',query)
getlogList(query).then(res=>{
- console.log('res-------------->',res)
this.recordList = res.data.data
})
}
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index cd6f8dd..036d3e5 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -489,12 +489,10 @@ export default {
methods: {
// 报警图片预览
alarmFn(){
- console.log(44444444444)
this.dialogImgVisible = true
},
getPeopleNum(){
maintenancePersonnel({id:this.userInfo.user_id}).then(res =>{
- console.log('res ==============>',res)
this.peopleXdata = res.data.data.xData
this.peopleNum = res.data.data.repairNum
this.peoplePercent = res.data.data.percent
@@ -504,7 +502,6 @@ export default {
})
},
clickReqiure(item){
- console.log('item----------->',item)
this.$router.push({
path:'/operation/hand',
query:item
@@ -630,7 +627,6 @@ export default {
perType: this.role_id == '1839536982874193922' ? 0 : 1 //人员类型 0-客服 1-维修负责人
}
faultRatio(query).then(res => {
- console.log('res ===================>', res)
this.problemData = res.data.data.fault
this.rateData = res.data.data.rate
@@ -784,12 +780,13 @@ export default {
right: '5%',
bottom: '10%'
},
- yAxis: {},
+ yAxis: {
+ },
series: [
{
name: '数量',
type: 'bar',
- barWidth:this.numData == 1 ? 50 : null,
+ barWidth:this.numData == 1 ? 30 : 30,
data: this.numData,
itemStyle: {
color: '#2478f2'
@@ -812,7 +809,6 @@ export default {
trigger: 'axis',
transitionDuration: 0,//防止页面抖动
formatter: params => {
- console.log('params',params)
let rander = params.map(item => `
${item.marker}${item.seriesName}: ${item.seriesType !== "line" ? item.value : item.value != '' ? item.value + "%" : '-'}
` ).join('')
return `
${params[0].axisValue}
diff --git a/vue.config.js b/vue.config.js
index b0bfacf..0a64f2e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,10 +27,13 @@ module.exports = {
'/api': {
//本地服务接口地址
// target: 'http://localhost',
- // target:'http://124.221.142.15:8088/lab',
- target:'http://192.168.0.111:80',
+ // target:'http://192.168.0.111:80',
+ // target:'http://192.168.1.12:10001',
+ target:'http://192.168.0.108:10001',
+ // target:'http://192.168.0.116:80',
+ // target:'http://192.168.0.108:80',
//远程演示服务地址,可用于直接启动项目
- //target: 'https://saber.bladex.cn/api',
+ // target: 'http://124.221.142.15:8088/api',
ws: true,
pathRewrite: {
'^/api': '/'