Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/config/index.js

@@ -1,6 +1,6 @@
 export default {
     baseURL: "/api",
     host: window.location.host,
-    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : (process.env.NODE_ENV === 'test'?'http://139.224.24.90:8083':'http://139.224.24.90:8084'),
+    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : (process.env.NODE_ENV === 'test'?'http://139.224.24.90:8083':'http://192.168.1.24:8084'),
     staticURL2: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8081' : 'http://139.224.24.90:8081',
 }

RMS-FrontEnd/src/views/report/components/ReportTemplate.vue

@@ -65,7 +65,7 @@ export default {
     },
     watch:{
         reportType(val){
-            if(val == ''){
+            if(val.toString() == ''){
                 this.templateId = ''
             }else{
                 this.queryParams.reportType = val