diff --git a/.env.production b/.env.production index 537ed91..c329a8d 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API='http://192.168.16.110:8080' -VUE_APP_UPLOAD_API='http://192.168.16.110:8080/api/upload-file' +VUE_APP_BASE_API='' +VUE_APP_UPLOAD_API='/api/upload-file' VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/.env.staging b/.env.staging index e2b8f38..e2a4c1d 100644 --- a/.env.staging +++ b/.env.staging @@ -4,6 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API='https://cz-hjjc.115.langye.net' -VUE_APP_UPLOAD_API='https://cz-hjjc.115.langye.net/api/upload-file' +VUE_APP_BASE_API='' +VUE_APP_UPLOAD_API='/api/upload-file' VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/src/layout/components/Navbar/index.vue b/src/layout/components/Navbar/index.vue index 6c8a471..27b633b 100644 --- a/src/layout/components/Navbar/index.vue +++ b/src/layout/components/Navbar/index.vue @@ -55,7 +55,7 @@
{{ name }}
-
{{ (department && department.name) ? department.name : '暂无部门' }}
+
{{ (department && department.name) ? department.name : '暂无部门' }}
diff --git a/src/styles/navbar.css b/src/styles/navbar.css index f2b34e3..ab642ad 100644 --- a/src/styles/navbar.css +++ b/src/styles/navbar.css @@ -96,7 +96,11 @@ .navbar .container .navbar-nav .nav-info .department { color: #eeeeee; font-size: 85%; + max-width: 100px; margin-top: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } @media (max-width: 1200px) { diff --git a/src/styles/navbar.css.map b/src/styles/navbar.css.map index 6e7c8b7..ada4ceb 100644 --- a/src/styles/navbar.css.map +++ b/src/styles/navbar.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["navbar.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEA;EACE;;AAEF;EACE;;AAEA;EACE;EACA;EACA;;AAIN;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGJ;EACE;;AAGJ;EACE;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AAMV;EAEI;IACE;;;EAKA;IACE;;;AAKR;EAEI;IACE;;;EAKA;IACE;;EAEF;IACE;IACA;;;AAKR;EAEI;IACE;;EAGA;IACE;;EAIF;IACE;;EAIF;IACE;;;AAON;EACE;;AAEA;EACE;EACA;;AAGJ;EACE;EACA;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;AAIA;EACE;EACA","file":"navbar.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["navbar.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEA;EACE;;AAEF;EACE;;AAEA;EACE;EACA;EACA;;AAIN;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGJ;EACE;;AAGJ;EACE;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMV;EAEI;IACE;;;EAKA;IACE;;;AAKR;EAEI;IACE;;;EAKA;IACE;;EAEF;IACE;IACA;;;AAKR;EAEI;IACE;;EAGA;IACE;;EAIF;IACE;;EAIF;IACE;;;AAON;EACE;;AAEA;EACE;EACA;;AAGJ;EACE;EACA;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;AAIA;EACE;EACA","file":"navbar.css"} \ No newline at end of file diff --git a/src/styles/navbar.scss b/src/styles/navbar.scss index 6008e9f..79e05be 100644 --- a/src/styles/navbar.scss +++ b/src/styles/navbar.scss @@ -99,7 +99,11 @@ .department { color: rgb(238, 238, 238); font-size: 85%; + max-width: 100px; margin-top: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } diff --git a/src/views/system/DashboardComponents/toDo.vue b/src/views/system/DashboardComponents/toDo.vue index 3b397aa..8011ef3 100644 --- a/src/views/system/DashboardComponents/toDo.vue +++ b/src/views/system/DashboardComponents/toDo.vue @@ -195,9 +195,9 @@ export default { try { const data = row.data if (data.from === 'ht') { - this.modalUrl = `/${data.from}/#/contract/contractList?auth_token=${window.encodeURIComponent(getToken())}&module_name=${data.from}&keyword=${(/\[(.*?)]/.exec(data.title) ? /\[(.*?)]/.exec(data.title)[1] : '')}` + this.modalUrl = `/${data.from}/#/contract/contractList?auth_token=${window.encodeURIComponent(getToken())}&module_name=${data.from}&keyword=${(/\[(.*?)]/.exec(data.title) ? /\[(.*?)]/.exec(data.title)[1] : '')}&isSinglePage=1` } else if (data.from === 'oa') { - this.modalUrl = `/${data.from}/#/flow/create?auth_token=${window.encodeURIComponent(getToken())}&module_name=${data.from}&flow_id=${data.other?.flow_id}` + this.modalUrl = `/${data.from}/#/flow/create?auth_token=${window.encodeURIComponent(getToken())}&module_name=${data.from}&flow_id=${data.other?.flow_id}&isSinglePage=1` } console.log(this.modalUrl) this.isShowModal = true