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

commandCenter/src/views/communityAssets/assembly/allcommunit.js

@@ -27,6 +27,6 @@ export default {
     methods: {},
     created() {
         this.mixins_query.communityId = this.homeCommunityAll;
-        this.getData();
+        // this.getData();
     }
 };

commandCenter/src/views/industrialInvestment/assembly/allcommunit.js

@@ -27,6 +27,6 @@ export default {
     methods: {},
     created() {
         this.mixins_query.communityId = this.homeCommunityAll;
-        this.getData();
+        // this.getData();
     }
 };

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

@@ -14,21 +14,24 @@
         v-for="(item, index) in datas"
         :key="index"
       >
-        <div class="flex">
+        <div
+          class="flex"
+          style="width: 45%;"
+        >
           <img
             class="listInformation_img"
-            :src="item.pictureUrl"
+            :src=" url + item.pictureUrl[0]"
           />
-          <div class="listInformation_text">
+          <div class="listInformation_text size-color">
             <div>{{ item.title }}</div>
             <div>{{ filterType(item.buildingType, item.residenceType) }} {{ item.houseArea || 0 }}㎡</div>
           </div>
         </div>
-        <div class="listInformation_text">
+        <div class="listInformation_text size-color">
           <div>{{ item.monthlyRentAmount | filterMoney }}/月</div>
           <div>{{ item.sellAmount | filterMoney }}</div>
         </div>
-        <div class="listInformation_operation">{{ item.clickNumber }}</div>
+        <div class="listInformation_operation size-color">{{ item.clickNumber }}</div>
       </div>
       <div
         v-if="datas.length <= 0"
@@ -51,7 +54,8 @@ export default {
         year: 1,
         month: 10
       },
-      datas: []
+      datas: [],
+      url: 'http://114.135.61.186:21020'
     };
   },
   filters: {
@@ -80,6 +84,10 @@ export default {
         .then(({ status, data, msg }) => {
           if (status == 0) {
             this.datas = data;
+            for (let i = 0; i < data.length; i++) {
+              this.datas[i].pictureUrl = (data[i].pictureUrl).split(',');
+            }
+            console.log('5555', this.datas[0].pictureUrl)
           }
         })
         .catch((err) => { });

commandCenter/src/views/operationalServices/assembly/allcommunit.js

@@ -1,32 +1,32 @@
 import { mapState } from 'vuex';
 export default {
-  data() {
-    return {
-      loadding: true,
-    }
-  },
-  computed: {
-    //全局社区
-    ...mapState(['homeCommunityAll']),
+    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);
+        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();
     }
-  },
-  methods: {
-  },
-  created() {
-    this.mixins_query.communityId = this.homeCommunityAll;
-    this.getData();
-  }
-}
+};

commandCenter/src/views/operationalServices/assembly/operationMaintenancePersonnel.vue

@@ -59,7 +59,6 @@ export default {
     getData () {
       this.$http.get('/sc-community/statisticWorkOrderTask', this.mixins_query).then(({ data, msg, status }) => {
         if (status == 0 && data.length != 0) {
-          debugger
           let dataName = [];
           let dataNums = [];
           let datacompelete = [];
@@ -68,7 +67,6 @@ 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);

commandCenter/src/views/operationalServices/assembly/orderClassification.vue

@@ -59,6 +59,7 @@ export default {
     getData () {
       this.$http.get('/sc-community/statisticWorkOrderCategory', this.mixins_query).then(({ data, msg, status }) => {
         if (status == 0 && !!data.datas) {
+          debugger
           this.clientOptions = ringType([], this.eachartObj(data), {}, { type: '%', total: data.total });
         }
       });

commandCenter/src/views/operationalServices/assembly/scoringOperationPersonnel.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="modelBlock">
     <div class="model-title">
-      <div class="model-title-text">运维人员评分系统</div>
+      <div class="model-title-text">运维人员评价分数</div>
       <div class="model-title-right">
         <el-date-picker
           value-format="yyyy-MM"
@@ -36,20 +36,12 @@ export default {
         date: ''
       },
       clientOptions: columnOptionsChartName(
-        '(个)',
-        ['name1', 'name2', 'name3'],
+        '(分)',
+        ['name1'],
         [
           {
             name: 'name1',
             data: 0
-          },
-          {
-            name: 'name2',
-            data: 0
-          },
-          {
-            name: 'name3',
-            data: 0
           }
         ],
         [],
@@ -69,7 +61,7 @@ export default {
       this.$http
         .get('/sc-community-web/statisticWorkOrderEvaluate', this.mixins_query)
         .then(({ status, data, msg }) => {
-          if (status == 0) {
+          if (status == 0 && data.length != 0) {
             let name = [];
             let Resdate = [];
             for (let i = 0; i < data.length; i++) {
@@ -79,8 +71,10 @@ export default {
                 data: data[i].evaluation
               })
             }
-
-            this.clientOptions = columnOptionsChartName('(个)', name, Resdate, [], 10);
+            this.clientOptions = columnOptionsChartName('(分)', name, Resdate, [], 10);
+          } else if (data.length == 0) {
+            debugger
+            this.clientOptions = columnOptionsChartName('(分)', ['name1'], [{ name: 'name1', data: 0 }], [], 10);
           }
         })
         .catch((err) => { });

commandCenter/src/views/operationalServices/assembly/todayTask.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="modelBlock">
     <div class="model-title">
-      <div class="model-title-text">社区总体情况统计</div>
+      <div class="model-title-text">今日任务</div>
     </div>
     <div class="model-contents">
       <!-- @click="$router.push({ path: item.path })" -->