新页面接口联调

20211022
解润东

src/utils/axios.js

@@ -10,7 +10,8 @@
  import router from '../router'
  
 import { Notify } from 'vant';
- import { getToken } from '@/utils/auth' // get token from cookie
+import { Dialog } from 'vant';
+ import { getToken ,removeToken} from '@/utils/auth' // get token from cookie
 const service = axios.create({
 	baseURL: '/hse/app-api', //前缀路径
     headers: {//请求头部
@@ -36,15 +37,24 @@ service.interceptors.response.use(response => {
         if(res.code === 0) {//接口响应码0 代表接口代码运行正常
             return res
         }else if(res.code === 301){
-            Notify({ type: 'danger', message: res.msg});
+            // Notify({ type: 'danger', message: res.msg});
             return res
+        }else if(res.code === 403){
+            Dialog.alert({
+                title: '提示',
+                message: res.msg,
+                theme: 'round-button',
+            }).then(() => {
+                removeToken()
+                this.$router.push('/login2')
+            });
         }
     }else{
-        Notify({ type: 'danger', message: '失败' });
+        // Notify({ type: 'danger', message: '失败' });
         Promise.reject(new Error('Error'))
     }
  },err=>{
-    Notify({ type: 'danger', message: '失败' });
+    // Notify({ type: 'danger', message: '失败' });
     return Promise.reject(err)
  })
  

src/views/checked/index.vue

@@ -21,7 +21,7 @@
                 <div @click="onSearch">搜索</div>
             </template>
         </van-search>
-        <div class="card" v-for="(item,index) in checkedList"  :key="index"  @click="cardLocation">
+        <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>
@@ -80,8 +80,19 @@ export default {
         onSearch(){
             this.$toast('提示内容')
         },
-        cardLocation(){
-            this.$router.push('/problem')
+        cardLocation(item){
+            console.log(item)
+            this.$router.push({
+                name:'problem',
+                query:{
+                    checkitemId:item.id,
+                    name:item.name,
+                    type:item.type,
+                    planStartTime:item.planStartTime,
+                    planEndTime:item.planEndTime,
+                    address:item.address,
+                }
+            })
         }
     }
 }

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

@@ -31,8 +31,8 @@
                             <td align="center" v-text="item.checkBasis" style="width:30%"></td>
                             <td align="center">
                                 <van-radio-group v-model="item.checkStatus">
-                                    <van-radio name="1">合格</van-radio>
-                                    <van-radio name="2">不合格</van-radio>
+                                    <van-radio name="0">合格</van-radio>
+                                    <van-radio name="1" @click="noGrage(item)">不合格</van-radio>
                                 </van-radio-group>
                             </td>
                         </tr>
@@ -88,8 +88,20 @@ export default {
     },
     methods: {
         init(){
+            this.list=[]
             getFun('check/carry/list/problem').then((Response)=>{
                 this.list=Response.data
+                console.log(this.list)
+            })
+        },
+        noGrage(item){
+            this.$router.push({
+                name: 'list',
+                query:{
+                    checkitem:item.checkItem,//检查项目
+                    checkContent:item.checkContent,//检查内容
+                    checkBasis:item.checkBasis,//法律依据
+                }
             })
         }
     }

src/views/checked/problem/index.vue

@@ -12,10 +12,11 @@
     <div>
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
-            <div>检查名称：昌平区回迁房改造项目安全检查</div>
-            <div>检查名称：专项检查</div>
-            <div>检查名称：2021-12-15</div>
-            <div>检查名称：昌平区回迁房改造工程</div>
+            <div>检查名称：{{itemlist.name}}</div>
+            <div>检查类型：{{itemlist.type}}</div>
+            <div>检查开始时间：{{itemlist.planStartTime}}</div>
+            <div>检查结束时间：{{itemlist.planEndTime}}</div>
+            <div>检查地点：{{itemlist.address}}</div>
         </div>
         <div class="button-more">
             <van-button type="primary" round size="large" @click="problem">检查问题上报{{nums.TroubleNumber}}</van-button>
@@ -37,10 +38,21 @@ export default {
     data() {
         return {
             nums:{},
+            itemlist:{},
             text:'问题上报'
         }
     },
     mounted() {
+        if(this.$route.query.checkitemId){
+            this.itemlist={
+                id:this.$route.query.checkitemId,
+                name:this.$route.query.name,
+                type:this.$route.query.type,
+                planStartTime:this.$route.query.planStartTime,
+                planEndTime:this.$route.query.planEndTime,
+                address:this.$route.query.address,
+            }
+        }
         this.init()
     },
     methods: {

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

@@ -51,12 +51,19 @@
                 placeholder="问题描述"
                 :rules="[{ required: true, message: '请填写问题描述' }]"
             />
+            <van-field
+                v-model="checkBasis"
+                name="法律依据"
+                label="法律依据"
+                placeholder="法律依据"
+                :rules="[{ required: true, message: '请填写法律依据' }]"
+            />
             <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
                 <template #input>
                     <van-uploader v-model="uploaderImg" />
                 </template>
             </van-field>
-            <van-field name="uploader" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
+            <van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
                 <template #input>
                     <van-uploader v-model="uploaderVideo" />
                 </template>
@@ -70,6 +77,7 @@
 
 <script>
 import LHeader from '@/components/header.vue'
+import { getFun,postFun } from '@/service/table'
 export default {
     name: 'list',
     components: {
@@ -81,16 +89,28 @@ export default {
             problemName:'',//问题名称
             problemPosition:'',//问题位置
             value:'',//责任单位
+            valueId:0,//责任单位id
             problemDescribe:'',//问题描述
             uploaderImg:[],//图像上传
             uploaderVideo:[],//视频上传
+            checkBasis:'',//法律依据
             showPicker:false,
-            columns: ['研发二组', '研发一组', '能源石油化', '平台应用事业前端组', '项目经理部'],
+            columns: [
+                { text:'研发二组',value:0}, 
+                { text:'研发一组',value:1}, 
+                { text:'能源石油化',value:2}, 
+                { text:'平台应用事业前端组',value:3}, 
+                { text:'项目经理部',value:4}],
             text:'检查问题',
+            jumpObj:{}
         }
     },
     mounted() {
-        
+        if(this.$route.name=='list'&&this.$route.query.checkitem){
+            this.problemName=this.$route.query.checkitem,//检查项目
+            this.problemDescribe=this.$route.query.checkContent,//检查内容
+            this.checkBasis=this.$route.query.checkBasis//法律依据  
+        }
     },
     methods: {
         //失败的回调
@@ -103,15 +123,32 @@ export default {
 
         },
         onSubmit(value){
-            this.$notify({
-                message:'成功',
-                background:'green',
-                duration: 1000
+            console.log(value)
+            var obj={
+                planId:1,
+                title:value['问题名称'],//问题名称
+                address:value['问题位置'],//问题位置
+                deptId:this.valueId,//责任单位
+                context:value['问题描述'],//问题描述
+                checkBasis:value['法律依据']//法律依据
+            }
+            console.log(obj)
+            this.$dialog.confirm({
+                title: '提示',
+                message: '确定提交检查问题？',
+            }).then(()=>{
+                postFun('check/carry/trouble',value).then((Response)=>{
+                    
+                    history.go(-1)
+                })
+            }).catch(()=>{
+
             })
-            history.go(-1)
+            
         },
-        onConfirm(value){
-            this.value = value;
+        onConfirm(v){
+            this.value = v.text;
+            this.valueId=v.value
             this.showPicker = false;
         }
     }

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

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
             <div class="card" v-for="(item,index) in list"  :key="index" >
-                <van-checkbox :name="item.id">问题{{item.id}}</van-checkbox>
+                <van-checkbox :name="item.planItemId">问题{{item.id}}</van-checkbox>
                 <div>问题名称：{{item.title}}</div>
                 <div>问题位置：{{item.address}}</div>
                 <div>问题内容：{{item.context}}</div>
@@ -90,11 +90,20 @@ export default {
             this.$toast('取消')
         },
         commit(){
+            var obj={
+                planId:1,
+                troubleIds:this.result
+            }
             this.$dialog.confirm({
                 title: '提示',
                 message: '确定提交检查问题？',
             }).then(()=>{
-                this.$router.push('/correct')
+                postFun('check/carry/report/submit',obj).then((Response)=>{
+                    
+                    this.$router.push('/correct')
+                })
+            }).catch(()=>{
+
             })
         }
     }