191017 1st Commit

adc0612 · Oct 17, 2019 · e68af05 · e68af05
1 parent f3b16fc
commit e68af05
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "core-js": "^2.6.5",
     "vue": "^2.6.10",
+    "vue-clipboards": "^1.3.0",
     "vue-router": "^3.1.3",
     "vue-select": "^3.2.0",
     "vuex": "^3.1.1"

diff --git a/src/components/FirstView.vue b/src/components/FirstView.vue
@@ -70,11 +70,12 @@ export default {
         /* background: url("../assets/img/woodPatern.png"); */
     }
     .header_text{
-        margin-bottom: 20px;
+        margin-bottom: 40px;
         font-size: 1.5rem;
+        color: #00028e;
     }
     .header_wrap {
-        padding: 30px;
+        padding: 20px 30px;
     }
     .week_select_header {
         font-size: 1.3rem;

diff --git a/src/components/MainSite.vue b/src/components/MainSite.vue
@@ -8,10 +8,7 @@
     <div class="main_wrap" :class="{main_wrap_full:!menuVal}">
       <div class="country_heading_wrap">
         <div class="country_heading_box">
-          <!-- <img :src="'https://www.tnssurvey.com/cai/243412976/testImg/' + selectedCountry.img" :alt="selectedCountry.id" class="country_Img" /> -->
-          <!-- <img :src=computedProp(selectedCountry.img) :alt="selectedCountry.id" class="country_Img" /> -->
           <!-- <img :src="require('@/assets/img/'+ selectedCountry.img)" :alt="selectedCountry.id" class="country_Img" /> -->
-          <!-- <img :src=require(`@/assets/img/${selectedCountryImg}`) :alt="selectedCountry.id" class="country_Img" /> -->
           <img :src="gettingImg(selectedCountry.id)" :alt="selectedCountry.id" class="country_Img" />
           <span class="country_Txt">{{selectedCountry.id}}</span>
         </div>
@@ -20,45 +17,36 @@
         <li class="section_list shadow">
           <p class="section_list_heading">From Start</p>
           <div class="link_wrap">
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=5&lang='+selectedCountry.handle"
-              @mouseover=activeWeek.handle+selectedCountry.handle>
-              Beginning
+            <a class="link_addr" target="_blank" v-for="(item) in this.startList" v-bind:key="item.id"
+              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug='+item.id+'&lang='+selectedCountry.handle">
+              {{item.name}}
             </a>
           </div>
         </li>
         <li class="section_list shadow">
            <p class="section_list_heading">AQ/BQ Part</p>
           <div class="link_wrap">
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=44&lang='+selectedCountry.handle">
-              AQ4
-            </a>
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=55&lang='+selectedCountry.handle">
-              BQ Part<br/>(AQ4, AQ10 included)
+            <a class="link_addr" target="_blank" v-for="(item) in this.aQBQList" v-bind:key="item.id"
+              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug='+item.id+'&lang='+selectedCountry.handle">
+              {{item.name}}
             </a>
           </div>
         </li>
         <li class="section_list shadow">
            <p class="section_list_heading">DQ/EQ Part</p>
           <div class="link_wrap">
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=22&lang='+selectedCountry.handle">
-              From DQ
-            </a>
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=33&lang='+selectedCountry.handle">
-              From EQ
+            <a class="link_addr" target="_blank" v-for="(item) in this.dQEQList" v-bind:key="item.id"
+              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug='+item.id+'&lang='+selectedCountry.handle">
+              {{item.name}}
             </a>
           </div>
         </li>
         <li class="section_list shadow">
            <p class="section_list_heading">CrossMedia Part</p>
           <div class="link_wrap">
-            <a class="link_addr" target="_blank"
-              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug=33&lang='+selectedCountry.handle">
-              sdwd
+            <a class="link_addr" target="_blank" v-for="(item) in this.crossMediaList" v-bind:key="item.id"
+              :href="'https://t2-test.ktrmr.com/surveyw.aspx?i.project='+activeWeek.handle+'&s=GEN24&id=1&chk=na&pid=auto&i.test=1&debug='+item.id+'&lang='+selectedCountry.handle">
+              {{item.name}}
             </a>
           </div>
         </li>
@@ -89,7 +77,20 @@
   export default {
     data() {
       return {
-        
+        countryButtons: [
+          {
+            id:1,
+            value: 'B1',
+          },
+          {
+            id:2,
+            value: 'B2',
+          },      
+          {
+            id:3,
+            value: 'B3',
+          },      
+        ],
         usImg,
         ukImg,
         frImg,
@@ -106,7 +107,11 @@
         selectedCountry: 'getSelectedCountry',
         activeWeek: 'getActiveWeek',
         selectedCountryImg: 'getSelectedCountryImg',
-        menuVal: 'getMenuStatus'
+        menuVal: 'getMenuStatus',
+        startList: 'getStartList',
+        aQBQList: 'getAQBQList',
+        dQEQList: 'getDQEQList',
+        crossMediaList: 'getCrossMediaList'
       })
     },
     methods: {
@@ -141,13 +146,16 @@
     min-height: 50px;
     width: 100%;
     border-bottom: 1px solid #cbced0;
+    position: fixed;
+    z-index: 99;
+    background-color: #fff;
   }
 
   .sidebar_wrap {
     width: 250px;
     padding: 5px;
     box-sizing: border-box;
-    position: absolute;
+    position: fixed;
     top: 50px;
     bottom: 0;
     left: 0;
@@ -156,8 +164,6 @@
     transition: visibility 1s, opacity 0.5s linear;
   }
 
-  
-
   .main_wrap {
     position: absolute;
     top: 50px;
@@ -255,7 +261,6 @@
   @media only screen and (max-width: 700px) {
     .sidebar_wrap{
       width: 70%;
-      position: fixed;
       background-color: #fff;
       z-index: 99;
     }

diff --git a/src/store/modules/testLinkCreator.js b/src/store/modules/testLinkCreator.js
@@ -38,24 +38,88 @@ const state = {
     ],
     weekList : [
         {
-            name: "Week33",
+            name: "Week35",
             addr: "Week1",
             handle: "ADMSMPW27V3"
         },
         {
-            name: "Week34",
+            name: "Week36",
             addr: "Week2",
             handle: "ADMSMPW25V3"
         },
         {
-            name: "Week35",
+            name: "Week37",
             addr: "Week1",
             handle: "ADMSMPW27V3"
         },
         {
-            name: "Week36",
+            name: "Week38",
             addr: "Week2",
             handle: "ADMSMPW25V3"
+        },
+    ],
+    startList: [
+        {
+            id: "5",
+            name: "Beginning"
+        }
+    ],
+    aQBQList: [
+        {
+            id: "44",
+            name: "AQ Part"
+        },
+        {
+            id: "55",
+            name: "BQ Part"
+        },
+    ],
+    dQEQList: [
+        {
+            id: "22",
+            name: "DQ Part"
+        },
+        {
+            id: "33",
+            name: "EQ Part"
+        },
+    ],
+    crossMediaList: [
+        {
+            id: "71",
+            name: "Television"
+        },
+        {
+            id: "72",
+            name: "Radio"
+        },
+        {
+            id: "73",
+            name: "Megazine"
+        },
+        {
+            id: "74",
+            name: "News"
+        },
+        {
+            id: "75",
+            name: "Cinema"
+        },
+        {
+            id: "76",
+            name: "Outdoor"
+        },
+        {
+            id: "77",
+            name: "Online Mobile"
+        },
+        {
+            id: "78",
+            name: "Airport"
+        },
+        {
+            id: "79",
+            name: "Point Of Purchase"
         }
     ],
     // selectedCountry: {
@@ -105,6 +169,18 @@ const getters = {
     },
     getMenuStatus(state){
         return state.menuStatus;
+    },
+    getStartList(state){
+        return state.startList;
+    },
+    getAQBQList(state){
+        return state.aQBQList;
+    },
+    getDQEQList(state){
+        return state.dQEQList;
+    },
+    getCrossMediaList(state){
+        return state.crossMediaList;
     }
 };