Pārlūkot izejas kodu

依赖项版本修改

yangxiao 3 gadi atpakaļ
vecāks
revīzija
3e25aa20e1
4 mainītis faili ar 14 papildinājumiem un 26 dzēšanām
  1. 1 1
      package.json
  2. 2 1
      src/main.js
  3. 1 15
      src/views/Decision/Decision1.vue
  4. 10 9
      src/views/layout/Menu.vue

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "core-js": "^3.6.5",
     "echarts": "^5.1.1",
     "echarts-gl": "^2.0.4",
-    "element-plus": "^1.0.2-beta.46",
+    "element-plus": "^1.0.2-beta.53",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.0.0-rc.7",
     "jspdf": "^2.3.1",

+ 2 - 1
src/main.js

@@ -7,6 +7,7 @@ import 'font-awesome/css/font-awesome.min.css';
 // 引入 element-ui
 import ElementPlus from 'element-plus';
 import 'element-plus/lib/theme-chalk/index.css';
+import locale from 'element-plus/lib/locale/lang/zh-cn';
 
 // 引入环境配置
 import "@modeConfig/modeConfig.js";
@@ -40,7 +41,7 @@ Date.prototype.formatDate = function (fmt) {
 }
 
 window.__STATICVUE__ = createApp(App);
-window.__STATICVUE__.use(ElementPlus);
+window.__STATICVUE__.use(ElementPlus, { locale });
 window.__STATICVUE__.use(store);
 window.__STATICVUE__.use(router);
 

+ 1 - 15
src/views/Decision/Decision1.vue

@@ -9,9 +9,6 @@
             <el-select v-model="value1" clearable placeholder="请选择" popper-class="select">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
           </div>
         </div>
         <div class="query-item">
@@ -20,9 +17,6 @@
             <el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
           </div>
         </div>
         <div class="query-item">
@@ -31,18 +25,12 @@
             <el-select v-model="value3" multiple placeholder="请选择" popper-class="select">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
           </div>
         </div>
         <div class="query-item">
           <div class="lable">开始日期:</div>
           <div class="search-input">
             <el-date-picker v-model="value4" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
           </div>
         </div>
         <div class="query-item">
@@ -50,7 +38,6 @@
           <div class="search-input">
             <el-date-picker v-model="value5" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
             <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
             </div>
           </div>
         </div>
@@ -113,12 +100,11 @@
 
 <script>
 import BarLineChart from "../../components/chart/combination/bar-line-chart.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Table from "../../components/coms/table/table.vue";
 export default {
-  components: { ToolbarPanel, BarLineChart, Panel, Table, SvgIcon },
+  components: { ToolbarPanel, BarLineChart, Panel, Table },
   data() {
     return {
       tableData: {

+ 10 - 9
src/views/layout/Menu.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="menu">
     <ul class="menu-list">
-      <li class="menu-item" v-for="(menu, index) of currentMenu" :key="menu" @click="click(index)" :class="{ active: activeIndex == index }" @mouseenter="subMenuShow(menu.children, index)">
+      <li class="menu-item" v-for="(menu, index) of currentMenu" :key="menu" @click="click(index)" :class="{ active: activeIndex == index }"
+        @mouseenter="subMenuShow(menu.children, index)">
         <router-link v-if="!menu.children" :to="menu.path">
           <el-tooltip class="item" effect="dark" :content="menu.text" placement="right" :show-after="500">
             <div class="menu-icon svg-icon" :class="activeIndex == index ? 'svg-icon-green' : 'svg-icon-gray'">
@@ -17,7 +18,7 @@
       </li>
     </ul>
   </div>
-  <div class="sub-menu" v-show="isShowSubMenu">
+  <!-- <div class="sub-menu" v-show="isShowSubMenu">
     <ul class="menu-list">
       <li class="menu-item" v-for="(menu, index) of subMenu" @click="subclick(index)" :key="menu" :class="{ active: subIndex == index }">
         <router-link :to="menu.path">
@@ -28,7 +29,7 @@
         </router-link>
       </li>
     </ul>
-  </div>
+  </div> -->
 </template>
 <script>
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
@@ -37,7 +38,7 @@ export default {
     SvgIcon,
   },
   props: {},
-  data() {
+  data () {
     return {
       currRoot: "monitor",
       menuData: [
@@ -183,11 +184,11 @@ export default {
     };
   },
   methods: {
-    click(index) {
+    click (index) {
       this.activeIndex = index;
       this.subIndex = null;
     },
-    subMenuShow(children, index) {
+    subMenuShow (children, index) {
       if (children) {
         this.isShowSubMenu = true;
         this.parentIndex = index;
@@ -197,13 +198,13 @@ export default {
       }
       this.subMenu = children;
     },
-    subclick(index) {
+    subclick (index) {
       this.activeIndex = this.parentIndex;
       this.subIndex = index;
     },
   },
   computed: {
-    currentMenu() {
+    currentMenu () {
       let data = this.menuData.filter((t) => {
         return t.id == this.currRoot;
       })[0].data;
@@ -213,7 +214,7 @@ export default {
   watch: {
     // 监听路由
     $route: {
-      handler: function(val, oldVal) {
+      handler: function (val, oldVal) {
         this.menuData.some((element, index) => {
           if (val.path.includes(element.id)) {
             this.currRoot = element.id;