diff --git a/package.json b/package.json index 9cd3a2085..8a0f82d7e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "stylus-loader": "^6.2.0", "tinymce": "^5.10.3", "tui-calendar-hi": "^1.15.1-5", - "view-design-hi": "^4.7.0-24", + "view-design-hi": "^4.7.0-25", "vue": "^2.6.14", "vue-clipboard2": "^0.3.3", "vue-kityminder-ggg": "^1.3.10", diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 26e52b71e..92adfad68 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -50,7 +50,6 @@ import { Dropdown, DropdownMenu, DropdownItem, - Progress, } from 'element-ui'; Vue.component('EAvatar', Avatar); @@ -59,7 +58,6 @@ Vue.component('EPopover', Popover); Vue.component('EDropdown', Dropdown); Vue.component('EDropdownMenu', DropdownMenu); Vue.component('EDropdownItem', DropdownItem); -Vue.component('EProgress', Progress); const originalPush = VueRouter.prototype.push VueRouter.prototype.push = function push(location) { diff --git a/resources/assets/js/functions/eeui.js b/resources/assets/js/functions/eeui.js index f1b06276b..42d57496b 100755 --- a/resources/assets/js/functions/eeui.js +++ b/resources/assets/js/functions/eeui.js @@ -16,6 +16,11 @@ requireModuleJs("eeui").alert(object, callback); }, + eeuiAppToast(object) { + if (!$A.isEEUiApp) return; + requireModuleJs("eeui").toast(object); + }, + eeuiAppOpenPage(object, callback) { if (!$A.isEEUiApp) return; if (typeof callback !== "function") callback = _ => {}; diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index 17e8f9c86..1d454a62e 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -166,7 +166,7 @@ export default { style: { fontSize: '13px', cursor: 'pointer', - color: '#8bcf70', + color: '#84C56A', }, on: { 'on-ok': () => { diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 0663185b0..a716b82d1 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -33,13 +33,17 @@
- + trail-color="rgba(132, 197, 106, 0.2)" + :trail-width="8" + :stroke-color="item.task_percent === 100 ? 'rgba(132, 197, 106, 0)' : '#84C56A'" + :stroke-width="8" + :percent="item.task_percent" + :size="56"> + + {{item.task_percent}}% +
diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index d59f62171..83a098d2c 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -184,7 +184,7 @@ export default { style: { fontSize: '13px', cursor: 'pointer', - color: '#8bcf70', + color: '#84C56A', }, on: { 'click': () => { @@ -203,7 +203,7 @@ export default { marginLeft: '6px', fontSize: '13px', cursor: 'pointer', - color: '#8bcf70', + color: '#84C56A', }, on: { 'on-ok': () => { diff --git a/resources/assets/js/pages/manage/components/TaskDeleted.vue b/resources/assets/js/pages/manage/components/TaskDeleted.vue index e54d963c0..1a8bf7237 100644 --- a/resources/assets/js/pages/manage/components/TaskDeleted.vue +++ b/resources/assets/js/pages/manage/components/TaskDeleted.vue @@ -170,7 +170,7 @@ export default { style: { fontSize: '13px', cursor: 'pointer', - color: '#8bcf70', + color: '#84C56A', }, on: { 'on-ok': () => { diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 6aec9eb6e..6e16017d4 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -73,7 +73,7 @@

{{$L('没有任何文件')}}

-