diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 92adfad68..26e52b71e 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -50,6 +50,7 @@ import { Dropdown, DropdownMenu, DropdownItem, + Progress, } from 'element-ui'; Vue.component('EAvatar', Avatar); @@ -58,6 +59,7 @@ 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/web.js b/resources/assets/js/functions/web.js index e40e91297..e4141b72c 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -441,10 +441,17 @@ } else if (typeof config === "string") { config = {content: config}; } - config.title = $A.L(config.title || (typeof config.render === 'undefined' ? '温馨提示' : '')); - config.content = $A.L(config.content || ''); - config.okText = $A.L(config.okText || '确定'); - config.cancelText = $A.L(config.cancelText || '取消'); + config.title = config.title || (typeof config.render === 'undefined' ? '温馨提示' : ''); + config.content = config.content || ''; + config.okText = config.okText || '确定'; + config.cancelText = config.cancelText || '取消'; + if (config.language !== false) { + delete config.language; + config.title = $A.L(config.title); + config.content = $A.L(config.content); + config.okText = $A.L(config.okText); + config.cancelText = $A.L(config.cancelText); + } return config; }, diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 989af7a63..dccffa76a 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -22,24 +22,24 @@ v-for="(item, key) in projectLists" :key="key" @click="toggleRoute('project', {projectId: item.id})"> -
- {{item.name}} -
-
- {{item.desc}} -
-
- -
{{item.task_my_complete}}/{{item.task_my_num}}
-
-