Merge remote-tracking branch 'origin/master'

.env.development

@@ -25,22 +25,28 @@ VUE_APP_BASE_API_0_0_TEST=http://127.0.0.1:5100/ibps
 VUE_APP_BASE_API_1_0_DEV=http://127.0.0.1:5100/ibps
 # ---前端开发环境
 #VUE_APP_BASE_API_2_0_FRONT=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_2_0_FRONT=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_2_0_FRONT=https://139.159.225.4/ibps
+VUE_APP_BASE_API_2_0_FRONT=http://139.159.225.4/ibps
 # ---集成环境
 #VUE_APP_BASE_API_3_0_STAGING=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_3_0_STAGING=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_3_0_STAGING=https://139.159.225.4/ibps
+VUE_APP_BASE_API_3_0_STAGING=http://139.159.225.4/ibps
 # ---生产环境
 #VUE_APP_BASE_API_4_0_PRODUCTION=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_4_0_PRODUCTION=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_4_0_PRODUCTION=https://139.159.225.4/ibps
+VUE_APP_BASE_API_4_0_PRODUCTION=http://139.159.225.4/ibps
 # ---mock环境
 #VUE_APP_BASE_API_5_0_MOCK=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_5_0_MOCK=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_5_0_MOCK=https://139.159.225.4/ibps
+VUE_APP_BASE_API_5_0_MOCK=http://139.159.225.4/ibps
 # ---本地环境 
 #VUE_APP_BASE_API_6_0_110=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_6_0_110=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_6_0_110=https://139.159.225.4/ibps
+VUE_APP_BASE_API_6_0_110=http://139.159.225.4/ibps
 # ---多域名环境 
 #VUE_APP_BASE_API_7_0_DOMAIN=https://www.mingjianlims.com/ibps
-VUE_APP_BASE_API_7_0_DOMAIN=https://139.159.225.4/ibps
+#VUE_APP_BASE_API_7_0_DOMAIN=https://139.159.225.4/ibps
+VUE_APP_BASE_API_7_0_DOMAIN=http://139.159.225.4/ibps
 
 
 

.env.prod.boot

@@ -11,9 +11,12 @@ VUE_APP_PUBLIC_PATH  = '/ibps3/'
 # ========base api======================
 #VUE_APP_BASE_API = 'https://www.mingjianlims.com/ibps'
 #VUE_APP_BASE_WEBSOCKET_API = 'https://www.mingjianlims.com/ibps'
-VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
-VUE_APP_BASE_WEBSOCKET_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_WEBSOCKET_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_API = 'http://139.159.225.4/ibps'
+VUE_APP_BASE_WEBSOCKET_API = 'http://139.159.225.4/ibps'
 
 # ========report api======================
 #VUE_APP_BASE_REPORT_API = 'https://www.mingjianlims.com/ibps'
-VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_REPORT_API = 'http://139.159.225.4/ibps'

.env.prod.cloud

@@ -13,3 +13,4 @@ VUE_APP_BASE_WEBSOCKET_API = 'ws://cloud.bpmhome.cn:28888'
 
 # ========report api======================
 #VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_REPORT_API = 'http://139.159.225.4/ibps'

.env.prod.test

@@ -11,8 +11,11 @@ ENV = 'prod.test'
 # ========base api======================
 #VUE_APP_BASE_API = 'https://www.mingjianlims.com/ibps'
 #VUE_APP_BASE_WEBSOCKET_API = 'https://www.mingjianlims.com/ibps'
-VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
-VUE_APP_BASE_WEBSOCKET_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_WEBSOCKET_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_API = 'http://139.159.225.4/ibps'
+VUE_APP_BASE_WEBSOCKET_API = 'http://139.159.225.4/ibps'
 # ========report api======================
 #VUE_APP_BASE_REPORT_API = 'https://www.mingjianlims.com/ibps'
-VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_REPORT_API = 'http://139.159.225.4/ibps'

.env.production

@@ -7,9 +7,11 @@ NODE_ENV = 'production'
 # VUE_APP_PUBLIC_PATH  = '/'
 # ========base api======================
 	#VUE_APP_BASE_API = 'https://www.mingjianlims.com/ibps'
-	VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
+	#VUE_APP_BASE_API = 'https://139.159.225.4/ibps'
+	VUE_APP_BASE_API = 'http://139.159.225.4/ibps'
 	VUE_APP_BASE_WEBSOCKET_API = 'ws://yapi.bpmhome.cn:28888'
 # ========report api======================
 	#VUE_APP_BASE_REPORT_API = 'https://www.mingjianlims.com/ibps'
-	VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+	#VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+	VUE_APP_BASE_REPORT_API = 'http://139.159.225.4/ibps'
 	

.env.staging

@@ -14,5 +14,6 @@ VUE_APP_BASE_WEBSOCKET_API = 'ws://yapi.bpmhome.cn:28888'
 
 # ========report api======================
 #VUE_APP_BASE_REPORT_API = 'https://www.mingjianlims.com/ibps'
-VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+#VUE_APP_BASE_REPORT_API = 'https://139.159.225.4/ibps'
+VUE_APP_BASE_REPORT_API = 'http://139.159.225.4/ibps'
 

public/index.html

@@ -20,7 +20,7 @@
     <% } %>
     <title><%= VUE_APP_TITLE %></title>
 <!-- 	<script type="text/javascript" src="http://192.168.48.129:9999/web-apps/apps/api/documents/api.js"></script> -->
-	<script type="text/javascript" src="https://139.159.225.4/word/web-apps/apps/api/documents/api.js"></script>
+	<script type="text/javascript" src="http://139.159.225.4/word/web-apps/apps/api/documents/api.js"></script>
     <style>
      html,body,#app{height:100%;margin:0;padding:0}
      .ibps-home{background-color:#303133;height:100%;display:flex;flex-direction:column}

src/plugins/ibps/index.js

@@ -56,15 +56,15 @@ export default {
     Vue.prototype.$ibpsUrl = env.VUE_APP_BASE_API_0_0_TEST
 	/* 中汇瑞德检测中心 */
 	let downloadReport = (src,where)=> {
-		return  'https://139.159.225.4/demo/reportServlet?action=6&file='+encodeURIComponent(src)+'.rpx&columns=0&srcType=file&paramString='+encodeURIComponent(where)
+		return  'http://139.159.225.4/demo/reportServlet?action=6&file='+encodeURIComponent(src)+'.rpx&columns=0&srcType=file&paramString='+encodeURIComponent(where)
 	}
     let timer = setInterval(() => { //定时循环添加参数
           if (getToken()) {
-              Vue.prototype.$reportPash = 'https://139.159.225.4/demo/reportJsp/showReport.jsp?access_token = '+getToken()+'&rpx=中汇瑞德检测中心/' //报表路径
+              Vue.prototype.$reportPash = 'http://139.159.225.4/demo/reportJsp/showReport.jsp?access_token = '+getToken()+'&rpx=中汇瑞德检测中心/' //报表路径
               Vue.prototype.$getReportFile = downloadReport //通过方法函数，拼接url，并将字符串格式化
-              Vue.prototype.$getSealUri = 'https://139.159.225.4/getSealFile/' //微签 回显获取文件地址
-              Vue.prototype.$getFileDow = 'https://139.159.225.4/ibps/platform/v3/file/download?attachmentId=' //文件下载地址
-              Vue.prototype.$getSealUploadingFile='https://139.159.225.4/doSeal/' //微签 上传地址
+              Vue.prototype.$getSealUri = 'http://139.159.225.4/getSealFile/' //微签 回显获取文件地址
+              Vue.prototype.$getFileDow = 'http://139.159.225.4/ibps/platform/v3/file/download?attachmentId=' //文件下载地址
+              Vue.prototype.$getSealUploadingFile='http://139.159.225.4/doSeal/' //微签 上传地址
            clearInterval(timer) //添加成功后即删除定时任务
             }
     }, 500)

src/views/component/uploadTxt.vue

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <label for="uploadTxt" :class="$style.upload">
+      <el-tooltip class="item" effect="dark" content="请选择格式为txt的原始数据文件" placement="top">
+        <div :class="$style.btn"><i class="el-icon-upload" />选择文件</div>
+      </el-tooltip>
+      <span :class="$style.file">{{ fileName }}</span>
+      <input
+        id="uploadTxt"
+        type="file"
+        accept=".txt"
+        hidden
+        @change="onChange"
+      >
+    </label>
+  </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                fileName: ''
+            }
+        },
+        methods: {
+            onChange(e) {
+                const { files } = e.dataTransfer || e.target
+                // console.log(files)
+                this.fileName = files[0].name
+            }
+        }
+    }
+</script>
+<style lang="scss" module>
+    .upload {
+        // display: block;
+        // width: 200px;
+        .btn {
+            display: inline-block;
+            width: 100px;
+            font-size: 12px;
+            line-height: 20px;
+            text-align: center;
+            background-color: #409eff;
+            color: #fff;
+            border-radius: 5px;
+            padding: 7px 15px;
+            i{
+                margin-right: 5px;
+            }
+        }
+        .file {
+            display: inline-block;
+            font-size: 12px;
+            color: #666;
+            margin-left: 20px;
+        }
+    }
+</style>