Merge branch 'bug_mine_1'

src/views/dataEntry_manage/onlineExcelCopy.vue

@@ -67,7 +67,7 @@ export default {
               "r":0,
               "c":0,
               "v":{
-                ct: {fa: "General", t: "g"},
+                ct: {fa: "@", t: "s"},
                 m:"一级分类",
                 v:"一级分类",
                 bg:'#b4a7d6'
@@ -77,7 +77,7 @@ export default {
               "r":1,
               "c":0,
               "v":{
-                ct: {fa: "General", t: "g"},
+                ct: {fa: "@", t: "s"},
                 m:"指标分类",
                 v:"指标分类",
                 bg:'#b4a7d6'
@@ -87,7 +87,7 @@ export default {
               "r":2,
               "c":0,
               "v":{
-                ct: {fa: "General", t: "g"},
+                ct: {fa: "@", t: "s"},
                 m:"频度",
                 v:"频度",
                 bg:'#b4a7d6'
@@ -97,7 +97,7 @@ export default {
               "r":3,
               "c":0,
               "v":{
-                ct: {fa: "General", t: "g"},
+                ct: {fa: "@", t: "s"},
                 m:"指标名称",
                 v:"指标名称",
                 bg:'#b4a7d6'
@@ -107,7 +107,7 @@ export default {
               "r":4,
               "c":0,
               "v":{
-                ct: {fa: "General", t: "g"},
+                ct: {fa: "@", t: "s"},
                 m:"单位",
                 v:"单位",
                 bg:'#b4a7d6'
@@ -416,7 +416,7 @@ created() {
             "r":3,
             "c":1+index,
             "v":{
-              ct: {fa: "General", t: "g"},
+              ct: {fa: "@", t: "s"},
               m:item.SecName,
               v:item.SecName,
               bg:'#cccccc'
@@ -426,7 +426,7 @@ created() {
             "r":4,
             "c":1+index,
             "v":{
-              ct: {fa: "General", t: "g"},
+              ct: {fa: "@", t: "s"},
               m:item.Unit,
               v:item.Unit,
               bg:'#cccccc'
@@ -439,7 +439,7 @@ created() {
           "r":0,
           "c":1+i,
           "v":{
-            ct: {fa: "General", t: "g"},
+            ct: {fa: "@", t: "s"},
             m:this.firstClassName || '',
             v:this.firstClassName || '',
             bg:'#cccccc'
@@ -449,7 +449,7 @@ created() {
           "r":1,
           "c":1+i,
           "v":{
-            ct: {fa: "General", t: "g"},
+            ct: {fa: "@", t: "s"},
             m:this.secondClassName || '',
             v:this.secondClassName || '',
             bg:'#cccccc'
@@ -459,7 +459,7 @@ created() {
           "r":2,
           "c":1+i,
           "v":{
-            ct: {fa: "General", t: "g"},
+            ct: {fa: "@", t: "s"},
             m:this.dataForm.frequency || '',
             v:this.dataForm.frequency || '',
             bg:'#cccccc'