处理历史冲突

operationSupport/src/views/businessManagement/opportunityManagement/index.vue

@@ -146,7 +146,7 @@ export default {
     };
   },
   created () {
-    this.mixins_dataUrl = '/sc-community-web/business/page';
+    this.mixins_dataUrl = '/sc-community/business/page';
     this.mixins_query = {};
     this.mixins_search();
     this.getUserList();
@@ -203,7 +203,7 @@ export default {
       });
     },
     exportExcel () {
-      this.__exportExcel('/sc-community-web/business/excel', this.mixins_query);
+      this.__exportExcel('/sc-community/business/excel', this.mixins_query);
     },
     getUserList () {
       this.$http.get('/sc-user-center/user/findUserList').then(({ data, status, msg }) => {

operationSupport/src/views/businessManagement/opportunityManagement/setpPage/add.vue

@@ -411,9 +411,9 @@ export default {
       console.log('this.formData.intentionLevel', this.formData.intentionLevel);
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          let url = '/sc-community-web/business/add';
+          let url = '/sc-community/business/add';
           if (this.params.todo == 'edit') {
-            url = '/sc-community-web/business/edit';
+            url = '/sc-community/business/edit';
           }
           // let houseIds = [];
           this.timePeriod.map((item) => {
@@ -534,7 +534,7 @@ export default {
     });
     if (this.params.todo == 'edit') {
       console.log(this.params.data);
-      let url = `/sc-community-web/business/find/${this.params.data}`;
+      let url = `/sc-community/business/find/${this.params.data}`;
       this.$http.get(url).then(({ status, msg, data }) => {
         if (status == 0) {
           this.close();

operationSupport/src/views/businessManagement/opportunityManagement/setpPage/details.vue

@@ -159,7 +159,7 @@ export default {
   methods: {
     getDatali (id) {
       this.$http
-        .get('/sc-community-web/business/find/' + id)
+        .get('/sc-community/business/find/' + id)
         .then(({ data, msg, status }) => {
           if (status == 0) {
             this.thisItem = data;

operationSupport/src/views/newWorkBench/components/dispatchWorkOrder.vue

@@ -15,7 +15,7 @@
                         <div>房产地址：{{ item.address }}</div>
                     </div>
                     <div class="listInformation_text">
-                        <div>报修内容：{{ item.repairContent }}</div>
+                        <div class="ellipsis">报修内容：{{ item.repairContent }}</div>
                         <div>投诉时间：{{ item.createDate }}</div>
                     </div>
                     <div class="listInformation_operation">
@@ -135,6 +135,12 @@ export default {
             .listInformation_text {
                 line-height: rem(23);
                 opacity: 0.5;
+                width: rem(200);
+                .ellipsis {
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                }
             }
             .listInformation_operation {
                 display: flex;

operationSupport/src/views/newWorkBench/components/equipmentStatistics.vue

@@ -55,15 +55,16 @@ export default {
     methods: {
         getData() {
             this.$http
-                .post('/sc-community/alarm/details/selectPage', this.mixins_query)
+                .get('/sc-community/statisticEquipmentQuantity', this.mixins_query)
                 .then(({ status, data, msg }) => {
-                    if (status == 0) {
+                    if (status == 0 && !!data.list.length) {
                         let name = [];
-                        data.map((item) => {
-                            name.push(item.date);
-                            item.data = item.evaluation;
+                        data.list.map((item) => {
+                            name.push(item.type);
+                            item.data = item.nums;
+                            item.name = item.type
                         });
-                        this.clientOptions = columnOptionsChartName('(个)', name, data, [], 10);
+                        this.clientOptions = columnOptionsChartName('(个)', name, data.list, [], 10);
                     }
                 })
                 .catch((err) => {});

operationSupport/src/views/newWorkBench/components/facilityInspections/taskType.vue

@@ -54,11 +54,9 @@ export default {
             clientOptions: ringType(
                 colors,
                 [
-                    { value: 0, name: '业主' },
-                    { value: 0, name: '亲属' },
-                    { value: 0, name: '租客' },
-                    { value: 0, name: '租户管理员' },
-                    { value: 0, name: '普通员工' }
+                    { value: 0, name: 'name1' },
+                    { value: 0, name: 'name2' },
+                    { value: 0, name: 'name3' }
                 ],
                 {},
                 { type: 'number', total: 0 }
@@ -68,17 +66,15 @@ export default {
     methods: {
         getData() {
             this.$http.get('/sc-community/statisticInspectionTaskType', this.mixins_query).then(({ data, msg, status }) => {
-                if (status == 0 && !!data.datas) {
+                if (status == 0 && Object.keys(data.datas).length !== 0) {
                     this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
                 } else {
                     this.clientOptions = ringType(
                         colors,
                         [
-                            { value: 0, name: '业主' },
-                            { value: 0, name: '亲属' },
-                            { value: 0, name: '租客' },
-                            { value: 0, name: '租户管理员' },
-                            { value: 0, name: '普通员工' }
+                            { value: 0, name: 'name1' },
+                            { value: 0, name: 'name2' },
+                            { value: 0, name: 'name3' }
                         ],
                         {},
                         { type: 'number', total: 0 }
@@ -91,20 +87,14 @@ export default {
             this.getData();
         },
         eachartObj(data) {
-            this.total = data.total || 0;
-            let typeName = {
-                1: '业主',
-                2: '亲属',
-                3: '租客',
-                4: '租户管理员',
-                5: '普通员工'
-            };
+            this.total = 0;
             let newData = [];
             for (let a in data.datas) {
                 newData.push({
                     value: data.datas[a],
-                    name: typeName[a]
+                    name: a
                 });
+                this.total += data.datas[a];
             }
             return newData;
         }

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

@@ -7,18 +7,18 @@
 // collectionRate 收款率分析 OK 圈待调整
 // householdGender住户性别占比 OK
 // householdIdentity住户身份占比 OK
-// equipmentStatistics设备设施统计 没有接口
+// equipmentStatistics设备设施统计 OK
 // ownerApproval 业主审批 OK
 // pendingComplaints 待处理投诉 OK
 // complaintsAndSuggestions投诉建议数量趋势 OK
 
-// patrolDuration 巡更人员任务执行时长 数据格式待调试
+// patrolDuration 巡更人员任务执行时长 OK
 // communityAnnouncement 社区公告 OK
 // personnelScore 运维人员评分 OK
 // billToBeCollected  待收款账单 OK
 // contractAward 合同签约   OK
 // dispatchWorkOrder 待分派工单 OK
-// taskType 巡检任务类型分布 数据格式待调试
+// taskType 巡检任务类型分布 OK
 // alarmInformation 设备告警信息  单条没有跳转
 // overallCommunity 社区总体情况统计 OK
 

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

@@ -513,7 +513,7 @@ export const columnOptionsChartName = (name = '', xAxis = [], series = [], color
         },
         grid: {
             top: 50,
-            left: 0,
+            left: 10,
             bottom: 0,
             right: 0,
             containLabel: true

operationSupport/src/views/newWorkBench/components/patrolDuration.vue

@@ -24,9 +24,8 @@
     </div>
 </template>
 <script>
-import { columnOptionsChart } from './indexOptionChart';
+import { columnOptionsChartName } from './indexOptionChart';
 import permissionComponent from './permissionComponent';
-let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 export default {
     mixins: [permissionComponent],
     data() {
@@ -37,34 +36,52 @@ export default {
             },
             mixins_query: {
                 communityId: '',
-                date: '',
+                date: ''
             },
             date: '',
-            clientOptions: columnOptionsChart('(分)', [], [{ data: dataArr, name: '任务时长' }], [], 10)
+            clientOptions: columnOptionsChartName(
+                '(小时)',
+                ['name1', 'name2', 'name3'],
+                [
+                    {
+                        name: 'name1',
+                        data: 0
+                    },
+                    {
+                        name: 'name2',
+                        data: 0
+                    },
+                    {
+                        name: 'name3',
+                        data: 0
+                    }
+                ],
+                [],
+                10
+            )
         };
     },
     methods: {
         getData() {
             this.$http.get('/sc-community/statisticPatrolPersonnelDuration', this.mixins_query).then(({ data, msg, status }) => {
-                if (status == 0 && !!data) {
-                    let timeDay = [],
-                        datas = [];
+                if (status == 0 && !!data.length) {
+                    let name = [];
                     data.map((item) => {
-                        timeDay.push(item.date);
-                        datas.push(item.data);
+                        name.push(item.name);
+                        item.data = item.data / 60;
                     });
-                    this.clientOptions = columnOptionsChart('(分)', timeDay, [{ data: datas, name: '任务时长' }], [], 10);
+                    this.clientOptions = columnOptionsChartName('(小时)', name, data, [], 10);
                 }
             });
         },
         changeTime(v) {
-            this.mixins_query.date = v;
+            this.mixins_query.date = v + '-01';
             this.getData();
         }
     },
     created() {
         this.date = this.$moment().format('YYYY-MM');
-        this.mixins_query.date = this.$moment().format('YYYY-MM');
+        this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
         this.getData();
     }
 };

operationSupport/src/views/newWorkBench/components/pendingComplaints.vue

@@ -15,7 +15,7 @@
                         <div>房产地址：{{ item.communityName + '-' + item.roomNumber }}</div>
                     </div>
                     <div class="listInformation_text">
-                        <div>投诉内容：{{ item.content }}</div>
+                        <div class="ellipsis">投诉内容：{{ item.content }}</div>
                         <div>投诉时间：{{ item.createDate }}</div>
                     </div>
                     <div class="listInformation_operation"><span @click="toPage(item)" class="zoniot_font zoniot-icon-chuli"></span></div>
@@ -105,6 +105,12 @@ export default {
             .listInformation_text {
                 line-height: rem(23);
                 opacity: 0.5;
+                width: rem(200);
+                .ellipsis {
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                }
             }
             .listInformation_operation {
                 display: flex;

operationSupport/src/views/newWorkBench/components/personnelScore.vue

@@ -64,7 +64,7 @@ export default {
     methods: {
         getData() {
             this.$http.get('/sc-community/statisticWorkOrderEvaluate', this.mixins_query).then(({ data, msg, status }) => {
-                if (status == 0 && !!data) {
+                if (status == 0 && !!data.length) {
                     let name = [];
                     data.map((item) => {
                         name.push(item.date);

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

@@ -73,7 +73,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticWorkOrderComplete', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticWorkOrderComplete', this.mixins_query).then(({ data, msg, status }) => {
         if (status == 0 && !!data.datas) {
           this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
         }

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

@@ -60,7 +60,7 @@ export default {
   computed: {},
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticGeneration', this.mixins_query)
+      this.$http.get('/sc-community/statisticGeneration', this.mixins_query)
         .then(({ status, data, msg }) => {
           debugger
           if (status == 0) {

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

@@ -68,7 +68,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticWorkOrderTask', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticWorkOrderTask', this.mixins_query).then(({ data, msg, status }) => {
         debugger
         console.log('data', data);
         if (status == 0 && !!data) {

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

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

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

@@ -112,7 +112,7 @@ export default {
   methods: {
     getData () {
       this.$http
-        .get('/sc-community-web/statisticActuallyReceived', this.mixins_query)
+        .get('/sc-community/statisticActuallyReceived', this.mixins_query)
         .then(({ status, data, msg }) => {
           debugger
           if (status == 0) {

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

@@ -73,7 +73,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticInspectionTaskCompletionRate', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticInspectionTaskCompletionRate', this.mixins_query).then(({ data, msg, status }) => {
         if (status == 0 && !!data.datas) {
           this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
         }

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

@@ -68,7 +68,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticPatrolPersonnelSituation', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticPatrolPersonnelSituation', this.mixins_query).then(({ data, msg, status }) => {
         debugger
         console.log('data', data);
         if (status == 0 && !!data) {

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

@@ -92,7 +92,7 @@ export default {
   methods: {
     getData () {
       this.$http
-        .get('/sc-community-web/statisticPatrolTaskDistribution', this.mixins_query)
+        .get('/sc-community/statisticPatrolTaskDistribution', this.mixins_query)
         .then(({ status, data, msg }) => {
           if (status == 0) {
             let dateTime = []

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

@@ -73,7 +73,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticPatrolCompletionRate', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticPatrolCompletionRate', this.mixins_query).then(({ data, msg, status }) => {
         if (status == 0 && !!data.datas) {
           this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
         }

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

@@ -68,7 +68,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticInspectionPersonnelSituation', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticInspectionPersonnelSituation', this.mixins_query).then(({ data, msg, status }) => {
         console.log('data', data);
         if (status == 0 && !!data) {
           let dataName = [];

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

@@ -120,7 +120,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticIncomeMethod', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticIncomeMethod', this.mixins_query).then(({ data, msg, status }) => {
         debugger
         if (status == 0 && !!data.datas) {
           this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: this.total });