Merge branch 'zrj' into lhr

UI2/package.json

@@ -4,9 +4,9 @@
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
-    "serve": "vue-cli-service serve",
+    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build:test": "vue-cli-service build --mode test",
-    "build": "vue-cli-service build",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

UI2/src/views/dashboard/IndexChart.vue

@@ -16,7 +16,7 @@
             </a-col>
           </div>
         </a-card>
-        <a-card   style="margin-bottom: 1rem;width:70%;">
+        <a-card :hoverable='true' style="margin-bottom: 1rem;width:70%;">
             <a-row :gutter="24" style="margin-top: 2%;margin-left: 5%">
               <a-col v-show="this.show" :sm="24" :md="12" :xl="10" :style="{ marginBottom: '24px'}" class="xfrw">
                 <chart-card   :loading="loading" title="下发任务数(省属企业)" :total='this.xfrws'>
@@ -824,28 +824,33 @@
   }
 </style>
 <style>
+
   .xfrw .ant-card{
     /*border: 2px solid rgb(204,204,255);*/
     text-align: center;
-    background-color:rgb(10,88,193);
+    background-image: url('~@/assets/sytj_1.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
   .yxdls .ant-card{
     text-align: center;
-    background-color:rgb(211,73,39);
+    background-image: url('~@/assets/sytj_2.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
   .sbdks .ant-card{
   /*  border: 2px solid rgb(192,192,192);*/
     text-align: center;
-    background-color:rgb(44,134,238);
+    background-image: url('~@/assets/sytj_3.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
   .wshsl .ant-card{
    /* border: 2px solid rgb( 124,130,96);*/
    /* border: 2px solid rgb(225,215,100);*/
     text-align: center;
-    background-color:rgb(97,61,188);
+    background-image: url('~@/assets/sytj_4.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
 
   }