消息中心更改

package.json

@@ -21,7 +21,6 @@
     "vue": "^2.6.10",
     "vue-esign": "^1.0.5",
     "vue-router": "^3.0.7",
-    "vue-video-player": "^5.0.2",
     "vue2-verify": "^1.1.5",
     "vuex": "^3.1.2"
   },
@@ -39,6 +38,7 @@
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
     "postcss-pxtorem": "^4.0.1",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.10",
+    "vue-video-player": "^5.0.2"
   }
 }

src/utils/axios.js

@@ -44,10 +44,10 @@ service.interceptors.response.use(response => {
                 theme: 'round-button',
             }).then(() => {
                 removeToken()
-                // location.reload()
-                router.push({
-                    name:'login2'
-                })
+                location.reload()
+                // router.push({
+                //     name:'login2'
+                // })
             });
         }else{
             Toast.fail({

src/views/checked/index.vue

@@ -22,6 +22,7 @@
             </template>
         </van-search>
         <div class="card" v-for="(item,index) in checkedList"  :key="index"  @click="cardLocation(item)">
+            <div>检查编号：{{item.no}}</div>
             <div>检查名称：{{item.name}}</div>
             <div>检查类型：{{item.type}}</div>
             <div>开始时间：{{item.planStartTime}}</div>

src/views/checked/problem/index.vue

@@ -12,6 +12,7 @@
     <div>
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
+            <div>检查编号：{{nums.no}}</div>
             <div>检查名称：{{nums.name}}</div>
             <div>检查类型：{{nums.type}}</div>
             <div>检查开始时间：{{nums.planStartTime}}</div>

src/views/checked/problem/note/detail/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
             <div>问题位置：{{list.address}}</div>
-            <div>责任单位：{{list.deptNames.join('/')}}</div>
+            <div>责任单位：{{list.deptNames}}</div>
             <div>问题描述：{{list.context}}</div>
             <div>法律依据：{{list.checkBasis}}</div>
             <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false"  v-model="list.pictures" /></div>
@@ -49,7 +49,22 @@ export default {
         init(){
             this.list={}
             getFun('check/carry/trouble/'+this.id).then((Response)=>{
-                this.list=Response.data
+                this.list=JSON.parse(JSON.stringify(Response.data))
+                //数据处理
+                this.list.deptNames=this.list.deptNames.join('/')
+                this.list.pictures=[]
+                this.list.videos=[]
+                Response.data.pictures.forEach((item) => {
+                    this.list.pictures.push({
+                        url:item
+                    })
+                });
+                Response.data.videos.forEach((item) => {
+                    this.list.videos.push({
+                        url:item
+                    })
+                });
+                
             })
         }
     }

src/views/checked/problem/note/edit/index.vue

@@ -21,11 +21,10 @@
             />
             <van-field
                 v-model="editObj.checkBasis"
-                name="法律依据"
-                label="法律依据"
-                placeholder="法律依据"
+                name="判定依据"
+                label="判定依据"
+                placeholder="判定依据"
                 :disabled="true"
-                :rules="[{ required: true, message: '请填写法律依据' }]"
             />
             <van-field
                 v-model="editObj.address"
@@ -96,14 +95,23 @@ export default {
     mounted() {
         if(this.$route.query.name=='note'){
             this.editObj=JSON.parse(this.$route.query.obj)
+            var pictures=[]
+            var videos=[]
+            this.editObj.pictures.forEach((item)=>{
+                pictures.push({url:item})
+            })
+            this.editObj.videos.forEach((item)=>{
+                videos.push({url:item})
+            })
+            
             this.editObj={
                 id:this.editObj.id,//问题ID
                 address:this.editObj.address,//问题位置
                 value:this.editObj.deptNames.join('/'),//责任单位
                 context:this.editObj.context,//问题描述
                 checkBasis:this.editObj.checkBasis,//法律依据
-                pictures:this.editObj.pictures,//图片
-                videos:this.editObj.videos//视频
+                pictures:pictures,//图片
+                videos:videos//视频
             }
             this.ids=this.editObj.deptIds
         }
@@ -139,22 +147,14 @@ export default {
             console.log(value)
             var pictures=[];
             value.uploader.forEach((item) => {
-                pictures.push(item.content)
+                if(item.content){pictures.push(item.content)}
+                else if(item.url){pictures.push(item.url)}
             });
-            if(this.editObj.pictures){
-                this.editObj.pictures.forEach((item)=>{
-                    pictures.push(item)
-                })
-            }
             var videos=[];
             value.uploader2.forEach((item) => {
-                videos.push(item.content)
-            })
-            if(this.editObj.videos){
-                this.editObj.videos.forEach((item)=>{
-                    videos.push(item)
-                })
-            }
+                if(item.content){videos.push(item.content)}
+                else if(item.url){videos.push(item.url)}
+            });
             var obj={
                 id:this.editObj.id,//列表ID
                 pictures:pictures,//图片

src/views/checked/problem/note/index.vue

@@ -15,10 +15,10 @@
             <div class="card" v-for="(item,index) in list"  :key="index" >
                 <van-overlay @click.stop="close(item)" :show="item.show"  >
                     <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
-                    <van-button round type="info" v-show="!finish"  @click.stop="update(index,item)">修改</van-button>
-                    <van-button round type="warning " v-show="!finish" @click.stop="Delete(item)">删除</van-button>
+                    <van-button round type="info" v-show="!item.checkSubmitFlag"  @click.stop="update(index,item)">修改</van-button>
+                    <van-button round type="warning " v-show="!item.checkSubmitFlag" @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>
+                <van-checkbox :name="item.id" :disabled="finish?finish:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                 <div @click="cardClick(item)">
                     <!-- <div>问题名称：{{item.title}}</div> -->
                     <div>问题位置：{{item.address}}</div>
@@ -28,8 +28,8 @@
             </div>
         </van-checkbox-group>
         <div class="page-footer">
-            <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
-            <van-button round type="info" @click="commit" :disabled="finish=='true'?true:false">提交</van-button>
+            <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish">全选</van-checkbox>
+            <van-button round type="info" @click="commit" :disabled="finish">提交</van-button>
         </div>
         <tab-bar :index="1"></tab-bar>
     </div>
@@ -134,6 +134,7 @@ export default {
                 title: '提示',
                 message: '确定提交检查问题？',
             }).then(()=>{
+                if(checkedList.length==0){this.$toast.fail('提交失败,请至少选择一个问题');return}
                 this.$toast.loading({
                     message:'提交中...',
                     forbidClick: true,

src/views/checkedConfirm/confirmNote/detail/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
             <div>问题位置：{{list.address}}</div>
-            <div>责任单位：{{list.deptId}}</div>
+            <div>责任单位：{{list.deptNames}}</div>
             <div>问题描述：{{list.context}}</div>
             <div>法律依据：{{list.checkBasis}}</div>
             <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false"  v-model="list.pictures" /></div>
@@ -48,8 +48,22 @@ export default {
         /* 获取详情列表 */
         init(){
             this.list={}
-            getFun('check/confirm/trouble/list',{planId:this.id}).then((Response)=>{
-                this.list=Response.data.list
+            getFun('check/notify/trouble/'+this.id).then((Response)=>{
+                this.list=JSON.parse(JSON.stringify(Response.data))
+                //数据处理
+                this.list.deptNames=this.list.deptNames.join('/')
+                this.list.pictures=[]
+                this.list.videos=[]
+                Response.data.pictures.forEach((item) => {
+                    this.list.pictures.push({
+                        url:item
+                    })
+                });
+                Response.data.videos.forEach((item) => {
+                    this.list.videos.push({
+                        url:item
+                    })
+                });
             })
         }
     }

src/views/checkedConfirm/confirmNote/index.vue

@@ -20,7 +20,7 @@
                     <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                     <div @click="cardClick(item)">
                         <div>负责人姓名：{{item.realName}}</div>
-                        <div>问题名称：{{item.title}}</div>
+                        <!-- <div>问题名称：{{item.title}}</div> -->
                         <div>问题位置：{{item.address}}</div>
                         <div>问题内容：{{item.context}}</div>
                         <div>发现时间：{{item.checkTime}}</div>
@@ -38,13 +38,15 @@
                 label="整改完成时间"
                 placeholder="请选择时间"
                 @click="calendarOpen"
+                :disabled="true"
                 />
             <van-popup v-model="showCalendar" position="bottom">
                 <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
             </van-popup> 
-            <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="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="sign"><span>现场负责人签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istextl" @click="signl" >电子签字</p><img  class="sign-img" v-show="isImgl" :src="resultImgl" alt=""></van-tag></div>
             <div class="page-footer-button">
-                <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">整改确认</van-button>
+                <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">确认</van-button>
             </div>
         <tab-bar :index="1"></tab-bar>
     </div>
@@ -62,10 +64,14 @@ export default {
     },
     data() {
         return {
+            currentDate: new Date(),//当前默认时间
+            istextl:true,//检查组签字是否显示文字
             dialogShow:false,//弹框是否显示
             istext:true,//是否显示文字
             isImg:false,//是否显示图片
             resultImg:'',//电子签名图片
+            resultImgl:'',//检查组电子签名图片
+            isImgl:false,//是否显示检查组图片
             noticeQuestionList:[],//整改通知问题记录列表
             active: 0,//tab选中状态
             checkedAll:false,//全选状态
@@ -89,13 +95,17 @@ export default {
         if(this.$route.params.name=='checkedConfirm'){
             this.istext=true//是否显示文字
             this.isImg=false//是否显示图片
+            this.istextl=true//检查组是否显示文字
+            this.isImgl=false//检查组是否显示图片
             this.value=''//日期值
             this.resultImg=''//电子签名图片
+            this.resultImgl=''//检查组电子签名图片
             this.id=this.$route.params.id//请求问题记录列表的唯一id
             this.noticeTableList=[];//问题记录列表数组
             if(sessionStorage.getItem('ConfirmFinish')){
                 this.finish=sessionStorage.getItem('ConfirmFinish')
             }
+            this.problem()
         }
         //判断是否从电子签名跳转过来-获取图片是否显示的布尔值
         if(this.$route.query.name=='callbackSign'){
@@ -108,6 +118,17 @@ export default {
                 }
             }
         }
+        //判断是否从检查组的电子签名跳转过来-获取图片是否显示的布尔值
+        if(this.$route.query.name=='callbackSignl'){
+            if(this.$route.query.confirmImgl==true||this.$route.query.confirmImgl=='true'){
+                this.istextl=false
+                this.isImgl=true
+                //从session中获取签名生成的图片1
+                if(sessionStorage.getItem('confirmImgl')){
+                    this.resultImgl=sessionStorage.getItem('confirmImgl')
+                }
+            }
+        }
     },
     mounted() {
         //刷新页面时候，从session中获取确认id
@@ -138,26 +159,35 @@ export default {
                     item.show=false
                 })
                 this.$toast.clear()
+                 //日期数据回显
+                if(Response.data.finishTime){
+                    this.value=Response.data.finishTime
+                }
+                //电子签名数据回显
+                if(Response.data.leaderSign){
+                    this.resultImg=Response.data.leaderSign
+                }
+                //获取选中状态数组
+                this.noticeQuestionList.forEach((item)=>{
+                    if(item.checkSubmitId){
+                        this.result.push(parseInt(item.checkSubmitId))
+                    }
+                })
+                //判断是否有签名
+                if(this.resultImg){
+                    this.istext=false
+                    this.isImg=true
+                }
                 /* ----详情---- */
                 if(this.isFinish){
-                    //获取选中状态数组
-                    this.noticeQuestionList.forEach((item)=>{
-                        if(item.checkSubmitId){
-                            this.result.push(parseInt(item.checkSubmitId))
-                        }
-                    })
-                    //日期数据回显
-                    if(Response.data.finishTime){
-                        this.value=Response.data.finishTime
-                    }
-                    //电子签名数据回显
-                    if(Response.data.leaderSign){
-                        this.resultImg=Response.data.leaderSign
+                    //检查组电子签名数据回显
+                    if(Response.data.managerSign){
+                        this.resultImgl=Response.data.managerSign
                     }
                     //判断是否有签名
-                    if(this.resultImg){
-                        this.istext=false
-                        this.isImg=true
+                    if(this.resultImgl){
+                        this.istextl=false
+                        this.isImgl=true
                     }
                 }
             })
@@ -197,9 +227,9 @@ export default {
         },
         //日期输入框点击事件
         calendarOpen(){
-            if(this.finish=='false'){
-                this.showCalendar = true
-            } 
+            // if(this.finish=='false'){
+            //     this.showCalendar = true
+            // } 
         },
         //标签点击事件防止标签切换首次进入不执行复选框监听事件
         tabClick(idx){
@@ -224,6 +254,19 @@ export default {
                 this.$router.push({name:'sign',query:{name:'confirmNote',confirmImg:true}})
             }
         },
+        //电子签名2
+        signl(){
+            //点击电子签名，保存用户选择的日期和复选框回显值
+            if(this.finish=='false'){
+                //每次签名检测需要签名的模块是哪个
+                if(sessionStorage.getItem('IsconfirmImgl')){
+                    sessionStorage.removeItem('IsconfirmImgl')
+                }else{
+                    sessionStorage.setItem('IsconfirmImgl',true)
+                }
+                this.$router.push({name:'sign',query:{name:'confirmNotel',confirmImgl:true}})
+            }
+        },
         //提交问题记录
         commit(){
             var checkedList=[]
@@ -238,6 +281,7 @@ export default {
             var obj={
                 planId:this.id,
                 leaderSign:this.resultImg,
+                managerSign:this.resultImgl
             }
             this.$dialog.confirm({
                 title: '提示',

src/views/danger/changeDanger/changeInfo.vue

@@ -32,7 +32,7 @@
         <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">状态：</van-col>
+        <van-col span="6">工单状态：</van-col>
         <van-col span="18">{{ item.taskName }}</van-col>
       </van-row>
       <!-- 详情 -->

src/views/danger/changeDanger/index.vue

@@ -61,7 +61,7 @@
               <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">状态：</van-col>
+              <van-col span="6">工单状态：</van-col>
               <van-col span="18">{{ item.taskName }}</van-col>
             </van-row>
 

src/views/danger/insertDanger/list.vue

@@ -51,7 +51,7 @@
           <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
         </van-row> -->
         <!-- <van-row gutter="">
-          <van-col span="6">状态：</van-col>
+          <van-col span="6">工单状态：</van-col>
           <van-col span="18">{{ item.taskName }}</van-col>
         </van-row> -->
 

src/views/danger/reviewDanger/reviewAdd.vue

@@ -32,7 +32,7 @@
         <van-col span="18">{{ item | formatTime }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">状态：</van-col>
+        <van-col span="6">工单状态：</van-col>
         <van-col span="18">{{ item.taskName }}</van-col>
       </van-row>
       <!-- 详情 -->

src/views/notice/noticeList/detail/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
             <div>问题位置：{{list.address}}</div>
-            <div>责任单位：{{list.deptNames.join('/')}}</div>
+            <div>责任单位：{{list.deptNames}}</div>
             <div>问题描述：{{list.context}}</div>
             <div>法律依据：{{list.checkBasis}}</div>
             <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false"  v-model="list.pictures" /></div>
@@ -49,7 +49,21 @@ export default {
         init(){
             this.list={}
             getFun('check/notify/trouble/'+this.id).then((Response)=>{
-                this.list=Response.data
+                this.list=JSON.parse(JSON.stringify(Response.data))
+                //数据处理
+                this.list.deptNames=this.list.deptNames.join('/')
+                this.list.pictures=[]
+                this.list.videos=[]
+                Response.data.pictures.forEach((item) => {
+                    this.list.pictures.push({
+                        url:item
+                    })
+                });
+                Response.data.videos.forEach((item) => {
+                    this.list.videos.push({
+                        url:item
+                    })
+                });
             })
         }
     }

src/views/notice/noticeList/edit/index.vue

@@ -21,10 +21,10 @@
             />
             <van-field
                 v-model="editObj.checkBasis"
-                name="法律依据"
-                label="法律依据"
-                placeholder="法律依据"
-                :rules="[{ required: true, message: '请填写法律依据' }]"
+                name="判定依据"
+                label="判定依据"
+                placeholder="判定依据"
+                :disabled="true"
             />
             <van-field
                 v-model="editObj.address"
@@ -53,12 +53,12 @@
                 />
                 <!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> -->
             </van-popup> 
-            <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
+            <van-field name="uploader" label="图像上传">
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
                 </template>
             </van-field>
-            <van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
+            <van-field name="uploader2" label="视频上传">
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
                 </template>
@@ -96,14 +96,22 @@ export default {
         
         if(this.$route.query.name=='noticeList'){
             this.editObj=JSON.parse(this.$route.query.obj)
+            var pictures=[]
+            var videos=[]
+            this.editObj.pictures.forEach((item)=>{
+                pictures.push({url:item})
+            })
+            this.editObj.videos.forEach((item)=>{
+                videos.push({url:item})
+            })
             this.editObj={
                 id:this.editObj.id,//问题ID
                 address:this.editObj.address,//问题位置
                 value:this.editObj.deptNames.join('/'),//责任单位
                 context:this.editObj.context,//问题描述
                 checkBasis:this.editObj.checkBasis,//法律依据
-                pictures:this.editObj.pictures,//图片
-                videos:this.editObj.videos//视频
+                pictures:pictures,//图片
+                videos:videos//视频
             }
             this.ids=this.editObj.deptIds
             
@@ -138,15 +146,14 @@ export default {
         /* 问题提交 */
         onSubmit(value){
             var pictures=[];
-            console.log(value)
             value.uploader.forEach((item) => {
                 if(item.content){pictures.push(item.content)}
-                else if(item){pictures.push(item)}
+                else if(item.url){pictures.push(item.url)}
             });
             var videos=[];
             value.uploader2.forEach((item) => {
                 if(item.content){videos.push(item.content)}
-                else if(item){videos.push(item)}
+                else if(item.url){videos.push(item.url)}
             });
             var obj={
                 id:this.editObj.id,//列表ID
@@ -157,6 +164,7 @@ export default {
                 context:value['问题描述'],//问题描述
                 checkBasis:value['法律依据']//法律依据
             }
+            console.log(obj)
             this.$dialog.confirm({
                 title: '提示',
                 message: '确定提交检查问题？',

src/views/notice/noticeList/index.vue

@@ -60,7 +60,7 @@
                         <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                         <div @click="cardClick(item)">
                             <div>负责人姓名：{{item.realName}}</div>
-                            <div>问题名称：{{item.title}}</div>
+                            <!-- <div>问题名称：{{item.title}}</div> -->
                             <div>问题位置：{{item.address}}</div>
                             <div>问题内容：{{item.context}}</div>
                             <div>发现时间：{{item.checkTime}}</div>

src/views/notice/noticeList/sign/index.vue

@@ -29,6 +29,7 @@ export default {
             lineColor: 'red',
             bgColor: '',
             resultImg: '',
+            confirmImgl:'',
             isCrop: false,
             value:'',
             result:[],
@@ -46,6 +47,9 @@ export default {
         if(this.$route.query.name=='confirmNote'){
             this.confirmImg=this.$route.query.confirmImg
         }
+        if(this.$route.query.name=='confirmNotel'){
+            this.confirmImgl=this.$route.query.confirmImgl
+        }
     },
     methods: {
     handleReset () {
@@ -58,6 +62,8 @@ export default {
             //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
             if(this.confirmImg){
                 this.$router.push({name:'confirmNote',query:{name:'callbackSign',confirmImg:this.confirmImg}})
+            }else if(this.confirmImgl){
+                this.$router.push({name:'confirmNote',query:{name:'callbackSignl',confirmImgl:this.confirmImgl}})
             }else{
                 this.$router.push({name:'noticeList',query:{name:'sign',img:this.img}})
             }
@@ -65,9 +71,9 @@ export default {
             if(this.img){
                 sessionStorage.setItem('resultImg',this.resultImg)
             }
-            // else if(this.img2){
-            //     sessionStorage.setItem('resultImg2',this.resultImg)
-            // }
+            else if(this.confirmImgl){
+                sessionStorage.setItem('confirmImgl',this.resultImg)
+            }
             else if(this.confirmImg){
                 sessionStorage.setItem('confirmImg',this.resultImg)
             }