feat: 风险管控页面2

src/api/model/system.js

@@ -13,6 +13,28 @@ export default {
 	// 		}
 	// 	},
 	// },
+	myschedule: {
+		list: {
+			url: `${config.API_URL}/system/myschedule/`,
+			name: "获取列表",
+			req: async function(data){
+				return await http.get(this.url, data);
+			}
+		},
+		create: {
+			url: `${config.API_URL}/system/myschedule/`,
+			name: "新增",
+			req: async function(data){
+				return await http.post(this.url,data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(`${config.API_URL}/system/myschedule/${id}/`);
+			}
+		}
+	},
 	dept: {
 		list: {
 			url: `${config.API_URL}/system/dept/`,

src/config/route.js

@@ -2360,16 +2360,6 @@ const routes = [
             },
             "component": "dpm/riskpoint"
           },
-          {
-            "name": "checktaskset",
-            "path": "/dpm/checktaskset",
-            "meta": {
-              "title": "排查任务",
-              "icon": "el-icon-aim",
-              "perms": ["checktaskset"]
-            },
-            "component": "dpm/checktaskset"
-          },
           {
             "name": "checkwork",
             "path": "/dpm/checkwork",

src/utils/enum.js

@@ -172,3 +172,16 @@ export const riskTypeEnum = new EnumFactory({
   10: { text: '作业活动类', type: 'primary' },
   20: { text: '设备设施类', type: 'primary' },
 }, parseInt)
+
+
+export const scheduleTypeEnum = new EnumFactory({
+  10: '间隔',
+  20: '定时',
+}, parseInt)
+
+export const schedulePeriodEnum = new EnumFactory({
+  'seconds': '秒',
+  'minutes': '分钟',
+  'hours': '小时',
+  'days': '天',
+}, parseInt)

src/views/dpm/checktaskset.vue

@@ -1,17 +1,69 @@
 <template>
-    <el-container>
+	<scTable
-    </el-container>
+		ref="table"
+		:apiObj="apiObj"
+		row-key="id"
+		:query="query"
+		:params="params"
+		hidePagination
+		hideDo
+		style="height: 400px"
+	>
+		<el-table-column
+			label="时间策略"
+			prop="myschedule_name"
+			min-width="100"
+		></el-table-column>
+		<el-table-column
+			label="指派人"
+			prop="user_duty_name"
+			width="80"
+		></el-table-column>
+		<el-table-column
+			label="期限(h)"
+			prop="expire"
+			width="80"
+		></el-table-column>
+		<el-table-column
+			label="启用"
+			prop="enabled"
+			width="50"
+		></el-table-column>
+		<el-table-column
+			label="派发次数"
+			prop="total_run_count"
+			width="100"
+		></el-table-column>
+		<el-table-column
+			label="最近派发"
+			prop="last_run_at"
+		></el-table-column>
+	</scTable>
 </template>
 <script>
+import { riskLevelEnum, manageLevelEnum, riskTypeEnum } from "@/utils/enum.js";
 export default {
-    name: 'checktaskset',
+	name: "risk",
+	props: {
+		rpId: { type: String, default: null },
+	},
 	data() {
 		return {
-        }
+			riskLevelEnum,
+			manageLevelEnum,
+			riskTypeEnum,
+			apiObj: this.$API.dpm.risk.list,
+			params: { riskpoint: this.rpId },
+			query: {
+				search: "",
 			},
-    methods: {
+		};
 	},
-    mounted() {
+	methods: {},
-    }
+	created() {},
-}
+	mounted() {},
+	computed: {},
+	watch: {},
+	components: {},
+};
 </script>

src/views/dpm/risk.vue

@@ -1,35 +1,10 @@
 <template>
-	<el-card style="width: 100%" shadow="hover">
-		<el-descriptions :column="2">
-			<el-descriptions-item label="名称">{{
-				modelv.name
-			}}</el-descriptions-item>
-			<el-descriptions-item label="类型">{{
-				riskTypeEnum[modelv.type]?.text
-			}}</el-descriptions-item>
-			<el-descriptions-item label="等级"
-				><el-tag :type="riskLevelEnum[modelv.level]?.type">{{
-					riskLevelEnum[modelv.level]?.text
-				}}</el-tag></el-descriptions-item
-			>
-			<el-descriptions-item label="责任部门">{{
-				modelv.dept_res_name
-			}}</el-descriptions-item>
-			<el-descriptions-item label="责任人">{{
-				modelv.user_res_name
-			}}</el-descriptions-item>
-			<el-descriptions-item label="所在区域"> </el-descriptions-item>
-			<el-descriptions-item label="具体地点">
-				{{ modelv.place }}
-			</el-descriptions-item>
-		</el-descriptions>
-	</el-card>
-	<el-card header="风险列表" shadow="hover" style="margin-top: 8px">
 	<scTable
 		ref="table"
 		:apiObj="apiObj"
 		row-key="id"
 		:query="query"
+		:params="params"
 		hidePagination
 		hideDo
 		style="height: 400px"
@@ -40,21 +15,19 @@
 			min-width="100"
 		></el-table-column>
 	</scTable>
-	</el-card>
 </template>
 <script>
-import { riskLevelEnum, manageLevelEnum, riskTypeEnum } from "@/utils/enum.js";
+import { riskLevelEnum } from "@/utils/enum.js";
 export default {
 	name: "risk",
 	props: {
-		modelv: { type: Object, default: () => {} },
+		rpId: { type: String, default: null },
 	},
 	data() {
 		return {
 			riskLevelEnum,
-			manageLevelEnum,
-			riskTypeEnum,
 			apiObj: this.$API.dpm.risk.list,
+			params: { riskpoint: this.rpId },
 			query: {
 				search: "",
 			},

src/views/dpm/riskpoint.vue

@@ -1,4 +1,6 @@
 <template>
+	<el-container>
+		<el-aside width="54%">
 			<el-container>
 				<el-header>
 					<div class="left-panel">
@@ -24,7 +26,13 @@
 					</div>
 				</el-header>
 				<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" :query="query">
+					<scTable
+						ref="table"
+						:apiObj="apiObj"
+						row-key="id"
+						:query="query"
+						@row-click="rowClick"
+					>
 						<el-table-column label="类型" prop="type">
 							<template #default="scope"
 								>{{ riskTypeEnum[scope.row.type]?.text }}
@@ -32,8 +40,12 @@
 						</el-table-column>
 						<el-table-column label="等级" prop="level">
 							<template #default="scope">
-                        <el-tag :type="riskLevelEnum[scope.row.level]?.type">{{
+								<el-tag
-                    riskLevelEnum[scope.row.level]?.text }}</el-tag>
+									:type="riskLevelEnum[scope.row.level]?.type"
+									>{{
+										riskLevelEnum[scope.row.level]?.text
+									}}</el-tag
+								>
 							</template>
 						</el-table-column>
 						<el-table-column
@@ -71,17 +83,13 @@
 									@click="table_edit(scope.row)"
 									v-auth="'riskpoint.update'"
 									type="primary"
-							>编辑</el-button>
+									>编辑</el-button
-                        <el-button
+								>
-							link
-							size="small"
-							@click="risk_set(scope.row)"
-							v-auth="'riskpoint.update'"
-							type="warning"
-							>风险配置</el-button>
 								<el-popconfirm
 									title="确定删除吗？"
-							@confirm="table_del(scope.row, scope.$index)"
+									@confirm="
+										table_del(scope.row, scope.$index)
+									"
 								>
 									<template #reference>
 										<el-button
@@ -97,6 +105,89 @@
 						</el-table-column>
 					</scTable>
 				</el-main>
+			</el-container>
+		</el-aside>
+		<el-main class="nopadding">
+			<el-container>
+				<el-header style="height: 160px; padding: 0">
+					<el-card
+						style="width: 100%; height: 100%"
+						header="风险点详情"
+					>
+						<el-descriptions :column="3" v-if="rowData.id">
+							<el-descriptions-item label="名称">{{
+								rowData.name
+							}}</el-descriptions-item>
+							<el-descriptions-item label="类型">{{
+								riskTypeEnum[rowData.type]?.text
+							}}</el-descriptions-item>
+							<el-descriptions-item label="等级"
+								><el-tag
+									:type="riskLevelEnum[rowData.level]?.type"
+									>{{
+										riskLevelEnum[rowData.level]?.text
+									}}</el-tag
+								></el-descriptions-item
+							>
+							<el-descriptions-item label="责任部门">{{
+								rowData.dept_res_name
+							}}</el-descriptions-item>
+							<el-descriptions-item label="责任人">{{
+								rowData.user_res_name
+							}}</el-descriptions-item>
+							<el-descriptions-item label="所在区域">
+							</el-descriptions-item>
+							<el-descriptions-item label="具体地点">
+								{{ rowData.place }}
+							</el-descriptions-item>
+						</el-descriptions>
+					</el-card>
+				</el-header>
+				<el-main class="nopadding">
+					<el-container>
+						<el-header>
+							<div class="left-panel">
+								<el-segmented
+									v-model="defaultX"
+									:options="xoptions"
+									size="default"
+								/>
+							</div>
+							<div class="right-panel">
+								<el-button
+									v-if="defaultX == '风险列表' && rowData.id"
+									type="primary"
+									icon="el-icon-plus"
+									@click="risk_add"
+									v-auth="'riskpoint.update'"
+								></el-button>
+								<el-button
+									v-if="
+										defaultX == '排查任务配置' && rowData.id
+									"
+									type="primary"
+									icon="el-icon-plus"
+									@click="checktaskset_add"
+									v-auth="'checktaskset.create'"
+								></el-button>
+							</div>
+						</el-header>
+						<el-main class="nopadding">
+							<Risk
+								:rpId="rowData.id"
+								v-if="defaultX == '风险列表' && rowData.id"
+								style="height: 100%"
+							></Risk>
+							<CheckTaskSet
+								:rpId="rowData.id"
+								v-if="defaultX == '排查任务配置' && rowData.id"
+								style="height: 100%"
+							></CheckTaskSet>
+						</el-main>
+					</el-container>
+				</el-main>
+			</el-container>
+		</el-main>
 		<el-dialog v-model="saveDialog" title="新增/编辑">
 			<el-form :model="saveForm" label-width="100px" ref="saveForm">
 				<el-row>
@@ -134,7 +225,10 @@
 					</el-col>
 					<el-col :span="24">
 						<el-form-item label="名称" prop="name" required>
-					<el-input v-model="saveForm.name" clearable></el-input>
+							<el-input
+								v-model="saveForm.name"
+								clearable
+							></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -156,9 +250,15 @@
 					<el-col :span="12">
 						<el-form-item label="责任人" prop="user_res" required>
 							<span style="display: flex">
-                <el-input readonly v-model="saveForm.user_res_name"></el-input>
+								<el-input
+									readonly
+									v-model="saveForm.user_res_name"
+								></el-input>
 								<span style="width: 4px"></span>
-                <ehsUserSelect :multiple="false" @submit="getUserRes"/>
+								<ehsUserSelect
+									:multiple="false"
+									@submit="getUserRes"
+								/>
 							</span>
 						</el-form-item>
 					</el-col>
@@ -180,7 +280,10 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="具体地点" prop="place">
-					<el-input v-model="saveForm.place" clearable></el-input>
+							<el-input
+								v-model="saveForm.place"
+								clearable
+							></el-input>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -194,30 +297,88 @@
 				>
 			</template>
 		</el-dialog>
-        <el-drawer v-model="drawerVisible" title="风险点详情" size="40%">
+		<el-dialog v-model="saveDialog2" title="排查任务配置">
-            <Risk :modelv="rowData"></Risk>
+			<el-form :model="saveForm2" label-width="100px" ref="saveForm2">
-        </el-drawer>
+				<el-form-item label="指派人" prop="user_duty" required>
+					<span style="display: flex">
+						<el-input
+							style="width:100px"
+							readonly
+							v-model="saveForm2.user_duty_name"
+						></el-input>
+						<span style="width: 4px"></span>
+						<ehsUserSelect
+							:multiple="false"
+							@submit="getUserRes2"
+						/>
+					</span>
+				</el-form-item>
+				<el-form-item label="时间策略" prop="myschedule" required>
+					<span style="display: flex">
+						<el-input
+							style="width:400px"
+							readonly
+							v-model="saveForm2.myschedule_name"
+						></el-input>
+						<span style="width: 4px"></span>
+						<el-button
+							type="primary"
+							circle
+							size="mini"
+							icon="el-icon-plus"
+							@click="()=>{ choseMyScheduleDialog = true}"
+							/>
+					</span>
+				</el-form-item>
+				<el-form-item label="排查备注" prop="note" required>
+					<el-input
+						v-model="saveForm2.note"
+						clearable
+						:rows="3"
+						type="textarea"
+					></el-input>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<el-button
+					type="primary"
+					:loading="formSaving"
+					@click="formSubmit2()"
+					>保 存</el-button>
+			</template>
+		</el-dialog>
+		<el-dialog v-model="choseMyScheduleDialog" title="选择策略">
+			<MySchedule></MySchedule>
+		</el-dialog>
 	</el-container>
 </template>
 <script>
 import { riskLevelEnum, manageLevelEnum, riskTypeEnum } from "@/utils/enum.js";
-import Risk from "./risk.vue"
+import Risk from "./risk.vue";
+import CheckTaskSet from "./checktaskset.vue";
+import MySchedule from "@/views/sys/myschedule.vue";
 const defaultForm = {};
 export default {
-    components:{ Risk },
+	components: { Risk, CheckTaskSet, MySchedule},
 	data() {
 		return {
-            riskTypeEnum, riskLevelEnum, manageLevelEnum,
+			riskTypeEnum,
-            drawerVisible: false,
+			riskLevelEnum,
+			manageLevelEnum,
 			formSaving: false,
 			saveDialog: false,
+			saveDialog2: false,
+			choseMyScheduleDialog: false,
 			query: {
 				search: "",
 			},
 			apiObj: this.$API.dpm.riskpoint.list,
 			saveForm: Object.assign({}, defaultForm),
+			saveForm2: {},
 			deptOptions: [],
-            rowData: {}
+			rowData: {},
+			xoptions: ["风险列表", "排查任务配置"],
+			defaultX: "风险列表",
 		};
 	},
 	mounted() {
@@ -225,23 +386,29 @@ export default {
 		this.getAreaOptions();
 	},
 	methods: {
-        risk_set(row) {
+		checktaskset_add() {
+			this.saveDialog2 = true;
+		},
+		rowClick(row) {
 			this.rowData = row;
-            this.drawerVisible = true;
 		},
 		getAreaOptions() {
-            this.$API.am.area.list.req({page: 0}).then(res=>{
+			this.$API.am.area.list.req({ page: 0 }).then((res) => {
-                this.areaOptions = res
+				this.areaOptions = res;
-            })
+			});
 		},
 		getDeptOptions() {
-            this.$API.system.dept.list.req({page: 0}).then(res=>{
+			this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-                this.deptOptions = res
+				this.deptOptions = res;
-            })
+			});
 		},
 		getUserRes(data) {
 			this.saveForm.user_res = data.id;
-      		this.saveForm.user_res_name=data.name
+			this.saveForm.user_res_name = data.name;
+		},
+		getUserRes2(data) {
+			this.saveForm2.user_duty = data.id;
+			this.saveForm2.user_duty_name = data.name;
 		},
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
@@ -254,31 +421,39 @@ export default {
 			this.saveDialog = true;
 		},
 		table_del(row, index) {
-            this.$API.dpm.riskpoint.delete.req(row.id).then(res=>{
+			this.$API.dpm.riskpoint.delete.req(row.id).then((res) => {
 				this.$message.success("删除成功");
 				this.handleQuery();
-            })
+			});
 		},
 		formSubmit() {
 			this.formSaving = true;
 			if (this.saveForm.id) {
-				this.$API.dpm.riskpoint.update.req(this.saveForm.id, this.saveForm).then(res=>{
+				this.$API.dpm.riskpoint.update
+					.req(this.saveForm.id, this.saveForm)
+					.then((res) => {
 						this.$message.success("更新成功");
 						this.formSaving = false;
 						this.saveDialog = false;
 						this.handleQuery();
-				}).catch(e=>{this.formSaving=false})
+					})
+					.catch((e) => {
+						this.formSaving = false;
+					});
 			} else {
-				this.$API.dpm.riskpoint.create.req(this.saveForm).then(res=>{
+				this.$API.dpm.riskpoint.create
+					.req(this.saveForm)
+					.then((res) => {
 						this.$message.success("创建成功");
 						this.formSaving = false;
 						this.saveDialog = false;
 						this.handleQuery();
-				}).catch(err=>{
-					this.formSaving = false;
 					})
+					.catch((err) => {
+						this.formSaving = false;
+					});
 			}
-        }
+		},
 	},
 };
 </script>

src/views/sys/myschedule.vue

@@ -0,0 +1,85 @@
+<template>
+    <el-button
+        type="primary"
+        icon="el-icon-plus"
+        @click="table_add"
+    ></el-button>
+	<el-divider></el-divider>
+	<scTable
+		ref="table"
+		:apiObj="apiObj"
+		row-key="id"
+		:query="query"
+		:params="params"
+		hidePagination
+		hideDo
+		style="height: 400px"
+	>
+		<el-table-column label="类型" prop="name" width="80"></el-table-column>
+		<el-table-column
+			label="名称"
+			prop="name"
+			min-width="100"
+		></el-table-column>
+	</scTable>
+    <el-dialog title="创建/编辑" v-model="dialogVisible" width="80%">
+        <el-form-item label="策略类型" prop="note" required>
+            <el-select
+                v-model="saveForm.type"
+            >
+        </el-select>
+		</el-form-item>
+        <el-form-item label="策略式" required>
+            每隔
+            <el-input-number
+                v-model="saveForm.interval_.every"
+                :min="1"
+                style="margin-left: 4px"
+            ></el-input-number>
+            <el-select
+                v-model="saveForm.interval_.period"
+            >
+            <el-option
+                v-for="e in schedulePeriodEnum.values"
+                :key="e.key"
+                :value="e.key"
+                :label="e.text"
+            ></el-option>
+            </el-select>
+		</el-form-item>
+    </el-dialog>
+</template>
+<script>
+import { scheduleTypeEnum, schedulePeriodEnum } from "@/utils/enum.js";
+const defaultForm = {
+    interval_: {},
+    crontab_: {}
+}
+export default {
+	name: "myschedule",
+	data() {
+		return {
+            schedulePeriodEnum, scheduleTypeEnum,
+            dialogVisible: false,
+			apiObj: this.$API.system.myschedule.list,
+			query: {
+				search: "",
+			},
+            saveForm: Object.assign({}, defaultForm)
+		};
+	},
+	methods: {
+        table_add(){
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+               this.saveForm = Object.assign({}, defaultForm)
+            });
+        }
+    },
+	created() {},
+	mounted() {},
+	computed: {},
+	watch: {},
+	components: {},
+};
+</script>