From 97d37b5d4fff88a2ba79fd40d976bf6a92a34e74 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 23 一月 2024 09:24:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/opcuaconfig/index.vue | 479 +++++++++++++++++++++++++++++------------------------------
1 files changed, 239 insertions(+), 240 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/opcuaconfig/index.vue b/jcdm-ui/src/views/main/da/opcuaconfig/index.vue
index 6be8c27..228e2ed 100644
--- a/jcdm-ui/src/views/main/da/opcuaconfig/index.vue
+++ b/jcdm-ui/src/views/main/da/opcuaconfig/index.vue
@@ -1,206 +1,173 @@
<template>
<div class="app-container">
<el-card class="box-card">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鎵�灞炴ā鍧�" prop="module">
- <el-input
- v-model="queryParams.module"
- placeholder="璇疯緭鍏ユ墍灞炴ā鍧�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑺傜偣" prop="node">
- <el-input
- v-model="queryParams.node"
- placeholder="璇疯緭鍏ヨ妭鐐�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="闀垮害" prop="length">
- <el-input
- v-model="queryParams.length"
- placeholder="璇疯緭鍏ラ暱搴�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="sysTypes">
- <el-select v-model="queryParams.sysTypes" placeholder="璇烽�夋嫨绫诲瀷" clearable>
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- />-->
- </el-select>
- </el-form-item>
- <el-form-item style="float: right">
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
- <el-form-item label="璁㈤槄鍝嶅簲妯″潡" prop="rModule">
- <el-input
- v-model="queryParams.rModule"
- placeholder="璇疯緭鍏ヨ闃呭搷搴旀ā鍧�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="璁㈤槄鍝嶅簲鍑芥暟" prop="rFunction">
- <el-input
- v-model="queryParams.rFunction"
- placeholder="璇疯緭鍏ヨ闃呭搷搴斿嚱鏁�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍔熻兘璇存槑" prop="functionality">
- <el-input
- v-model="queryParams.functionality"
- placeholder="璇疯緭鍏ュ姛鑳借鏄�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏄惁璁㈤槄" prop="subscribe">
- <el-select v-model="queryParams.subscribe" placeholder="璇烽�夋嫨鏄惁璁㈤槄" clearable>
- <!-- <el-option-->
- <!-- v-for="dict in dict.type.${dictType}"-->
- <!-- :key="dict.value"-->
- <!-- :label="dict.label"-->
- <!-- :value="dict.value"-->
- <!-- />-->
- </el-select>
- </el-form-item>
- </el-form>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="鑺傜偣" prop="node">
+ <el-input
+ v-model="queryParams.node"
+ placeholder="璇疯緭鍏ヨ妭鐐�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璁㈤槄绫诲瀷" prop="rFunction">
+ <el-select v-model="queryParams.rFunction" placeholder="璇烽�夋嫨璁㈤槄绫诲瀷" clearable>
+ <el-option
+ v-for="dict in dict.type.subscription_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栫爜" prop="process">
+ <el-select v-model="queryParams.process" placeholder="璇烽�夋嫨宸ュ簭缂栫爜" clearable>
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processName">
+ <el-input
+ v-model="queryParams.processName"
+ placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="state">
+ <el-select v-model="queryParams.state" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
</el-card>
<el-card style="margin-top: 10px" class="box-card">
- <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="['da:opcuaconfig: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="['da:opcuaconfig: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="['da:opcuaconfig: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="['da:opcuaconfig:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <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="['main:opcuaconfig: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="['main:opcuaconfig: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="['main:opcuaconfig: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="['main:opcuaconfig:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
- <el-table v-loading="loading" border :data="opcuaconfigList" @selection-change="handleSelectionChange" v-if="opcuaconfigList.length > 0">
- <el-table-column type="selection" width="55" align="center" />
-<!-- <el-table-column label="ID" align="center" prop="id" />-->
- <el-table-column label="鎵�灞炴ā鍧�" align="center" prop="module">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.module"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鑺傜偣" align="center" prop="node">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.node"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="闀垮害" align="center" prop="length">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.length"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="绫诲瀷" align="center" prop="sysTypes">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sysTypes"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍔熻兘璇存槑" align="center" prop="functionality">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.functionality"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鏄惁璁㈤槄" align="center" prop="subscribe">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.subscribe"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="璁㈤槄鍝嶅簲妯″潡" align="center" prop="rModule">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.rModule"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="璁㈤槄鍝嶅簲鍑芥暟" align="center" prop="rFunction">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.rFunction"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remarks"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="success"
- plain
- style="width: 72px"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['da:opcuaconfig:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="danger"
- plain
- style="width: 72px"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['da:opcuaconfig:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-empty v-else>
- <span slot="description">鏆傛棤鏁版嵁</span>
- </el-empty>
+ <el-table border v-loading="loading" :data="opcuaconfigList" @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="宸ュ簭缂栫爜" align="center" prop="process">
+ <!-- <template slot-scope="scope">-->
+ <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.process"/>-->
+ <!-- </template>-->
+ </el-table-column>
+ <el-table-column label="宸ュ簭鍚嶇О" align="center" prop="processName">
+ <!-- <template slot-scope="scope">-->
+ <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.processName"/>-->
+ <!-- </template>-->
+ </el-table-column>
+ <el-table-column label="鑺傜偣" align="center" prop="node">
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.node"/>-->
+<!-- </template>-->
+ </el-table-column>
+ <el-table-column label="鏁版嵁绫诲瀷" align="center" prop="sysTypes">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.data_type" :value="scope.row.sysTypes"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁璁㈤槄" align="center" prop="subscribe">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.subscribe"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁㈤槄绫诲瀷" align="center" prop="rFunction">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.subscription_type" :value="scope.row.rFunction"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" align="center" prop="remarks">
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remarks"/>-->
+<!-- </template>-->
+ </el-table-column>
+ <el-table-column label="鐘舵��" align="center" prop="state">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="success"
+ plain
+ style="width: 72px"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['da:opcuaconfig:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="danger"
+ plain
+ style="width: 72px"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['main:opcuaconfig:remove']"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</el-card>
<pagination
@@ -211,49 +178,70 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀筄PCUA鍙傛暟璁剧疆瀵硅瘽妗� -->
+ <!-- 娣诲姞鎴栦慨鏀逛氦浜掍俊鍙烽厤缃璇濇 -->
<el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <span slot="title">
+ <i class="el-icon-s-order"></i>
+ {{titleName}}
+ </span>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="鎵�灞炴ā鍧�" prop="module">
- <el-input v-model="form.module" placeholder="璇疯緭鍏ユ墍灞炴ā鍧�" />
- </el-form-item>
<el-form-item label="鑺傜偣" prop="node">
<el-input v-model="form.node" placeholder="璇疯緭鍏ヨ妭鐐�" />
</el-form-item>
- <el-form-item label="闀垮害" prop="length">
- <el-input v-model="form.length" placeholder="璇疯緭鍏ラ暱搴�" />
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="sysTypes">
- <el-select v-model="form.sysTypes" placeholder="璇烽�夋嫨绫诲瀷">
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- ></el-option>-->
+ <el-form-item label="鏁版嵁绫诲瀷" prop="sysTypes">
+ <el-select v-model="form.sysTypes" placeholder="璇烽�夋嫨鏁版嵁绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.data_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="鍔熻兘璇存槑" prop="functionality">
- <el-input v-model="form.functionality" placeholder="璇疯緭鍏ュ姛鑳借鏄�" />
</el-form-item>
<el-form-item label="鏄惁璁㈤槄" prop="subscribe">
<el-select v-model="form.subscribe" placeholder="璇烽�夋嫨鏄惁璁㈤槄">
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="parseInt(dict.value)"-->
-<!-- ></el-option>-->
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璁㈤槄鍝嶅簲妯″潡" prop="rModule">
- <el-input v-model="form.rModule" placeholder="璇疯緭鍏ヨ闃呭搷搴旀ā鍧�" />
- </el-form-item>
- <el-form-item label="璁㈤槄鍝嶅簲鍑芥暟" prop="rFunction">
- <el-input v-model="form.rFunction" placeholder="璇疯緭鍏ヨ闃呭搷搴斿嚱鏁�" />
+ <el-form-item label="璁㈤槄绫诲瀷" prop="rFunction">
+ <el-select v-model="form.rFunction" placeholder="璇烽�夋嫨璁㈤槄绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.subscription_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栫爜" prop="process">
+ <el-radio-group v-model="form.process">
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processName">
+ <el-input v-model="form.processName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="state">
+ <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -269,10 +257,12 @@
export default {
name: "Opcuaconfig",
+ dicts: ['subscription_type', 'sys_yes_no', 'sys_normal_disable', 'data_type'],
data() {
return {
// 閬僵灞�
loading: true,
+ titleName: "",
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -283,9 +273,8 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // OPCUA鍙傛暟璁剧疆琛ㄦ牸鏁版嵁
+ // 浜や簰淇″彿閰嶇疆琛ㄦ牸鏁版嵁
opcuaconfigList: [],
- advancedShowSearch: false,
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -294,14 +283,12 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- module: null,
node: null,
- length: null,
sysTypes: null,
- functionality: null,
- subscribe: null,
- rModule: null,
rFunction: null,
+ process: null,
+ processName: null,
+ state: null
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -310,6 +297,18 @@
id: [
{ required: true, message: "ID涓嶈兘涓虹┖", trigger: "blur" }
],
+ node: [
+ { required: true, message: "鑺傜偣涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ sysTypes: [
+ { required: true, message: "鏁版嵁绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ subscribe: [
+ { required: true, message: "鏄惁璁㈤槄涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ rFunction: [
+ { required: true, message: "璁㈤槄绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
+ ],
}
};
},
@@ -317,10 +316,7 @@
this.getList();
},
methods: {
- advancedQuery(){
- this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
- },
- /** 鏌ヨOPCUA鍙傛暟璁剧疆鍒楄〃 */
+ /** 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃 */
getList() {
this.loading = true;
listOpcuaconfig(this.queryParams).then(response => {
@@ -346,7 +342,10 @@
subscribe: null,
rModule: null,
rFunction: null,
- remarks: null
+ remarks: null,
+ process: null,
+ processName: null,
+ state: null
};
this.resetForm("form");
},
@@ -370,7 +369,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞OPCUA鍙傛暟璁剧疆";
+ this.titleName = "娣诲姞浜や簰淇″彿閰嶇疆";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -379,7 +378,7 @@
getOpcuaconfig(id).then(response => {
this.form = response.data;
this.open = true;
- this.title = "淇敼OPCUA鍙傛暟璁剧疆";
+ this.titleName = "淇敼浜や簰淇″彿閰嶇疆";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -405,7 +404,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎OPCUA鍙傛暟璁剧疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎浜や簰淇″彿閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
return delOpcuaconfig(ids);
}).then(() => {
this.getList();
--
Gitblit v1.9.3