coys 2 anni fa
parent
commit
7c108f6a98

+ 2 - 2
src/components/upload/index.vue

@@ -87,8 +87,8 @@ export default {
                 resolve(imgFile);
               },
               error: (e) => {
-                console.log('imageError:'+e);
-                this.$toast('图片压缩失败')
+               
+                this.$toast(e)
                 reject(e);
               },
              });

+ 10 - 2
src/views/home/works.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="index-container">
     <top-bar ref="topbar"></top-bar>
-
+    
     <!-- 步骤条 -->
     <van-tabs color="#1989fa" @click="tabClickHandler" v-if="workList&&workList.length>0">
       <van-tab  :title="item.taskTypeText" :name="worksLink(1, item.taskType)" v-for="item in workList" :key="item.taskType" :badge="item.nums"></van-tab>
     </van-tabs>
  
-    <div class="big_box" @scroll="scrolling">
+    <div :class="big_box" @scroll="scrolling">
       <!-- 列表 -->
       <div class="cellMargin" v-for="item in workList" :key="item.taskType">
         <!-- 标题区域 -->
@@ -61,6 +61,7 @@ export default {
   components: { TopBar, scandialog },
   data() {
     return {
+      big_box:'big_box',
       active: 0,
       taskId: '', //监控调阅ID
       workList: [], //工作台列表
@@ -72,6 +73,9 @@ export default {
     if (this.orgId) {
       this.$refs.topbar.getTheWeather()
     }
+    if(this.$refs.list.length>0){
+      this.big_box='big_boxTwo'
+    }
   },
   created() {
     this.getList()
@@ -342,6 +346,10 @@ export default {
   height: calc(100vh - 520px);
   overflow: auto;
 }
+.big_boxTwo {
+  height: calc(100vh - 570px);
+  overflow: auto;
+}
 a {
   text-decoration: none;
   color: inherit;

+ 1 - 1
src/views/menu/drillStatistics/index.vue

@@ -169,7 +169,7 @@ export default {
     },
     getPlanList() {
       getrehearsalList(this.cascaderValue).then(res => {
-        if (res.data.length === 0) return this.$toast('暂无教育计划')
+        if (res.data.length === 0) return this.$toast('暂无演练排名数据')
         this.planList = res.data
         this.taskList=(res.data.map(item => item.name))
       

+ 2 - 1
src/views/menu/monitoringCall/index.vue

@@ -191,7 +191,8 @@ export default {
     },
     //机构变化
     getDataList(v) {
-      this.cascaderValue = v.id
+      
+      this.cascaderValue = v
       this.selectListAppHandler()
     },
     //onLoad下拉刷新

+ 2 - 2
src/views/menu/training/components/personnelSignature.vue

@@ -88,7 +88,7 @@ import NavBar from '@/components/NavBar'
 import writingPad from '@/components/writingPad/index.vue'
 import { gettrainingInfo, signtrainingInfo } from '@/api/training.js'
 import { upload } from '@/api/public'
-// import imgCom from '@/components/imgCom/index.vue'
+import imgCom from '@/components/imgCom/index.vue'
 import { base64ToBlob } from '@/utils/base64TurnImg.js'
 import config from '@/config/index'
 // import VuePdf from '@/components/pdfCom/index.vue'
@@ -97,7 +97,7 @@ export default {
   components: {
     NavBar,
     // VuePdf,
-    // imgCom,
+    imgCom,
     writingPad
   },
   data() {