Hwt 2 jaren geleden
bovenliggende
commit
1f8dd41f82
24 gewijzigde bestanden met toevoegingen van 82 en 15 verwijderingen
  1. 2 1
      commandCenter/src/views/communityAssets/assembly/discount.vue
  2. 2 0
      commandCenter/src/views/communityAssets/assembly/equipmentStatistics.vue
  3. 2 2
      commandCenter/src/views/communityAssets/assembly/householdDistribution.vue
  4. 2 0
      commandCenter/src/views/communityAssets/assembly/householdGender.vue
  5. 2 0
      commandCenter/src/views/communityAssets/assembly/householdIdentity.vue
  6. 2 0
      commandCenter/src/views/communityAssets/assembly/rentalAndSaleRate.vue
  7. 2 1
      commandCenter/src/views/industrialInvestment/assembly/BusinessOpportunity.vue
  8. 32 0
      commandCenter/src/views/industrialInvestment/assembly/allcommunit.js
  9. 2 0
      commandCenter/src/views/industrialInvestment/assembly/contractAward.vue
  10. 2 2
      commandCenter/src/views/industrialInvestment/assembly/enterpriseDistribution.vue
  11. 2 0
      commandCenter/src/views/industrialInvestment/assembly/houseClick.vue
  12. 2 1
      commandCenter/src/views/industrialInvestment/assembly/personnelSalesanalysis.vue
  13. 2 1
      commandCenter/src/views/industrialInvestment/assembly/rentalShops.vue
  14. 2 0
      commandCenter/src/views/industrialInvestment/assembly/salesFunnel.vue
  15. 1 2
      commandCenter/src/views/industrialInvestment/index.vue
  16. 2 0
      commandCenter/src/views/operationalServices/assembly/complaintsAndSuggestions.vue
  17. 2 0
      commandCenter/src/views/operationalServices/assembly/completionMaintenanceOrder.vue
  18. 2 0
      commandCenter/src/views/operationalServices/assembly/distributionSuggestion.vue
  19. 9 3
      commandCenter/src/views/operationalServices/assembly/operationMaintenancePersonnel.vue
  20. 2 0
      commandCenter/src/views/operationalServices/assembly/orderClassification.vue
  21. 2 0
      commandCenter/src/views/operationalServices/assembly/satisfaction.vue
  22. 2 0
      commandCenter/src/views/operationalServices/assembly/scoringOperationPersonnel.vue
  23. 2 1
      commandCenter/src/views/operationalServices/assembly/todayTask.vue
  24. 0 1
      operationSupport/src/views/newWorkBench/components/discount.vue

+ 2 - 1
commandCenter/src/views/communityAssets/assembly/discount.vue

@@ -13,6 +13,7 @@
 </template>
 <script>
 import { discountedWave } from './indexOptionChart';
+import index from './allcommunit'
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 let dataDay = [
   '01-01',
@@ -48,7 +49,7 @@ let dataDay = [
   '01-31'
 ];
 export default {
-
+  mixins: [index],
   data () {
     return {
       clientOptions: discountedWave('(次)', dataDay, dataArr),

+ 2 - 0
commandCenter/src/views/communityAssets/assembly/equipmentStatistics.vue

@@ -13,7 +13,9 @@
 </template>
 <script>
 import { columnOptionsChartName } from './indexOptionChart.js';
+import index from './allcommunit'
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 2
commandCenter/src/views/communityAssets/assembly/householdDistribution.vue

@@ -13,9 +13,9 @@
 </template>
 <script>
 import { columnOptionsChartName } from './indexOptionChart.js';
-
+import index from './allcommunit'
 export default {
-
+  mixins: [index],
 
   data () {
     return {

+ 2 - 0
commandCenter/src/views/communityAssets/assembly/householdGender.vue

@@ -20,7 +20,9 @@
 </template>
 <script>
 import { ringType } from './indexOptionChart';
+import index from './allcommunit'
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/communityAssets/assembly/householdIdentity.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
 import { GradualChange, ringType } from './indexOptionChart';
+import index from './allcommunit'
 const colors = [
   GradualChange('#22D8FF', '#00B2FF'),
   GradualChange('#F0646C', '#F4994E'),
@@ -28,6 +29,7 @@ const colors = [
   GradualChange('#884DD2', '#DF63CC')
 ];
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/communityAssets/assembly/rentalAndSaleRate.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
 import { ringType } from './indexOptionChart';
+import index from './allcommunit'
 let defaultTitle = {
   text: `{a|租售率}`,
   left: 'center',
@@ -45,6 +46,7 @@ let defaultTitle = {
   }
 };
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 1
commandCenter/src/views/industrialInvestment/assembly/BusinessOpportunity.vue

@@ -31,8 +31,9 @@
 </template>
 <script>
 import { ringType } from './indexOptionChart';
+import index from './allcommunit';
 export default {
-
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 32 - 0
commandCenter/src/views/industrialInvestment/assembly/allcommunit.js

@@ -0,0 +1,32 @@
+import { mapState } from 'vuex';
+export default {
+    data() {
+        return {
+            loadding: true
+        };
+    },
+    computed: {
+        //全局社区
+        ...mapState(['homeCommunityAll']),
+
+        resize() {
+            // 通过scale值来判断窗口是变化
+            return this.$store.getters['getScale'];
+        }
+    },
+    watch: {
+        //全局社区接口调用
+        homeCommunityAll(n) {
+            this.mixins_query.communityId = n;
+            this.getData();
+        },
+        resize(va) {
+            // console.log(va);
+        }
+    },
+    methods: {},
+    created() {
+        this.mixins_query.communityId = this.homeCommunityAll;
+        this.getData();
+    }
+};

+ 2 - 0
commandCenter/src/views/industrialInvestment/assembly/contractAward.vue

@@ -26,10 +26,12 @@
 </template>
 <script>
 import { discountedWave } from './indexOptionChart';
+import index from './allcommunit';
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 let dataDay = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
 export default {
   props: ['dataObj'],
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 2
commandCenter/src/views/industrialInvestment/assembly/enterpriseDistribution.vue

@@ -17,9 +17,9 @@
 </template>
 <script>
 import { ringType } from './indexOptionChart';
-
+import index from './allcommunit';
 export default {
-
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/industrialInvestment/assembly/houseClick.vue

@@ -40,7 +40,9 @@
 <script>
 
 import { residenceTypeArr } from './housPublic'
+import index from './allcommunit';
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 1
commandCenter/src/views/industrialInvestment/assembly/personnelSalesanalysis.vue

@@ -25,8 +25,9 @@
 </template>
 <script>
 import { columnOptionsChartss } from './indexOptionChart.js';
-
+import index from './allcommunit';
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 1
commandCenter/src/views/industrialInvestment/assembly/rentalShops.vue

@@ -13,8 +13,9 @@
 </template>
 <script>
 import { columnOptionsChartName } from './indexOptionChart.js';
-
+import index from './allcommunit';
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/industrialInvestment/assembly/salesFunnel.vue

@@ -29,6 +29,7 @@
 
 <script>
 import { funnelChart } from './indexOptionChart';
+import index from './allcommunit';
 let dataseries = [{ value: 500, name: '意向' },
 { value: 350, name: '方案' },
 { value: 250, name: '商务' },
@@ -40,6 +41,7 @@ let series = [{ value: 100, name: '意向' },
 { value: 40, name: '即将成交' },
 { value: 20, name: '赢单' }];
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 1 - 2
commandCenter/src/views/industrialInvestment/index.vue

@@ -38,9 +38,8 @@ export default {
 
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
-@import '@views/communityAssets/style.scss';
+@import '@views/industrialInvestment/style.scss';
 
-@import '@assets/css/public-style.scss';
 $BackColor: #171f32;
 .list_border {
     border: 1px solid $BackColor;

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/complaintsAndSuggestions.vue

@@ -26,6 +26,7 @@
 </template>
 <script>
 import { discountedWave } from './indexOptionChart';
+import index from './allcommunit'
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 let dataDay = [
   '01-01',
@@ -61,6 +62,7 @@ let dataDay = [
   '01-31'
 ];
 export default {
+  mixins: [index],
   props: ['dataObj'],
   data () {
     return {

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/completionMaintenanceOrder.vue

@@ -29,6 +29,7 @@
 </template>
 <script>
 import { GradualChange, ringType } from './indexOptionChart';
+import index from './allcommunit'
 // import permissionComponent from '../permissionComponent';
 const colors = [
   GradualChange('#22D8FF', '#00B2FF'),
@@ -38,6 +39,7 @@ const colors = [
   GradualChange('#884DD2', '#DF63CC')
 ];
 export default {
+  mixins: [index],
   // mixins: [permissionComponent],
   data () {
     return {

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/distributionSuggestion.vue

@@ -29,6 +29,7 @@
 </template>
 <script>
 import { GradualChange, ringType } from './indexOptionChart';
+import index from './allcommunit'
 // import permissionComponent from '../permissionComponent';
 const colors = [
   GradualChange('#22D8FF', '#00B2FF'),
@@ -38,6 +39,7 @@ const colors = [
   GradualChange('#884DD2', '#DF63CC')
 ];
 export default {
+  mixins: [index],
   // mixins: [permissionComponent],
   data () {
     return {

+ 9 - 3
commandCenter/src/views/operationalServices/assembly/operationMaintenancePersonnel.vue

@@ -26,8 +26,10 @@
 </template>
 <script>
 import { columnOptionsChartStacking } from './indexOptionChart';
+import index from './allcommunit'
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {
@@ -40,11 +42,11 @@ export default {
         ['name1', 'name2', 'name3'],
         [
           {
-            data: [10, 20, 15],
+            data: [0],
             name: '任务总数'
           },
           {
-            data: [20, 30, 10],
+            data: [0],
             name: '已完成'
           }
         ],
@@ -56,7 +58,8 @@ export default {
   methods: {
     getData () {
       this.$http.get('/sc-community/statisticWorkOrderTask', this.mixins_query).then(({ data, msg, status }) => {
-        if (status == 0 && !!data) {
+        if (status == 0 && data.length != 0) {
+          debugger
           let dataName = [];
           let dataNums = [];
           let datacompelete = [];
@@ -65,7 +68,10 @@ export default {
             dataNums.push(item.total);
             datacompelete.push(item.completeTotal);
           })
+          debugger
           this.clientOptions = columnOptionsChartStacking('(个)', dataName, [{ data: dataNums, name: '任务总数' }, { data: datacompelete, name: '已完成' }], [], 10);
+        } else if (data.length == 0) {
+          this.clientOptions = columnOptionsChartStacking('(个)', ['name1'], [{ data: [0], name: '任务总数' }, { data: [0], name: '已完成' }], [], 10);
         }
       })
     },

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/orderClassification.vue

@@ -29,7 +29,9 @@
 </template>
 <script>
 import { ringType } from './indexOptionChart';
+import index from './allcommunit'
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/satisfaction.vue

@@ -41,8 +41,10 @@
 </template>
 <script>
 import { columnOptionsChart } from './indexOptionChart';
+import index from './allcommunit'
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 export default {
+  mixins: [index],
   data () {
     return {
       mixins_query: {

+ 2 - 0
commandCenter/src/views/operationalServices/assembly/scoringOperationPersonnel.vue

@@ -25,7 +25,9 @@
 </template>
 <script>
 import { columnOptionsChartName } from './indexOptionChart.js';
+import index from './allcommunit'
 export default {
+  mixins: [index],
   data () {
     return {
       date: "",

+ 2 - 1
commandCenter/src/views/operationalServices/assembly/todayTask.vue

@@ -38,8 +38,9 @@
   </div>
 </template>
 <script>
+import index from './allcommunit'
 export default {
-
+  mixins: [index],
   data () {
     return {
       houseData: [],

+ 0 - 1
operationSupport/src/views/newWorkBench/components/discount.vue

@@ -84,7 +84,6 @@ export default {
               dateTime.push(item.date);
               valueArr.push(item.total);
               //   valueArr.push(item.data);
-
             });
             this.clientOptions = discountedWave('(次)', dateTime, valueArr);
           }