kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-03-28 16:34:02 +08:00
parent 84f60ce32f 64c1ae7656
commit 8aae62c071
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/jianping/AppAssessment/components/List.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-list class="notice"> <ai-list class="notice">
<template slot="title"> <template slot="title">
<ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" v-model="search.areaId" :instance="instance" @change="getList"></ai-title> <ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" isShowBack @onBackClick="back" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-search-bar> <ai-search-bar>
@@ -110,6 +110,12 @@
this.total = res.data.total this.total = res.data.total
} }
}) })
},
back () {
this.$emit('change', {
type: 'Statistics'
})
} }
} }
} }

2
packages/jianping/AppRiskWarning/components/Add.vue
View File

@@ -38,7 +38,7 @@
<el-input v-model="form.address" :maxlength="30" size="small" placeholder="请输入联系地址"></el-input> <el-input v-model="form.address" :maxlength="30" size="small" placeholder="请输入联系地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注说明" prop="remarks" style="width: 100%;"> <el-form-item label="备注说明" prop="remarks" style="width: 100%;">
<el-input v-model="form.remarks" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请输入..."></el-input> <el-input v-model="form.remarks" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请简要说明风险情况"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>

2
packages/jianping/AppVisitToVerify/components/List.vue
View File

@@ -21,7 +21,7 @@
@change="search.current = 1, getList()"> @change="search.current = 1, getList()">
</ai-select> </ai-select>
<el-button size="small" v-if="checkType === '2'" :disabled="addIds.length == 0" type="primary" @click="addMonitor">纳入监测</el-button> <el-button size="small" v-if="checkType === '2'" :disabled="addIds.length == 0" type="primary" @click="addMonitor">纳入监测</el-button>
<el-button size="small" v-if="checkType === '2'" :disabled="removeIds.length == 0" @click="removeAll">解除风险</el-button> <el-button size="small" v-if="checkType !== '0'" :disabled="removeIds.length == 0" @click="removeAll">解除风险</el-button>
</template> </template>
<template #right> <template #right>
<el-input <el-input