Merge branch 'new5_25home' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new5_25home

commandCenter/src/views/industrialInvestment/assembly/BusinessOpportunity.vue

@@ -37,7 +37,7 @@ export default {
   data () {
     return {
       mixins_query: {
-        companyOrgId: '',
+        // companyOrgId: '',
         startDate: ''
       },
       date: '',

commandCenter/src/views/industrialInvestment/assembly/personnelSalesanalysis.vue

@@ -31,7 +31,7 @@ export default {
   data () {
     return {
       mixins_query: {
-        companyOrgId: '',
+        // companyOrgId: '',
         startDate: ''
       },
       date: '',

commandCenter/src/views/industrialInvestment/assembly/salesFunnel.vue

@@ -46,7 +46,7 @@ export default {
     return {
       mixins_query: {
         startDate: '',
-        companyOrgId: ''
+        // companyOrgId: ''
       },
       date: '',
       clientOptions: funnelChart(dataseries, series)

operationSupport/src/views/newWorkBench/components/indexOptionChart.js

@@ -1001,7 +1001,7 @@ export const funnelChart = (dataseries = [], series = []) => {
                 top: 0,
                 type: 'funnel',
                 left: '0',
-                width: '30%',
+                width: '20%',
                 height: '85%',
                 top: '15%',
                 gap: 16,

operationSupport/src/views/newWorkBench/components/workbenchMent/BusinessOpportunity.vue

@@ -47,7 +47,7 @@ export default {
         titleName: '商业管理'
       },
       mixins_query: {
-        companyOrgId: '',
+        // companyOrgId: '',
         startDate: ''
       },
       date: '',

operationSupport/src/views/newWorkBench/components/workbenchMent/personnelSalesanalysis.vue

@@ -42,7 +42,7 @@ export default {
         titleName: '商业管理'
       },
       mixins_query: {
-        companyOrgId: '',
+        // companyOrgId: '',
         startDate: ''
       },
       date: '',

operationSupport/src/views/newWorkBench/components/workbenchMent/salesFunnel.vue

@@ -56,7 +56,8 @@ export default {
       },
       mixins_query: {
         startDate: '',
-        companyOrgId: ''
+        // companyOrgId: ''
+
       },
       date: '',
       clientOptions: funnelChart(dataseries, series)