[新增功能](dev):

- 气象平台接入
  - 消防器材导入提示语优化

src/utils/upload.js

@@ -67,7 +67,7 @@ service.interceptors.response.use(
         })
       } else {
         Message({
-          message: res.exception || '系统开小差了，请联系管理员',
+          message: res.exception || res.msg || '系统开小差了，请联系管理员',
           type: 'error',
           duration: 5 * 1000
         })

src/views/firefighting/device/components/list.vue

@@ -384,11 +384,14 @@ export default {
         formData
       ).then((data) => {
         this.$message({
-          message: data.msg,
-          type: data.result === 'success' ? 'success' : 'error'
+          dangerouslyUseHTMLString: true,
+          message: data.msg.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>'),
+          type: data.code === 200 ? 'success' : 'error'
         })
-        this.getList()
-        this.dialogFormDaoru = false
+        if (data.code === 200) {
+          this.getList()
+          this.dialogFormDaoru = false
+        }
       }).catch(() => {
         this.listLoading = false
       })

src/views/meteorologicalMonitoring/meteorologicalHY/index.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="iframe-container">
+    <iframe
+      :src="srcurl"
+      width="100%"
+      height="100%"
+      allowfullscreen
+      style="overflow-y:hidden;overflow-x:hidden;"/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+export default {
+  components: {
+  },
+  data() {
+    return {
+      srcurl: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 获取列表
+    getList() {
+      var _this = this
+      requestFN(
+        '/meteorologicalServices/getUser',
+      ).then((data) => {
+        var jami = data.jiami
+        console.log('加密后：', jami)
+        var url = 'http://192.168.192.201:8995/ocean/userInfo/loginByUser?k=' + data.jiami
+        _this.srcurl = url
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.iframe-container {
+  position: fixed;
+  top: 10;
+  left: 10;
+  width: 90%;
+  height: 90%;
+}
+</style>