Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

package-lock.json

@@ -22,9 +22,6 @@
         "file-saver": "^2.0.5",
         "happypack": "^5.0.1",
         "jszip": "^3.10.1",
-        "lodash": "^4.17.21",
-        "luckyexcel": "^1.0.1",
-        "luckysheet": "^2.1.13",
         "ol": "^9.2.3",
         "papaparse": "^5.4.1",
         "plotly.js-dist": "^2.34.0",
@@ -8797,9 +8794,14 @@
     },
     "node_modules/file-saver": {
       "version": "2.0.5",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/file-saver/-/file-saver-2.0.5.tgz",
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
       "license": "MIT"
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
     },
     "node_modules/filelist": {
       "version": "1.0.4",
@@ -8901,12 +8903,15 @@
         "flat": "cli.js"
       }
     },
+<<<<<<< HEAD
+=======
     "node_modules/flatpickr": {
       "version": "4.6.13",
       "resolved": "https://repo.huaweicloud.com/repository/npm/flatpickr/-/flatpickr-4.6.13.tgz",
       "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==",
       "license": "MIT"
     },
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
     "node_modules/follow-redirects": {
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
@@ -11346,9 +11351,14 @@
     },
     "node_modules/immediate": {
       "version": "3.0.6",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
       "license": "MIT"
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
     },
     "node_modules/immer": {
       "version": "9.0.21",
@@ -12187,9 +12197,14 @@
     },
     "node_modules/jszip": {
       "version": "3.10.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/jszip/-/jszip-3.10.1.tgz",
       "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "license": "(MIT OR GPL-3.0-or-later)",
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -12199,6 +12214,15 @@
     },
     "node_modules/jszip/node_modules/pako": {
       "version": "1.0.11",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "node_modules/jszip/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "license": "(MIT AND Zlib)"
@@ -12208,6 +12232,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "license": "MIT",
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -12220,6 +12245,15 @@
     },
     "node_modules/jszip/node_modules/safe-buffer": {
       "version": "5.1.2",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/jszip/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "license": "MIT"
@@ -12229,6 +12263,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "license": "MIT",
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -12312,9 +12347,14 @@
     },
     "node_modules/lie": {
       "version": "3.3.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
       "license": "MIT",
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -13751,6 +13791,8 @@
       "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "node_modules/numeral": {
       "version": "2.0.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/numeral/-/numeral-2.0.6.tgz",
@@ -13760,6 +13802,7 @@
         "node": "*"
       }
     },
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
     "node_modules/numeric": {
       "version": "1.2.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/numeric/-/numeric-1.2.6.tgz",
@@ -17078,9 +17121,14 @@
     },
     "node_modules/setimmediate": {
       "version": "1.0.5",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+=======
       "resolved": "https://repo.huaweicloud.com/repository/npm/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "license": "MIT"
+>>>>>>> e52c39273cb1c0d80a6f0fa12b71c737395f4fc0
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",

package.json

@@ -22,9 +22,6 @@
     "file-saver": "^2.0.5",
     "happypack": "^5.0.1",
     "jszip": "^3.10.1",
-    "lodash": "^4.17.21",
-    "luckyexcel": "^1.0.1",
-    "luckysheet": "^2.1.13",
     "ol": "^9.2.3",
     "papaparse": "^5.4.1",
     "plotly.js-dist": "^2.34.0",

src/views/home/components/mockData.js

@@ -88,6 +88,26 @@ export const orgList = [
         component: () =>
           import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/anemometer.vue"),
       },
+      {
+        id: 46,
+        name: "部件信息",
+        path: "modules",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/modules.vue"),
+      },
+      {
+        id: 47,
+        name: "维护部件",
+        path: "maintain",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/maintain.vue"),
+      },
     ],
   },
   {

src/views/ledger/modules.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="global-variable" >
+<div class="condition">
+    <p>所属风场：<el-select ></el-select></p>
+    <p>选择机型：<el-select></el-select></p>
+</div>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+.condition{
+display: flex;
+p{
+    margin-right: 20px;
+}
+}
+</style>

vue.config.js

@@ -64,11 +64,10 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        target: "http://192.168.50.235:16200/", //内网 开发环境
-        // target: "http://192.168.5.15:16200",//陈宏琰
-        // target: "http://192.168.50.235:16300", //内网 生产环境
-        // target: "http://106.120.102.238:16600", //外网 生产环境
-        //  target: "http://10.96.137.5",//大～^唐
+        // target: "http://192.168.50.235:16200", //内网
+        // target: "http://192.168.5.15:16200",
+        target: "http://106.120.102.238:16600", //外网
+        //  target: "http://10.96.137.5",
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,