Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/business/deviceManagement/components/CarouselTabl.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="width: 98%;height: 98%;overflow: hidden;padding: 1%;">
         <div class="title" style="vertical-align: top; height: 10%;font-size: 24px;color: white;font-weight:600;">{{ title }}</div>
-        <div v-show="showChart" style="width:100%;height: 89%;display: flex;justify-content: center;">
+        <div v-show="showChart" style="width:100%;height: 88%;display: flex;justify-content: center;">
             <dv-scroll-board :config="configData" style="width:100%;height:100%" />
         </div>
         <div v-if="!showChart" style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">

src/views/business/deviceManagement/index.vue

@@ -15,39 +15,39 @@
             <dv-border-box-1>
                 <div class="vessel">
                     <div class="area">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <middleCard v-if="mergeData[0].numData.length>0" v-model="mergeData[0].numData" :title="mergeData[0].title" :width="'98%'" :height="'98%'" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <pie-chart v-if="mergeData[1].numData.length>0" :title="mergeData[1].title" v-model="mergeData[1].numData" :width="'98%'" :height="'98%'" :id="1"/>
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line2`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.33%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[2].numData.length>0" :title="mergeData[2].title" v-model="mergeData[2].numData" :width="'98%'" :height="'98%'" :id="1" />
                         </dv-border-box-7>
                     </div>
                     <dv-decoration-2 :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:100%;" />
                     <div class="area midArea">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:41.5%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:41.5%;">
                             <entirety :title="mergeData[7].title" v-model="mergeData[7].numData" :width="'98%'" :height="'98%'"/>
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line5`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:55.9%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:56.18%;">
                             <bar-chart v-if="mergeData[3].numData.length>0" :title="mergeData[3].title" v-model="mergeData[3].numData" :width="'98%'" :height="'98%'" :id="2" />
                         </dv-border-box-7>
                     </div>
                     <dv-decoration-2 :key="`line4`" :reverse="true" :dur="6" style="width:1%;height:100%;" />
                     <div class="area">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[4].numData.length>0" :title="mergeData[4].title" v-model="mergeData[4].numData" :width="'98%'" :height="'98%'" :id="3" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[5].numData.length>0" :title="mergeData[5].title" v-model="mergeData[5].numData" :width="'98%'" :height="'98%'" :id="4" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <CarouselTabl v-if="mergeData[6].numData.data.length>0" :title="mergeData[6].title" v-model="mergeData[6].numData"/> 
                         </dv-border-box-7>
                     </div>
@@ -80,6 +80,8 @@ export default {
             fontSize: 18,
             show: true,
             hoverClassAdd:'w',
+            dvColor: ['rgb(22,47,98)', 'rgba(116, 142, 194, 1)'],
+            dvBackColor: 'rgba(6, 30, 93, 0)',
             mergeData:[
                 {
                     title: '检验科各型设备分布情况',

src/views/business/trainManagement/components/jobPlanChart.vue

@@ -2,15 +2,15 @@
   <div class="statisticsPage" :style="{width:width,height:height}">
     <div style="height:8%;font-size:24px;font-weight: 600;"> {{ title }} </div>
     <div v-show="show" style="height:92%;display:flex">
-      <div style="width:30%;display: flex;margin-top: 5%;">
+      <div style="width:30%;margin: 4% 5% 0 0;">
         <div class="leftSty">
-          <div style="width: 100%;height:20%;font-size: 20px;">自动创建培训计划</div>
-          <div style="display:flex;height: 90%;display: flex;align-items: center;width:100%">
-            <div style="width: 46%;display:flex;flex-flow: column;height: 100%;font-size: 20px;">
+          <div style="width: 100%;font-size: 2vh;">自动创建培训计划</div>
+          <div style="display:flex;display: flex;align-items: center;width:100%">
+            <div style="width: 46%;display:flex;flex-flow: column;height: 100%;font-size: 2vh;">
               <div style="line-height: 250%;color: rgb(250, 200, 88);">{{data.autoNum}}</div>
               <div style="color: rgb(250, 200, 88);">占比{{data.rate}}%</div>
             </div>
-            <div :id="'jobPie'+id" :style="{height:'100%',width:'64%'}"/>
+            <div :id="'jobPie'+id" :style="{height:'8vh',width:'64%'}"/>
           </div>
         </div>
       </div>
@@ -106,13 +106,14 @@
           title: {
             text: '近一周计划发布',
             left: 'left',
-            textStyle:{ fontSize:20,color: this.colorw }
+            textStyle:{ fontSize:18,color: this.colorw },
+            itemGap: 20
           },
           grid: {
             left: '5%',
             right: '3%',
             bottom: '15%',
-            top: '15%'
+            top: '20%'
           },
           tooltip: {
             trigger: 'axis',
@@ -137,7 +138,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },
@@ -218,7 +219,7 @@
     background-color: rgba(84, 112, 198, 0.3);
     border-radius: 10px;
     padding: 5%;
-    height: 50%;
+    /* height: 50%; */
     display: flex;
     align-items: center;
     flex-flow: column;

src/views/business/trainManagement/components/preWorkChart.vue

@@ -125,7 +125,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },

src/views/business/trainManagement/components/staffList.vue

@@ -90,7 +90,7 @@ export default {
 }
 .fontS{
   padding-left: 25px;
-  font-size: 20px;
+  font-size: 18px;
   font-weight: 600;
 }
 //修改的是下拉框选项内容上方的尖角

src/views/business/trainManagement/components/trainingStaffChart.vue

@@ -165,7 +165,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },

src/views/business/trainManagement/index.vue

@@ -100,24 +100,24 @@
                     <pie-chart class="tabular" :title="mergeData[4].title" v-model="mergeData[4].numData" :width="'32%'" :height="'29%'" :id="3"/>
                 </div> -->
                 <div class="vessel">
-                    <dv-border-box-12 class="areaTop" :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)">
+                    <dv-border-box-12 class="areaTop" :color="dvColor" :backgroundColor="dvBackColor">
                         <div class="area">
                             <job-plan-chart class="merge" :title="mergeData[1].title" v-model="nowWeekData" :data="mergeData[1].numData" :width="'63%'" :height="'85%'" :id="1" />
-                            <dv-decoration-2  :color="['rgba(255, 255, 255, 0.5)']" :key="`line1`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
+                            <dv-decoration-2  :color="dvLineColor" :key="`line1`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[0].title" v-model="mergeData[0].numData" :total="mergeData[0].total" :width="'32%'" :height="'85%'" :id="1"/>
                         </div>
-                        <dv-decoration-2 :color="['rgba(255, 255, 255, 0.5)']" :key="`line4`" :dur="6" style="width:98%;height:4%;margin: auto;" />
+                        <dv-decoration-2 :color="dvLineColor" :key="`line4`" :dur="6" style="width:98%;height:4%;margin: auto;" />
                         <div class="area">
                             <training-staff-chart class="merge"  :title="mergeData[2].title" v-model="mergeData[2].numData" :data="mergeData[2].perList" :width="'63%'" :height="'85%'" :id="1" />
-                            <dv-decoration-2  :color="['rgba(255, 255, 255, 0.5)']" :key="`line2`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
+                            <dv-decoration-2  :color="dvLineColor" :key="`line2`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[3].title" v-model="mergeData[3].numData" :total="mergeData[3].total" :width="'32%'" :height="'85%'" :id="2"/>
                         </div>
                     </dv-border-box-12>
                     <div style="width:100%;height:2.64%" />
-                    <dv-border-box-12 class="areaBottom" :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)">
+                    <dv-border-box-12 class="areaBottom" :color="dvColor" :backgroundColor="dvBackColor">
                         <div class="area" style="height:100%">
                             <pre-work-chart class="merge" :title="mergeData[5].title" v-model="mergeData[5].numData" :width="'63%'" :height="'87%'" :id="1" />
-                            <dv-decoration-2 :color="['rgba(255, 255, 255, 0.5)']" :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:87%;margin: auto;" />
+                            <dv-decoration-2 :color="dvLineColor" :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:87%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[4].title" v-model="mergeData[4].numData" :total="mergeData[4].total" :width="'32%'" :height="'87%'" :id="3"/>
                         </div>
                     </dv-border-box-12>
@@ -162,6 +162,9 @@ export default {
             dateValM:'',
             dateValY:'',
             nowWeekData: [],
+            dvColor: ['rgb(22,47,98)', 'rgba(116, 142, 194, 1)'],
+            dvLineColor: ['rgba(255, 255, 255, 0.5)'],
+            dvBackColor: 'rgba(6, 30, 93, 0)',
             dateVal: ["week","nowWeek"],
             show: true,
             options: data.options,