diff --git a/.env.dev b/.env.dev
index 7cb5aaab..c8f7d099 100644
--- a/.env.dev
+++ b/.env.dev
@@ -6,6 +6,6 @@ NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# 佩佩
-# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
diff --git a/package-lock.json b/package-lock.json
index da4af035..cbf81319 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
"axios": "^1.4.0",
"core-js": "^3.8.3",
"driver.js": "^1.3.1",
+ "echarts": "^5.5.1",
"element-plus": "^2.4.2",
"file-saver": "^2.0.5",
"fingerprintjs2": "^2.1.4",
@@ -5475,6 +5476,20 @@
"node": ">=6.0.0"
}
},
+ "node_modules/echarts": {
+ "version": "5.5.1",
+ "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
+ "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
+ "dependencies": {
+ "tslib": "2.3.0",
+ "zrender": "5.6.0"
+ }
+ },
+ "node_modules/echarts/node_modules/tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ },
"node_modules/ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
@@ -12449,6 +12464,19 @@
"resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
"dev": true
+ },
+ "node_modules/zrender": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
+ "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
+ "dependencies": {
+ "tslib": "2.3.0"
+ }
+ },
+ "node_modules/zrender/node_modules/tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
}
},
"dependencies": {
@@ -16631,6 +16659,22 @@
"integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
"dev": true
},
+ "echarts": {
+ "version": "5.5.1",
+ "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
+ "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
+ "requires": {
+ "tslib": "2.3.0",
+ "zrender": "5.6.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ }
+ }
+ },
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
@@ -22120,6 +22164,21 @@
"dev": true
}
}
+ },
+ "zrender": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
+ "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
+ "requires": {
+ "tslib": "2.3.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ }
+ }
}
}
}
diff --git a/package.json b/package.json
index 34c4d6cd..5bea6be9 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"axios": "^1.4.0",
"core-js": "^3.8.3",
"driver.js": "^1.3.1",
+ "echarts": "^5.5.1",
"element-plus": "^2.4.2",
"file-saver": "^2.0.5",
"fingerprintjs2": "^2.1.4",
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index a2775b2d..efdf43dc 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -480,6 +480,22 @@ li {
width: 0.8rem;
height: 0.8rem;
}
+.trial_page .ant-tooltip {
+ z-index: 1049 !important;
+}
+.trial_page .habit :deep(.ant-tooltip .ant-tooltip-inner),
+.trial_page :deep(.ant-tooltip-arrow-content) {
+ background: #000 !important;
+}
+.trial_page .habit_mod {
+ background-color: #000 !important;
+ /* top: 0 !important; */
+ /* left: 0 !important; */
+}
+.trial_page .ant-tooltip .ant-tooltip-inner,
+.trial_page .ant-tooltip-arrow-content {
+ background: #000 !important;
+}
.trial_page .ant-cascader-checkbox-checked .ant-cascader-checkbox-inner {
background-color: #767676;
border-color: #d9d9d9 !important;
@@ -1163,6 +1179,19 @@ li {
border: none;
background: transparent;
}
+.admin_page .admin_table_content .operate_list {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 1rem;
+}
+.admin_page .admin_table_content .operate_list .operate_item {
+ font-size: 1.4rem;
+ font-family: Roboto;
+ font-weight: 400;
+ color: #343579;
+ cursor: pointer;
+}
.admin_page .admin_table_content .ant-table-tbody > tr:hover > td {
background: #ffffff3a;
}
@@ -1174,6 +1203,7 @@ li {
align-items: center;
justify-content: space-between;
padding: 0 1rem;
+ justify-content: center;
}
.admin_page .admin_table_content .operate_list .operate_item {
font-size: 1.4rem;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 1890dc36..1a8ffd38 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -536,6 +536,22 @@ input:focus{
}
}
+
+.ant-tooltip{
+ z-index: 1049 !important;
+}
+.habit :deep(.ant-tooltip .ant-tooltip-inner) ,:deep(.ant-tooltip-arrow-content){
+ background: #000 !important;
+}
+.habit_mod{
+ background-color: #000 !important;
+ /* top: 0 !important; */
+ /* left: 0 !important; */
+}
+.ant-tooltip .ant-tooltip-inner ,.ant-tooltip-arrow-content{
+ background: #000 !important;
+}
+
.ant-cascader-checkbox-checked .ant-cascader-checkbox-inner{
background-color: #767676;
border-color: #d9d9d9 !important;
@@ -1296,6 +1312,20 @@ input:focus{
background: transparent;
// color: #fff;
}
+ .operate_list{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 1rem;
+
+ .operate_item{
+ font-size: 1.4rem;
+ font-family: Roboto;
+ font-weight: 400;
+ color: #343579;
+ cursor: pointer;
+ }
+ }
.ant-table-tbody > tr {
&:hover > td {
background: #ffffff3a;
@@ -1309,7 +1339,7 @@ input:focus{
align-items: center;
justify-content: space-between;
padding: 0 1rem;
-
+ justify-content: center;
.operate_item {
font-size: 1.4rem;
font-family: Roboto;
diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue
index 5be5d2b3..9bf32723 100644
--- a/src/component/Administrator/TestClickData.vue
+++ b/src/component/Administrator/TestClickData.vue
@@ -292,6 +292,3 @@ export default defineComponent({
},
});
-
\ No newline at end of file
diff --git a/src/component/Administrator/administratorEcharts copy.vue b/src/component/Administrator/administratorEcharts copy.vue
new file mode 100644
index 00000000..f8c494a8
--- /dev/null
+++ b/src/component/Administrator/administratorEcharts copy.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index aa7cd474..f6e72a7b 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -3,7 +3,7 @@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/component/Administrator/questionnaire.vue b/src/component/Administrator/questionnaire.vue
new file mode 100644
index 00000000..4d32a0a9
--- /dev/null
+++ b/src/component/Administrator/questionnaire.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue
index d063a272..3fda9309 100644
--- a/src/component/Administrator/trialApproval.vue
+++ b/src/component/Administrator/trialApproval.vue
@@ -16,7 +16,7 @@
-
+
-
\ No newline at end of file
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 13bf3405..fd95db46 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -1156,7 +1156,9 @@ export default defineComponent({
.design_detail_modal_component{
color: #000;
// max-width: 1440px ;
-
+ .mark_loading{
+ position: absolute;
+ }
.ant-modal-content{
border-radius: calc(1rem*1.2);
// overflow: hidden;
@@ -1713,9 +1715,6 @@ export default defineComponent({
\ No newline at end of file
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 2840c04c..6a792084 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -907,6 +907,7 @@ export default defineComponent({
margin-top: calc(1.5rem*1.2);
cursor: pointer;
position: relative;
+
.habit_workspace_show{
width: 100%;
z-index: 1;
@@ -1159,21 +1160,9 @@ export default defineComponent({
align-items: center;
justify-content: space-between;
font-size: calc(1.4rem*1.2);
-}
-
-
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 37389753..ad08b5f6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -117,6 +117,11 @@ const routes: Array = [
name: 'administrator',
component: _import('Administrator'),
children:[
+ {
+ path: "",
+ name:'adminChil',
+ redirect: "/administrator/allUser"
+ },
{
path:'allUser',
name:'allUser',
@@ -131,6 +136,10 @@ const routes: Array = [
path:'trialApproval',
name:'trialApproval',
component: _import_component('Administrator/trialApproval.vue'),
+ },{
+ path:'questionnaire',
+ name:'questionnaire',
+ component: _import_component('Administrator/questionnaire.vue'),
},
]
},
@@ -234,7 +243,6 @@ router.beforeEach((to, from, next) => {
let sSystemUser = false
for (let index = 0; index < isSystemUserRouteList.length; index++) {
if(to.path.indexOf(isSystemUserRouteList[index]) > -1){
-
sSystemUser = true
break
}
diff --git a/src/tool/https.js b/src/tool/https.js
index 0ffb96f8..574e6c99 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -233,10 +233,13 @@ export const Https = {
trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批
trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批
+ //管理员接口
//查询所有试用用户
inquiryGetTrial:`/api/inquiry/getTrial`,//拒绝审批
//查询某个时间内design点击次数
getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批
+ getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批
+
getTasksList:`/api/tasks/getList`,//获取w为执行完的所有任务
getTasksHistory:`/api/tasks/getAllTask`,//获取所有任务列表
diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue
index b4064d6b..6b17a177 100644
--- a/src/views/Administrator.vue
+++ b/src/views/Administrator.vue
@@ -1,6 +1,12 @@
+
Administrator
-
+
+
+
@@ -47,7 +55,11 @@
-
+
+
+
+
+
@@ -78,13 +90,13 @@ export default defineComponent({
setup() {
const router = useRouter()
const route:any = useRoute()
- const state = reactive({
+ const state:any = reactive({
rootSubmenuKeys: [{
name:'Trial User',
route:'/administrator/allUser',
icon:'yonghu',
expandIcon:'icon-xiala',
- key:'/administrator/allUser',
+ key:'sub1',
isShow:true,
// children: [
// {
@@ -108,18 +120,41 @@ export default defineComponent({
route:'/administrator/testClickData',
icon:'shenpi',
expandIcon:'icon-xiala',
- key:'/administrator/testClickData',
+ key:'sub2',
isShow:true,
},{
name:'Trial User Approval',
route:'/administrator/trialApproval',
icon:'usetime',
- key:'/administrator/trialApproval',
+ key:'sub3',
expandIcon:'icon-xiala',
isShow:true,
+ },{
+ name:'Events',
+ icon:'usetime',
+ key:'sub4',
+ expandIcon:'icon-xiala',
+ isShow:true,
+ children: [
+ {
+ name:'Questionnaire Survey',
+ route:'/administrator/questionnaire',
+ icon:'',
+ key:'sub4-1',
+ isShow:true,
+ },
+ // {
+ // code:'ROLE_MANAGER',
+ // name:'Access Permission',
+ // route:'/home/excil2',
+ // icon:'',
+ // key:'/home/excil33',
+ // isShow:true,
+ // },
+ ],
}],
- openKeys: ['sub1'],
- selectedKeys: [],
+ openKeys: [],
+ selectedKeys: ['sub1'],
nowPageName:'Trial User',//当前页面名称
});
let routers:any = ref([])
@@ -134,11 +169,13 @@ export default defineComponent({
}
};
let handleClick = (event:any) => {
-
// state.selectedKeys = [Number(event.key)]
state.nowPageName = event.item.name
router.push({path:event.item.route})
}
+ let setBack = ()=>{
+ router.push('/home');
+ }
onMounted(() => {
let cookieInfo = getCookie('userInfo') || ''
if(cookieInfo){
@@ -149,8 +186,22 @@ export default defineComponent({
// getTitle(menuList.value, route.path)
}else{
}
- state.nowPageName = state.rootSubmenuKeys[0].name
- router.push(state.rootSubmenuKeys[0].route)
+
+ state.rootSubmenuKeys.forEach((item:any) => {
+ if(item.children){
+ item.children.forEach((item:any) => {
+ if(item.route == router.currentRoute.value.path){
+ state.selectedKeys[0] = item.key
+ }
+ });
+ }else{
+ if(item.route == router.currentRoute.value.path){
+ state.selectedKeys[0] = item.key
+ }
+ }
+ });
+ // state.nowPageName = state.rootSubmenuKeys[0].name
+ // router.push(state.rootSubmenuKeys[0].route)
})
return {
@@ -158,6 +209,7 @@ export default defineComponent({
onOpenChange,
routers,
handleClick,
+ setBack,
};
},
data(prop) {
@@ -190,7 +242,31 @@ export default defineComponent({
height: 100%;
display: flex;
background: rgba(243,244,248,0.4);
-
+ .administrator_title{
+ display: flex;
+ align-items: center;
+ position: sticky;
+ top: 0;
+ z-index: 222;
+ .modal_title_text{
+ cursor: pointer;
+ display: flex;
+ margin-bottom: 0;
+ font-size: 1.8rem;
+ }
+ .administrator_title_text{
+ line-height: 1;
+ }
+ .modal_title_text:hover .administrator_title_text{
+ text-decoration: underline;
+ }
+ i{
+ font-size: 1.2rem;
+ display: flex;
+ align-items: center;
+ margin-right: 1rem;
+ }
+ }
.administrator_page_left{
padding-top: 20px;
.modal_title_text{
@@ -231,6 +307,7 @@ export default defineComponent({
}
.ant-menu-inline.ant-menu-sub{
background: #FFFFFF;
+ padding-left: 4rem;
}
.menu_title{
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 589c338e..8d739546 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -2,12 +2,40 @@
-
+
+
+
+
+
+
{{$t('Header.hello')}}@{{ $t('isTest.userName') }}
+
{{$t('Header.hello')}}@{{ userInfo?.userName }}
+
+
+
+
/ {{$t('Header.hello')}}@{{ $t('isTest.userName') }}
/ {{$t('Header.hello')}}@{{ userInfo?.userName }}
{
this.getLangIsShowMark = false
})
+
+
+ let tl1 = gsap.timeline({ paused: true });
+ let heradeRight = document.querySelector('.homeMain_max .homeMain_right_content')
+ let userDetailMax = document.querySelector('.homeMain_max .homeMain_user')
+ let userDetailIcon = document.querySelector('.homeMain_max .homeMain_user_icon')
+ let userName = document.querySelector('.homeMain_max .homeMain_user_content')
+ let userDetail = document.querySelector('.homeMain_max .homeMain_user_detail')
+ // let anmiation = TweenMax.to(userDetailMax,1, {'margin-top':'30px',opacity:1})
+ // anmiation.stop()
+ let state
+ tl1
+ .to(userDetail,.3, {opacity:1,display:'flex'})
+ .to(userDetailIcon,.3, {'left':'15rem',y:'25%',x:'-50%',scale:1.5,opacity:1},'-=.3')
+ .to(userName,.3, {opacity:0},'-=.3')
+ let overTime
+ let outTime
+ userDetailMax.addEventListener('mouseenter',(event)=>{
+ if(state && !outTime)return
+ clearTimeout(overTime)
+ clearTimeout(outTime)
+ overTime = setTimeout(() => {
+ state = true
+ this.isShowOperate = false
+ this.isLanguage = false
+ tl1.play()
+ }, 500);
+ })
+ heradeRight.addEventListener('mouseleave',(event)=>{
+ if(!state)return
+ clearTimeout(outTime)
+ outTime = setTimeout(() => {
+ state = false
+ tl1.reverse()
+ }, 500);
+ })
},
methods: {
setTask(data){
@@ -509,39 +581,109 @@ export default defineComponent({
width: 33%;
height: 100%;
align-items: center;
- overflow: hidden;
.homeMain_icon {
font-size: 3.6rem;
position: relative;
top: 0.3rem;
}
- .homeMain_user_icon{
- height: 4rem;
- width: 4rem;
- background-color: #000;
- border-radius: 50%;
- transform: translateX(-40%)scale(1.3);
+ .homeMain_user{
+ .homeMain_user_icon{
+ height: 6rem;
+ width: 6rem;
+ position: relative;
+ transform-origin: top;
+ overflow: hidden;
+ z-index: 2;
+ left: 0;
+ background-color: #000;
+ border-radius: 50%;
+ cursor: pointer;
+ // transition: all .3s;
+ }
+ .homeMain_user_detail{
+ position: absolute;
+ top: calc(100% + .5rem);
+ background: #fff;
+ border-radius: 4px;
+ width: 30rem;
+ height: 30rem;
+ opacity: 0;
+ display: none;
+ box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
+ padding-top: 4rem;
+ text-align: center;
+ flex-direction: column;
+ align-items: center;
+ padding: 4rem 3rem;
+
+ .homeMain_user_detail_attention{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ padding: 0 2rem;
+ border-bottom: 1px solid #e3e5e7;
+ .attention_item{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ cursor: pointer;
+ }
+ .attention_item_active:hover{
+ color: #39215b;
+ span{
+ color: #39215b;
+ }
+ }
+ .attention_item:last-child{
+ cursor: auto;
+ }
+ span{
+ font-size: 1.4rem;
+ color: #949eae;
+ }
+ }
+ .homeMain_user_detail_setUser{
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ cursor: pointer;
+ width: 100%;
+ i{
+ font-size: 2rem;
+ display: flex;
+ }
+ .fi-rr-user{
+ margin-right: 1rem;
+ }
+ .icon-xiala{
+ margin-left: auto
+ }
+ }
+ .homeMain_user_detail_item{
+ margin-top: 1rem;
+ padding-bottom: 1rem;
+ }
+ }
+
+ }
+ .username {
+ font-size: 1.8rem;
+ color: #1a1a1a;
+ margin: 0 0.8rem;
+ font-weight: 900;
+ span{
+ margin: .7rem;
+ }
}
.homeMain_user_content {
- // margin-left: 2rem;
+ // transition: all .3s;
display: flex;
align-items: center;
position: relative;
- // top: 1.2rem;
height: 3.7rem;
&.marLeft2{
margin-left: 2rem;
}
- .username {
- font-size: 1.8rem;
- color: #1a1a1a;
- margin: 0 0.8rem;
- font-weight: 900;
- span{
- margin: .7rem;
- }
- }
-
.icon-xiala {
font-size: 1.4rem;
cursor: pointer;
diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue
index dbf16958..a3144df1 100644
--- a/src/views/feedbackSurvey.vue
+++ b/src/views/feedbackSurvey.vue
@@ -1,15 +1,16 @@
-
+
AiDA 3.0 Feedback Survey
- Please take the survey
-
+
Please take the survey
+
-
@@ -437,7 +471,7 @@ import { Https } from "@/tool/https";
import { defineComponent, toRefs,ref, reactive, createVNode } from "vue";
export default defineComponent({
setup() {
- const feedbackData:any = reactive({
+ let feedbackData:any = reactive({
userName:'',
gender:'Female',
occupation:'',
@@ -684,7 +718,42 @@ export default defineComponent({
).catch(res=>{
});
}
-
+ let forbid = ref(false)
+ let initData = (data:any) => {
+ // Object.assign(feedbackData,data)
+ // console.log(JSON.parse(JSON.stringify(feedbackData)));
+ forbid.value = true
+ for (const iterator in data) {
+ if(typeof data[iterator] == 'object'){
+ data[iterator].forEach((item:any)=>{
+ if(item*1){
+ feedbackData[iterator].push(item)
+ }else{
+ if(iterator == 'helpful'){
+ refList.helpfulOthers.checked = true
+ othersHelpful.value = item
+ }else if(iterator == 'improve'){
+ refList.improvelOthers.checked = true
+ othersImprovel.value = item
+ }
+ }
+ })
+ }else{
+ feedbackData[iterator] = data[iterator]
+ }
+ }
+ if(data.othersIsSubscribeCause){
+ refList.isSubscribeCauseOthers.checked = true
+ let arr = []
+ data.reasonForNotSubscribe.forEach((item:any,index:number) => {
+ if(index <= 1){
+ arr.push(item)
+ }
+ });
+ othersIsSubscribeCause.value = data.othersIsSubscribeCause[2]
+ }
+ // feedbackData = reactive(...data)
+ }
return {
...toRefs(feedbackData),
...toRefs(refList),
@@ -693,6 +762,8 @@ export default defineComponent({
othersIsSubscribeCause,
CountryList,
setSubmit,
+ forbid,
+ initData,
};
},
@@ -710,15 +781,49 @@ export default defineComponent({
@import url("https://fonts.googleapis.com/css2?family=Quicksand:wght@400;700&display=swap");
.feedbackSurvey {
font-family: "Quicksand", sans-serif;
+ font-family: 'Roboto', sans-serif;
text-align: center;
line-height: 1.5;
// background: linear-gradient(180deg, #f3f3e6 0%, #eee4f3 100%);
margin: 1rem;
height: 100%;
overflow-y: auto;
+ &.active{
+ #title {
+ font-size: 3rem;
+ }
+ #description {
+ font-size: 1.4rem;
+ }
+ #survey-form {
+ width: 90%;
+ padding: 1.5rem;
+ font-size: 1.2rem;
+ }
+ p{
+ font-size: 1.4rem;
+ }
+ input,
+ #dropdown {
+ padding: 5px;
+ }
+
+ textarea {
+ max-height: 125px;
+ padding: 5px;
+ }
+ input[type="radio"],
+ input[type="checkbox"] {
+ width: 1rem;
+ height: 1rem;
+ }
+ input,select{
+ height: 3.5rem;
+ }
+ }
#main{
background: linear-gradient(45deg, #eee4f3, #f3f4e6);
-
+ padding: 2rem;
}
#title {
font-size: 6rem;
@@ -730,7 +835,7 @@ export default defineComponent({
font-size: 2.8rem;
font-style: italic;
}
-
+
#survey-form {
position: relative;
background: rgba(255, 255, 255, 0.2);
@@ -742,12 +847,14 @@ export default defineComponent({
padding: 3rem;
box-shadow: -1px 1px 5px 0.5px;
font-size: 2.4rem;
- transition: width 1s ease;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
+ &.active{
+ transition: width 1s ease;
+ }
}
-
+
@media (max-width: 760px) {
form {
width: 75%;
@@ -763,6 +870,9 @@ export default defineComponent({
margin: 1rem;
width: 100%;
}
+ .section:last-child{
+ margin-bottom: 4rem;
+ }
.w40 {
width: 40%;
}
diff --git a/src/views/feedbackSurveyCN.vue b/src/views/feedbackSurveyCN.vue
index b239901e..0823d248 100644
--- a/src/views/feedbackSurveyCN.vue
+++ b/src/views/feedbackSurveyCN.vue
@@ -20,8 +20,8 @@
>性别:
*
- 男性
- 女性
+ 男女性性
+ 男性