diff --git a/package.json b/package.json
index 7067494..39e659d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
"pizzip": "3.1.7",
"quill": "1.3.7",
"screenfull": "5.0.2",
- "sockjs-client": "^1.6.1",
"sortablejs": "1.10.2",
"v-viewer": "1.6.4",
"vue": "2.6.12",
@@ -66,8 +65,7 @@
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vue-video-player": "5.0.1",
- "vuex": "3.6.0",
- "websocket": "^1.0.35"
+ "vuex": "3.6.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
diff --git a/src/App.vue b/src/App.vue
index 39ca9b3..8d3da3c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,7 @@
import ThemePicker from "@/components/ThemePicker";
import store from '@/store'
import { Message } from 'element-ui'
+import { getToken } from '@/utils/auth'
export default {
name: "App",
@@ -22,7 +23,9 @@ export default {
}
},
created() {
- store.dispatch('GetUserMsgCount').then(() => { })
+ if (getToken()) {
+ store.dispatch('GetUserMsgCount').then(() => { })
+ }
},
methods:{
diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue
index fc8ed18..a9e5959 100644
--- a/src/components/tool-selector/index.vue
+++ b/src/components/tool-selector/index.vue
@@ -42,15 +42,15 @@
header-align="left"
>
-
-
-
+
+
+
-
-
+
+
{
+ self.$nextTick(() => {
for (const tag of tags) {
if (tag.to.path === this.$route.path) {
- this.$refs.scrollPane.moveToTarget(tag)
+ self.$refs.scrollPane.moveToTarget(tag)
// when query is different then update
if (tag.to.fullPath !== this.$route.fullPath) {
- this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+ self.$store.dispatch('tagsView/updateVisitedView', self.$route)
}
break
}
diff --git a/src/permission.js b/src/permission.js
index c568979..9e4fe44 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register']
+const whiteList = ['/login', '/register', '/workflow/msg/count/']
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -37,6 +37,7 @@ router.beforeEach((to, from, next) => {
next({ path: '/' })
})
})
+ store.dispatch('GetUserMsgCount').then(() => { })
} else {
next()
}
diff --git a/src/views/document/uploadProgress.vue b/src/views/document/uploadProgress.vue
index bfd4d0c..25d7188 100644
--- a/src/views/document/uploadProgress.vue
+++ b/src/views/document/uploadProgress.vue
@@ -30,10 +30,10 @@
}
},
created(){
- this.initWebSocket();
+ // this.initWebSocket();
},
methods: {
- initWebSocket() {
+ /* initWebSocket() {
this.websocket = new WebSocket(process.env.VUE_APP_WS_URL);
this.websocket.onmessage = (event) => {
this.uploading = true;
@@ -52,8 +52,8 @@
}
})
console.log('this.progressArr=' + this.progressArr);
- /* let progress = msgStr.substring(msgStr.indexOf("/") + 1, msgStr.length);
- this.progress = parseInt(msgArr[2])*/
+ /!* let progress = msgStr.substring(msgStr.indexOf("/") + 1, msgStr.length);
+ this.progress = parseInt(msgArr[2])*!/
// if (progress === '100%') {
// this.websocket.close();
// }
@@ -61,7 +61,7 @@
this.websocket.onclose = () => {
console.log('WebSocket connection closed');
};
- },
+ }, */
checkDuplicate(docId) {
return this.progressArr.findIndex(t => t['docId'] == docId) == -1
}
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index b622302..5e9fb11 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -175,7 +175,7 @@ export default {
previewUrl: '',
progress: 0,
fileList: [],
- websocket: null,
+ // websocket: null,
// 查询参数
queryParams: {
pageNum: 1,
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 8805bf2..d7b94aa 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -20,11 +20,9 @@
{{detailData.remark}}
- 查看
-
-
+
+ {{tag.toolName}}
+
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index b97c296..644bfc2 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -192,15 +192,15 @@
- 查看
+
+
- -->
+
@@ -740,6 +740,10 @@ export default {
saveForm() {
let _this = this
_this.$refs["eForm"].validate(valid => {
+ if(_this.attachmentList.length == 0){
+ _this.$message.warning("最少上传一个附件");
+ return;
+ }
if (valid) {
if (!_this.procDefKey) {
_this.$message.warning("尚未进行流程设置，将无法发起流程！");
@@ -858,6 +862,10 @@ export default {
dialogVisible = false
}
}
+ if(this.attachmentList.length == 0){
+ _this.$message.warning("最少上传一个附件");
+ return true;
+ }
_this.searchQuery.pass = _this.formSubmit.pass
let defaultStaff = []
this.defaultStaff=defaultStaff
@@ -1188,6 +1196,23 @@ export default {
self.toolTreeLoading = false;
});
},
+ toolSelect(){
+ /* this.$refs.selectHeadTool.blur();
+ this.$nextTick(()=>{
+ this.$refs.toolSelect.init(null,null,true)
+ }) */
+ let self = this
+ this.$refs.selectHeadTool.blur();
+ let toolIds = []
+ if(self.form.association && self.form.association.length > 0){
+ self.form.association.forEach(item=>{
+ toolIds.push(item.toolId)
+ })
+ }
+ this.$nextTick(()=>{
+ this.$refs.toolSelect.init(null,null,true, toolIds)
+ })
+ },
},