coys

src/components/TopBar.vue

@@ -127,7 +127,7 @@ export default {
     //获取天气数据
     getTheWeather() {
       getTheAreaWeather(this.orgId).then(res => {
-        this.list = res.data || []
+        this.list = res.data || [{}]
         // this.list.forEach(item => {
         //   if (item.alarmLevel == '橙色') {
         //     item.bgc = '#fa8e00'

src/views/home/works.vue

@@ -3,7 +3,7 @@
     <top-bar ref="topbar"></top-bar>
     
     <!-- 步骤条 -->
-    <van-tabs color="#1989fa" @click="tabClickHandler" v-if="workList&&workList.length>0">
+    <van-tabs class="tab-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>
  
@@ -73,7 +73,7 @@ export default {
     if (this.orgId) {
       this.$refs.topbar.getTheWeather()
     }
-    if(this.$refs.list?.length>0){
+    if(this.$refs.topbar.list?.length>0){
       this.big_box='big_boxTwo'
     }
   },
@@ -94,7 +94,7 @@ export default {
     },
     scrolling(el) {
       // 滚动条距文档顶部的距离
-      let scrollTop = document.querySelector('.big_box').scrollTop || document.body.scrollTop
+      let scrollTop = document.querySelector(`.${this.big_box}`).scrollTop || document.body.scrollTop
       // 滚动条滚动的距离
       let scrollStep = scrollTop - this.oldScrollTop
       console.log('header 滚动距离 ', scrollTop)
@@ -102,9 +102,9 @@ export default {
       this.oldScrollTop = scrollTop
 
       //变量windowHeight是可视区的高度
-      let windowHeight = document.querySelector('.big_box').clientHeight || document.body.clientHeight
+      let windowHeight = document.querySelector(`.${this.big_box}`).clientHeight || document.body.clientHeight
       //变量scrollHeight是滚动条的总高度
-      let scrollHeight = document.querySelector('.big_box').scrollHeight || document.body.scrollHeight
+      let scrollHeight = document.querySelector(`.${this.big_box}`).scrollHeight || document.body.scrollHeight
       console.log(scrollTop, 'sssssssssssss')
       //滚动条到底部的条件
       if (scrollTop + windowHeight == scrollHeight) {
@@ -345,9 +345,15 @@ export default {
 .big_box {
   height: calc(100vh - 520px);
   overflow: auto;
+  
+}
+.tab-tabs{
+  padding-top: 55px;
+  
 }
 .big_boxTwo {
   height: calc(100vh - 570px);
+  
   overflow: auto;
 }
 a {

src/views/menu/monitoringCall/components/taskInfo.vue

@@ -48,7 +48,7 @@
                     autosize
                     label=""
                     type="textarea"
-                    maxlength="50"
+                    maxlength="150"
                     placeholder="请输入异常原因"
                     show-word-limit
                     :rules="[{ required: true, message: '内容不能为空' }]"

src/views/menu/training/index.vue

@@ -5,7 +5,7 @@
 
       <van-row>
         <van-col span="24">
-          <org-tree v-model="cascaderValue" :name="'sss'"  @changeItem="getDataList"></org-tree>
+          <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
       <van-row>
@@ -95,10 +95,10 @@
             <div class="titleClass">
               <div class="title">{{ item.title }}</div>
               <div>
-                <van-button  type="info" v-if="isSign(item)" size="mini" @click="trainSign(item.id)"
+                <van-button type="info" v-if="isSign(item)" size="mini" @click="trainSign(item.id)"
                   >培训登记</van-button
                 >
-                <van-button  type="info" v-if="isSignature(item)" size="mini" @click="signature(item.id)"
+                <van-button type="info" v-if="isSignature(item)" size="mini" @click="signature(item.id)"
                   >签名</van-button
                 >
               </div>
@@ -191,7 +191,7 @@ export default {
       fieldValue: '全部', //状态名称
       statusValue: ' ', //状态值
       columns: ['全部', '待记录', '待签名', '已完成'], //状态数组
-      typeColumns: ['全部','每月安全培训教育', '专项安全培训教育'], //类型数组
+      typeColumns: ['全部', '每月安全培训教育', '专项安全培训教育'], //类型数组
       currentDate: newDateMonth(), //月份值
       conditionShow: false //机构弹框显示隐藏
     }
@@ -241,10 +241,8 @@ export default {
     this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
   },
   methods: {
-   
     //机构搜索
     getDataList(val) {
-     
       this.cascaderValue = val.id
       this.orgName = val.name
       this.selectListAppHandler()
@@ -265,12 +263,14 @@ export default {
           timefalg = true
         }
       }
-      list.userList.forEach(item => {
-        console.log(this.value1, 'sss')
-        if (this.value1 == item.userId && item.sign === 0 && item.type == 1) {
-          falg = true
-        }
-      })
+      if (list.userList && list.userList.length > 0) {
+        list.userList.forEach(item => {
+         
+          if (this.value1 == item.userId && item.sign === 0 && item.type == 1) {
+            falg = true
+          }
+        })
+      }
 
       if (falg && timefalg) {
         return true
@@ -286,7 +286,7 @@ export default {
       let endDate = Date.parse(new Date(list.endDate))
       //任务处于待记录状态，且任务在规定完成时间范围内，登录人所在机构和角色与任务培训角色、培训机构一致才显示
 
-      if (list.startDate && list.endDate && (list.status == 0|| list.status == 4)) {
+      if (list.startDate && list.endDate && (list.status == 0 || list.status == 4)) {
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }
@@ -422,7 +422,7 @@ export default {
           this.typeValue = ' '
           break
       }
-      
+
       this.typeStatus = false
       this.selectListAppHandler()
     },

vue.config.js

@@ -109,7 +109,8 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.10.47:8080",
+        // target: "http://10.87.10.47:8080",
+        target: "http://10.87.10.55:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{