Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/components/IStreamTable.vue

 <template>
   <div class="eContainer-table-block">
+    <div style="text-align: left" v-if="showButtonFlg" class="buttonDiv">
+              <c-button
+                    icon="el-icon-s-tools"
+                    @click="clounmSetting"
+                    style=""
+                  ></c-button
+                ></div>
     <el-table
       ref="table"
       :data="
@@ -33,23 +40,14 @@
         </template>
       </el-table-column>
       <slot></slot>
-      <el-table-column fixed="right" width="48px" v-if="showButtonFlg" class-name="buttonColumn">
-        <template slot="header">
-          <c-col style="text-align: left"
-                  ><c-button
-                    icon="el-icon-s-tools"
-                    @click="clounmSetting"
-                    style="padding:0 7px"
-                  ></c-button
-                ></c-col>
-        </template>
-      </el-table-column>
     </el-table>
+    
     <el-dialog
       class="showColumnDialog"
       :visible.sync="setColumnFlg"
       :title="'自定义列属性'"
       appenD-to-body
+      v-if="showButtonFlg"
     >
       <el-form-item label-width="0">
         <el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
@@ -364,8 +362,13 @@ export default {
 .eContainer-table-block .el-table .cell {
   white-space: pre-wrap;
 }
-.el-table.buttonColumn th>.cell {
-    padding-left: 0;
-    padding-right: 0;
+.buttonDiv{
+  text-align: left;
+    display: inline-block;
+    margin: 0;
+    position: absolute;
+    z-index: 999;
+    right: 5px;
+    padding-top: 3px;
 }
 </style>
\ No newline at end of file

src/views/Business/Bopsel/Selp.vue

@@ -192,10 +192,10 @@
       </template>
     </c-list-search>
 
-    <c-row style="margin-top: 20px; padding: 0 10px 0 10px">
+    <c-row style="margin-top: 10px">
       <c-col>
-        <c-button size="small" type="primary">导出Excel</c-button>
-        <c-button size="small" type="primary">应急导出</c-button>
+        <c-button size="small" type="primary" style="margin-left:0">导出Excel</c-button>
+        <c-button size="small" type="primary" style="margin-left:0">应急导出</c-button>
       </c-col>
     </c-row>
 

src/views/Business/Infbdd/BusNavbar.vue

@@ -34,9 +34,10 @@ export default {
             let rtnmsg = await this.executeRule("cfgfil.hotsub3")
             console.log("cfgfil.code:" +  this.model.cfgfil.subtrn1);
             if(rtnmsg.respCode = SUCCESS){
+               this.navcode = []
                this.$emit("onChoose",code.toLowerCase());
             }else{
-
+               this.$notify.error({ title: "错误", message: "服务请求失败！" });
             }
             
         },
@@ -66,6 +67,7 @@ export default {
     mounted(){
          this.$nextTick(function(){
               this.$on('childmethods',async function(){
+                   this.navcode = []
                   //请求按钮数据
                   //this.model.didgrp.rec.ownref = 'KZ3500210540AA'  
                   this.model.bddgrp.rec.ownref = this.ownref  

src/views/Business/Infdid/BusNavbar.vue

@@ -34,9 +34,10 @@ export default {
             let rtnmsg = await this.executeRule("cfgfil.hotsub1")
             console.log("cfgfil.code:" +  this.model.cfgfil.subtrn1);
             if(rtnmsg.respCode = SUCCESS){
+               this.navcode = []
                this.$emit("onChoose",code.toLowerCase());
             }else{
-
+               this.$notify.error({ title: "错误", message: "服务请求失败！" });
             }
             
         },
@@ -66,9 +67,11 @@ export default {
     mounted(){
          this.$nextTick(function(){
               this.$on('childmethods',async function(){
+                   this.navcode = []
                   //请求按钮数据
                   this.model.didgrp.rec.ownref = this.ownref  
                   console.log("ownref:" + this.ownref  );
+                  
                     let rtnmsg = await this.executeRule("didgrp.rec.ownref");//didgrp_rec_ownref
                     if(rtnmsg.respCode = SUCCESS){
                               //重置数组
@@ -96,6 +99,7 @@ export default {
                                    
                                }
 
+                        
                          }
                         
                     })

src/views/Business/Sptsel/Menu.vue

@@ -301,14 +301,8 @@
           <el-table-column fixed="right" prop="op" label="操作" width="165px" class-name="lastColumn">
             <template slot="header">
               <c-col style="text-align: left"
-                ><span>操作</span></c-col
-              >
-              <!-- <c-col style="text-align: right"
-                ><c-button
-                  icon="el-icon-s-tools"
-                  @click="clounmSetting"
-                ></c-button
-              ></c-col> -->
+                ><span>操作</span>
+                </c-col>
             </template>
             <template slot-scope="scope">
               <c-button style="margin-left: 0" size="small" @click="onDetails(scope.$index,scope.row)"

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -306,7 +306,7 @@
                         </c-col>             
                                                         -->
                         <c-col :span="24" style="height:24px;margin-top:30px">
-                            <el-form-item label="Signatures" class="messageLabel">
+                            <el-form-item label="经办/复核" class="messageLabel">
                             </el-form-item>
                         </c-col>
                         <c-col :span="23" style="height:0px;">
@@ -346,7 +346,7 @@
 
                         <!-- -------------------workflow------------------- -->
                         <c-col :span="24" style="height:24px;margin-top:30px">
-                            <el-form-item label="Workflow" class="messageLabel">
+                            <el-form-item label="工作流服务" class="messageLabel">
                             </el-form-item>
                         </c-col>
                         <c-col :span="23" style="height:0px;">

src/views/Home/cells/CustomerAnalyse.vue

@@ -24,10 +24,19 @@ export default {
   name: "CustomerAnalyse",
   components: { CellHeaderVue },
   data() {
-    return {};
+    return {
+      echartInstance: null,
+    };
   },
   mounted() {
-    const echartInstance = echarts.init(document.getElementById("chart"));
+    this.echartInstance = echarts.init(document.getElementById("chart"));
+    this.loadCharts()
+    this.loadChartsBind = this.loadCharts.bind(this)
+    window.addEventListener('resize', this.loadChartsBind)
+  },
+  methods: {
+    loadCharts() {
+      this.echartInstance.clear()
       const option = {
         title: {
           // text: "Test Demo",
@@ -80,8 +89,12 @@ export default {
           },
         ],
       };
-    echartInstance.setOption(option);
+      this.echartInstance.setOption(option);
+    },
   },
+  destroyed() {
+    window.removeEventListener('resize', this.loadChartsBind)
+  }
 };
 </script>
 

src/views/Home/cells/NoticeAnnouncement.vue

@@ -4,7 +4,8 @@
       <span class="el-icon-refresh" title="刷新"></span>
       <span class="el-icon-more" title="操作"></span>
     </CellHeaderVue>
-    <c-content :height="cellScrollHeight">
+
+    <el-scrollbar :style="{ height: scrollbarHeight + 'px' }">
       <div class="cell-content">
         <div class="notice-item" v-for="(item, idx) in noticeList" :key="idx">
           <div class="notice-title" :class="{ active: idx === 0 }">
@@ -17,7 +18,7 @@
           </div>
         </div>
       </div>
-    </c-content>
+    </el-scrollbar>
   </div>
 </template>
 
@@ -33,6 +34,11 @@ export default {
       required: true,
     },
   },
+  computed: {
+    scrollbarHeight() {
+      return window.document.body.clientHeight - this.cellScrollHeight;
+    },
+  },
   data() {
     return {
       noticeList: [

src/views/Home/cells/QuickSearch.vue

 <template>
   <div class="home-cell" id="quickSearch">
     <CellHeaderVue title="快速查询"> </CellHeaderVue>
-    <c-content :height="cellScrollHeight">
+    
+    <el-scrollbar :style="{ height: scrollbarHeight + 'px' }">
       <div class="cell-content">
         <div
           class="content-wrapper"
           v-for="(item, index) in options"
           :key="index"
-          :style="{ height: wrapperHeight + 'px' }"
+          :style="{ height: Math.floor(scrollbarHeight * 0.3) + 'px' }"
         >
           <div class="search-item-wrapper">
             <div class="search-item">
@@ -18,7 +19,7 @@
           </div>
         </div>
       </div>
-    </c-content>
+    </el-scrollbar>
   </div>
 </template>
 
@@ -35,10 +36,8 @@ export default {
     },
   },
   computed: {
-    wrapperHeight() {
-      return Math.floor(
-        (window.document.body.clientHeight - this.cellScrollHeight) * 0.3
-      );
+    scrollbarHeight() {
+      return window.document.body.clientHeight - this.cellScrollHeight;
     },
   },
   data() {

src/views/Home/cells/QuickVisit.vue

@@ -2,13 +2,13 @@
   <div class="home-cell" id="quickVisit">
     <CellHeaderVue title="快速访问"> </CellHeaderVue>
 
-    <c-content :height="cellScrollHeight">
+    <el-scrollbar :style="{ height: scrollbarHeight + 'px' }">
       <div class="cell-content">
         <div
           class="content-wrapper"
           v-for="(item, index) in quickVisitItem"
           :key="index"
-          :style="{ height: wrapperHeight + 'px' }"
+          :style="{ height: Math.floor(scrollbarHeight * 0.3) + 'px' }"
         >
           <div class="visit-item-wrapper">
             <div class="visit-item">
@@ -19,7 +19,7 @@
           </div>
         </div>
       </div>
-    </c-content>
+    </el-scrollbar>
   </div>
 </template>
 
@@ -36,10 +36,8 @@ export default {
     },
   },
   computed: {
-    wrapperHeight() {
-      return Math.floor(
-        (window.document.body.clientHeight - this.cellScrollHeight) * 0.3
-      );
+    scrollbarHeight() {
+      return window.document.body.clientHeight - this.cellScrollHeight;
     },
   },
   data() {

src/views/Home/index.vue

@@ -28,15 +28,23 @@ export default {
     QuickSearchVue,
   },
   created() {
-    this.cellScrollHeight =
-      window.document.body.clientHeight -
-      (window.document.body.clientHeight - 110 - 52 * 2 - 10) / 2;
+    this.calcCellScrollHeight();
+    this.calcCellScrollHeightBind = this.calcCellScrollHeight.bind(this)
+    window.addEventListener("resize", this.calcCellScrollHeightBind)
   },
   data() {
     return {
       cellScrollHeight: null,
     };
   },
+  methods: {
+    calcCellScrollHeight() {
+      this.cellScrollHeight = window.document.body.clientHeight - (window.document.body.clientHeight - 110 - 52 * 2 - 10) / 2;
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.calcCellScrollHeightBind)
+  }
 };
 </script>
 
@@ -62,4 +70,8 @@ export default {
   height: calc(100% - 52px);
   overflow: auto;
 }
+.home-cell >>> .el-scrollbar__wrap{
+  overflow-y: scroll;
+	overflow-x: auto;
+}
 </style>