From a6f4edd102b4b2bf10f3b05dfccdb9e908de07a8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 24 三月 2023 18:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue | 359 ++++++++++++++++-------------------------------------------
1 files changed, 101 insertions(+), 258 deletions(-)
diff --git a/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue b/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
index 25d14c6..50349fe 100644
--- a/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
@@ -1,141 +1,19 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label=" 涓旀垨 " prop="orand">
- <el-input
- v-model="queryParams.orand"
- placeholder="璇疯緭鍏� 涓旀垨 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
- <el-input
- v-model="queryParams.ruleconditions"
- placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
- <el-input
- v-model="queryParams.parentresultconditionsid"
- placeholder="璇疯緭鍏� 鐖舵潯浠� "
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label=" 鏉′欢绫诲瀷 " prop="conditionstype">
+ <el-input v-model="queryParams.conditionstype" placeholder="璇疯緭鍏� 鏉′欢绫诲瀷 " clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label=" 鏈烘瀯ID " prop="orgid">
- <el-input
- v-model="queryParams.orgid"
- placeholder="璇疯緭鍏� 鏈烘瀯ID "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
- <el-input
- v-model="queryParams.isupload"
- placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
- <el-date-picker clearable
- v-model="queryParams.uploadTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
- </el-date-picker>
+ <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label=" 鏂规ID " prop="schemeid">
- <el-input
- v-model="queryParams.schemeid"
- placeholder="璇疯緭鍏� 鏂规ID "
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.schemeid" placeholder="璇疯緭鍏� 鏂规ID " clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
- <el-input
- v-model="queryParams.triggersceneid"
- placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" " prop="conditionstypesecord">
- <el-input
- v-model="queryParams.conditionstypesecord"
- placeholder="璇疯緭鍏� "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
- <el-input
- v-model="queryParams.conditionstypethree"
- placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" prop="verifyrule">
- <el-input
- v-model="queryParams.verifyrule"
- placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
- <el-input
- v-model="queryParams.extraruleconditions"
- placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
- <el-input
- v-model="queryParams.extraverifyrule"
- placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
- <el-input
- v-model="queryParams.number"
- placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
- <el-input
- v-model="queryParams.groupnumber"
- placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
- <el-input
- v-model="queryParams.grouporand"
- placeholder="璇疯緭鍏� 鐖朵笖鎴� "
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label=" 鏄惁蹇呭～ " prop="isrequired">
- <el-input
- v-model="queryParams.isrequired"
- placeholder="璇疯緭鍏� 鏄惁蹇呭～ "
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -145,46 +23,20 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['smartor:schemetriggerrule:add']"
- >鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['smartor:schemetriggerrule:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['smartor:schemetriggerrule:edit']"
- >淇敼</el-button>
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['smartor:schemetriggerrule:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['smartor:schemetriggerrule:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['smartor:schemetriggerrule:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['smartor:schemetriggerrule:export']"
- >瀵煎嚭</el-button>
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['smartor:schemetriggerrule:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -192,22 +44,15 @@
<el-table v-loading="loading" :data="schemetriggerruleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label=" 鑷ID " align="center" prop="id" />
- <el-table-column label=" 鏉′欢绫诲瀷;1.鎮ｈ�呭睘鎬� 2.璇婄枟淇℃伅 3.鐩戞祴鍊� 4.浠诲姟淇℃伅 " align="center" prop="conditionstype" />
- <el-table-column label=" 涓旀垨 " align="center" prop="orand" />
+ <el-table-column label=" 鏉′欢绫诲瀷 " align="center" prop="conditionstype" />
<el-table-column label=" 瑙勫垯鏉′欢 " align="center" prop="ruleconditions" />
<el-table-column label=" 鐖舵潯浠� " align="center" prop="parentresultconditionsid" />
<el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
- <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
- <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
<el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
<el-table-column label=" 瑙﹀彂鍦烘櫙ID " align="center" prop="triggersceneid" />
<el-table-column label=" " align="center" prop="conditionstypesecord" />
<el-table-column label=" 涓夌骇鏉′欢绫诲瀷 " align="center" prop="conditionstypethree" />
- <el-table-column label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" align="center" prop="verifyrule" />
+ <el-table-column label=" 楠岃瘉瑙勫垯" align="center" prop="verifyrule" />
<el-table-column label=" 棰濆瑙勫垯鏉′欢 " align="center" prop="extraruleconditions" />
<el-table-column label=" 棰濆楠岃瘉瑙勫垯 " align="center" prop="extraverifyrule" />
<el-table-column label=" 鍒嗙粍缂栧彿 " align="center" prop="number" />
@@ -216,94 +61,92 @@
<el-table-column label=" 鏄惁蹇呭～ " align="center" prop="isrequired" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['smartor:schemetriggerrule:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['smartor:schemetriggerrule:remove']"
- >鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['smartor:schemetriggerrule:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['smartor:schemetriggerrule:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀规柟妗堣Е鍙戞潯浠惰鍒欏璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label=" 涓旀垨 " prop="orand">
- <el-input v-model="form.orand" placeholder="璇疯緭鍏� 涓旀垨 " />
- </el-form-item>
- <el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
- <el-input v-model="form.ruleconditions" placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 " />
- </el-form-item>
- <el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
- <el-input v-model="form.parentresultconditionsid" placeholder="璇疯緭鍏� 鐖舵潯浠� " />
- </el-form-item>
- <el-form-item label=" 鏈烘瀯ID " prop="orgid">
- <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
- </el-form-item>
- <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
- <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
- </el-form-item>
- <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
- <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
- </el-form-item>
- <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
- <el-date-picker clearable
- v-model="form.uploadTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
- </el-date-picker>
- </el-form-item>
- <el-form-item label=" 鏂规ID " prop="schemeid">
- <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
- </el-form-item>
- <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
- <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
- </el-form-item>
- <el-form-item label=" " prop="conditionstypesecord">
- <el-input v-model="form.conditionstypesecord" placeholder="璇疯緭鍏� " />
- </el-form-item>
- <el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
- <el-input v-model="form.conditionstypethree" placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 " />
- </el-form-item>
- <el-form-item label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" prop="verifyrule">
- <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" />
- </el-form-item>
- <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
- <el-input v-model="form.extraruleconditions" placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 " />
- </el-form-item>
- <el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
- <el-input v-model="form.extraverifyrule" placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 " />
- </el-form-item>
- <el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
- <el-input v-model="form.number" placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 " />
- </el-form-item>
- <el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
- <el-input v-model="form.groupnumber" placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 " />
- </el-form-item>
- <el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
- <el-input v-model="form.grouporand" placeholder="璇疯緭鍏� 鐖朵笖鎴� " />
- </el-form-item>
- <el-form-item label=" 鏄惁蹇呭～ " prop="isrequired">
- <el-input v-model="form.isrequired" placeholder="璇疯緭鍏� 鏄惁蹇呭～ " />
- </el-form-item>
+ <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1200px"
+ append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-row>
+ <el-col :span="12"><el-form-item label=" 涓旀垨 " prop="orand">
+ <el-input v-model="form.orand" placeholder="璇疯緭鍏� 涓旀垨 " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
+ <el-input v-model="form.ruleconditions" placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 " />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12"><el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
+ <el-input v-model="form.parentresultconditionsid" placeholder="璇疯緭鍏� 鐖舵潯浠� " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+ <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+ <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+ <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12"> <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+ <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+ </el-date-picker>
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 鏂规ID " prop="schemeid">
+ <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
+ </el-form-item></el-col>
+ </el-row><el-row>
+ <el-col :span="12"><el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
+ <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" " prop="conditionstypesecord">
+ <el-input v-model="form.conditionstypesecord" placeholder="璇疯緭鍏� " />
+ </el-form-item></el-col>
+ </el-row><el-row>
+ <el-col :span="12"><el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
+ <el-input v-model="form.conditionstypethree" placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 楠岃瘉瑙勫垯" prop="verifyrule">
+ <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12"> <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
+ <el-input v-model="form.extraruleconditions" placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
+ <el-input v-model="form.extraverifyrule" placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 " />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12"><el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
+ <el-input v-model="form.number" placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
+ <el-input v-model="form.groupnumber" placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 " />
+ </el-form-item></el-col>
+ </el-row> <el-row>
+ <el-col :span="12"><el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
+ <el-input v-model="form.grouporand" placeholder="璇疯緭鍏� 鐖朵笖鎴� " />
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label=" 鏄惁蹇呭～ " prop="isrequired">
+ <el-input v-model="form.isrequired" placeholder="璇疯緭鍏� 鏄惁蹇呭～ " />
+ </el-form-item></el-col>
+ </el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -435,7 +278,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -477,12 +320,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏂规瑙﹀彂鏉′欢瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏂规瑙﹀彂鏉′欢瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delSchemetriggerrule(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
--
Gitblit v1.9.3