Selaa lähdekoodia

样式修改,数据修改

SunZehao 1 kuukausi sitten
vanhempi
commit
f9c49e87d7
3 muutettua tiedostoa jossa 100 lisäystä ja 83 poistoa
  1. 57 57
      package.json
  2. 4 3
      src/components/allMatricesNoDia.vue
  3. 39 23
      src/components/allMatricesNoDiaJson.json

+ 57 - 57
package.json

@@ -1,58 +1,58 @@
 {
-  "name": "project-neic",
-  "version": "2.2.1",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "eb": "vue-cli-service electron:build",
-    "es": "vue-cli-service electron:serve",
-    "postinstall": "electron-builder install-app-deps",
-    "postuninstall": "electron-builder install-app-deps"
-  },
-  "main": "background.js",
-  "dependencies": {
-    "axios": "^0.21.1",
-    "bufferutil": "^4.0.6",
-    "core-js": "^3.6.5",
-    "dayjs": "^1.10.6",
-    "echarts": "^5.1.2",
-    "element-plus": "^1.1.0-beta.4",
-    "file-saver": "^2.0.5",
-    "html2canvas": "^1.4.1",
-    "jquery": "^3.6.0",
-    "json-bigint": "^1.0.0",
-    "rebuild": "^0.1.2",
-    "register-service-worker": "^1.7.1",
-    "stompjs": "^2.3.3",
-    "utf-8-validate": "^5.0.9",
-    "vue": "^3.0.11",
-    "vue-grid-layout": "^3.0.0-beta1",
-    "vue-router": "^4.0.0-0",
-    "vuex": "^4.0.0-0",
-    "xlsx": "^0.17.5",
-    "xlsx-js-style": "^1.2.0",
-    "xlsx-style": "^0.8.13"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-pwa": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-vuex": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0",
-    "electron": "^13.0.0",
-    "electron-devtools-installer": "^3.1.0",
-    "less": "^3.0.4",
-    "less-loader": "^5.0.0",
-    "node-sass": "^4.14.1",
-    "sass-loader": "^8.0.2",
-    "vue-cli-plugin-electron-builder": "~2.1.1"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ],
-  "__npminstall_done": false
-}
+    "name": "project-neic",
+    "version": "2.2.1",
+    "private": true,
+    "scripts": {
+        "serve": "vue-cli-service serve",
+        "build": "vue-cli-service build",
+        "eb": "vue-cli-service electron:build",
+        "es": "vue-cli-service electron:serve",
+        "postinstall": "electron-builder install-app-deps",
+        "postuninstall": "electron-builder install-app-deps"
+    },
+    "main": "background.js",
+    "dependencies": {
+        "axios": "^0.21.1",
+        "bufferutil": "^4.0.6",
+        "core-js": "^3.6.5",
+        "dayjs": "^1.10.6",
+        "echarts": "^5.1.2",
+        "element-plus": "^1.1.0-beta.4",
+        "file-saver": "^2.0.5",
+        "html2canvas": "^1.4.1",
+        "jquery": "^3.6.0",
+        "json-bigint": "^1.0.0",
+        "rebuild": "^0.1.2",
+        "register-service-worker": "^1.7.1",
+        "stompjs": "^2.3.3",
+        "utf-8-validate": "^5.0.9",
+        "vue": "^3.0.11",
+        "vue-grid-layout": "^3.0.0-beta1",
+        "vue-router": "^4.0.0-0",
+        "vuex": "^4.0.0-0",
+        "xlsx": "^0.17.5",
+        "xlsx-js-style": "^1.2.0",
+        "xlsx-style": "^0.8.13"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "~4.5.0",
+        "@vue/cli-plugin-pwa": "~4.5.0",
+        "@vue/cli-plugin-router": "~4.5.0",
+        "@vue/cli-plugin-vuex": "~4.5.0",
+        "@vue/cli-service": "~4.5.0",
+        "@vue/compiler-sfc": "^3.0.0",
+        "electron": "^13.0.0",
+        "electron-devtools-installer": "^3.1.0",
+        "less": "^3.0.4",
+        "less-loader": "^5.0.0",
+        "node-sass": "^4.14.1",
+        "sass-loader": "^8.0.2",
+        "vue-cli-plugin-electron-builder": "~2.1.1"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not dead"
+    ],
+    "__npminstall_done": false
+}

+ 4 - 3
src/components/allMatricesNoDia.vue

@@ -288,11 +288,11 @@ export default {
   },
   created() {
     // this.getLocks();
+    this.$store.state.titleInfo.stationOverviewInfos =
+      dataJson.stationOverviewInfos;
   },
   mounted() {
     this.$nextTick(() => {
-      this.$store.state.titleInfo.stationOverviewInfos =
-        dataJson.stationOverviewInfos;
       this.stationArr = dataJson.stationArr;
     });
   },
@@ -914,7 +914,8 @@ export default {
 </script>
 <style lang="less" scoped>
 .AllMatricesNoDia {
-  padding-left: 3%;
+  padding-left: 1%;
+  padding-top: 50px;
   .body {
     display: flex;
     flex-direction: column;

+ 39 - 23
src/components/allMatricesNoDiaJson.json

@@ -3,6 +3,7 @@
         [
             {
                 "stationId": 0,
+                "id": 0,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -11,7 +12,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 1,
+                "id": 1,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -20,7 +22,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 2,
+                "id": 2,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -29,7 +32,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 3,
+                "id": 3,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -38,7 +42,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 4,
+                "id": 4,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -47,7 +52,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 5,
+                "id": 5,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -56,7 +62,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 6,
+                "id": 6,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -65,7 +72,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 7,
+                "id": 7,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -74,7 +82,8 @@
                 "status": 3
             },
             {
-                "stationId": 0,
+                "stationId": 8,
+                "id": 8,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -83,7 +92,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 9,
+                "id": 9,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -92,7 +102,8 @@
                 "status": 3
             },
             {
-                "stationId": 0,
+                "stationId": 10,
+                "id": 10,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -101,7 +112,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 11,
+                "id": 11,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -110,7 +122,8 @@
                 "status": 3
             },
             {
-                "stationId": 0,
+                "stationId": 12,
+                "id": 12,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -119,7 +132,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 13,
+                "id": 13,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -128,7 +142,8 @@
                 "status": 3
             },
             {
-                "stationId": 0,
+                "stationId": 14,
+                "id": 14,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -137,7 +152,8 @@
                 "status": 2
             },
             {
-                "stationId": 0,
+                "stationId": 15,
+                "id": 15,
                 "station": "风场HZJ",
                 "code": "A01",
                 "i": 123,
@@ -149,7 +165,7 @@
         [
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ1",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -158,7 +174,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ2",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -167,7 +183,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ3",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -176,7 +192,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ4",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -185,7 +201,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ5",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -194,7 +210,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ6",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -203,7 +219,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ7",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,
@@ -212,7 +228,7 @@
             },
             {
                 "stationId": 1,
-                "windturbineId": "风场HZJ",
+                "windturbineId": "风场HZJ8",
                 "modelId": "10523",
                 "windSpeed": 123,
                 "power": 321,