Commit 12f84d52 authored by 王李辉's avatar 王李辉
Browse files

风险新增模块页面搭建

parent dbd40972
Loading
Loading
Loading
Loading
+40 −5
Original line number Diff line number Diff line
@@ -272,13 +272,13 @@ const routes = [
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/addDanger/addDanger'),
  },
  {
    path: '/confirm-danger',
    name: 'confirm-danger',
    path: '/confirme-danger',
    name: 'confirme-danger',
    meta: {
      title:'隐患确认',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/confirmDanger'),
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/confirmeDanger'),
  },
  {
    path: '/affirm-danger',
@@ -287,7 +287,7 @@ const routes = [
      title:'隐患确认表单',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/confirmDanger/confirmDanger'),
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/confirmeDanger/confirmeDanger'),
  },
  {
    path: '/change-danger',
@@ -325,7 +325,42 @@ const routes = [
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/danger/reviewDanger/reviewAdd'),
  },

  {
    path: '/risk',
    name: 'risk',
    meta: {
      title:'风险',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/risk'),
  },
  {
    path: '/risk-add',
    name: 'risk-add',
    meta: {
      title:'风险上报',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/risk/riskAdd'),
  },
  {
    path: '/risk-confirme',
    name: 'risk-confirme',
    meta: {
      title:'风险确认',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/risk/riskConfirme'),
  },
  {
    path: '/risk-affirm',
    name: 'risk-affirm',
    meta: {
      title:'风险确认',
      index: 1
    },
    component: () => import(/* webpackChunkName: "SaveWorkbench" */ '../views/risk/riskConfirme/riskAffirm'),
  },
  
]

src/service/danger.js

0 → 100644
+11 −0
Original line number Diff line number Diff line
import request from '@/utils/axios'

// 隐患上报模块
// 隐患上报已退回
export function dangerReturn(url,data) {
    return request({
      url: url,
      method: 'post',
      data
    })
}
 No newline at end of file

src/utils/format.js

0 → 100644
+37 −0
Original line number Diff line number Diff line
export function timestampToTime (time,type,zero,num) {
    if(!time){return ''}
    try{
        var date = new Date(time)
        if(num&&typeof parseInt(num)=="number"){
            date = new Date(new Date(time).getTime()+num*60*60*24*1000)//时间戳以毫秒为单位,也可用其他日期格式
        }
        let yy = date.getFullYear();//年
        let mm = date.getMonth()+1;//月
        let dd = date.getDate();//日
        let hh = date.getHours();//小时
        let mf = date.getMinutes()<10 ? '0'+date.getMinutes() : date.getMinutes();//分钟
        let ss = date.getSeconds()<10 ? '0'+date.getSeconds() : date.getSeconds();//秒
        if(zero){
            if(mm<10){mm='0'+mm}
            if(dd<10){dd='0'+dd}
            if(hh<10){hh='0'+hh}
        }
        if(type=="DT1"){
            return yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;//yyyy-mm-dd hh:mf:ss
        }else if(type=="DT2"){
            return yy+'-'+mm+'-'+dd;//yyyy-mm-dd
        }else if(type=="DT3"){
            return yy+'/'+mm+'/'+dd+' '+hh+':'+mf+':'+ss;//yyyy/mm/dd hh:mf:ss
        }else if(type=="DT4"){
            return yy+'-'+mm+'-'+dd;//yyyy/mm/dd
        }else if(type=="DT5"){
            return date.getTime();//时间戳 秒数
        }else if(type=="DT6"){
            return yy+'年'+mm+'月'+dd+'日 '+hh+'时'+mf+'分'+ss+'秒';//yyyy年mm月dd日 hh时mf分ss秒
        }else if(type=="DT7"){
            return yy+'年'+mm+'月'+dd+'日';//yyyy年mm月dd日
        }
    }catch(e){
        console.log("timestampToTime Error");return ""
    }
}
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ export default {
.login {
  background-size: cover;
  background-repeat: no-repeat;
  background-position: center;
  background-attachment: fixed;
  // background-position: center;
  // background-attachment: fixed;
  .login-logo {
    width: 120px;
    margin: 22% auto 0px;
+5 −14
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@
    <LHeader :text="text"></LHeader>
    <van-form
      @submit="onSubmit"
      :show-error-message="false"
      :scroll-to-error="true"
      :show-error='false'
      validate-trigger="onSubmit"
    >
      <van-field
        v-model="gongcheng"
@@ -180,6 +181,7 @@

<script>
import LHeader from "@/components/header.vue";
import { timestampToTime } from '@/utils/format'
export default {
  components: {
    LHeader
@@ -217,12 +219,11 @@ export default {
      console.log("submit", values);
    },
    onConfirmrili(date) {
      this.timeval = this.format(date)
      this.timeval = timestampToTime(date,'DT1',true)
      this.showCalendar = false;
    },
    onConfirmdaoqi(date) {
      this.daoqitimeval = this.format(date)
      // this.daoqitimeval = `${date.getMonth() + 1}/${date.getDate()}`;
      this.daoqitimeval = timestampToTime(date,'DT1',true)
      this.daoqishowCalendar = false;
    },
    onConfirmfengxian(value) {
@@ -237,16 +238,6 @@ export default {
    cancel() {
      this.$router.go(-1);
    },

    format(value){
      let myDate 
       if (value.getMinutes() <= 9) {
        myDate = value.getFullYear() + '-' + (value.getMonth() + 1) + '-' + value.getDate() + ' ' + value.getHours() + ':' + '0' + value.getMinutes(); 
      } else {
        myDate = value.getFullYear() + '-' + (value.getMonth() + 1) + '-' + value.getDate() + ' ' + value.getHours() + ':' + value.getMinutes(); 
      }; 
      return myDate
    }
  }
};
</script>
Loading