合并分支 'thy' 到 'ningbo'

package-lock.json

@@ -10646,6 +10646,11 @@
         }
       }
     },
+    "simple-uploader.js": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npm.taobao.org/simple-uploader.js/download/simple-uploader.js-0.5.4.tgz",
+      "integrity": "sha1-+FjtH+/t3FjUanJNWmx3BAsLKbs="
+    },
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -12001,6 +12006,14 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.7.tgz",
       "integrity": "sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ=="
     },
+    "vue-simple-uploader": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npm.taobao.org/vue-simple-uploader/download/vue-simple-uploader-0.7.4.tgz",
+      "integrity": "sha1-jPYDP9rgWzn4mBRsyWEhOjhgYlk=",
+      "requires": {
+        "simple-uploader.js": "^0.5.4"
+      }
+    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",

package.json

@@ -19,6 +19,7 @@
     "node-sass": "^4.13.1",
     "vue": "^2.6.11",
     "vue-router": "^3.0.7",
+    "vue-simple-uploader": "^0.7.4",
     "vuex": "^3.1.2"
   },
   "devDependencies": {

src/components/assessment/homeDetailcopy.vue

@@ -8,8 +8,9 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
     <div
+    class="myloading2"
       v-loading="loading2"
-      element-loading-text="评估报告生成中"
+      element-loading-text="正在评估中"
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
@@ -2849,6 +2850,7 @@ export default {
   data() {
     //这里存放数据
     return {
+      myloadingText:'',
       compatibleBrowsersList:[],
       middlewareEnumsList:[],
       opGAscodeList: [],
@@ -3654,11 +3656,12 @@ export default {
       console.log("======>", obj);
       console.log("ma======>", JSON.stringify(obj));
       // console.log("=231321=====>", obj.applicationType.length);
-
+   
       //  return
 
       this.$server.goPg(obj).then(res => {
         console.log(res);
+        
         this.$store.commit("changeRoutePg", 1);
         this.$message({
           message: "生成评估报告成功",
@@ -5048,11 +5051,51 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
+    
     this.getPrev();
-    console.log("系统不熟", this.middleware.microServices.length);
+    // console.log("系统不熟",this.$loading());
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
+  mounted() {
+      // localhost
+    var ws = new WebSocket("ws://120.55.57.35:8078/websocket/22");
+  var that = this
+ws.onopen = function() {
+    ws.send("hello");
+     //心跳检测重置
+    // heartCheck.start();
+};
+ 
+ws.onmessage = function (e) {
+  //1成功 2失败 
+    console.log('链接成功');
+    if(JSON.parse(e.data).msg != ""){
+      // this.myloadingText = JSON.parse(e.data)
+      // var str = document.querySelector(".myloading2 .el-loading-text")
+      // console.log('dsadsadsadsadsadsadsa',str)
+      // console.log(this.$loading(options))
+  
+        var str = document.querySelector(".myloading2 .el-loading-text")
+      // console.log('dsadsadsadsadsadsadsa',str)
+      str.innerText = JSON.parse(e.data).msg
+      // console.log(JSON.parse(e.data));
+    }
+    // console.log(JSON.parse(e.data));
+ 
+   
+
+};
+ 
+ws.onclose = function() {
+   console.log('链接关闭');
+  
+};
+ 
+ws.onerror = function () {
+    console.log('发生异常了');
+  
+}
+  },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前

src/main.js

@@ -8,9 +8,12 @@ import './tools/element';
 import './assets/changeElementStyle.css'
 import server from './services/server';
 import echarts from 'echarts';
+import uploader from 'vue-simple-uploader'
+Vue.use(uploader)
 Vue.prototype.$echarts = echarts;
 Vue.prototype.$store = store;
 Vue.prototype.$server = server;
+Vue.prototype.$uploader = uploader;
 Vue.config.productionTip = false;
 import htmlToPdf from './tools/htmlToPdf' // 导出pdf    npm install html2canvas jspdf --save
 Vue.use(htmlToPdf)

src/services/server.js

@@ -11,7 +11,7 @@ import axios from '@/services/axios';
  */
 import qs from 'qs';
 const assessma = 'http://120.55.57.35:8078'
-// const assessma = 'http://192.168.1.85:8078'
+// const assessma = 'http://192.168.1.104:8078'
 const server = {
     getloginOut(id) { // 用户退出
         return axios('/user/loginOut/' + id, {