Merge branch 'main' of https://git.positivepole.cn/dev/GScreenWEB_TPMes

src/AppCommon.vue

@@ -0,0 +1,47 @@
+<template>
+  <div id="app">
+    <component :is="currentComponent" />
+  </div>
+</template>
+
+<script>
+
+const queryParams = new URLSearchParams(window.location.search);
+const dataTypeParam = queryParams.get('q');
+export default {
+  name: 'app', 
+  data() {
+    return {
+      dataType: '',
+      //确保testRes加载好后再加载组件
+      currentComponent: null
+    }
+  },
+  components: {
+    // 异步注册两个组件
+    datav: () => import('./components/datav/index.vue'),
+  },
+  created() {
+    this.dataType = dataTypeParam;
+
+    this.currentComponent = 'datav';
+
+
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less">
+#app {
+  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #2c3e50;
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/baozuo-demo3/LeftCmp.vue

@@ -47,9 +47,9 @@
               <div class="rank-progress">
                 <div 
                   class="rank-bar" 
-                  :style="{ width: currentMonth>=index+1?item.value + '%' : '0%' }"
+                  :style="{ width: item.value + '%' }"
                 ></div>
-                <span class="rank-value">{{currentMonth>=index+1? item.value : '0' }}%</span>
+                <span class="rank-value">{{ item.value }}%</span>
               </div>
             </div>
           </div>
@@ -81,7 +81,7 @@ import * as echarts from 'echarts';
 import testRes from './test'
 import LeftChart2 from './LeftChart2'
 
-const currentMonth = new Date().getMonth() + 1;
+console.log(testRes)
 export default {
   name: 'CenterCmp',
   components: {
@@ -124,7 +124,6 @@ export default {
 
 
     return {
-      currentMonth: currentMonth,
       config: {
         data: [
           {
@@ -205,13 +204,13 @@ export default {
       { name: '03月', value: 90 },
       { name: '04月', value: 85 },
       { name: '05月', value: 95 },
-      { name: '06月', value: 99 },
-      { name: '07月', value: 100 },
-      { name: '08月', value: 88 },
-      { name: '09月', value: 92 },
-      { name: '10月', value: 96 },
-      { name: '11月', value: 89 },
-      { name: '12月', value: 97 },
+      { name: '06月', value: 0 },
+      { name: '07月', value: 0 },
+      { name: '08月', value: 0 },
+      { name: '09月', value: 0 },
+      { name: '10月', value: 0 },
+      { name: '11月', value: 0 },
+      { name: '12月', value: 0 },
     ],
     staffList: [
         { name: '负责人', arrived: 1, total: 1 },
@@ -235,7 +234,6 @@ export default {
   mounted() {
     this.initRightChart();
     this.initPieChart(); // 新增初始化饼图方法
-
   },
   // 在methods中添加方法
   methods: {

src/main.js

@@ -1,7 +1,12 @@
 import Vue from 'vue'
- import App from './App.vue'
+ //import App from './App.vue'
 // import App from './AppV2.vue'
-// import App from './AppV3.vue'
+//import App from './AppV3.vue'
+
+//永盛等 简单可配置的版本
+ import App from './AppCommon.vue'
+
+
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'