qinhouyu пре 2 година
родитељ
комит
a01b3bab93

+ 1 - 0
src/api/components/supermap.js

@@ -60,4 +60,5 @@ export const iconList = {
   'sj-icon-map-centerdata-t-forest-firehydrant@1': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_forest_firehydrant@1.png'),//地上消防栓
   'sj-icon-map-centerdata-t-forest-firehydrant@2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_forest_firehydrant@2.png'),//地下消防栓
   'sj-icon-map-centerdata-t-forest-firehydrant@3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_forest_firehydrant@3.png'),//室内消防栓
+  'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
 }

+ 8 - 0
src/api/forest.js

@@ -360,3 +360,11 @@ export function sendMessage(param) {
 }
 
 
+// 事件审核
+export function eventExamine(param) {
+  return request({
+    url: '/center-event/eventcatalogue/eventExamine',
+    method: 'post',
+    data: param
+  })
+}

BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png


+ 17 - 17
src/components/ImageUpload/index.vue

@@ -46,19 +46,19 @@
 import { getToken } from "@/utils/auth";
 
 export default {
-    name: 'ImageUpload',
+  name: 'ImageUpload',
   props: {
-      ImageUpload: Function,
+    ImageUpload: Function,
     value: [String, Object, Array],
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 1,
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
-      default: 5,
+      type: Number,
+      default: 10,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
@@ -115,30 +115,30 @@ export default {
   },
 
   methods: {
-      clear: function(){
-          alert('2')
+    clear: function(){
+      alert('2')
 
 
-      },
+    },
     // 删除图片
     handleRemove(file, fileList) {
       const findex = this.fileList.map(f => f.name).indexOf(file.name);
       if(findex > -1) {
         this.fileList.splice(findex, 1);
-        this.$emit("input", this.listToString(this.fileList));
-          // this.ImageUpload.setUrl("")
+        this.$emit("input", this.fileList);
+        // this.ImageUpload.setUrl("")
       }
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.data.url, url: res.data.url });
+      this.uploadList.push({ name: res.data.url, url: res.data.webUrl });
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
         this.number = 0;
         console.log("213",this.fileList)
-          // this.ImageUpload.setUrl(res.data.url)
-        this.$emit("input", this.listToString(this.fileList));
+        // this.ImageUpload.setUrl(res.data.url)
+        this.$emit("input", this.fileList);
         this.$modal.closeLoading();
       }
     },
@@ -202,17 +202,17 @@ export default {
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
 ::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
+  opacity: 0;
+  transform: translateY(0);
 }
 </style>
 

+ 4 - 2
src/main.js

@@ -27,8 +27,9 @@ import './permission' // permission control
 
 //DataV动效组件
 import dataV from '@jiaminghi/data-view'
-
-//公共过滤器 
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
+//公共过滤器
 import './filters'
 
 // //WebSocket封装方法
@@ -45,6 +46,7 @@ Vue.use(VueCookies)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(dataV)
+Vue.component('ImageUpload', ImageUpload)
 Vue.prototype.$echarts = echarts //挂载echarts
 DictData.install()
 

Разлика између датотеке није приказан због своје велике величине
+ 689 - 552
src/views/eventdetailsdialog.vue


Разлика између датотеке није приказан због своје велике величине
+ 793 - 643
src/views/firespread.vue