bianww 2 rokov pred
rodič
commit
07cd3f207a

+ 8 - 8
public/index.html

@@ -9,12 +9,12 @@
   <title>市场经营管理平台</title>
   <script src="static/js/crypoto-js.js"></script>
 
-  <script src="/static/js/luckysheet/plugins/js/plugin.js"></script>
-  <script src="/static/js/luckysheet/luckysheet.umd.js"></script>
-  <link rel='stylesheet' href='/static/js/luckysheet/plugins/css/pluginsCss.css' />
-  <link rel='stylesheet' href='/static/js/luckysheet/plugins/plugins.css' />
-  <link rel='stylesheet' href='/static/js/luckysheet/css/luckysheet.css' />
-  <link rel='stylesheet' href='/static/js/luckysheet/assets/iconfont/iconfont.css' />
+  <script src="static/js/luckysheet/plugins/js/plugin.js"></script>
+  <script src="static/js/luckysheet/luckysheet.umd.js"></script>
+  <link rel='stylesheet' href='static/js/luckysheet/plugins/css/pluginsCss.css' />
+  <link rel='stylesheet' href='static/js/luckysheet/plugins/plugins.css' />
+  <link rel='stylesheet' href='static/js/luckysheet/css/luckysheet.css' />
+  <link rel='stylesheet' href='static/js/luckysheet/assets/iconfont/iconfont.css' />
 </head>
 
 <body>
@@ -29,9 +29,9 @@
     // window.staticHost = 'http://10.149.85.90:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://192.168.2.142:9600/';
-    
+
     // document.title = "hello";
   </script>
 </body>
 
-</html>
+</html>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
public/static/js/luckysheet/expendPlugins/chart/chartmix.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 34 - 0
public/static/js/luckysheet/expendPlugins/chart/chartmix.umd.min.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
public/static/js/luckysheet/luckysheet.umd.js


+ 1 - 1
src/pages/main/departWorkLists/index.vue

@@ -399,8 +399,8 @@ export default {
             }else {
                 this.$nextTick(()=>{
                     this.$refs.simpleSheet.handleFullscreenOption()
+                    Vue.set(this, 'fullscreen', fullscreen)
                 })
-                Vue.set(this, 'fullscreen', fullscreen)
             }
 
         },

+ 17 - 5
src/pages/main/departWorkLists/sheet.vue

@@ -209,7 +209,7 @@ export default {
         request(){},
         handleInit() {
             if (this.id) {
-                if (this.workName){
+                if (this.workData){
                     this.handleCreate({
                         json: this.workData,
                         name: this.workName,
@@ -219,7 +219,7 @@ export default {
                     this.handleQuery();
                 }
             } else {
-                if (this.workName){
+                if (this.workData){
                     this.handleCreate({
                         json: this.workData,
                         name: this.workName,
@@ -284,7 +284,8 @@ export default {
                     container: "luckysheet",
                     lang: "zh",
                     showsheetbar: false,
-                    data:[{}],
+                    data:[{"name": "777e1d91-2075-446f-b163-03c5e0ee0e0c"}],
+                    plugins:['chart'],
                     userInfo:undefined,
                     title:""
                 })
@@ -315,9 +316,11 @@ export default {
                                     let lastIndexOf = export_json.info.name.lastIndexOf('.');
                                     name = name.substring(0, lastIndexOf);
                                     window.luckysheet.destroy();
+                                    export_json.sheets.name = '777e1d91-2075-446f-b163-03c5e0ee0e0c'
                                     window.luckysheet.create({
                                         container: "luckysheet",
                                         lang: "zh",
+                                        plugins:['chart'],
                                         showsheetbar: false,
                                         data:export_json.sheets,
                                         title:name,
@@ -349,6 +352,7 @@ export default {
                             window.luckysheet.create({
                                 container: "luckysheet",
                                 lang: "zh",
+                                plugins:['chart'],
                                 showsheetbar: false,
                                 data:data,
                                 title:name,
@@ -391,6 +395,7 @@ export default {
                             window.luckysheet.create({
                                 container: "luckysheet",
                                 lang: "zh",
+                                plugins:['chart'],
                                 showsheetbar: false,
                                 data:data,
                                 title:name,
@@ -453,8 +458,7 @@ export default {
             return arr.join(",");
         },
         handleFullscreen() {
-            const sheet_name = window.luckysheet.getSheet().name;
-            const data = window.luckysheet.getSheet(sheet_name);
+            const data = window.luckysheet.getSheet({name:"777e1d91-2075-446f-b163-03c5e0ee0e0c"});
             const workbook_name = window.luckysheet.getWorkbookName();
             this.$emit('saveData', workbook_name, data)
             if (this.fullscreen === false){
@@ -616,4 +620,12 @@ export default {
     height: calc(100% - 96px);
     width: 100%;
 }
+.containerClass #luckysheet .luckysheet .fa{
+    font:normal normal normal 14px/1 FontAwesome !important;
+}
+</style>
+<style lang="scss">
+body #luckysheet-modal-dialog-slider-pivot .fa{
+    font:normal normal normal 14px/1 FontAwesome !important;
+}
 </style>