对风偏差模块修改、微观选址分析模块修改

.env.development

@@ -19,7 +19,7 @@ VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # VUE_APP_GENERAT_URL = 'http://192.168.2.45:9002'
 # 王波
 VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'http://192.168.2.232:9002'
+# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://192.168.0.102:9001'

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CalculationModelConfiguration: typeof import('./src/components/powerPredictionComponent/configPage/calculationModelConfiguration.vue')['default']
     Card1: typeof import('./src/components/coms/cards/card-1.vue')['default']
     CheckTable: typeof import('./src/components/coms/table/check-table.vue')['default']
-    Col: typeof import('./src/components/coms/grid/col.vue')['default']
+    Col: typeof import('./src/components/homeComponent/grid/col.vue')['default']
     CollapseList: typeof import('./src/components/coms/collapse/collapse-list.vue')['default']
     CollectionLineManagement: typeof import('./src/components/powerPredictionComponent/configPage/stationFlode/collectionLineManagement.vue')['default']
     CommonHeaders: typeof import('./src/components/commonHeaders.vue')['default']
@@ -51,7 +51,6 @@ declare module 'vue' {
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -155,7 +154,7 @@ declare module 'vue' {
     RoleManagement: typeof import('./src/components/powerPredictionComponent/configPage/roleManagement.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Row: typeof import('./src/components/coms/grid/row.vue')['default']
+    Row: typeof import('./src/components/homeComponent/grid/row.vue')['default']
     SBQ: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/SBQ.vue')['default']
     ScatterLineChart: typeof import('./src/components/chart/combination/scatter-line-chart.vue')['default']
     SimpleLineChart: typeof import('./src/components/chart/line/simple-line-chart.vue')['default']
@@ -167,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
+    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

npminstall-debug.log

@@ -1,19 +1,19 @@
 {
-  root: 'D:\\Workspace\\vue\\windLifecontrolPro',
+  root: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
   registry: 'https://registry.npmmirror.com',
   pkgs: [],
   production: false,
   cacheStrict: false,
-  cacheDir: 'C:\\Users\\admin\\.npminstall_tarball',
+  cacheDir: 'C:\\Users\\26678\\.npminstall_tarball',
   env: {
     npm_config_registry: 'https://registry.npmmirror.com',
-    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\admin\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\admin\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
-    npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v20.13.1 win32 x64',
-    npm_config_cache: 'C:\\Users\\admin\\.npminstall_tarball',
-    NODE: 'C:\\Program Files\\nodejs\\node.exe',
-    npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe',
-    npm_execpath: 'C:\\Users\\admin\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
-    npm_config_userconfig: 'C:\\Users\\admin\\.cnpmrc',
+    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\26678\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\26678\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
+    npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v16.14.2 win32 x64',
+    npm_config_cache: 'C:\\Users\\26678\\.npminstall_tarball',
+    NODE: 'D:\\software\\nodejs\\node.exe',
+    npm_node_execpath: 'D:\\software\\nodejs\\node.exe',
+    npm_execpath: 'D:\\software\\nvm\\node_global\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
+    npm_config_userconfig: 'C:\\Users\\26678\\.cnpmrc',
     npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
     npm_config_r: 'https://registry.npmmirror.com',
     COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
@@ -42,8 +42,8 @@
     npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
     npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
     npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
-    npm_rootpath: 'D:\\Workspace\\vue\\windLifecontrolPro',
-    INIT_CWD: 'D:\\Workspace\\vue\\windLifecontrolPro'
+    npm_rootpath: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
+    INIT_CWD: 'D:\\work\\workspaces\\wind\\windLifecontrolPro'
   },
   binaryMirrors: {
     ENVS: {
@@ -179,7 +179,7 @@
   disableFallbackStore: false,
   workspacesMap: Map(0) {},
   enableWorkspace: false,
-  workspaceRoot: 'D:\\Workspace\\vue\\windLifecontrolPro',
+  workspaceRoot: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
   isWorkspaceRoot: true,
   isWorkspacePackage: false,
   offline: false,

package-lock.json

@@ -23,7 +23,7 @@
         "html2canvas": "^1.4.1",
         "js-cookie": "^3.0.5",
         "json-bigint": "^1.0.0",
-        "jspdf": "^2.5.1",
+        "jspdf": "^2.5.2",
         "jszip": "^3.10.1",
         "jszip-utils": "^0.1.0",
         "leaflet": "^1.9.4",

src/views/generatingCapacity/dataAnalysis/posAnalysis/index.vue

@@ -1445,37 +1445,28 @@ const funText = (index) => {
   let str = "";
   switch (index) {
     case 0:
-      str = "0-2.5";
+      str = "0-3";
       break;
     case 1:
-      str = "2.5-5";
+      str = "3-5";
       break;
     case 2:
-      str = "5-7.5";
+      str = "5-7";
       break;
     case 3:
-      str = "7.5-10";
+      str = "7-9";
       break;
     case 4:
-      str = "10-12.5";
+      str = "9-11";
       break;
     case 5:
-      str = "12.5-15";
+      str = "11-20";
       break;
     case 6:
-      str = "15-17.5";
+      str = "20-25";
       break;
     case 7:
-      str = "17.5-20";
-      break;
-    case 8:
-      str = "20-22.5";
-      break;
-    case 9:
-      str = "22.5-25";
-      break;
-    case 10:
-      str = "25-inf";
+      str = "25-∞";
       break;
   }
   return str;

src/views/generatingCapacity/dataAnalysis/rateAnalysis/components/chart.vue

@@ -11,6 +11,7 @@ import chartTheme from "./../rateAnalysis.json";
 import { ref, toRaw, computed, onMounted, watch, nextTick } from "vue";
 import { useStore } from "vuex";
 import * as echarts from "echarts";
+const store = useStore();
 const chartId = "chart-" + util.newGUID(); //chartId
 const chartIns = ref(null); //chart 实例
 const props = defineProps({
@@ -87,6 +88,9 @@ const option = computed({
         splitLine: {
           show: false,
         },
+        axisLine: {
+          show: false,
+        },
       };
     }
     return {
@@ -149,7 +153,7 @@ const option = computed({
         // data: ['0-2.5', '2.5-5', '5-7.5', '7.5-10', '10-12.5', '12.5-15', '15-17.5', '17.5-20',
         //     '20-22.5', '22.5-25', '25-inf'
         // ]
-        data: ["0-3", "3-5", "5-10", "10-12", "12-25", "25-inf"],
+        data: ["0-3", "3-5", "5-7", "7-9", "9-11", "11-20", "20-25", "25-∞"],
       },
     };
   },
@@ -174,7 +178,6 @@ watch([() => props.width, () => props.height], (newVal, oldVal) => {
     nextTick(() => echartIns.resize());
   }
 });
-const store = useStore();
 const collapse = computed({
   get() {
     return store.state.collapse;

src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -43,7 +43,7 @@
                 :tableId="tableShowId"
                 :tableName="tableName"
                 :tableFilePath="tableFilePath"
-                style="position:relative;top: -15px;"
+                style="position: relative; top: -15px"
               ></table-cop>
             </div>
             <el-row v-if="activeTab === '1'" :style="{ height: tableHeight }">
@@ -432,16 +432,22 @@ const funText = (index) => {
       str = "3-5";
       break;
     case 2:
-      str = "5-10";
+      str = "5-7";
       break;
     case 3:
-      str = "10-12";
+      str = "7-9";
       break;
     case 4:
-      str = "12-25";
+      str = "9-11";
       break;
     case 5:
-      str = "25-inf";
+      str = "11-20";
+      break;
+    case 6:
+      str = "20-25";
+      break;
+    case 7:
+      str = "25-∞";
       break;
   }
   return str;