Browse Source

修复16:00之后的缺陷

coys 2 years ago
parent
commit
cea1305f02

+ 1 - 1
src/config/env.development.js

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

+ 1 - 1
src/views/menu/rehearsalTask/components/addRehearsalTask.vue

@@ -344,7 +344,7 @@ export default {
       let endDate = JSON.parse(JSON.stringify(this.form.drillEndTime))
       endDate = Date.parse(new Date(endDate))
       if (startDate > endDate) {
-        Toast('开始时间不能大于结束时间')
+        Toast('演练开始时间不能大于演练结束时间')
         this.falg = true
         return
       }

+ 4 - 7
src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -10,24 +10,21 @@
       <div class="label">单位名称</div>
       <div>{{ trainingData.orgName }}</div>
     </div>
-    <div class="mainItem">
-      <div class="label">演练时间</div>
-      <div>{{ trainingData.drillTime }}</div>
-    </div>
+   
     <div class="mainItem">
       <div class="label">演练开始时间</div>
-      <div>{{ trainingData.trainingStartDateTime }}</div>
+      <div>{{ trainingData.drillStartDateTime }}</div>
     </div>
     <div class="mainItem">
       <div class="label">演练结束时间</div>
-      <div>{{ trainingData.trainingEndDateTime }}</div>
+      <div>{{ trainingData.drillEndDateTime }}</div>
     </div>
     <div class="mainItem">
       <div class="label">演练地点</div>
       <div>{{ trainingData.drillSite }}</div>
     </div>
     <div class="mainItem mainItemData">
-      <p class="label labelPeople">演练资料</p>
+      <p class="label labelPeople">演练计划资料</p>
       <div>
         <div v-for="item in studyList" :key="item.name">
           <van-tag type="primary" class="tagCls" plain @click="tagHandler(item)">{{ item.name }}</van-tag>

+ 4 - 3
src/views/menu/rehearsalTask/index.vue

@@ -95,10 +95,11 @@
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
               <div>演练状态</div>
-              <div v-if="item.status == 0" :style="{ color: '#008cd6' }">{{ item.statusText }}</div>
-              <div v-else-if="item.status == 1" :style="{ color: '#bc9f71' }">{{ item.statusText }}</div>
+              <div v-if="item.status == 0||item.status == 5" :style="{ color: '#008cd6' }">{{ item.statusText }}</div>
+              <div v-else-if="item.status == 1||item.status == 2" :style="{ color: '#bc9f71' }">{{ item.statusText }}</div>
               <div v-else-if="item.status == 3" :style="{ color: '#009240' }">{{ item.statusText }}</div>
               <div v-else-if="item.status == 4" :style="{ color: '#d7000f' }">{{ item.statusText }}</div>
+              
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
               <div>演练项目</div>
@@ -106,7 +107,7 @@
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
               <div>演练时间</div>
-              <div>{{ item.drillTime }}</div>
+              <div>{{ item.drillStartTime }}-{{item.drillEndTime }}</div>
             </div>
             <div class="mainItem">
               <div>签名情况</div>