diff --git a/src/pages/index/index.js b/src/pages/index/index.js index 2f8dd2d4..ce6df518 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -38,10 +38,10 @@ import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' -import VConsole from 'vconsole'; -if (process.env.NODE_ENV == 'development'){ - new VConsole(); -} +// import VConsole from 'vconsole'; +// if (process.env.NODE_ENV == 'development'){ +// new VConsole(); +// } const hls = require('videojs-contrib-hls') Vue.use(hls) Vue.use(VueQuillEditor) // 注册富文本编辑器 diff --git a/src/store/index.js b/src/store/index.js index 9860fd60..25362aac 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,24 +48,24 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) - // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 + WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue index dc72dc27..dc916161 100644 --- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue +++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue @@ -18,7 +18,7 @@ ref="searchForm" :model="searchForm" size="medium" - style="width: 100%;display: flex;align-items: center;" + style="width: 100%; display: flex; align-items: center" > - - + + - + - + - + 查询
消息列表 - 标为已读 - 删除 + 标为已读 + 删除
- + @@ -81,11 +88,7 @@ {{ scope.row.type | typeText(searchBtnList) }} - + @@ -108,31 +111,42 @@ 返回
-
{{rowObj.title}}
+
{{ rowObj.title }}
- 应用:{{rowObj.app}} - 标签:{{rowObj.tag}} - 接收时间:{{rowObj.operateTime}} + 应用:{{ rowObj.app }} + 标签:{{ rowObj.tag }} + 接收时间:{{ rowObj.operateTime }}
-
{{rowObj.content}}
+
{{ rowObj.content }}
@@ -406,8 +456,8 @@ export default { } } } -.table_wrap{ - .pagerBox{ +.table_wrap { + .pagerBox { margin-top: 30px; } } diff --git a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue index 02fdff00..e7a4fb8b 100644 --- a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue +++ b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue @@ -120,18 +120,25 @@ - - - - -