From e53e0d9cc7472153946147d548f572fd14be13f3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/wel/index.vue | 114 ++++++++++++++++++++++++++-------------------------------
1 files changed, 52 insertions(+), 62 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index f760b5d..69a47eb 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -32,59 +32,8 @@
<el-row>
<basic-container title="娑堟伅鍒楄〃">
<el-collapse v-model="logActiveNames" @change="handleChange">
- <el-collapse-item title="2.8.2.RELEASE鍙戝竷" name="23">
- <div>1.[鍗囩骇]SpringBoot 鑷� 2.3.12</div>
- <div>2.[鍗囩骇]SpringBootAdmin 鑷� 2.3.1</div>
- <div>3.[鍗囩骇]Knife4j 鑷� 2.0.9</div>
- <div>4.[鍗囩骇]Nacos 鑷� 2.0.2</div>
- <div>5.[鍗囩骇]Seata 鑷� 1.4.2</div>
- <div>6.[鍥炴粴]MybatisPlus 鑷� 3.4.2</div>
- <div>7.[鍗囩骇]DynamicDatasource 鑷� 3.3.6</div>
- <div>8.[鍗囩骇]Druid 鑷� 1.2.6</div>
- <div>9.[鍗囩骇]Avue 鑷� 2.8.18</div>
- <div>10.[鏂板]鐢ㄦ埛鐧诲綍閿欒娆℃暟閿佸畾鍔熻兘</div>
- <div>11.[鏂板]澶氶儴闂ㄥ瑙掕壊鐢ㄦ埛鍦ㄧ櫥褰曟椂澧炲姞涓嬫媺閫夐」</div>
- <div>12.[鏂板]鏂板鐢ㄦ埛澶氭潯浠舵煡璇㈡帴鍙�</div>
- <div>13.[鏂板]Ribbon缁勪欢鏉冮噸璇诲彇閫昏緫</div>
- <div>14.[鏂板]ExcelUtil鏂板WriteHandler鍙傛暟</div>
- <div>15.[鏂板]CacheUtil澧炲姞鎸囧畾tenantId娓呯┖鏂规硶</div>
- <div>16.[浼樺寲]鎵嬫満鐭俊鏍￠獙閫昏緫锛屽鍔犳墜鏈哄彿寮哄埗鍒ゆ柇</div>
- <div>17.[浼樺寲]鐭俊璋冭瘯鍔熻兘澧炲姞璧勬簮缂栧彿璇诲彇</div>
- <div>18.[浼樺寲]澶氱鎴峰垏闈㈤�昏緫</div>
- <div>19.[浼樺寲]澶氱鎴风紦瀛樻竻绌洪�昏緫</div>
- <div>20.[浼樺寲]ISqlInjector鏀寔鑷畾涔夎鐩�</div>
- <div>21.[浼樺寲]浼樺寲鏃ュ織瀵逛簬绉熸埛id鐨勫垽鏂�</div>
- <div>22.[浼樺寲]Menu绫婚噸鍐檋ashCode鏂规硶</div>
- <div>23.[浼樺寲]MySql鑴氭湰灏唋ong绫诲瀷瀛楁鏀逛负bigint(20)</div>
- <div>24.[淇]鐢ㄦ埛涓績瀛楁缁戝畾鐩稿弽鐨勯棶棰�</div>
- <div>25.[淇]鍏抽棴楠岃瘉鐮佹ā寮忓悗棣栭〉浠嶈皟鐢ㄩ獙璇佺爜鎺ュ彛鐨勯棶棰�</div>
- </el-collapse-item>
- <el-collapse-item title="2.8.2.RELEASE鍙戝竷锛屽寮虹敤鎴风櫥褰曟柟妗�" name="24">
- <div>1.[鍗囩骇]SpringBoot 鑷� 2.3.12</div>
- <div>2.[鍗囩骇]SpringBootAdmin 鑷� 2.3.1</div>
- <div>3.[鍗囩骇]Knife4j 鑷� 2.0.9</div>
- <div>4.[鍗囩骇]Nacos 鑷� 2.0.2</div>
- <div>5.[鍗囩骇]Seata 鑷� 1.4.2</div>
- <div>6.[鍥炴粴]MybatisPlus 鑷� 3.4.2</div>
- <div>7.[鍗囩骇]DynamicDatasource 鑷� 3.3.6</div>
- <div>8.[鍗囩骇]Druid 鑷� 1.2.6</div>
- <div>9.[鍗囩骇]Avue 鑷� 2.8.18</div>
- <div>10.[鏂板]鐢ㄦ埛鐧诲綍閿欒娆℃暟閿佸畾鍔熻兘</div>
- <div>11.[鏂板]澶氶儴闂ㄥ瑙掕壊鐢ㄦ埛鍦ㄧ櫥褰曟椂澧炲姞涓嬫媺閫夐」</div>
- <div>12.[鏂板]鏂板鐢ㄦ埛澶氭潯浠舵煡璇㈡帴鍙�</div>
- <div>13.[鏂板]Ribbon缁勪欢鏉冮噸璇诲彇閫昏緫</div>
- <div>14.[鏂板]ExcelUtil鏂板WriteHandler鍙傛暟</div>
- <div>15.[鏂板]CacheUtil澧炲姞鎸囧畾tenantId娓呯┖鏂规硶</div>
- <div>16.[浼樺寲]鎵嬫満鐭俊鏍￠獙閫昏緫锛屽鍔犳墜鏈哄彿寮哄埗鍒ゆ柇</div>
- <div>17.[浼樺寲]鐭俊璋冭瘯鍔熻兘澧炲姞璧勬簮缂栧彿璇诲彇</div>
- <div>18.[浼樺寲]澶氱鎴峰垏闈㈤�昏緫</div>
- <div>19.[浼樺寲]澶氱鎴风紦瀛樻竻绌洪�昏緫</div>
- <div>20.[浼樺寲]ISqlInjector鏀寔鑷畾涔夎鐩�</div>
- <div>21.[浼樺寲]浼樺寲鏃ュ織瀵逛簬绉熸埛id鐨勫垽鏂�</div>
- <div>22.[浼樺寲]Menu绫婚噸鍐檋ashCode鏂规硶</div>
- <div>23.[浼樺寲]MySql鑴氭湰灏唋ong绫诲瀷瀛楁鏀逛负bigint(20)</div>
- <div>24.[淇]鐢ㄦ埛涓績瀛楁缁戝畾鐩稿弽鐨勯棶棰�</div>
- <div>25.[淇]鍏抽棴楠岃瘉鐮佹ā寮忓悗棣栭〉浠嶈皟鐢ㄩ獙璇佺爜鎺ュ彛鐨勯棶棰�</div>
+ <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">
+ <div>{{item.subtitle}}</div>
</el-collapse-item>
</el-collapse>
</basic-container>
@@ -141,35 +90,76 @@
header: false,
align: 'center',
index: true,
- menuWidth: 100,
+ menuWidth: 80,
editBtn: false,
delBtn: false,
+ border:true,
column: [{
label: '浠诲姟鍚嶇О',
- prop: 'name',
+ 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.taskName + '</a>'
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
}
},
{
label: '涓婁竴姝ュ鐞嗘椂闂�',
- prop: 'createTime'
- },
- {
- label: '鎻忚堪',
- prop: 'description'
+ sortable:true,
+ width:150,
+ prop: 'historyActivityDurationTime'
},
{
label: '涓婁竴姝ユ搷浣滀汉',
- prop: 'creator_name'
+ sortable:true,
+ width:120,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
},
{
label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ overHidden:true,
prop: 'categoryName'
}
]
},
+ noticeData: [{
+ img: '/img/bg/vip1.png',
+ title: '鍙茶拏澶蜂箶甯冩柉 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '宸茬粡寮�濮�',
+ status: 0
+ }, {
+ img: '/img/bg/vip2.png',
+ title: '鏂拏澶锋矁鍏瑰凹浜氬厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '鏈紑濮�',
+ status: 1
+ }, {
+ img: '/img/bg/vip3.png',
+ title: '钂傚路搴撳厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 3,
+ tag: '鏈夐敊璇�'
+ }, {
+ img: '/img/bg/vip4.png',
+ title: '姣斿皵路璐瑰皵鍗楀痉鏂� 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 4,
+ tag: '宸插畬鎴�'
+ }],
logActiveNames: ['28'],
userarr: [],
userid: '',
--
Gitblit v1.9.3