graph change in dashboard and set field of admit card according to requirement

Shikha Mishra
1 parent 46c5b5fdd9
Showing 2 changed files with 7 additions and 7 deletions Show diff stats
src/pages/Dashboard/dashboard.vue
src/pages/Report/admitCard.vue
@@ -145,17 +145,18 @@
                         </v-list>
                       </v-flex>
                       <v-flex xs12 sm12 md9 lg9>
-                        <!-- <div id="chart"> -->
-                        <div v-if="this.series" title="Swarn Singh">
+                        <div id="chart">
+                        <div v-if="this.series">
                           <apexchart
                             type="bar"
                             height="250"
                             style="max-width: 800px !important"
                             :options="chartOptions"
                             :series="series"
+                            v-show="true"
                           ></apexchart>
                         </div>
-                        <!-- </div> -->
+                        </div>
                       </v-flex>
                     </v-layout>
                   </v-card>
@@ -646,7 +647,6 @@ export default {
           this.expenseData = response.data.data;
           // var array = response.data.data.sum;
           this.series[0].data[2] = this.expenseData.sum;
-          // console.log("this.series.data", this.series[0].data);
           // this.series = [
           //   {
           //     name: "Total",
@@ -25,7 +25,7 @@
               </v-layout>
             </v-flex>
  
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.examId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Class:</label>
@@ -45,7 +45,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.classId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Section:</label>
@@ -65,7 +65,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.sectionId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Student:</label>
...	...	@@ -145,17 +145,18 @@
145	145	</v-list>
146	146	</v-flex>
147	147	<v-flex xs12 sm12 md9 lg9>
148		- <!-- <div id="chart"> -->
149		- <div v-if="this.series" title="Swarn Singh">
	148	+ <div id="chart">
	149	+ <div v-if="this.series">
150	150	<apexchart
151	151	type="bar"
152	152	height="250"
153	153	style="max-width: 800px !important"
154	154	:options="chartOptions"
155	155	:series="series"
	156	+ v-show="true"
156	157	></apexchart>
157	158	</div>
158		- <!-- </div> -->
	159	+ </div>
159	160	</v-flex>
160	161	</v-layout>
161	162	</v-card>
...	...	@@ -646,7 +647,6 @@ export default {
646	647	this.expenseData = response.data.data;
647	648	// var array = response.data.data.sum;
648	649	this.series[0].data[2] = this.expenseData.sum;
649		- // console.log("this.series.data", this.series[0].data);
650	650	// this.series = [
651	651	// {
652	652	// name: "Total",
...	...
...	...	@@ -25,7 +25,7 @@
25	25	</v-layout>
26	26	</v-flex>
27	27
28		- <v-flex xs12 sm12 lg3>
	28	+ <v-flex xs12 sm12 lg3 v-if="getReport.examId">
29	29	<v-layout>
30	30	<v-flex xs3 sm6 lg2 class="subheading mt-4">
31	31	<label class="right">Class:</label>
...	...	@@ -45,7 +45,7 @@
45	45	</v-flex>
46	46	</v-layout>
47	47	</v-flex>
48		- <v-flex xs12 sm12 lg3>
	48	+ <v-flex xs12 sm12 lg3 v-if="getReport.classId">
49	49	<v-layout>
50	50	<v-flex xs3 sm6 lg2 class="subheading mt-4">
51	51	<label class="right">Section:</label>
...	...	@@ -65,7 +65,7 @@
65	65	</v-flex>
66	66	</v-layout>
67	67	</v-flex>
68		- <v-flex xs12 sm12 lg3>
	68	+ <v-flex xs12 sm12 lg3 v-if="getReport.sectionId">
69	69	<v-layout>
70	70	<v-flex xs3 sm6 lg2 class="subheading mt-4">
71	71	<label class="right">Student:</label>
...	...