dedsudiyu 2 anni fa
parent
commit
7af5f157b6
4 ha cambiato i file con 75 aggiunte e 45 eliminazioni
  1. 47 29
      package-lock.json
  2. 17 5
      src/App.vue
  3. 9 9
      src/assets/styles/publicEle.scss
  4. 2 2
      src/views/dangerDetail.vue

+ 47 - 29
package-lock.json

@@ -1,5 +1,4 @@
 {
-  "name": "",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -1428,11 +1427,6 @@
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
-    "@popperjs/core": {
-      "version": "npm:@sxzz/popperjs-es@2.11.7",
-      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-    },
     "@sideway/address": {
       "version": "4.1.4",
       "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
@@ -2040,29 +2034,6 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.10.0",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-          "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2306,6 +2277,27 @@
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.10.0",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
+      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        }
+      }
+    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -4220,6 +4212,13 @@
         "lodash-unified": "^1.0.2",
         "memoize-one": "^6.0.0",
         "normalize-wheel-es": "^1.2.0"
+      },
+      "dependencies": {
+        "@popperjs/core": {
+          "version": "npm:@sxzz/popperjs-es@2.11.7",
+          "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+          "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+        }
       }
     },
     "emoji-regex": {
@@ -4331,6 +4330,11 @@
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
@@ -5055,6 +5059,15 @@
       "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
+    "flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "requires": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz",
@@ -9965,6 +9978,11 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
+    "webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+    },
     "whatwg-fetch": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",

+ 17 - 5
src/App.vue

@@ -1,12 +1,24 @@
 <template>
-  <router-view/>
+  <el-config-provider :locale="locale">
+    <router-view/>
+  </el-config-provider>
 </template>
 
 <script>
-
-export default {
-  name: 'App',
-}
+    import { defineComponent } from 'vue'
+    import { ElConfigProvider } from 'element-plus'
+    import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+    export default defineComponent({
+        name: 'App',
+        components: {
+            ElConfigProvider,
+        },
+        setup() {
+            return {
+                locale: zhCn,
+            }
+        },
+    })
 </script>
 
 <style>

+ 9 - 9
src/assets/styles/publicEle.scss

@@ -66,7 +66,7 @@
         }
         .el-input--suffix{
           .el-input__inner{
-            color: #A2A2A2;
+            color: #0E9EED;
             background-color: none;
             border-color: #1ED0F8;
           }
@@ -115,9 +115,9 @@
   .el-select-dropdown__item{
     color:#0E9EED;
   }
-  .el-picker-panel__icon-btn{
-    color: #fff;
-  }
+  //.el-picker-panel__icon-btn{
+  //  color: red;
+  //}
   .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
     background-color: #0E9EED;
     color:#fff;
@@ -131,7 +131,7 @@
     }
   }
   .el-date-table th{
-    color: #C0C4CC;
+    color: #999;
     border-bottom:1px solid #0E9EED;
   }
   .el-date-table td.next-month, .el-date-table td.prev-month{
@@ -139,9 +139,8 @@
   }
 }
 .select-big-data{
-
-  background-color: #0F607C;
-  border-color: #0F607C;
+  //background-color: #0F607C;
+  //border-color: #0F607C;
   .el-select-dropdown__empty{
     color:#fff;
   }
@@ -149,7 +148,8 @@
     display: none;
   }
   .el-select-dropdown__item{
-    color:#0E9EED;
+    //color:#0E9EED;
+    padding:0 10px;
   }
   .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
     background-color: #0E9EED;

+ 2 - 2
src/views/dangerDetail.vue

@@ -135,7 +135,7 @@ export default {
         'subId':this.editForm.subId,
         'pageNum':this.editForm.pageNum,
         'pageSize':this.editForm.pageSize,
-        'beginTime':this.editForm.beginTimeStr,
+        'startTime':this.editForm.beginTimeStr,
         'endTime':this.editForm.endTimeStr,
       }
       optionChartDetails(obj).then((res) =>{
@@ -158,7 +158,7 @@ export default {
       let obj={
         'type':localStorage.getItem('deptLevel'),
         'subId':this.editForm.subId,
-        'beginTime':this.editForm.beginTimeStr,
+        'startTime':this.editForm.beginTimeStr,
         'endTime':this.editForm.endTimeStr,
       }
       optionCharts(obj).then((res) =>{