diff --git a/back/src/assets/img/del.png b/back/src/assets/img/del.png new file mode 100644 index 00000000..fd546467 Binary files /dev/null and b/back/src/assets/img/del.png differ diff --git a/back/src/assets/img/workBench/banner-gg.png b/back/src/assets/img/workBench/banner-gg.png new file mode 100644 index 00000000..66076b4d Binary files /dev/null and b/back/src/assets/img/workBench/banner-gg.png differ diff --git a/back/src/assets/img/workBench/banner-jc.png b/back/src/assets/img/workBench/banner-jc.png new file mode 100644 index 00000000..89d47a32 Binary files /dev/null and b/back/src/assets/img/workBench/banner-jc.png differ diff --git a/back/src/assets/img/workBench/banner-sj.png b/back/src/assets/img/workBench/banner-sj.png new file mode 100644 index 00000000..10f9f7f2 Binary files /dev/null and b/back/src/assets/img/workBench/banner-sj.png differ diff --git a/back/src/assets/img/workBench/banner-yy.png b/back/src/assets/img/workBench/banner-yy.png new file mode 100644 index 00000000..edf898e4 Binary files /dev/null and b/back/src/assets/img/workBench/banner-yy.png differ diff --git a/back/src/assets/img/workBench/banner-zj.png b/back/src/assets/img/workBench/banner-zj.png new file mode 100644 index 00000000..5b9cae95 Binary files /dev/null and b/back/src/assets/img/workBench/banner-zj.png differ diff --git a/back/src/views/modules/ability/assignedScene/area-add.vue b/back/src/views/modules/ability/assignedScene/area-add.vue index edac755d..bec30639 100644 --- a/back/src/views/modules/ability/assignedScene/area-add.vue +++ b/back/src/views/modules/ability/assignedScene/area-add.vue @@ -41,7 +41,7 @@ -
只能上传图片文件
+
只能上传图片文件,格式为jpg/png
点击上传
@@ -299,7 +299,7 @@ export default { file.type === 'image/jpg' || file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, @@ -314,7 +314,7 @@ export default { file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, diff --git a/back/src/views/modules/ability/assignedScene/city-add.vue b/back/src/views/modules/ability/assignedScene/city-add.vue index 4560fcfb..e77d109a 100644 --- a/back/src/views/modules/ability/assignedScene/city-add.vue +++ b/back/src/views/modules/ability/assignedScene/city-add.vue @@ -56,7 +56,7 @@ -
只能上传图片文件
+
只能上传图片文件,格式为jpg/png
点击上传
@@ -458,7 +458,7 @@ export default { file.type === 'image/jpg' || file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, @@ -473,7 +473,7 @@ export default { file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, diff --git a/back/src/views/modules/ability/assignedScene/components/ability-add.vue b/back/src/views/modules/ability/assignedScene/components/ability-add.vue index cb8a5fc5..199dd0a9 100644 --- a/back/src/views/modules/ability/assignedScene/components/ability-add.vue +++ b/back/src/views/modules/ability/assignedScene/components/ability-add.vue @@ -61,12 +61,21 @@ + + + + diff --git a/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue b/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue index 2b906467..8b5ecb2d 100644 --- a/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue +++ b/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue @@ -15,7 +15,7 @@ style="color:red;margin-left: 6px;" @click="deleteItem(index)" type="danger" size="small" v-if="dataInfo.length > 1" - src="~@/assets/img/deleteRed.png" + src="~@/assets/img/del.png" alt="" /> - +
@@ -89,33 +84,7 @@
- - - + @@ -262,7 +247,7 @@ export default { } .question-box { float: left; - width: 42%; + width: 295px; } .question-box1 { float: left; diff --git a/back/src/views/modules/workBench/components/DataStatistics.vue b/back/src/views/modules/workBench/components/DataStatistics.vue new file mode 100644 index 00000000..7197a09f --- /dev/null +++ b/back/src/views/modules/workBench/components/DataStatistics.vue @@ -0,0 +1,292 @@ + + + + diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index d3e6b140..13214218 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -1,5 +1,9 @@