commit

src/assets/styles/newStyle.less

@@ -793,7 +793,6 @@ tr.el-table__row{
 }
 .iconfont {
   font-size: 12px;
-  margin-right: 5px;
 }
 .dept-popover {
   padding: 0;

src/components/comHeader/index.vue

@@ -129,7 +129,6 @@
           align-items: center;
           .iconfont {
             font-size: 22px;
-            margin-right: 5px;
           }
           & > img{
             width: 25px;

src/components/navMenu/index.vue

@@ -489,6 +489,9 @@
     box-sizing: border-box;
     background: rgb(255, 255, 255);
     background-size: 100% 100%;
+    /deep/.el-tooltip {
+      padding: 0px 16px !important;
+    }
     .left-tree {
       height: calc(~'100% - 95px');
       overflow-y: auto;
@@ -537,6 +540,7 @@
     display: none; /* Chrome Safari */
   }
   .el-menu-item {
+    padding: 0 16px !important;
     span {
       font-weight: normal;
       margin-left: 5px;
@@ -570,6 +574,7 @@
   }
   .el-submenu {
     /deep/.el-submenu__title {
+      padding: 0 16px !important;
       span {
         font-weight: normal;
         margin-left: 5px;
@@ -612,6 +617,7 @@
     }
   }
   .el-menu--collapse{
+    width: 100%;
     .shangqi-icon{
       width: 24px;
       height: 24px;

src/pages/home/components/EnterCard.vue

@@ -1,32 +1,37 @@
 <template>
   <div class="wx-card" @click="toPage">
-    <div style="">
+    <div>
       <div>
         <i class="icon" :class="icon" />
       </div>
-      <div style="margin-top: 10px;">
+      <div v-if="label">
         <span class="card-font">{{ label }}</span>
       </div>
+      <div v-else>
+        <div class="labelNull">
+          <i class="el-icon-circle-plus-outline"></i>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-export default {
+  export default {
-  name: 'EnterCard',
+    name: 'EnterCard',
-  props: ['icon', 'label', 'path'],
+    props: ['icon', 'label', 'path'],
-  methods: {
+    methods: {
-    toPage() {
+      toPage() {
-      this.$router.push(this.path)
+        this.$router.push(this.path)
+      }
     }
   }
-}
 </script>
 
 <style lang="less" scoped>
   .wx-card {
     width: 214px;
-    line-height: 88px;
+    line-height: 70px;
     text-align: center;
     background: rgba(182, 213, 255, 0.22);
     margin-left: 10px;
@@ -36,4 +41,13 @@ export default {
     align-items: center;
     cursor: pointer;
   }
+  .labelNull {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    .el-icon-circle-plus-outline {
+      font-size: 50px;
+      color: #F4F4F4;
+    }
+  }
 </style>

src/pages/home2/components/empennage/index.vue

@@ -4,7 +4,7 @@
     <div class="title">友情链接</div>
     <ul>
       <li v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
-        <a v-if="link.name.length>13" v-html="link.name.substring(0,13)+'...'" :title="link.name"></a>
+        <a v-if="link.name.length>10" v-html="link.name.substring(0,10)+'...'" :title="link.name"></a>
         <a v-else v-html="link.name" :title="link.name"></a>
       </li>
       <li>

src/pages/home2/components/release/index.vue

@@ -13,7 +13,7 @@
               ref="selection"
               :data="standardReleaseList"
               tooltip-effect="dark"
-              style="width: 100%;padding:0 0 20px 0;"
+              style="padding:0 0 20px 0;"
               border
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
           style="width: 100%">
@@ -96,6 +96,7 @@ export default {
 
 <style lang="less" scoped>
 .release {
+    width: 100%;
   .time-title {
     margin: 15px;
     .time {

src/pages/home2/components/solicitopinions/index.vue

@@ -13,7 +13,7 @@
             ref="selection"
             :data="domesticDynamics"
             tooltip-effect="dark"
-            style="width: 100%;padding:0 0 20px 0;"
+            style="padding:0 0 20px 0;"
             border
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
       style="width: 100%">
@@ -90,7 +90,7 @@ export default {
 <style lang="less" scoped>
 .solicitopinions {
   height: 100%;
-
+  width: 100%;
   .time-title {
     margin: 15px;
      color: #333333;

src/pages/home2/components/todoList/index.vue

@@ -37,7 +37,7 @@ export default {
     queryProcess () { // 查询待办流程
       this.$http.postData('lawss/activiti/todoTaskList', {
             current: this.pageNo,
-            size: parseInt(this.$store.getters.userInfo.configContent),
+            size: 10,
             userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
           },
           {

src/pages/home2/index.vue

@@ -117,7 +117,7 @@ export default {
       display: flex;
       flex: 1;
       flex-direction: column;
-      width: 53.5vw;
+      width: 48vw;
       height: calc(~'100% - 10px');
       margin-right: 10px;
       .more {
@@ -157,8 +157,10 @@ export default {
         background:#FFFFFF;
         .main-left-wrap {
           height: 100%;
+            width: 100%;
           .home-tabs {
             height: 100%;
+              width: 100%;
           }
         }
       }

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -66,6 +66,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -66,6 +66,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -78,6 +78,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -78,6 +78,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -78,6 +78,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -78,6 +78,7 @@
           border
           style="width: 100%; flex: auto;"
           class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
           <el-table-column