diff --git a/package.json b/package.json
index ff684a3..430f367 100644
--- a/package.json
+++ b/package.json
@@ -74,5 +74,19 @@
"hooks": {
"pre-commit": "lint-staged"
}
+ },
+ "eslintConfig": {
+ "root": true,
+ "env": {
+ "node": true
+ },
+ "extends": [
+ "plugin:vue/essential"
+ ],
+ "rules": {},
+ "parserOptions": {
+ "parser": "babel-eslint"
+ }
}
+
}
diff --git a/src/components/generator/config.js b/src/components/generator/config.js
index 87d25ac..5b92aa1 100644
--- a/src/components/generator/config.js
+++ b/src/components/generator/config.js
@@ -259,6 +259,7 @@ export const selectComponents = [
tag: 'el-switch',
tagIcon: 'switch',
defaultValue: false,
+ showDefaultValue: false,
span: 24,
showRegList: false,
showLabel: true,
@@ -276,7 +277,9 @@ export const selectComponents = [
'active-color': null,
'inactive-color': null,
'active-value': true,
- 'inactive-value': false
+ 'show-active-value': false,
+ 'inactive-value': false,
+ 'show-inactive-value': false
},
{
typeId: 'SLIDER',
@@ -428,6 +431,7 @@ export const selectComponents = [
style: {},
max: 5,
'allow-half': false,
+ 'show-allow-half': false,
'show-text': false,
'show-score': false,
disabled: false
diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index c86f86f..a936fb9 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -219,6 +219,7 @@
-
-
-
@@ -1098,7 +1099,7 @@ export default {
},
isShowMax () {
return (
- ["el-input-number", "el-slider", "el-rate"].indexOf(this.activeTag) > -1
+ ["el-input-number", "el-slider"].indexOf(this.activeTag) > -1
);
},
isShowStep () {
diff --git a/src/views/form/index.vue b/src/views/form/index.vue
index 340f0c9..952b050 100644
--- a/src/views/form/index.vue
+++ b/src/views/form/index.vue
@@ -38,7 +38,7 @@
/>
-
+
{
- console.log(res)
- this.projectKey = res.data
- console.log('新增')
- console.log(this.projectKey)
- this.initLoaded = true
- this.defaultActiveMenu = this.$route.path
- this.isCollapse = this.$store.state.form.isCollapse
- })
- },
menuSelectHandle(route, key) {
if (key === 'preview') {
diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue
index 52e74e5..738827f 100644
--- a/src/views/form/preview/ProjectForm.vue
+++ b/src/views/form/preview/ProjectForm.vue
@@ -5,29 +5,34 @@
>
-
-
-
+
{{ formConf.title }}
-
@@ -35,8 +40,8 @@
diff --git a/src/views/form/publish/index.vue b/src/views/form/publish/index.vue
index 5e2200d..a8dc3f0 100644
--- a/src/views/form/publish/index.vue
+++ b/src/views/form/publish/index.vue
@@ -1,196 +1,287 @@
-
+
+
+
-
-
- 开始发布
-
+
+
+
+ 居民端
+ 工作端
+
+
+
+
+
+
+
+
+
+
+ 开始发布
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 停止发布
+
+
+
+
+ 查看反馈
+
+
+
+
+
+
+
diff --git a/src/views/form/setting/index.vue b/src/views/form/setting/index.vue
index 9f809b6..49f4e25 100644
--- a/src/views/form/setting/index.vue
+++ b/src/views/form/setting/index.vue
@@ -1,60 +1,79 @@
-
-
-
+
+
+
提交设置
-
+
显示提示图片
- {this.userProjectSettingData.submitPromptImg=''}"
+ {this.userProjectSettingData.submitPromptImg=''}"
/>
-
-
-
- 请上传提示图片 *
+
+ 请上传提示图片 *
+
-
+
显示提示文字
- {
- this.userProjectSettingData.submitPromptText=''
- this.saveUserProjectSetting()
- }"
+ {
+ this.userProjectSettingData.submitPromptText=''
+ this.saveUserProjectSetting()
+ }"
/>
-
+
-
-
- 跳转网页地址
-
-
- {
+
+
+
-
+
回收设置
-
-
- 只在微信中填写
-
-
-
-
-
-
+
+
定时收集表单
- {
- this.projectSetting.timingQuantitativeForm=false
- this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
- ,'timedNotEnabledPromptText','timedDeactivatePromptText'])
- this.saveUserProjectSetting()
- }"
+ {
+ this.projectSetting.timingQuantitativeForm=false
+ this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
+ ,'timedNotEnabledPromptText','timedDeactivatePromptText'])
+ this.saveUserProjectSetting()
+ }"
/>
-
+
收集时间:
-
- 至
+ 至
-
-
+
未启用提示语:
-
-
+
停用后提示语:
-
-
+
定时定量表单
- {
- this.projectSetting.timingCollectForm=false
- this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
- ,'timedNotEnabledPromptText','timedDeactivatePromptText','timedQuantitativeQuantity','timedEndPromptText'])
- this.saveUserProjectSetting()
- }"
+ {
+ this.projectSetting.timingCollectForm=false
+ this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
+ ,'timedNotEnabledPromptText','timedDeactivatePromptText','timedQuantitativeQuantity','timedEndPromptText'])
+ this.saveUserProjectSetting()
+ }"
/>
-
+
收集时间:
-
- 至
+ 至
-
-
+
未启用提示语:
-
-
+
停用后提示语:
-
-
+
定量表单填写数量:
-
-
-
-
- 每个微信仅填写一次
-
-
-
- {
- this.userProjectSettingData.recordWxUser=true
- this.userProjectSettingData.wxWrite=true
- this.saveUserProjectSetting()
- }"
- />
-
-
-
+
+
每人限制填写1次(用户id)
-
+
-
-
-
-
- 每人限制填写1次(IP地址)
-
-
-
-
-
-
-
-
-
-
-
- 每人每天限制填写1次
-
-
-
-
-
-
+
+
+ 每人限制填写1次(IP地址)
+
+
+
+
+
+
+
+
+ -->
+
-
- 重复填写后提示:
-
-
-
-
-
-
- 新反馈提醒我
+ 每人每天限制填写1次
-
+
-
-
-
- 发邮件提醒我
-
-
- {
+
+
+
-
-
-
- 记录微信用户个人信息
-
-
- {
+
+
-
-
- 分享设置
+
@@ -741,7 +792,7 @@ export default {
})
},
getSubNotifyWxQrCode() {
- this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}user/project/wx/notify-qrcode`, {params: {key: this.projectKey}}).then(res => {
+ this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/wx/notify-qrcode`, { params: { key: this.projectKey } }).then(res => {
this.subNotifyWxQrCode = res.data
})
},
@@ -892,8 +943,9 @@ export default {
overflow: hidden;
}
-.share-preview-msg::after,.share-preview-msg-angle {
- content: '';
+.share-preview-msg::after,
+.share-preview-msg-angle {
+ content: "";
border: 8px solid transparent;
border-style: solid;
border-left-color: rgba(157, 158, 162, 0.397);
@@ -919,7 +971,7 @@ export default {
font-size: 14px;
text-align: left;
- overflow : hidden;
+ overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
@@ -941,7 +993,7 @@ export default {
line-height: 20px;
text-align: left;
- overflow : hidden;
+ overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
diff --git a/src/views/project/my/index.vue b/src/views/project/my/index.vue
index 7c54a02..a60d6b0 100644
--- a/src/views/project/my/index.vue
+++ b/src/views/project/my/index.vue
@@ -42,6 +42,12 @@
>
查询
+
+ 新建项目
+
创建时间:{{ p.createdTime | formatDate }}
-
@@ -185,7 +192,8 @@
/>
-
编辑
@@ -239,6 +247,7 @@