From a55d22468017679f4503c1f4c5f595300e8d2f34 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十一月 2024 23:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/styles/normalize.scss | 181 +++++-----
Source/plt-web/plt-web-ui/src/util/func.js | 4
Source/plt-web/plt-web-ui/src/views/wel/workIndex.vue | 49 ++
Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue | 14
Source/plt-web/plt-web-ui/src/views/system/password/index.vue | 5
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue | 63 +++
Source/plt-web/plt-web-ui/src/views/system/log/index.vue | 15
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 222 +++++++++++++
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue | 38 --
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue | 4
Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue | 39 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue | 8
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 37 --
Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue | 249 ++++---------
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue | 6
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 25 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 2
18 files changed, 584 insertions(+), 379 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index ab8905f..243aa33 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -211,7 +211,7 @@
isShow: {
handler(newval) {
if (newval && this.$el.clientHeight > 50) {
- this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+ this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - (this.$children[0].$children[2].$el.clientHeight || 57) - 5;
}
if(newval){
this.handleRefresh();
diff --git a/Source/plt-web/plt-web-ui/src/styles/normalize.scss b/Source/plt-web/plt-web-ui/src/styles/normalize.scss
index e51d268..11bb855 100644
--- a/Source/plt-web/plt-web-ui/src/styles/normalize.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/normalize.scss
@@ -29,19 +29,19 @@
summary {
display: block;
}
-
+
/**
* Correct `inline-block` display not defined in IE 8/9.
*
* 淇鍦� IE 8/9 涓湭瀹氫箟鐨� 'inline-block' 鍏冪礌銆�
*/
-
+
audio,
canvas,
video {
display: inline-block;
}
-
+
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
@@ -49,28 +49,28 @@
* 闃绘鐜板湪娴忚鍣ㄦ樉绀烘湭瀹氫箟 control 鎾斁鎺т欢鐨� 'audio' 澹伴煶鍏冪礌銆�
* 鍒犻櫎 IOS 5 璁惧涓樉绀虹殑澶氫綑鐨勯珮搴︺��
*/
-
+
audio:not([controls]) {
display: none;
height: 0;
}
-
+
/**
* Address styling not present in IE 8/9.
*
* 澶勭悊 IE 8/9 涓笉瀛樺湪鐨勬牱寮忋��
*/
-
+
[hidden] {
display: none;
}
-
+
/* ==========================================================================
Base
-
+
鍩烘湰璁剧疆
========================================================================== */
-
+
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
@@ -79,129 +79,129 @@
* 1. 璁剧疆榛樿瀛椾綋绫诲瀷涓� sans-serif.
* 2. 褰撶敤鎴锋斁澶ф垨缂╁皬椤甸潰鏃朵笉鏀瑰彉瀛椾綋澶у皬銆�
*/
-
+
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
-
+
/**
* Remove default margin.
*
* 鍒犻櫎榛樿杈硅窛銆�
*/
-
+
body {
margin: 0;
}
-
+
/* ==========================================================================
Links
-
+
閾炬帴
========================================================================== */
-
+
/**
* Address `outline` inconsistency between Chrome and other browsers.
*
* 澶勭悊 Chrome 涓庡叾瀹冩祻瑙堝櫒涓叧浜� 'outline' 鐨勪笉涓�鑷存�с��
*/
-
+
a:focus {
outline: thin dotted;
}
-
+
/**
* Improve readability when focused and also mouse hovered in all browsers.
*
* 涓烘墍鏈夋祻瑙堝櫒鏀瑰杽褰撴縺娲绘垨鎮仠鍦ㄥ厓绱犱笂鏃跺厓绱犲唴瀹圭殑鍙鎬с��
*/
-
+
a:active,
a:hover {
outline: 0;
}
-
+
/* ==========================================================================
Typography
-
+
鎺掔増
========================================================================== */
-
+
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*
- * 澶勭悊澶氬彉鐨� 'h1' 瀛椾綋澶у皬鍙婂叾鍦� Firefox 4+, Safari 5, 鍙� Chrome鏃舵祻瑙堝櫒涓殑
+ * 澶勭悊澶氬彉鐨� 'h1' 瀛椾綋澶у皬鍙婂叾鍦� Firefox 4+, Safari 5, 鍙� Chrome鏃舵祻瑙堝櫒涓殑
* 'section' 涓庛��'article' 鍏冪礌涓殑杈硅窛銆�
*/
-
+
h1 {
font-size: 2em;
margin: 0.67em 0;
}
-
+
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*
* 澶勭悊鍦� IE 8/9, Safari 5, 鍙� Chrome 娌℃湁鐨勬牱寮忋��
*/
-
+
abbr[title] {
border-bottom: 1px dotted;
}
-
+
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*
* 澶勭悊 Firefox 4+, Safari 5, 鍙� Chrome 涓粯璁ょ殑 'bolder' 鏍峰紡涓恒��'bold'.
*/
-
+
b,
strong {
font-weight: bold;
}
-
+
/**
* Address styling not present in Safari 5 and Chrome.
*
* 澶勭悊鍦� Safari 5 鍜� Chrome 娌℃湁鐨勬牱寮忋��
*/
-
+
dfn {
font-style: italic;
}
-
+
/**
* Address differences between Firefox and other browsers.
*
* 澶勭悊銆�Firefox銆�涓庡叾瀹冩祻瑙堝櫒鐨勫樊寮傘��
*/
-
+
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
-
+
/**
* Address styling not present in IE 8/9.
*
* 澶勭悊鍦� IE 8/9 涓病鏈夌殑鏍峰紡銆�
*/
-
+
mark {
background: #ff0;
color: #000;
}
-
+
/**
* Correct font family set oddly in Safari 5 and Chrome.
*
* 淇纭� Safari 5 鍜� Chrome 涓彜鎬殑榛樿瀛椾綋銆�
*/
-
+
code,
kbd,
pre,
@@ -209,45 +209,45 @@
font-family: monospace, serif;
font-size: 1em;
}
-
+
/**
* Improve readability of pre-formatted text in all browsers.
*
* 涓烘墍鏈夋祻瑙堝櫒鏀瑰杽棰勬牸寮忓寲鏂囨湰鐨勫彲璇绘�с��
*/
-
+
pre {
white-space: pre-wrap;
}
-
+
/**
* Set consistent quote types.
*
* 璁剧疆涓�鑷寸殑寮曠敤鏍煎紡銆�
*/
-
+
q {
quotes: "\201C" "\201D" "\2018" "\2019";
}
-
+
/**
* Address inconsistent and variable font size in all browsers.
*
* 澶勭悊鎵�鏈夋祻瑙堝櫒涓瓧浣撳ぇ灏忕殑涓嶄竴鑷存�璇戣�呮敞锛氬師鏂囩洿璇戜负锛氬鐞嗘墍鏈�
* 娴忚鍣ㄤ腑鐨勪笉涓�鑷村拰澶氬彉鐨勫瓧浣撳ぇ灏廬銆�
*/
-
+
small {
font-size: 80%;
}
-
+
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*
- * 闃绘鎵�鏈夋祻瑙堝櫒涓� 'sub' 鍜� 'sup' 鍏冪礌褰卞搷 'line-height'.
+ * 闃绘鎵�鏈夋祻瑙堝櫒涓� 'sub' 鍜� 'sup' 鍏冪礌褰卞搷 'line-height'.
* [璇戣�呮敞锛氬氨鏄笉璁╀笂鏍囦笌涓嬫爣褰卞搷琛岄珮銆俔
*/
-
+
sub,
sup {
font-size: 75%;
@@ -255,87 +255,91 @@
position: relative;
vertical-align: baseline;
}
-
+
sup {
top: -0.5em;
}
-
+
sub {
bottom: -0.25em;
}
-
+
/* ==========================================================================
Embedded content
-
+
宓屽叆鐨勫唴瀹�
========================================================================== */
-
+
/**
* Remove border when inside `a` element in IE 8/9.
*
* 鍒犻櫎 IE 8/9 涓綋鍐呭浣嶄簬 'a' 涓嚭鐜扮殑杈规銆�
*/
-
+
img {
border: 0;
}
-
+
/**
* Correct overflow displayed oddly in IE 9.
*
* 淇 IE 9 涓樉绀哄彜鎬殑婧㈠嚭鍐呭銆�
*/
-
+
svg:not(:root) {
overflow: hidden;
}
-
+
/* ==========================================================================
Figures
-
+
Figure 鍥惧儚/鍥捐〃/浠ｇ爜绛�
========================================================================== */
-
+
/**
* Address margin not present in IE 8/9 and Safari 5.
*
* 澶勭悊鍦� IE 8/9 鍜� Safari 5 娌℃湁鐨勮竟璺濄��
*/
-
+
figure {
margin: 0;
}
-
+
/* ==========================================================================
Forms
========================================================================== */
-
+
/**
* Define consistent border, margin, and padding.
*
* 瀹氫箟涓�鑷寸殑杈规銆佸杈硅窛鍙婂唴杈硅窛銆�
*/
-
+
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
+ border-radius: 5px;
+ -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ box-sizing: border-box;
}
-
+
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
- * 1. 淇鍦ㄣ��IE 8/9 涓病鏈夌户鎵跨殑 'color'.
+ * 1. 淇鍦ㄣ��IE 8/9 涓病鏈夌户鎵跨殑 'color'.
*
* [璇戣�呮敞锛氳鏄慨姝ｉ鑹插槢锛屽彲涓嬮潰娌℃湁鍏充簬棰滆壊鐨勫憖锛岃繖涔熻锛熸眰澶х瑙ｉ噴锛乚
* 2. 鍘绘帀鍐呰竟璺濓紝閬垮厤褰撶敤鎴锋竻绌鸿〃鍗曠粍鏃惰涓哄嚭閿欎簡銆�
*/
-
+
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
-
+
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
@@ -345,7 +349,7 @@
* 2. 淇鎵�鏈夋祻瑙堝櫒涓湭琚户鎵跨殑瀛椾綋澶у皬銆�
* 3. 澶勭悊 Firefox 4+, Safari 5, 鍙� Chrome 涓粯璁よ缃笉鍚岀殑澶栬竟璺濄��
*/
-
+
button,
input,
select,
@@ -354,36 +358,36 @@
font-size: 100%; /* 2 */
margin: 0; /* 3 */
}
-
+
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*
* 澶勭悊 Firefox 4+ 涓殑瀹㈡埛绔牱寮忚〃閲屼娇鐢� '!important' 璁剧疆鐨� 'line-height'.
*/
-
+
button,
input {
line-height: normal;
}
-
+
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
* Correct `select` style inheritance in Firefox 4+ and Opera.
- *
+ *
* 澶勭悊 'button' 鍜� 'select' 鐨� 'text-transform' 缁ф壙鐨勪笉涓�鑷存�с��
* 鎵�鏈夊叾瀹冭〃鍗曟帶浠跺厓绱犱笉缁ф壙 'text-transform' 鐨勫�笺��
* 淇 Chrome, Safari 5+, 鍙� IE 8+ 涓� 'button' 鐨勭户鎵挎牱寮忋��
* 淇 Firefox 4+ 鍜� Opera 涓� 'select' 鐨勭户鎵挎牱寮忋��
*/
-
+
button,
select {
text-transform: none;
}
-
+
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
@@ -395,7 +399,7 @@
* 2. 淇 iOS 涓笉鍙偣鍑荤殑 'input' 鏍峰紡銆�
* 3. 鏀瑰杽鍥剧墖绫诲瀷鐨� 'input' 绛夊厜鏍囨牱寮忕殑鍙敤鎬т笌涓�鑷存�с��
*/
-
+
button,
html input[type="button"], /* 1 */
input[type="reset"],
@@ -403,18 +407,18 @@
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
-
+
/**
* Re-set default cursor for disabled elements.
- *
+ *
* 閲嶇疆涓嶅彲鐢ㄥ厓绱犵殑榛樿鍏夋爣鏍峰紡銆�
*/
-
+
button[disabled],
html input[disabled] {
cursor: default;
}
-
+
/**
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
@@ -422,13 +426,13 @@
* 1. 澶勭悊 IE 8/9 涓缃负 'content-box' 鐨勭洅瀛愭ā鍨嬨��
* 2. 鍒犻櫎 IE 8/9 涓浣欑殑鍐呰竟璺濄��
*/
-
+
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
-
+
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
@@ -438,38 +442,38 @@
* 2. 澶勭悊 Safari 5 鍜� Chrome 涓粯璁よ缃负 'box-sizing' 鐨� 'border-box'
* (鍖呮嫭涓嶄細杩囨椂鐨� '-moz').
*/
-
+
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
}
-
+
/**
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*
* 鍒犻櫎 Safari 5 鍜� OS X 涓婄殑 Chrome 涓殑杈撳叆妗嗕笂鐨勫唴杈硅窛鍜屾悳绱㈠彇娑堟寜閽��
*/
-
+
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
-
+
/**
* Remove inner padding and border in Firefox 4+.
*
* 鍒犻櫎 Firefox 4+ button 涓� input 涓婄殑鍐呰竟璺濄��
*/
-
+
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
-
+
/**
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
@@ -477,26 +481,25 @@
* 1. 鍒犻櫎 IE8/9 涓粯璁ょ殑鍨傜洿婊氬姩鏉°��
* 2. 鏀瑰杽鎵�鏈夋祻瑙堝櫒涓殑鍙鎬у苟浣挎枃鏈瀭鐩村榻愩��
*/
-
+
textarea {
overflow: auto; /* 1 */
vertical-align: top; /* 2 */
}
-
+
/* ==========================================================================
Tables
-
+
琛ㄦ牸
========================================================================== */
-
+
/**
* Remove most spacing between table cells.
*
* 鍒犻櫎琛ㄦ牸閲屽崟鍏冩牸闂寸殑闂磋窛銆�
*/
-
+
table {
border-collapse: collapse;
border-spacing: 0;
}
-
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js
index a423962..19783ca 100644
--- a/Source/plt-web/plt-web-ui/src/util/func.js
+++ b/Source/plt-web/plt-web-ui/src/util/func.js
@@ -45,7 +45,9 @@
CrudRef.clearSelection();
CrudRef.toggleRowSelection(row);
}*/
- CrudRef.toggleRowSelection(row);
+ setSelectList();
+ CrudRef.toggleSelection();
+ CrudRef.toggleRowSelection(row);//閫変腑褰撳墠琛�
setLastIndex(row.$index);
}
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
new file mode 100644
index 0000000..b2eb1c6
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
@@ -0,0 +1,63 @@
+<template>
+ <div style="padding: 10px 0">
+ <el-tabs tab-position="left" :style="'height: '+height+';'">
+ <el-tab-pane label="涓讳綋">
+ <fieldset>
+ <legend> 涓婚 </legend>
+ <div>
+ <div v-if="!readOnly">
+ <el-button plain size="mini" type="primary" @click="userHandler">閫変腑鐢ㄦ埛</el-button>
+ <el-button plain size="mini" type="primary" @click="roleHandler">閫夋嫨瑙掕壊</el-button>
+ <el-button plain size="mini" type="primary" @click="deptHandler">閫夋嫨鐢ㄦ埛缁�</el-button>
+ </div>
+ </div>
+ </fieldset>
+ </el-tab-pane>
+ <el-tab-pane label="瀹綋">瀹綋</el-tab-pane>
+ <el-tab-pane label="鎿嶄綔">鎿嶄綔</el-tab-pane>
+ </el-tabs>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "dataView",
+ props: {
+ //閫変腑鐨勪笟鍔＄被鍨嬭妭鐐�
+ btmNode: {
+ type: Object,
+ default: {}
+ },
+ //閫変腑琛屾暟鎹�
+ data: {
+ type: Object,
+ default: {}
+ },
+ readOnly: {
+ type: Boolean,
+ default: false
+ },
+ height: {
+ type: String,
+ default: '400px'
+ },
+ },
+ data() {
+ return {
+ }
+ },
+ created() {
+ },
+ methods: {
+
+ }
+}
+</script>
+
+<style scoped>
+fieldset {
+ padding: 10px 6px;
+ margin: 10px 0 0 0;
+ border: 1px solid #EBEEF5;
+}
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 45507cf..1412b4f 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -20,6 +20,60 @@
<el-main>
<basic-container>
+ <avue-crud
+ ref="crud"
+ :data="data"
+ :option="option"
+ :table-loading="tableLoading"
+ @refresh-change="handleRefresh"
+ @selection-change="selectChange"
+ @row-click="rowClickHandler">
+ <template slot="menuLeft">
+ <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">娣诲姞</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
+ <el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅鎺堟潈缁撴灉</el-button>
+ </template>
+ </avue-crud>
+ <div>
+ <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :readOnly="true" height="400px"></data-view>
+ </div>
+ <!-- 鏂板 && 缂栬緫 -->
+ <el-dialog
+ v-dialogDrag
+ :title="title === 'add' ? '鍒涘缓' : '淇敼'"
+ :visible.sync="visible"
+ append-to-body="true"
+ class="avue-dialog"
+ width="75%"
+ @close="addDialogClose">
+ <div>
+ <data-view key="editView" :btmNode="nodeRow" :data="viewData" :readOnly="false" height="60vh"></data-view>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+ <!-- 鏌ョ湅鎺堟潈缁撴灉 -->
+ <el-dialog
+ v-dialogDrag
+ v-loading="checkViewLoading"
+ :visible.sync="checkViewVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="鏌ョ湅浣跨敤鑼冨洿"
+ width="60%"
+ >
+ <avue-crud
+ ref="checkViewCrud"
+ :data="checkViewData"
+ :option="checkViewOption"
+ @search-change="checkHandleSearch"
+ @search-reset="checkHandleReset"
+ >
+
+ </avue-crud>
+ </el-dialog>
</basic-container>
</el-main>
@@ -28,8 +82,15 @@
<script>
import {getBizTree} from "@/api/UI/uiDefine";
+import basicOption from "@/util/basic-option";
+import dataView from "./dataView";
+import {getTypeActionByType} from "@/api/authority/ui/typeAction";
+import func from "@/util/func";
+import {getUsedEnumList} from "@/api/modeling/enumType/api";
+import {deleteTemplate, saveTemplate, updateTemplate} from "@/api/queryTemplate/queryDefine";
export default {
name: "index",
+ components:{dataView},
data:function (){
return{
treeOption: {
@@ -45,6 +106,38 @@
},
nodeRow: {},
treeData: [],
+ tableLoading: false,
+ selectList: [],
+ option: {
+ ...basicOption,
+ height:260,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ filterBtn:false,
+ columnBtn:false,
+ gridBtn:false,
+ tip: false,
+ align: 'left',
+ menu:false,
+ column: [
+ {
+ label: '瑙勫垯鍚嶇О',
+ prop: 'plCode',
+ overHidden: true
+ },
+ {
+ label: '瑙勫垯绫诲瀷',
+ prop: 'plName',
+ overHidden: true
+ }
+ ]
+ },
+ data: [],
+ viewData:{},
+ title: '',
+ visible: false,
+ form:{}
}
},
created() {
@@ -69,7 +162,136 @@
}
},
getTableList() {
+ getTypeActionByType({
+ 'typeName': this.nodeRow.attributes.name,
+ }).then(res => {
+ this.data = res.data.data;
+ this.$refs.crud.clearSelection();
+ this.tableLoading = false;
+ })
+ },
+ handleRefresh() {
+ this.getTableList();
+ },
+ // 琛岀偣鍑�
+ rowClickHandler(row) {
+ func.rowClickHandler(
+ row,
+ this.$refs.crud,
+ this.lastIndex,
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [row];
+ }
+ );
+ this.getViewData(row)
+ },
+ // 閫夋嫨妗�
+ selectChange(row) {
+ this.selectList = row;
+ },
+ //鑾峰彇涓嬫柟鏁版嵁
+ getViewData(row){
+ this.viewData={};
+ },
+ // 鏌ョ湅鎺堟潈缁撴灉
+ chekView() {
+ if (this.selectList.length <= 0) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
+ return;
+ }
+ if (this.selectList.length > 1) {
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹繘琛屾煡鐪�');
+ return;
+ }
+ getUsedEnumList({enumName: this.selectList[0].id}).then(res => {
+ if (res.data.code === 200) {
+ this.checkViewVisible = true;
+ this.checkViewData = res.data.data;
+ this.checkViewDataSearch = res.data.data;
+ }
+ })
+ },
+
+ // 鏌ョ湅鎺堟潈缁撴灉鏌ヨ
+ checkHandleSearch(params, done) {
+ const {source} = params;
+
+ if (!params.source) {
+ this.checkViewData = this.checkViewDataSearch;
+ return done();
+ }
+ ;
+
+ this.checkViewData = this.checkViewData.filter(item => {
+ return item.source && item.source.includes(source);
+ });
+
+ done();
+
+ },
+ //鍒涘缓
+ addHandler(){
+ if (func.isEmptyObject(this.nodeRow)) {
+ this.$message.error('璇烽�夋嫨瑕佹坊鍔犵殑鑺傜偣');
+ return;
+ }
+ this.title = 'add';
+ this.visible = true;
+ },
+ //淇敼
+ editHandler(){
+ if (func.isEmptyObject(this.nodeRow)) {
+ this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
+ return;
+ }
+ this.title = 'edit';
+ this.visible = true;
+ },
+ // 鏂板缂栬緫淇濆瓨
+ addDialogSavaHandler() {
+ saveTemplate(this.viewData).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ this.addDialogClose();
+ }
+ })
+ },
+ // 鏂板缂栬緫瀵硅瘽妗嗗彇娑�
+ addDialogClose() {
+ this.visible = false;
+ },
+ //鍒犻櫎
+ delHandler(){
+ if (func.isEmptyObject(this.nodeRow)) {
+ this.$message.error('璇烽�夋嫨鏁版嵁');
+ return;
+ }
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteTemplate({name:this.templateForm}).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+ },
+ // 鏌ョ湅浣跨敤鑼冨洿閲嶇疆
+ checkHandleReset() {
+ this.checkViewData = this.checkViewDataSearch;
},
}
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index 7a7bc2e..e890aff 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -216,8 +216,6 @@
this.data = data;
this.page.total = res.data.total;
this.loading = false;
- }).catch(err => {
- this.$message.error(err);
});
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
index e0b5ff2..3533948 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
@@ -56,7 +56,7 @@
</fieldset>
</el-aside>
<el-main>
- <fieldset style="margin: 0 10px">
+ <fieldset style="margin: 0 0 0 10px">
<legend> 鏌ヨ鏉′欢 </legend>
<form-query-dialog ref="formQuery"
:levelFlag.sync="form.levelFlag"
@@ -71,7 +71,7 @@
</el-container>
</div>
<div class="dialog-footer avue-dialog__footer">
- <el-button plain size="small" type="primary" @click="submitDialog">淇� 瀛�</el-button>
+ <el-button size="small" type="primary" @click="submitDialog">淇� 瀛�</el-button>
<el-button size="small" @click="cancelDialog">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -483,11 +483,7 @@
<style scoped>
fieldset {
- border-radius: 5px;
- -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
padding: 10px 6px;
- box-sizing: border-box;
margin: 0;
border: 1px solid #EBEEF5;
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
index 3b809cc..1c23959 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
@@ -289,47 +289,9 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button{
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
}
fieldset {
- border-radius: 5px;
- -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
padding: 10px 6px;
- box-sizing: border-box;
margin: 10px 0 0 0;
border: 1px solid #EBEEF5;
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index abc4359..8c35f7c 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -79,7 +79,7 @@
</el-container>
</div>
<div class="dialog-footer avue-dialog__footer">
- <el-button type="primary" plain size="small" @click="submitDialog" >淇� 瀛�</el-button>
+ <el-button type="primary" size="small" @click="submitDialog" >淇� 瀛�</el-button>
<el-button size="small" @click="cancelDialog">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -624,11 +624,7 @@
<style scoped>
fieldset {
- border-radius: 5px;
- -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
padding: 10px 6px;
- box-sizing: border-box;
margin: 0;
border: 1px solid #EBEEF5;
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index 2c22f82..bfe46ab 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -10,10 +10,10 @@
<div v-for="(condition,index) in conditionList" :key="index" class="el-input--small"
style="margin-bottom: 5px; text-align:left">
<span :title="condition.clause"
- style="width: 200px;display: inline-block;text-align: right">{{ condition.clause }}</span>
+ style="width: 32%;display: inline-block;text-align: right;word-break: break-all">{{ condition.clause }}</span>
<avue-select v-model="condition.operator" :clearable="false" :dic="condition.operatorDic" :disabled="readOnly"
style="width: 80px;margin: 0 5px;" type="tree"></avue-select>
- <el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
+ <!--<el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
style="width:300px;margin-right: 5px;display: inline-block;" type="date"
value-format="YYYY-MM-DD">
</el-date-picker>
@@ -33,7 +33,9 @@
:disabled="readOnly"
style="width:300px;margin-right: 5px;display: inline-block;"></avue-input-number>
<avue-input v-else v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
- style="width: 300px;margin-right: 5px;"></avue-input>
+ style="width: 300px;margin-right: 5px;"></avue-input>-->
+ <avue-input v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
+ style="width: 36%;margin-right: 5px;"></avue-input>
<el-button v-if="!readOnly" plain size="mini" type="primary" @click="checkTemp(index)">閫夋嫨鏌ヨ妯℃澘</el-button>
<el-button v-if="!readOnly" icon="el-icon-delete" size="mini" style="padding: 7px 8px" type="danger"
@click="delCondition(index)"></el-button>
@@ -355,7 +357,7 @@
if (queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate) {
getValue(queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate, item)
} else {
- item.ordinaryValue = queryTemplate.condition.cIMap[key].leafInfo.value.ordinaryValue;
+ //item.ordinaryValue = queryTemplate.condition.cIMap[key].leafInfo.value.ordinaryValue;
item.type = queryTemplate.condition.cIMap[key].leafInfo.type;
if (['VTInteger', 'VTDouble', 'VTLong'].includes(item.type)) {
item.operatorDic = that.operatorIntDic;
@@ -379,7 +381,19 @@
operatorDic: []
}
if (this.queryCondition.cIMap[key].leafInfo.value.queryTemplate) {
- getValue(this.queryCondition.cIMap[key].leafInfo.value.queryTemplate, item)
+ item.ordinaryValue = this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.id+';'+this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.clauseList.join(',');
+ if(this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.id.indexOf('qt_')==0){
+ getValue(this.queryCondition.cIMap[key].leafInfo.value.queryTemplate, item)
+ }else {
+ item.type = this.queryCondition.cIMap[key].leafInfo.type;
+ if (['VTInteger', 'VTDouble', 'VTLong'].includes(item.type)) {
+ item.operatorDic = that.operatorIntDic;
+ } else if (['VTDateTime', 'VTDate', 'VTTime'].includes(item.type)) {
+ item.operatorDic = that.operatorDateDic;
+ } else {
+ item.operatorDic = that.operatorDic;
+ }
+ }
} else {
item.ordinaryValue = this.queryCondition.cIMap[key].leafInfo.value.ordinaryValue;
item.type = this.queryCondition.cIMap[key].leafInfo.type;
@@ -537,7 +551,6 @@
return item
},
handleDragEnd(draggingNode, dropNode, dropType, ev) {
- debugger;
console.log('tree drag end: ', dropNode && dropNode.label, dropType);
},
handleDragOver({event}) {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index 36166ce..c150e3e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -316,47 +316,10 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button{
- width: 82px;
- }
- }
}
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
-}
fieldset {
- border-radius: 5px;
- -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
padding: 10px 6px;
- box-sizing: border-box;
margin: 10px 0 0 0;
border: 1px solid #EBEEF5;
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
index 0258cd6..749b9f9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
@@ -57,8 +57,8 @@
@select="selectHandler">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
</el-container>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
index ccad73e..5b51340 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
@@ -2,7 +2,7 @@
<!--鏂囦粨绠＄悊椤甸潰-->
<basic-container>
<avue-crud
- ref="logCrud"
+ ref="crud"
v-model="form"
:data="tableData"
:option="option"
@@ -11,6 +11,7 @@
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
@row-del="rowDeleteHandler"
+ @row-click="rowClickHandler"
@selection-change="selectionChange"
>
<template slot="menuLeft" slot-scope="scope">
@@ -236,6 +237,17 @@
selectionChange(list) {
this.selectionList = list;
},
+
+ // 琛屽崟閫�
+ rowClickHandler(row) {
+ func.rowClickHandler(
+ row,
+ this.$refs.crud,
+ this.lastIndex,
+ (newIndex) => { this.lastIndex = newIndex; },
+ () => { this.selectionList = []; }
+ );
+ },
}
}
</script>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
index 08d3a02..cf0cfe1 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
@@ -11,6 +11,7 @@
@search-change="handleSearch"
@search-reset="handleReset"
@size-change="sizeChange"
+ @row-click="rowClickHandler"
@current-change="currentChange"
>
<template slot="menuLeft" slot-scope="scope">
@@ -100,7 +101,9 @@
total: 0,
pageSizes: [10, 30, 50, 100],
},
- searchParams: {}
+ searchParams: {},
+ selectList: [],
+
}
},
watch: {
@@ -161,6 +164,16 @@
loading.close();
})
},
+ // 琛屽崟閫�
+ rowClickHandler(row) {
+ func.rowClickHandler(
+ row,
+ this.$refs.logCrud,
+ this.lastIndex,
+ (newIndex) => { this.lastIndex = newIndex; },
+ () => { this.selectList = []; }
+ );
+ },
}
}
</script>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/password/index.vue b/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
index 06f2980..99b37e2 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
@@ -419,7 +419,8 @@
this.checkboxlength = val.value;
this.checkboxedit = this.checkboxlength.toString().split(",");
- if (val.value !== undefined && val.value !== null) {
+ if (val.value !== undefined && val.value !== null && val.value.length > 0) {
+ this.form.requireCharCount = 1;
if (this.checkboxlist === val.value) {
return;
} else {
@@ -432,6 +433,8 @@
this.form.requireCharCount = "";
}
}
+ }else {
+ this.form.requireCharCount = "";
}
// 澶勭悊 蹇呭～绉嶇被閫夐」绂佺敤
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue b/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
index ae5aa53..c0d691a 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
@@ -1,199 +1,114 @@
<template>
- <!--浠ｅ姙浠诲姟-->
- <basic-containers :key="loadKey">
- <div>
- <avue-crud
- ref="crud"
- :data="data"
- :option="options"
- :page.sync="pages"
- :search.sync="searchParams"
- :table-loading="loading"
- @search-change="handleSearch"
- @search-reset="handleReset"
- @current-change="currentChange"
- @size-change="sizeChange">
- <template slot="title" slot-scope="{row}">
- <el-link type="primary" @click="linkClickHandler(row)">{{ row.title }}</el-link>
- </template>
- </avue-crud>
- </div>
- </basic-containers>
+ <basic-container title="寰呭姙娴佺▼浠诲姟">
+ <avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
+ :table-loading="loading"
+ @on-load="onLoad"
+ @cell-click="cellHandle">
+ <template #menu="{size,row,index}">
+ <el-button :size="size"
+ icon="el-icon-check"
+ type="text"
+ @click="gotodo(row,index)">鎵ц
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
</template>
<script>
export default {
name: "UndoTaskPortlet",
- data() {
+ data(){
return {
- loadKey:0,
- data: [],
- options: {
- height: 'auto',
- calcHeight:210,
+ loading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ // 浠ｅ姙娴佺▼浠诲姟data
+ todoData: [],
+ // 浠ｅ姙娴佺▼浠诲姟option
+ todoOption: {
+ height: 500,
addBtn: false,
+ header: false,
+ align: 'center',
+ index: true,
+ menuWidth: 80,
editBtn: false,
delBtn: false,
- index: true,
border: true,
- menu: false,
- refreshBtn: false,
- searchIcon: true,
- searchShow: true,
- menuWidth: 120,
- menuAlign: "center",
- column: [
+ column: [{
+ label: '浠诲姟鍚嶇О',
+ prop: 'taskName',
+ sortable: true,
+ headerAlign: 'center',
+ align: 'left',
+ html: true,
+ width: 300,
+ overHidden: true,
+ formatter: (val) => {
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName + '-' + val.taskName + '</a>'
+ }
+ },
{
- label: "绫诲瀷",
- prop: "msgClassifyText",
+ label: '涓婁竴姝ュ鐞嗘椂闂�',
sortable: true,
- width: 100,
+ width: 150,
+ prop: 'createTime'
},
{
- label: "娑堟伅鏍囬",
- prop: "title",
- search:true,
- minWidth: 400,
+ label: '涓婁竴姝ユ搷浣滀汉',
sortable: true,
- searchSpan:6,
+ width: 120,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
overHidden: true,
- slot:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
},
{
- label: "鍙戦�佹椂闂�",
- prop: "sendTime",
- width: 130,
- type:'datetime',
- overHidden: true,
- format:'yyyy-MM-dd HH:mm',
- sortable:true,
- slot: true
- },
- {
- label: '宸ュ彿',
- prop: "sendUserCode",
- searchLabelWidth: 100,
- search:true,
+ label: '鎵�灞炴祦绋嬫ā鏉�',
sortable: true,
- searchSpan:6,
- width: 130,
- },
- {
- label: "鍙戦�佷汉濮撳悕",
- prop: "sendUserName",
- searchLabelWidth: 100,
- search:true,
- searchSpan:6,
- sort: true,
- width: 130,
- },
- {
- label: "鍐呭",
- overHidden:true,
- prop: "msgContent",
- minWidth: 300
- },
+ overHidden: true,
+ prop: 'categoryName'
+ }
]
},
- pages: {
- currentPage: 1,
- pageSize: 15,
- pageSizes: [15, 25, 45, 60, 100],
- total: 0,
- layout: "prev,pager,next,jumper,sizes,total",
- },
- loading: false,
- searchParams: {
- pageNum: 1,
- pageSize: 15,
- },
- };
+ }
},
created() {
- this.getTableList();
- },
- mounted() {
- window.addEventListener('resize', this.handleResize); // 鑾峰彇鐢ㄦ埛缂╂斁浜嬩欢
- },
- beforeDestroy() {
- window.removeEventListener('resize', this.handleResize); // 閿�姣佺粦瀹氱殑鏂规硶
},
methods: {
- // 寮哄埗淇敼瀹瑰櫒key鍊�
- handleResize() {
- this.loadKey += 1;
+ onLoad(page, params = {}) {
+ this.loading = true;
+ const query = {
+ ...this.query,
+ category: (params.category) ? flowCategory(params.category) : null
+ };
+ todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.todoData = data.records;
+ this.loading = false;
+ }).catch(error => {
+ this.$message.error(error);
+ this.loading = false;
+ })
},
-
- // 鍒濆鍖栨牴鎹垎杈ㄧ巼鏉ュ喅瀹氶〉闈㈠垵濮嬪灏戞潯鏁版嵁
- createdPageSize(){
- let windowHeight = window.outerHeight;
- if(windowHeight > 1350) this.homeTable.pages.pageSize = 25;
- if(windowHeight > 1350) this.searchParams.pageSize = 25;
- },
-
- getTableList() {
- this.createdPageSize(); // 鍒ゆ柇椤甸潰鍒嗚鲸鐜�
-
- getList(this.searchParams).then(res => {
- if (res && res.success) {
- this.homeTable.data = res.data;
- this.homeTable.pages.total = res.total;
- }
- });
- },
-
- linkClickHandler(row){
- if(row.msgLink != null && row.msgLink != ''){
- var link = row.msgLink.replace("inner:","").replace("?","").split("&");
- var html = link.find((val=>(val.toLowerCase().startsWith("html=")|| val.toLowerCase().startsWith("html ="))));
- if(html!=null && html!=''){
- var page = html.split("=")[1].replace("-","/");
- var single = {
- fromUndo:true
- };
- link.forEach((val)=>{
- var temp = val.split("=");
- single[temp[0]] = temp[1];
- });
- this.$router.push({
- path:"/" + page,
- query:single
- });
- }
+ cellHandle(row, column, cell, event) {
+ if (column.property == 'taskName') {
+ this.gotodo(row)
}
},
-
- // 鍒嗛〉閫夋嫨鏄剧ず澶氬皯鏉�
- sizeChange(val) {
- this.searchParams.pageSize = val;
- this.searchParams.pageNum = 1;
- this.getTableList();
- },
-
- // 鍒嗛〉椤电爜
- currentChange(val) {
- this.searchParams.pageNum = val;
- this.getTableList();
- },
-
- // 鏌ヨ
- handleSearch(params, done) {
- setTimeout(() => {
- done();
- this.searchParams = { ...params };
- this.getTableList();
- }, 300);
- },
-
- // 娓呯┖鎼滅储
- handleReset() {
- this.searchParams = this.defaultSearch;
- this.getTableList();
- },
- // 鍒锋柊鏁版嵁
- handleRefresh() {
- this.getTableList();
- },
+ gotodo(row, index) {
+ this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`});
+ }
}
}
</script>
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
index 58316cc..2aba3a8 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
@@ -8,8 +8,6 @@
@selection-change="selectChange"
@row-click="rowClickHandler"
@refresh-change="handleRefresh"
- @size-change="sizeChange"
- @current-change="currentChange"
>
<template slot="menuLeft">
<el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
@@ -36,7 +34,7 @@
width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
+ <el-form ref="form" :model="form" :rules="rules" label-width="95px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="缁勪欢锛�" prop="id">
@@ -44,7 +42,12 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鍗犳嵁鍒楁暟锛�" prop="span">
+ <el-form-item label="鏍囬锛�" prop="title">
+ <el-input v-model="form.title"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍗犳嵁鍒楁暟锛�" prop="span" tip="鎬诲垪鏁颁负24">
<avue-input-number v-model="form.span" precision="0" style="width: 100%" :max="24" :min="1" controls-position="" tip="鎬诲垪鏁颁负24锛屽鍗犳弧鏁磋璇疯緭鍏�24"></avue-input-number>
</el-form-item>
</el-col>
@@ -94,6 +97,10 @@
prop: 'id',
},
{
+ label: '鏍囬',
+ prop: 'title',
+ },
+ {
label: '鍗犳嵁鍒楁暟',
prop: 'span'
},
@@ -117,10 +124,13 @@
rules: {
id: [
{required: true, message: '璇烽�夋嫨缁勪欢', trigger: 'blur'},
+ ],
+ span:[
+ {required: true, message: '璇疯緭鍏ュ崰鎹垪鏁�', trigger: 'blur'},
]
},
dic:[{
- label:'寰呭姙浠诲姟',
+ label:'寰呭姙娴佺▼浠诲姟',
value:'UndoTaskPortlet'
},{
label:'閫夐」2',
@@ -136,13 +146,10 @@
},
methods: {
getList() {
- gridStatus(this.page.currentPage, this.page.pageSize).then(res => {
+ gridStatus().then(res => {
const data = res.data.data;
this.data = data;
- this.page.total = res.data.total;
this.loading = false;
- }).catch(err => {
- this.$message.error(err);
});
},
@@ -156,23 +163,11 @@
this.selectList = row;
},
- // 鏉℃暟
- sizeChange(val) {
- this.page.pageSize = val;
- this.getList();
- },
-
- // 椤电爜
- currentChange(val) {
- this.page.currentPage = val;
- this.getList();
- },
-
// 琛屽崟閫�
rowClickHandler(row) {
func.rowClickHandler(
row,
- this.$refs.useCrud,
+ this.$refs.crud,
this.lastIndex,
(newIndex) => {
this.lastIndex = newIndex;
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/workIndex.vue b/Source/plt-web/plt-web-ui/src/views/wel/workIndex.vue
new file mode 100644
index 0000000..69a16ca
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/wel/workIndex.vue
@@ -0,0 +1,49 @@
+<template>
+ <div>
+ <el-row>
+ <el-col v-for="item in homeData" :span="item.span">
+ <component :is="item.currentComponent" :key="item.component"></component>
+ </el-col>
+ </el-row>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "workIndex",
+ components:{},
+ data(){
+ return {
+ homeData:[{
+ component:'UndoTaskPortlet',
+ span:24
+ }]
+ }
+ },
+ created() {
+ this.initData();
+ },
+ methods:{
+ initData() {
+ this.homeData.map(item => {
+ this.loadCompoent(item);
+ return item;
+ })
+ },
+ loadCompoent(item){
+ // 鍔ㄦ�佸鍏ョ粍浠�
+ import(`@/views/wel/components/${item.component}.vue`).then((module) => {
+ // 鎴愬姛瀵煎叆鍚庯紝灏嗙粍浠舵敞鍐屽埌Vue瀹炰緥涓�
+ item.currentComponent = module.default;
+ }).catch((error) => {
+ // 澶勭悊瀵煎叆澶辫触鐨勬儏鍐�
+ console.log('缁勪欢鍔犺浇澶辫触:', error);
+ });
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.3