iZaiZaiA hace 2 años
padre
commit
f91ed1079e

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209211820',    //开发版本号
+    dev_version: '202209221600',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 1 - 1
src/store/modules/app.js

@@ -1,5 +1,5 @@
 import pinia from "~src/store/init"
-import { useAppStore } from "~src/store/index";
+import { useAppStore } from "~src/store";
 import { getButtons } from '~api/menu';
 import { getProjectAndContract } from '~api/user';
 import { getStoreData }  from '~src/utils/storage'

+ 12 - 3
src/styles/schedule/hc-data.scss

@@ -73,10 +73,19 @@
             .hc-card-chart-box {
                 position: relative;
                 height: 129px;
-                display: flex;
-                align-items: center;
+                width: 129px;
+                display: block;
                 .text-num {
-
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    right: 0;
+                    bottom: 0;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    pointer-events: none;
+                    color: var(--el-color-primary);
                 }
             }
         }

+ 1 - 1
src/views/schedule/components/echarts/BarChart.vue

@@ -65,7 +65,7 @@ const setDatas = (data) => {
 const setOptions = (AxisData,neiYeRatio,waiYeRatio) => {
     let xLabelWidth = ((chart.getWidth() * 1 - 30 - 40) / AxisData.length) - 30
     chart.setOption({
-        color: ['#4094C2', '#6DC8E1'],
+        color: ['#1ACC96', '#3187FF'],
         tooltip: {
             trigger: 'axis',
             axisPointer: {

+ 7 - 3
src/views/schedule/components/echarts/RoundChart.vue

@@ -6,6 +6,7 @@
 
 <script setup>
 import * as echarts from 'echarts'
+import {useAppStore} from "~src/store";
 import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 const props = defineProps({
     ratio: {
@@ -17,6 +18,8 @@ const props = defineProps({
 //初始变量
 let chart = null;
 const echart = ref(null)
+const useAppState = useAppStore()
+const AppColor = ref(useAppState.getColor);
 
 watch(() => [
     props.ratio
@@ -53,7 +56,7 @@ const setOptions = (val1,val2) => {
                 {
                     name: 'Access From',
                     type: 'pie',
-                    radius: ['80%', '90%'],
+                    radius: ['100%', '70%'],
                     center: ["50%", "50%"],
                     label: {
                         show: false,
@@ -67,14 +70,14 @@ const setOptions = (val1,val2) => {
                             value: val1,
                             name: "完成率",
                             itemStyle: {
-                                color: "#0081ff",
+                                color: AppColor.value?.color ?? "#0081ff",
                             }
                         },
                         {
                             value: val2,
                             name: "",
                             itemStyle: {
-                                color: "#F5F5F5",
+                                color: "#D4DDE9",
                             }
                         },
                     ]
@@ -114,6 +117,7 @@ defineExpose({
 
 <style lang="scss" scoped>
 .RoundChart-box {
+    display: block;
     height: 100%;
     overflow: hidden;
     position: relative;