Commit df43f7d7 authored by dlkong's avatar dlkong
Browse files

Merge branch 'develop' into dev_kdl

parents 1ec2d9e4 d7927ee9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ export default {
          'riskAdd'
          ],
          // 不需要展示底部tabbar的页面
          noTab:["login", "login2", 'addCurrent','addPresent','addInherent','riskInherent',"choose-people","scan",'success','fail','warn','center','reset-pas-two','riskTaskList','riskView'],
          noTab:["login", "login2", 'addCurrent','addPresent','addInherent','riskInherent',"choose-people","scan",'success','fail','warn','center','reset-pas-two','riskTaskList','riskBigDetail','riskView'],
           // cachePage预先定义的缓存页面
          otherCache: [],
           // 专门处理列表缓存的页面,这些页面缓存逻辑与其他缓存不一样去详情返回列表缓存,但是进入列表必须刷新,如何有需要缓存的列表请放到这里来。
+10 −0
Original line number Diff line number Diff line
@@ -166,6 +166,16 @@ const routes = [{
    name: 'addPresent',
    component: () => import('../views/riskProject/add/addPresent.vue'),
  },
  {//风险评估列表详情页
    path: '/riskBigDetail',
    name: 'riskBigDetail',
    component: () => import('../views/riskProject/assess/riskBigDetail.vue'),
  },
  {//执行情况管理
    path: '/riskExecution',
    name: 'riskExecution',
    component: () => import('../views/riskProject/execution/index.vue'),
  },
  {//四色图
    path: '/riskView',
    name: 'riskView',
+287 −423

File changed.

Preview size limit exceeded, changes collapsed.

+206 −338

File changed.

Preview size limit exceeded, changes collapsed.

+0 −2
Original line number Diff line number Diff line
@@ -61,14 +61,12 @@

            <van-field
                required
                clickable
                name="name"
                v-model="form.name"
                label="风险源名称"
                placeholder="请输入"
                :rules="[{ required: true, message: '风险源名称不能为空' }]"
            />

            <van-field
                v-model="form.factor"
                required
Loading