Commit 06bee1e2 authored by 杨帆's avatar 杨帆

Merge branch 'dev-yf'' into 'develop'

Dev yf'

See merge request !4
parents 10dcb296 454d5624
...@@ -266,7 +266,7 @@ export default { ...@@ -266,7 +266,7 @@ export default {
.footer { .footer {
width: 100%; width: 100%;
height: 2.4rem; height: 1rem;
z-index: 9; z-index: 9;
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
......
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
<van-field <van-field
readonly readonly
name="deptId" name="deptName"
:value="form.deptId" :value="form.deptName"
label="评估小组选择" label="评估小组选择"
input-align="right" input-align="right"
:rules="[{ required: true, message: '评估小组不能为空' }]" :rules="[{ required: true, message: '评估小组不能为空' }]"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:key="index" :key="index"
> >
<div style="font-size: 0.45rem;padding: 5px 0;"> <div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.title }} {{ item.name }}
</div> </div>
<van-row gutter=""> <van-row gutter="">
<van-col span="17"> <van-col span="17">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
type="info" type="info"
size="mini" size="mini"
@click="todetail(index, item)" @click="todetail(index, item)"
>{{ active == 2 ? '去处理' :'去审批' }}</van-button >{{ active == 2 ? "去处理" : "去审批" }}</van-button
> >
</van-row> </van-row>
</van-col> </van-col>
...@@ -171,13 +171,13 @@ export default { ...@@ -171,13 +171,13 @@ export default {
this.$router.push({ this.$router.push({
name: "riskTaskList", name: "riskTaskList",
params: { params: {
id: item.id, id: item.id
// buildingId: item.buildingId // buildingId: item.buildingId
} }
}); });
sessionStorage.setItem("planId", item.id); sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("buildingId", ''); sessionStorage.setItem("buildingId", "");
}, }
} }
}; };
</script> </script>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:key="index" :key="index"
> >
<div style="font-size: 0.45rem;padding: 5px 0;"> <div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.title }} {{ item.name }}
</div> </div>
<van-row gutter=""> <van-row gutter="">
<van-col span="17"> <van-col span="17">
...@@ -170,7 +170,7 @@ import { timestampToTime, generateId } from "@/utils/format"; ...@@ -170,7 +170,7 @@ import { timestampToTime, generateId } from "@/utils/format";
export default { export default {
name: "risk-execution", name: "risk-execution",
components: { components: {
LHeader, LHeader
}, },
data() { data() {
return { return {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:key="index" :key="index"
> >
<div style="font-size: 0.45rem;padding: 5px 0;"> <div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.title }} {{ item.name }}
</div> </div>
<van-row gutter=""> <van-row gutter="">
<van-col span="17"> <van-col span="17">
...@@ -279,7 +279,7 @@ export default { ...@@ -279,7 +279,7 @@ export default {
}); });
sessionStorage.setItem("planId", item.id); sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("buildingId", item.buildingId); sessionStorage.setItem("buildingId", item.buildingId);
this.showIndex = false;; this.showIndex = false;
}, },
// 详情 // 详情
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment