diff --git a/package-lock.json b/package-lock.json index f64f3c4..92d675b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3696,8 +3696,7 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "commondir": { "version": "1.0.1", @@ -4240,6 +4239,11 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssfilter": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", + "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" + }, "cssnano": { "version": "4.1.10", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", @@ -7115,6 +7119,14 @@ "object-visit": "^1.0.0" } }, + "mavon-editor": { + "version": "2.10.4", + "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz", + "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==", + "requires": { + "xss": "^1.0.6" + } + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -12317,6 +12329,15 @@ "async-limiter": "~1.0.0" } }, + "xss": { + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz", + "integrity": "sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==", + "requires": { + "commander": "^2.20.3", + "cssfilter": "0.0.10" + } + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 3164875..1555287 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "core-js": "^3.6.5", "element-ui": "^2.14.0", "lib-flexible": "^0.3.2", + "mavon-editor": "^2.10.4", "postcss-px2rem": "^0.3.0", "postcss-pxtorem": "^5.1.1", "px2rem-loader": "^0.1.9", diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue index bde8779..a908d76 100644 --- a/src/components/quill/index.vue +++ b/src/components/quill/index.vue @@ -1,223 +1,310 @@ diff --git a/src/utils/api.js b/src/utils/api.js index 286598d..64ce245 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -11,7 +11,7 @@ if(isKd){ host = 'http://124.71.12.62:9000'; // 巢湖版 } else if (dev) { host = 'http://121.37.12.51'; //线上 - // host = 'http://192.168.31.137:9000'; //赓 + // host = 'http://192.168.31.217:9000'; } } let host1 = 'http://121.37.12.51:8080'; @@ -22,6 +22,11 @@ export default { // 交易类(流程类) getAllBusiness: `${host}/judgment/judgment/lcRecord/getAllBusiness`, // 获取流程记录列表(树) getProcess: `${host}/judgment/judgment/lcRecord/getProcess`, // 获取流程记录列表(树) + // getAllBusinessSt: `${host}/nakadai/nakadai/customsPass/checkpointList`, // 获取流程记录列表(树) + getProcessSt: `${host}/judgment/judgment/stRecord/getProcess`, // 获取流程记录列表(树) + getAllBusinessSt: `${host}/judgment/judgment/stRecord/getAllBusiness`, // 获取流程记录列表(树) + getSubjectInfoSt: `${host}/judgment/stSubject/getSubjectInfo`, // 根据题目id获取题目信息 + queryJudgmentPointDetailsSt: `${host}/judgment/judgment/lcJudgmentPoint/queryJudgmentPointDetailsBySt`, // 获取判分点详细信息 getSubjectInfo: `${host}/judgment/judgment/lcSubject/getSubjectInfo`, // 根据题目id获取题目信息 addJudgmentRule: `${host}/judgment/judgment/lcJudgmentRule/addJudgmentRule`, // 添加判分点规则 updateJudgmentRule: `${host}/judgment/judgment/lcJudgmentRule/updateJudgmentRule`, // 添加判分点规则 diff --git a/src/views/Home.vue b/src/views/Home.vue index 7ddeab5..33b6779 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,7 +1,9 @@