diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/prod.env.js b/config/prod.env.js
index ec1f271..15abe8e 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,6 +8,6 @@
// BASE_API: '"http://111.198.10.15:11407"'
// BASE_API: '"http://111.198.10.15:11408"'
// BASE_API: '"http://192.168.8.201:8083"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //--测试
+ // BASE_API: '"http://111.198.10.15:11408"' --周甜
}
diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/prod.env.js b/config/prod.env.js
index ec1f271..15abe8e 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,6 +8,6 @@
// BASE_API: '"http://111.198.10.15:11407"'
// BASE_API: '"http://111.198.10.15:11408"'
// BASE_API: '"http://192.168.8.201:8083"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //--测试
+ // BASE_API: '"http://111.198.10.15:11408"' --周甜
}
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..c9d0f79
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/prod.env.js b/config/prod.env.js
index ec1f271..15abe8e 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,6 +8,6 @@
// BASE_API: '"http://111.198.10.15:11407"'
// BASE_API: '"http://111.198.10.15:11408"'
// BASE_API: '"http://192.168.8.201:8083"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //--测试
+ // BASE_API: '"http://111.198.10.15:11408"' --周甜
}
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..c9d0f79
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue
index 99822f3..65a908d 100644
--- a/src/views/assessResult/components/deptStatistics.vue
+++ b/src/views/assessResult/components/deptStatistics.vue
@@ -2,36 +2,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {{ buttonName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {{ buttonName }}
-
-
+
+
{{ title }}
@@ -159,7 +159,12 @@
this.listLoading = true
this.listQuery.startTime = this.listQuery.dateRange[0]
this.listQuery.endTime = this.listQuery.dateRange[1]
- statisticsByDepartment(this.listQuery).then(response => {
+ const params = {
+ deptId: this.listQuery.deptId,
+ startTime: this.listQuery.startTime,
+ endTime: this.listQuery.endTime
+ }
+ statisticsByDepartment(params).then(response => {
this.title = this.deptName + this.listQuery.startTime + '~' + this.listQuery.endTime + '指标考核情况'
this.chartData.rows = response.data
this.chartDataPie.rows = response.data
diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/prod.env.js b/config/prod.env.js
index ec1f271..15abe8e 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,6 +8,6 @@
// BASE_API: '"http://111.198.10.15:11407"'
// BASE_API: '"http://111.198.10.15:11408"'
// BASE_API: '"http://192.168.8.201:8083"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //--测试
+ // BASE_API: '"http://111.198.10.15:11408"' --周甜
}
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..c9d0f79
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue
index 99822f3..65a908d 100644
--- a/src/views/assessResult/components/deptStatistics.vue
+++ b/src/views/assessResult/components/deptStatistics.vue
@@ -2,36 +2,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {{ buttonName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {{ buttonName }}
-
-
+
+
{{ title }}
@@ -159,7 +159,12 @@
this.listLoading = true
this.listQuery.startTime = this.listQuery.dateRange[0]
this.listQuery.endTime = this.listQuery.dateRange[1]
- statisticsByDepartment(this.listQuery).then(response => {
+ const params = {
+ deptId: this.listQuery.deptId,
+ startTime: this.listQuery.startTime,
+ endTime: this.listQuery.endTime
+ }
+ statisticsByDepartment(params).then(response => {
this.title = this.deptName + this.listQuery.startTime + '~' + this.listQuery.endTime + '指标考核情况'
this.chartData.rows = response.data
this.chartDataPie.rows = response.data
diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue
index fec4bc0..caa5b05 100644
--- a/src/views/assessResult/components/indexStatistics.vue
+++ b/src/views/assessResult/components/indexStatistics.vue
@@ -2,44 +2,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {{ buttonName }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {{ buttonName }}
+
+
diff --git a/config/dev.env.js b/config/dev.env.js
index e3a40a0..fb5019a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,8 +12,8 @@
// BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
// BASE_API: '"http://139.198.16.38:20007"'
// BASE_API: '"http://111.198.10.15:11407"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //测试
+ // BASE_API: '"http://111.198.10.15:11408"' //周甜
// BASE_API: '"http://192.168.0.123:20007"'
// BASE_API: '"http://192.168.2.107:20007"'
// BASE_API: '"http://192.170.1.102:8093"'
diff --git a/config/prod.env.js b/config/prod.env.js
index ec1f271..15abe8e 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,6 +8,6 @@
// BASE_API: '"http://111.198.10.15:11407"'
// BASE_API: '"http://111.198.10.15:11408"'
// BASE_API: '"http://192.168.8.201:8083"'
- // BASE_API: '"http://11.100.6.142:8082/xzwx"'
- BASE_API: '"http://111.198.10.15:11408"'
+ BASE_API: '"http://11.100.6.142:8082/xzwx"' //--测试
+ // BASE_API: '"http://111.198.10.15:11408"' --周甜
}
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..c9d0f79
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue
index 99822f3..65a908d 100644
--- a/src/views/assessResult/components/deptStatistics.vue
+++ b/src/views/assessResult/components/deptStatistics.vue
@@ -2,36 +2,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {{ buttonName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {{ buttonName }}
-
-
+
+
{{ title }}
@@ -159,7 +159,12 @@
this.listLoading = true
this.listQuery.startTime = this.listQuery.dateRange[0]
this.listQuery.endTime = this.listQuery.dateRange[1]
- statisticsByDepartment(this.listQuery).then(response => {
+ const params = {
+ deptId: this.listQuery.deptId,
+ startTime: this.listQuery.startTime,
+ endTime: this.listQuery.endTime
+ }
+ statisticsByDepartment(params).then(response => {
this.title = this.deptName + this.listQuery.startTime + '~' + this.listQuery.endTime + '指标考核情况'
this.chartData.rows = response.data
this.chartDataPie.rows = response.data
diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue
index fec4bc0..caa5b05 100644
--- a/src/views/assessResult/components/indexStatistics.vue
+++ b/src/views/assessResult/components/indexStatistics.vue
@@ -2,44 +2,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {{ buttonName }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {{ buttonName }}
+
+
diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue
index b5ceab9..d033750 100644
--- a/src/views/assessRules/deptStatistics.vue
+++ b/src/views/assessRules/deptStatistics.vue
@@ -8,6 +8,7 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
+ format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
@@ -132,6 +133,8 @@
this.dialogFormVisible = dialogFormVisible
this.listQuery.beginDate = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
this.listQuery.endDate = new Date()
+ this.listQuery.endDate = this.getDateTime(new Date(this.listQuery.endDate).getTime())
+ this.listQuery.beginDate = this.getDateTime(new Date(this.listQuery.beginDate).getTime())
this.dateRange = [this.listQuery.beginDate, this.listQuery.endDate]
const projectId = row.id
this.projectId = row.id
@@ -165,6 +168,17 @@
},
cancel: function() {
this.dialogFormVisible = false
+ },
+ // 时间戳转变为yyyy-MM-DD
+ getDateTime(value) {
+ const time = new Date(value)
+ const year = time.getFullYear() + '-'
+ let month = (time.getMonth() + 1)
+ let date = time.getDate()
+ month = month < 10 ? '0' + month + '-' : month + '-'
+ date = date < 10 ? '0' + date : date
+ const str = String(year) + String(month) + String(date)
+ return str
}
}
}