coys

src/components/TopBar.vue

@@ -1,22 +1,21 @@
 <template>
   <div>
+    <div class="top-bar">
+      <div class="top-box">
+        <span>移动安全保卫管理平台</span>
+        <van-icon name="setting-o" size="26" @click="clickOutLogin" />
+      </div>
+      <div class="bottom-box">
+        <div>
+          
+          <p class="user-name">{{ userName }}</p>
 
-  
-  <div class="top-bar">
-    <div class="top-box">
-      <span>移动安全保卫管理平台</span>
-      <van-icon name="setting-o" size="26" @click="clickOutLogin" />
-    </div>
-    <div class="bottom-box">
-      <div>
-        <p class="user-name">{{userName}}</p>
-        <p class="introduce-info" v-for="item in rolesList" :key="item.roleId">{{orgName}} · {{item.roleName}}</p>
+          <p class="introduce-info" v-for="item in rolesList" :key="item.roleId">{{ orgName }} · {{ item.roleName }}</p>
+        </div>
+        <van-icon name="arrow" size="20" />
       </div>
-      <van-icon name="arrow" size="20"  />
     </div>
-  
-  </div>
-  
+
     <!-- 天气预警 -->
     <van-swipe v-if="list.length > 0" style="height: 50px" vertical autoplay="2000">
       <van-swipe-item v-for="item in list" :key="item.id" @click="clickHandler(item)">
@@ -32,12 +31,12 @@
   </div>
 </template>
 <script>
-import { Icon } from 'vant';
-import {mapGetters} from "vuex";
-import {logout,getTheAreaWeather} from "@/api/public";
+import { Icon } from 'vant'
+import { mapGetters } from 'vuex'
+import { logout, getTheAreaWeather } from '@/api/public'
 export default {
   components: {
-    [Icon.name]: Icon,
+    [Icon.name]: Icon
   },
   data() {
     return {
@@ -45,23 +44,25 @@ export default {
       show: false,
       info: '',
       active: this.defaultActive,
-      rolesList:[]
+      rolesList: []
     }
   },
   computed: {
-    ...mapGetters(['userName','orgName','orgId'])
+    ...mapGetters(['userName', 'orgName', 'orgId'])
   },
-  created(){
-    this.rolesList=JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST'))
-
+  created() {
     this.getTheWeather()
   },
+  mounted() {
+    // console.log(this.rolesList);
+    // this.rolesList=JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST'))||[]
+  },
   methods: {
-    clickOutLogin(){
-      logout().then(res=>{
-        sessionStorage.clear();
-        this.$router.replace('/login');
-        this.$toast('退出登录');
+    clickOutLogin() {
+      logout().then(res => {
+        sessionStorage.clear()
+        this.$router.replace('/login')
+        this.$toast('退出登录')
       })
     },
     clickHandler(item) {
@@ -72,8 +73,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'
@@ -85,21 +85,26 @@ export default {
             item.bgc = '#e9fa00'
           }
         })
+        setTimeout(() => {
+          
+          this.rolesList = JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST')) || []
+        }, 100);
+       console.log(this.rolesList);
       })
-    },
+    }
   }
 }
 </script>
 
 <style scoped lang="scss">
-.top-bar{
+.top-bar {
   height: 300px;
   width: 100%;
-  background: url("../assets/img/banner.png") no-repeat center;
+  background: url('../assets/img/banner.png') no-repeat center;
   background-size: 100% 100%;
   padding: 40px;
   box-shadow: 0 1px 8px #ccc;
-  >div{
+  > div {
     width: 100%;
     display: flex;
     justify-content: space-between;
@@ -107,19 +112,19 @@ export default {
     color: #fff;
   }
 }
-.top-box{
-  >span{
+.top-box {
+  > span {
     font-size: 40px;
   }
 }
-.bottom-box{
-  padding-top:50px;
-  >div{
-    .user-name{
+.bottom-box {
+  padding-top: 50px;
+  > div {
+    .user-name {
       font-size: 30px;
       margin-bottom: 20px;
     }
-    .introduce-info{
+    .introduce-info {
       font-size: 20px;
     }
   }

src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://10.87.10.55:8080', // 本地图片地址
-  baseApi: '/dev', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
+  baseApi: '/jingyuanchao', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

src/router/router.config.js

@@ -110,7 +110,7 @@ export let routers = [
         path: '/works',
         name: 'works',
         component: () => import('@/views/home/works'),
-        meta: { title: '工作台', keepAlive: true }
+        meta: { title: '工作台', keepAlive: false }
       },
       {
         path: '/menu',

src/views/home/works.vue

@@ -3,13 +3,16 @@
     <top-bar></top-bar>
    
     <!-- 步骤条 -->
-    <van-steps :active="active" active-icon="success" active-color="#38f">
-      <van-step v-for="item in workList" :key="item.taskType"
-        ><van-badge :content="item.nums" color="#1989fa">
+    <div :class="workList.length<=1? 'oneItem':''">
+
+      <van-steps :active="active" active-icon="success" active-color="#38f">
+        <van-step v-for="item in workList" :key="item.taskType" 
+        ><van-badge :content="item.nums" color="#1989fa" >
           <a :href="`#${worksLink(1, item.taskType)}`">{{ item.taskTypeText }}</a>
         </van-badge>
       </van-step>
     </van-steps>
+  </div>
     <div class="big_box" @scroll="scrolling">
       <!-- 列表 -->
       <div class="cellMargin" v-for="item in workList" :key="item.taskType">
@@ -54,7 +57,7 @@
 <script>
 import scandialog from '@/components/nfcPopup/alone.vue'
 import TopBar from '@/components/TopBar'
-import { mapGetters } from 'vuex'
+
 import { Toast } from 'vant'
 import { registration } from '@/api/toConsult.js'
 import { upload } from '@/api/public'
@@ -186,6 +189,8 @@ export default {
           strName = '待登记'
         } else if (val == 5 && taskType == 1) {
           strName = '待签名'
+        } else if(val==5&&taskType==4){
+          strName='待提交'
         }
         return strName
       } else if (type == 3) {
@@ -322,10 +327,14 @@ a {
   color: inherit;
   margin-right: 10px;
 }
-.van-step--horizontal:last-child{
-  left: 1px;
-}
-::v-deep.van-step--horizontal:last-child .van-step__circle-container{
-  display: none;
+
+::v-deep.oneItem{
+  .van-step--horizontal:last-child{
+    left: 1px;
+  }
+  
+  .van-step--horizontal:last-child .van-step__circle-container{
+    display: none;
+  }
 }
 </style>

src/views/menu/training/components/addTraining.vue

@@ -416,7 +416,12 @@ export default {
       obj.imageList = obj.imageList.map(item => item.path).join(',')
       console.log(obj.imageList)
       obj.taskUserList = []
-
+      let list=this.studyList
+      obj.fileList=[]
+      list.forEach(item=>{
+        obj.fileList.push(JSON.stringify(item))
+      })
+      
       obj.taskUserList.push(...this.userPeopleList, ...this.lackPeopleList)
 
       edittrainingInfo({

src/views/menu/training/index.vue

@@ -286,7 +286,7 @@ export default {
       let endDate = Date.parse(new Date(list.endDate))
       //任务处于待记录状态，且任务在规定完成时间范围内，登录人所在机构和角色与任务培训角色、培训机构一致才显示
 
-      if (list.startDate && list.endDate && list.status == 0) {
+      if (list.startDate && list.endDate && (list.status == 0|| list.status == 4)) {
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }