diff --git a/.env.development b/.env.development index 6da5859..bb7eb8e 100644 --- a/.env.development +++ b/.env.development @@ -2,16 +2,6 @@ ENV = 'development' # 接口地址 -#内网服务地址 -# VUE_APP_BASE_API = 'http://192.168.99.107:7077' -# VUE_APP_WS_API = 'ws://192.168.99.107:7077' -# VUE_APP_CAMERA_API = '192.168.99.107:3000' - -# VUE_APP_BASE_API = 'http://192.168.99.107:7070' -# VUE_APP_WS_API = 'ws://192.168.99.107:7071' -# VUE_APP_CAMERA_API = '192.168.99.107:3000' - - # 许镇-本地服地址 # VUE_APP_BASE_API = 'http://192.168.99.84:7070' # VUE_APP_WS_API = 'ws://192.168.99.84:7070' @@ -19,8 +9,5 @@ ENV = 'development' VUE_APP_BASE_API = 'http://192.168.99.67:11100' VUE_APP_WS_API = 'ws://192.168.99.67:11100' -# VUE_APP_BASE_API = 'http://192.168.99.107:11100' -# VUE_APP_WS_API = 'ws://192.168.99.107:11100' - # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 869e29f..333916e 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -871,4 +871,25 @@ border: 1px solid #FBC0B5; border-radius: 3px; cursor: pointer; +} +.detail-tab{ + position: relative; +} +.double-click-btn{ + position: absolute; + right: 0; + top: 0; + display: flex; + justify-content: flex-start; + align-items: center; + line-height: 26px; + span{ + display: inline-block; + font-size: 12px; + color: #545B65; + } + i{ + display: inline-block; + color: #0348F3; + } } \ No newline at end of file diff --git a/src/views/archiveUtilize/archiveEditing/index.vue b/src/views/archiveUtilize/archiveEditing/index.vue index 86e02fe..b042b26 100644 --- a/src/views/archiveUtilize/archiveEditing/index.vue +++ b/src/views/archiveUtilize/archiveEditing/index.vue @@ -46,6 +46,7 @@ + @@ -54,15 +55,16 @@ import CRUD, { presenter, crud } from '@crud/crud' import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker' import crudOperation from '@crud/CRUD.operation' +import EditingDetail from './module/detail' export default { name: 'ArchiveEditing', - components: { pagination, DateRangePicker, crudOperation }, + components: { pagination, DateRangePicker, crudOperation, EditingDetail }, mixins: [presenter(), crud()], cruds() { return CRUD({ url: 'api/log/initLog', - title: '借阅记录', + title: '档案编研', optShow: { add: true, edit: true, @@ -104,6 +106,7 @@ export default { this.$refs.table.toggleRowSelection(row) }, tableDoubleClick(row) { + this.$refs.editingDetail.editingDetailVisible = true }, handleCloseDialog(done) { } diff --git a/src/views/archiveUtilize/archiveEditing/module/detail.vue b/src/views/archiveUtilize/archiveEditing/module/detail.vue new file mode 100644 index 0000000..362f6f1 --- /dev/null +++ b/src/views/archiveUtilize/archiveEditing/module/detail.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/archiveUtilize/archiveEditing/module/material.vue b/src/views/archiveUtilize/archiveEditing/module/material.vue new file mode 100644 index 0000000..0e5d897 --- /dev/null +++ b/src/views/archiveUtilize/archiveEditing/module/material.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue b/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/system/processManage/runningProcess/module/detail.vue b/src/views/system/processManage/runningProcess/module/detail.vue index 389593d..f0fcbc9 100644 --- a/src/views/system/processManage/runningProcess/module/detail.vue +++ b/src/views/system/processManage/runningProcess/module/detail.vue @@ -132,9 +132,7 @@ export default {