修改bug

解润东
20211122

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/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,15 +95,26 @@ export default {
     mounted() {
         if(this.$route.query.name=='note'){
             this.editObj=JSON.parse(this.$route.query.obj)
+            console.log()
+            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//视频
             }
+            console.log(this.editObj)
             this.ids=this.editObj.deptIds
         }
         this.init()
@@ -139,11 +149,14 @@ export default {
             console.log(value)
             var pictures=[];
             value.uploader.forEach((item) => {
-                pictures.push(item.content)
+                if(item){
+                    pictures.push(item.content)
+                }
+                
             });
             if(this.editObj.pictures){
                 this.editObj.pictures.forEach((item)=>{
-                    pictures.push(item)
+                    pictures.push(item.url)
                 })
             }
             var videos=[];
@@ -152,7 +165,7 @@ export default {
             })
             if(this.editObj.videos){
                 this.editObj.videos.forEach((item)=>{
-                    videos.push(item)
+                    videos.push(item.url)
                 })
             }
             var obj={

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,