Merge remote-tracking branch 'origin/master'

src/views/engine/engine/index.vue

@@ -32,59 +32,106 @@
     </el-button>
 
 
-    <el-button
+<!--    <el-button-->
-      icon="el-icon-delete"
+<!--      icon="el-icon-delete"-->
-      plain
+<!--      plain-->
-      size="mini"
+<!--      size="mini"-->
-      type="danger"
+<!--      type="danger"-->
-      @click="insert()"
+<!--      @click="insert()"-->
-    >新增
+<!--    >新增-->
-    </el-button>
+<!--    </el-button>-->
 
 
-    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
+    <!-- 添加或修改规则引擎对话框 -->
-
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-form :model="engine">
+      <el-form ref="form" :model="engine" :rules="rules" label-width="80px">
-        <el-form-item label="接入源名称">
+        <el-row>
-          <el-input v-model="engine.id"></el-input>
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="规则名称" prop="name">
-        <el-form-item label="数据来源系统名称">
+              <el-input v-model="engine.name" placeholder="请输入规则名称"/>
-          <el-input v-model="engine.name"></el-input>
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="主机地址">
+          <el-col :span="12">
-          <el-input v-model="engine.type"></el-input>
+            <el-form-item label="规则编码" prop="engineCode">
-        </el-form-item>
+              <el-input v-model="engine.engineCode" placeholder="请输入规则编码"/>
-        <el-form-item label="主机端口">
+            </el-form-item>
-          <el-input v-model="engine.scope"></el-input>
+          </el-col>
-        </el-form-item>
+        </el-row>
-        <el-form-item label="数据接入类型">
+        <el-row>
-          <el-input v-model="engine.engineCode"></el-input>
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="规则类型" prop="type">
-        <el-form-item label="数据库名称">
+              <el-select v-model="engine.type" placeholder="请选择规则类型" style="width: 100%">
-          <el-input v-model="engine.isActivate"></el-input>
+                <el-option
-        </el-form-item>
+                  v-for="dict in dict.type.rule_engine_type"
-        <el-form-item label="数据库用户">
+                  :key="dict.value"
-          <el-input v-model="engine.status"></el-input>
+                  :label="dict.label"
-        </el-form-item>
+                  :value="Number(dict.value)"
-        <el-form-item label="数据库密码">
+                ></el-option>
-          <el-input v-model="engine.description"></el-input>
+              </el-select>
-        </el-form-item>
+            </el-form-item>
-
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规则级别" prop="scope">
+              <el-select v-model="engine.scope" placeholder="请选择规则级别" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.rule_engine_level"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="Number(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否激活" prop="isActivate">
+              <el-radio-group v-model="engine.isActivate">
+                <el-radio
+                  v-for="dict in dict.type.rule_engine_activate_status"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规则状态" prop="status">
+              <el-radio-group v-model="engine.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规则描述">
+              <editor v-model="engine.description" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="engine.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-
-
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
-
     </el-dialog>
 
 
 
 
 
-
     <el-table :data="arr" style="width: 100%">
 
       <el-table-column label="编号" prop="id"></el-table-column>
@@ -215,9 +262,37 @@ export default {
       engine:{
 
       },
+      // 弹出层标题
+      title: "",
       arr:[],
       dialogFormVisible:false,
-      total:0
+      total:0,
+      rules: {
+        name: [
+          {required: true, message: "规则名称不能为空", trigger: "blur"}
+        ],
+        type: [
+          {required: true, message: "规则类型不能为空", trigger: "change"}
+        ],
+        engineCode: [
+          {required: true, message: "规则编码不能为空", trigger: "blur"}
+        ],
+        scope: [
+          {required: true, message: "规则级别不能为空", trigger: "change"}
+        ],
+        isActivate: [
+          {required: true, message: "是否激活不能为空", trigger: "change"}
+        ],
+        status: [
+          {required: true, message: "规则状态不能为空", trigger: "change"}
+        ],
+        createBy: [
+          {required: true, message: "创建者不能为空", trigger: "blur"}
+        ],
+        createTime: [
+          {required: true, message: "创建时间不能为空", trigger: "blur"}
+        ],
+      }
     };
   },
   //计算属性 类似于data概念",
@@ -226,23 +301,41 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            update(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.getList();
+              this.open = false;
+            })
+          } else {
+            insert(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.getList();
+              this.open = false;
+            })
+          }
+        }
+      });
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.engineReq.pageSize = val;
       this.findSelectSourceList();
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.engineReq.pageNum = val;
       this.findSelectSourceList();
     },
-    insert(){
-      this.dialogFormVisible = true
-      insert(this.engine).then(res =>{
-        this.$message.success(res.msg || "添加成功")
-      })
-      this.engine = {}
-    },
     findSelectSourceList(){
       selectEngineList(this.engineReq).then(res=>{
           this.arr=res.data.list;
@@ -254,11 +347,6 @@ export default {
         this.$message.success(res.msg || "删除成功")
       })
     },
-    handUpdate(){
-      update(this.engine).then(res =>{
-        this.$message.success(res.msg || "修改成功")
-      })
-    },
     findSelectSourceExport(){
       this.download('engine/engine/export', {
         ...this.engineReq

src/views/port/port/index.vue

@@ -18,8 +18,27 @@
         </el-card>
       </el-col>
       <el-col :span="8">
-        <el-card shadow="never">
+        <el-card shadow="hover">
-          从不显示
+          <div slot="header" class="clearfix">
+            <span>新闻头条</span>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix">
+            <span>气象预警</span>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix">
+            <span>生辰助手</span>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          </div>
         </el-card>
       </el-col>
     </el-row>