样式提交

src/page/index/setting.vue

@@ -3,7 +3,7 @@
   <el-drawer append-to-body :with-header="false" v-model="show" size="30%">
     <div class="setting">
       <h5>菜单风格</h5>
-      <el-radio-group v-model="setting.styleRadio" @change="styleRadioChange">
+      <el-radio-group v-model="styleRadio">
         <el-radio value="1">风格一</el-radio>
         <el-radio value="2">风格二</el-radio>
         <el-radio value="3">风格三</el-radio>
@@ -44,6 +44,7 @@ import { setTheme } from 'utils/util';
 export default {
   data() {
     return {
+      styleRadio:'',
       show: false,
       list1: [
         {
@@ -87,54 +88,33 @@ export default {
     ...mapGetters(['isHorizontal', 'setting', 'tagWel', 'themeName']),
   },
   watch: {
-    // setting: function (val) {
-    //   if (setting.styleRadio == '3') {
-    //     this.$store.commit('SET_THEME_NAME', 'theme-white');
-    //     setTheme('theme-white');
-    //     if (this.$store.getters.isMacOs) {
-    //       this.$router.push(this.tagWel);
-    //       setTimeout(() => location.reload());
-    //     }
-    //   }
-
-    // },
-  },
-  methods: {
-    styleRadioChange(val) {
+    styleRadio: function (val) {
+       this.setting.styleRadio = val
       if (val == '3' || val == '5') {
         this.$store.commit('SET_THEME_NAME', 'theme-white');
         setTheme('theme-white');
-        // if (this.$store.getters.isMacOs) {
-        //   this.$router.push(this.tagWel);
-        //   setTimeout(() => location.reload());
-        // }
+       
       } else if (val == '4') {
         this.$store.commit('SET_THEME_NAME', 'theme-white');
         setTheme('theme-white');
-        // if (this.$store.getters.isMacOs) {
-        //   this.$router.push(this.tagWel);
-        //   setTimeout(() => location.reload());
-        // }
+        
       } else if (val == '1') {
         this.$store.commit('SET_THEME_NAME', 'theme-bule');
         setTheme('theme-bule');
-        // if (this.$store.getters.isMacOs) {
-        //   this.$router.push(this.tagWel);
-        //   setTimeout(() => location.reload());
-        // }
+        
       } else if (val == '2') {
         this.$store.commit('SET_THEME_NAME', 'theme-go');
         setTheme('theme-go');
+        
       }
-      // else{
-      // this.$store.commit('SET_THEME_NAME', 'theme-go');
-      // setTheme('theme-go');
-      // // if (this.$store.getters.isMacOs) {
-      // //   this.$router.push(this.tagWel);
-      // //   setTimeout(() => location.reload());
-      // // }
-      // }
-    }
+
+    },
+  },
+  methods: {
+    
+  },
+  mounted(){
+    this.styleRadio = this.setting.styleRadio
   }
 
 };

src/page/index/sidebar/leftMenu.vue

@@ -5,7 +5,7 @@
                 <div class="menu_item" v-for="(item, index) in newMneu" :class="item.activeMenu == true ? 'xz_bg' : ''"
                     @click="slectMenu(item, index)" :title="item.name">
                     <span><i :class="item.source"></i></span>
-                    <span>{{ item.name }}</span>
+                    <span>{{ item.name.slice(0,2) }}</span>
                 </div>
             </div>
         </div>

src/views/productionSchedulingPlan/productRlue.vue

@@ -142,7 +142,7 @@ export default {
                     {
                         label: '规则ID',
                         prop: 'rlueId',
-                        search: true,
+                        search: false,
                         sortable: true,
                         span: 12,
                         rules: [
@@ -212,7 +212,7 @@ export default {
                     {
                         label: '创建人',
                         prop: 'createName',
-                        search: true,
+                        search: false,
                         sortable: true,
                         span: 12,
                         rules: [

src/views/wel/components/workBase2.vue

@@ -0,0 +1,60 @@
+<template>
+    <div class="box">
+        <div class="top">
+            <statistics-data></statistics-data>
+
+        </div>
+        <div class="center">
+
+        </div>
+        <div class="footer">
+
+        </div>
+    </div>
+</template>
+<script>
+import statisticsData from './statisticsData.vue';
+export default {
+    components: {
+        statisticsData,
+    },
+    data(){
+        return {
+            
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.box {
+    width: 98%;
+    height: 100%;
+    overflow: hidden;
+    // background: #fff;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    flex-direction: column;
+
+    .top {
+        width: 100%;
+        height: 15%;
+        border-radius: 10px;
+        background: #fff;
+    }
+
+    .center {
+        width: 100%;
+        height: 35%;
+        border-radius: 10px;
+        background: #fff;
+    }
+
+    .footer {
+        width: 100%;
+        height: 45%;
+        border-radius: 10px;
+        background: #fff;
+    }
+}
+</style>

src/views/wel/index.vue

@@ -1,17 +1,21 @@
 <template>
   <div style="width: 100%;height: 100%;">
+    <!-- <work-base2 v-if="setting.styleRadio=='2'"></work-base2> -->
     <work-base></work-base>
+    
   </div>
 </template>
 
 <script>
 import workBase from './components/workbase.vue';
+import workBase2 from './components/workbase2.vue';
 import { mapGetters } from 'vuex';
 
 export default {
   name: 'wel',
   components:{
-    workBase
+    workBase,
+    workBase2
   },
   data() {
     return {
@@ -20,7 +24,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(['userInfo','setting']),
   },
   methods: {
     handleChange(val) {