bug修改

src/views/checked/index.vue

@@ -14,7 +14,7 @@
        <van-search
             v-model="value"
             show-action
-            placeholder="请输入关键字"
+            placeholder="请输入检查名称"
             @search="onSearch" 
             >
             <template #action>
@@ -24,8 +24,8 @@
         <div class="card" v-for="(item,index) in checkedList"  :key="index"  @click="cardLocation(item)">
             <div>检查名称：{{item.name}}</div>
             <div>检查类型：{{item.type}}</div>
-            <div>检查开始时间：{{item.planStartTime}}</div>
-            <div>检查结束时间：{{item.planEndTime}}</div>
+            <div>开始时间：{{item.planStartTime}}</div>
+            <div>结束时间：{{item.planEndTime}}</div>
             <div>检查地点：{{item.address}}</div>
             <div>是否提交：{{item.finish?'已提交':'未提交'}}</div>
         </div>

src/views/checked/problem/index.vue

@@ -19,10 +19,10 @@
             <div>检查地点：{{nums.address}}</div>
         </div>
         <div class="button-more">
-            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">检查问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>
+            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">临时问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>
             <van-button type="primary" round size="large" @click="formwork">检查清单模板{{'('+nums.listNumber+')'}}</van-button>
             <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{'('+nums.troubleNumber+')'}}</van-button>
-            <van-button type="primary" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>
+            <van-button type="info" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>
         </div>
         <tab-bar :index="1"></tab-bar>
     </div>

src/views/notice/noticeList/index.vue

@@ -37,8 +37,9 @@
                 <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
                     <div class="card" v-for="(item,index) in noticeQuestionList"  :key="index">
                         <van-overlay @click.stop="close(item)" :show="item.show"  >
-                            <van-button round type="primary" size="small" @click.stop="update(index,item)">修改</van-button>
-                            <van-button round type="primary" size="small" @click.stop="cardCommit(item)">提交</van-button>
+                            <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
+                            <van-button round type="info"  @click.stop="update(index,item)">修改</van-button>
+                            <van-button round type="warning " @click.stop="Delete(item)">删除</van-button>
                         </van-overlay>
                         <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                         <div @click="cardClick(item)">
@@ -78,11 +79,14 @@
                     clickable
                     name="calendar"
                     :value="value"
-                    label="整改完成日期"
-                    placeholder="请选择日期"
+                    label="整改完成时间"
+                    placeholder="请选择时间"
                     @click="calendarOpen"
                     />
-                <van-calendar v-model="showCalendar" @confirm="onConfirm" />
+                <van-popup v-model="showCalendar" position="bottom">
+                    <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
+                </van-popup> 
+                <!-- <van-calendar v-model="showCalendar" @confirm="onConfirm" /> -->
                 <div class="sign"><span>检查组负责人签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext" @click="sign" >电子签字</p><img  class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div>
                 <div class="sign2"><span>项目经理签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext2" @click="sign2" >电子签字</p><img  class="sign-img2" v-show="isImg2" :src="resultImg2" alt=""></van-tag></div>
                 <div class="page-footer-button">
@@ -108,6 +112,7 @@ export default {
     },
     data() {
         return {
+            currentDate: new Date(),//当前默认时间
             dialogShow:false,//弹框是否显示
             istext:true,//是否显示文字
             isImg:false,//是否显示图片
@@ -288,7 +293,7 @@ export default {
         },
         /* 时间戳转换 */
         onConfirm(date) {
-            this.value = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+            this.value = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours()+':00:00'}`;
             this.showCalendar = false;
         },
         //日期输入框点击事件
@@ -381,17 +386,36 @@ export default {
             this.updateObj.address=item.address,//问题位置
             this.updateObj.context=item.context//问题内容
             this.$forceUpdate()//强制刷新
+        },
+        //列表详情
+        detail(){
+
         },
         //卡片提交
-        cardCommit(item){
+        Delete(item){
             item.show=false
             this.$forceUpdate()//强制刷新
+            alert('删除成功')
+            
+        },
+        //弹框数据提交
+        commitDialog(){
+            this.noticeQuestionList.forEach((item)=>{
+                if(item.id==this.updateObj.id){
+                    item.title=this.updateObj.title,//问题名称
+                    item.address=this.updateObj.address,//问题位置
+                    item.context=this.updateObj.context//问题内容
+                }
+            })
+            console.log(this.updateObj,123)
+            this.$forceUpdate()//强制刷新
             this.$toast.loading({
                 message:'提交中...',
                 forbidClick: true,
                 loadingType: 'spinner',
                 duration: 0
             })
+             
             postFun('check/trouble/update',this.updateObj).then((Response)=>{
                 if(Response.code==0){
                    this.$toast.clear()
@@ -401,17 +425,6 @@ export default {
                 this.$toast.clear()
                 this.$toast.fail('提交失败,请稍后再试')
             })
-        },
-        //弹框数据提交
-        commitDialog(){
-            this.noticeQuestionList.forEach((item)=>{
-                if(item.id=this.updateObj.id){
-                    item.title=this.updateObj.title,//问题名称
-                    item.addressthis.updateObj.address,//问题位置
-                    item.context=this.updateObj.context//问题内容
-                }
-            })
-            this.$forceUpdate()//强制刷新
         }
     }
 }
@@ -430,7 +443,7 @@ export default {
             justify-content: space-evenly;
             align-items: center;
             .van-button{
-                width: 30%;
+                width: 20%;
                 margin-top: 0;
             }
             text-align: center;