Merge branch 'reg' of http://gitlab.scsmile.cn/zxf/smart_gov_platform into reg

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/components/pie2.vue

@@ -19,6 +19,19 @@ export default {
       type: Object,
       default: () => {},
     },
+    data() {
+      return {
+        info: this.info || {},
+      };
+    },
+  },
+  watch: {
+    info: {
+      deep: true,
+      handler(val) {
+        this._initEcharts();
+      },
+    },
   },
   mounted() {
     this._initEcharts();
@@ -29,7 +42,11 @@ export default {
       const echarts = this.$echarts;
       let option = {
         title: {
-          text: `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` + (this.info.success_rate * 100).toFixed(2) + "%" + "}",
+          text:
+            `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` +
+            (this.info.success_rate * 100).toFixed(2) +
+            "%" +
+            "}",
           x: "center",
           y: "center",
           textStyle: {
@@ -107,4 +124,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>

smart-gateway/src/main/resources/bootstrap.yml

@@ -133,6 +133,15 @@ spring:
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
+        # 考勤绩效
+        - id: attendance-performance-manager
+          #uri: http://192.168.0.98:21080
+          uri: lb://attendance-performance-manager
+          predicates:
+            - Path=/attendance/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: