diff --git a/package.json b/package.json index aee15fd..f95f1fa 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vue-cli-service serve", "serve": "vue-cli-service serve", - "build-dev": "vue-cli-service build --mode development --dest tduck-front", + "build-dev": "vue-cli-service build --mode development --dest questionnaire", "preview": "node build/index.js --preview", "build": "vue-cli-service build", "lint": "vue-cli-service lint", @@ -65,7 +65,7 @@ "not ie <= 8" ], "lint-staged": { - + }, "husky": { "hooks": { diff --git a/src/components/tinymce/index.vue b/src/components/tinymce/index.vue index 3a4a884..6b1a871 100644 --- a/src/components/tinymce/index.vue +++ b/src/components/tinymce/index.vue @@ -41,8 +41,8 @@ export default { selector: `#${this.tinymceId}`, language: 'zh_CN', menubar: 'false', - skin_url: '/tinymce/skins/ui/tduck', - content_css: '/tinymce/skins/content/tduck', + skin_url: '/questionnaire/tinymce/skins/ui/tduck', + content_css: '/questionnaire/tinymce/skins/content/tduck', cache_suffix: '?v=0.0.1', plugins, toolbar, diff --git a/src/router/index.js b/src/router/index.js index 6b11109..078da10 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,7 +31,8 @@ routes.push({ const router = new Router({ mode: 'history', - routes: routes.flat() + routes: routes.flat(), + base: '/questionnaire' }) // 解决路由在 push/replace 了相同地址报错的问题 @@ -46,11 +47,11 @@ Router.prototype.replace = function replace(location) { router.beforeEach((to, from, next) => { NProgress.start() - + if (to.meta.requireLogin) { if (to.query.token) { console.log('ro.query', to.query) - + localStorage.setItem('loginSource', 'epmet') localStorage.setItem('customerId', to.query.customerId) store.dispatch('user/getUserInfo', to.query.token) diff --git a/src/views/form/statistics/analysis.vue b/src/views/form/statistics/analysis.vue index e8d164e..1100c23 100644 --- a/src/views/form/statistics/analysis.vue +++ b/src/views/form/statistics/analysis.vue @@ -61,12 +61,7 @@ -
@@ -86,6 +81,24 @@
+
+
+
{{ i }}
+
+
+ +
+
+ {{ computedPercent(n, item.detail.totalCount).toFixed(2) }}% +
+
{{ n }}次
+
+
+
@@ -298,10 +311,12 @@ export default { async handleOpen(item) { if (item.type === 'SWITCH' || item.type === 'NUMBER_INPUT') return false - this.dialogTitle = item.label + if (item.moduleType && item.moduleType === 'concat') { + this.dialogTitle = '联系人信息' await this.getConcatList() } else { + this.dialogTitle = item.label this.dialogHeader.push(item) await this.getInputList(item.formItemId, item.type) } @@ -363,6 +378,8 @@ export default { .cell-type { padding-left: 10px; font-size: 14px; + color: #409EFF; + cursor: pointer; } .cell-wrapper { width: 100%; diff --git a/vue.config.js b/vue.config.js index c86d0f6..623be23 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { } module.exports = { - publicPath: '/', + publicPath: '/questionnaire', lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false, devServer: {