merge

public/static/views/onlineShareExcel.html

@@ -217,17 +217,17 @@
                         showsheetbar: false, // 底部sheet显示/隐藏
                         loadUrl:
                             window.location.protocol +
-                            "//192.168.2.124:7777" +
+                            "//10.149.85.91:7777" +
                             "/sheet/worksheet/" +
                             ids + '/' + JSON.parse(window.sessionStorage.userInfo).loginNo,
                         loadSheetUrl:
                             window.location.protocol +
-                            "//192.168.2.124:7777" +
+                            "//10.149.85.91:7777" +
                             "/sheet/loadsheet/" +
                             ids,
                         updateUrl:
                             "ws://" +
-                            "//192.168.2.124:7777" +
+                            "//10.149.85.91:7777" +
                             "/ws/" +
                             JSON.parse(window.sessionStorage.userInfo).loginName +
                             "/" +
@@ -680,7 +680,7 @@
                         }
                         let res = JSON.stringify(exportJson)
                         console.log(res);
-                        util.ajaxJson("正在导入中", "http://192.168.2.124:7777/sheet/excel/importFile", { exceldata: res, id: excelId }, function (res) {
+                        util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: res, id: excelId }, function (res) {
                             console.log(res);
                             if (res.code === '1') {
                                 // 销毁原来的excel

src/pages/main/onlineExcel/index.vue

@@ -37,13 +37,18 @@
                 <div class="inner-right">
                     <div style="overflow: hidden;" v-if="showExcel == false">
                         <toolList @iconCli='iconCli' :tooltit='tooltit' style="margin: 10px"></toolList>
-                        <div style="margin-top: 20px;float: left;" class="bigbtns">
-                            <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
+                        <div style="margin-top: 20px;float: left;display: flex;" class="bigbtns">
+                            <el-button style="margin:0 20px 0 20px;" class="btn-check" size="medium" type="primary"
                                 @click="addNewStatus = true">新建
                             </el-button>
-                            <input style="margin-left:30px" id="upload-file" name="file" type="file" @change="handleUpload">
+                            <div>
+                                <input id="upload-file" @click="handleUpload" name="file" type="file" />
+                                <el-button type="primary">导入</el-button>
+
+                            </div>
+
                         </div>
-                        
+
                         <div style="margin-top: 20px;float: right;margin-right: 20px" class="bigbtns"
                             v-if="selectionSize != 0">
                             <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
@@ -87,15 +92,15 @@
                                 </template>
                             </el-table-column>
                         </el-table>
-                        <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next"
-                            background :total="total">
+                        <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+                            :total="total">
                         </el-pagination>
                     </div>
 
                     <div class="container" id="container" v-else>
                         <fullscreen :fullscreen.sync="excelFullScreen" class="container">
-                            <iframe id="excelIframe" height="100%" width="100%"
-                                src="/static/views/onlineShareExcel.html" frameborder="0"></iframe>
+                            <iframe id="excelIframe" height="100%" width="100%" src="/static/views/onlineShareExcel.html"
+                                frameborder="0"></iframe>
                         </fullscreen>
                     </div>
                 </div>
@@ -112,7 +117,9 @@
                         </div>
                         <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer">
                             <span class="iconfont icon-excel" style="font-size: 80px;color: dodgerblue"></span>
-                            <input id="upload-file" name="file" type="file" @change="handleUpload">
+                            <input id="upload-file" style="height: 130px;bottom: 20px;
+                right: 44%;" name="file" type="file" @change="handleUpload">
+                            <span style="top: 10px;position: relative;left: 10px;">在线导入</span>
                         </div>
                         <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer"
                             @click="addFolderStatus = true">
@@ -129,8 +136,7 @@
                         <div class="online">
                             <el-form-item prop="name">
                                 <span>文件夹名称</span>
-                                <el-input v-model="infolist.name" placeholder="文件夹名称"
-                                    :disabled="disableStatus"></el-input>
+                                <el-input v-model="infolist.name" placeholder="文件夹名称" :disabled="disableStatus"></el-input>
                             </el-form-item>
                         </div>
                     </el-form>
@@ -197,10 +203,10 @@
                     </div>
                 </div>
             </el-dialog>
-            <myMessage :messTit='messTit' @closeMessage="processDel" :centerDialogVisible="delVisible"
-                v-if="delVisible"></myMessage>
-            <myMessageRadio :messTit='oaTitle' @closeMessage="processOa" :centerDialogVisible="oaVisible"
-                v-if="oaVisible" yesBtnName="是" noBtnName="否" ok-btn-name="提交"></myMessageRadio>
+            <myMessage :messTit='messTit' @closeMessage="processDel" :centerDialogVisible="delVisible" v-if="delVisible">
+            </myMessage>
+            <myMessageRadio :messTit='oaTitle' @closeMessage="processOa" :centerDialogVisible="oaVisible" v-if="oaVisible"
+                yesBtnName="是" noBtnName="否" ok-btn-name="提交"></myMessageRadio>
         </div>
     </fullscreen>
 </template>
@@ -213,7 +219,7 @@ import myMessage from "../../../components/myMessage.vue";
 import myMessageNew from "../../../components/myMessageNew.vue";
 import myMessageRadio from "../../../components/myMessageRadio.vue";
 import deptTreeUserNew from "../../../components/deptTreeUserNew.vue"
-import {ajaxJson} from '../../../../public/static/js/util'
+import { ajaxJson } from '../../../../public/static/js/util'
 
 export default {
     components: {
@@ -326,12 +332,12 @@ export default {
                     return;
                 }
                 let exceljson = JSON.stringify(exportJson)
-                _this.$util.ajaxJson("正在导入中", "http://192.168.2.124:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
+                _this.$util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
                     // console.log('[ res ] >', res)
                     _this.addNewStatus = false;
                     document.getElementById('excelId').setAttribute("value", res.id);
                     _this.showExcel = true;
-  
+
 
                 });
             }
@@ -861,6 +867,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+#upload-file {
+    position: absolute;
+    width: 70px;
+    height: 40px;
+    opacity: 0;
+}
+
 .container {
     background-color: #f0f2f5;