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

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

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

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

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

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

@@ -73,7 +73,7 @@ export default {
   },
   methods: {
     getData () {
-      this.$http.get('/sc-community-web/statisticComplaint', this.mixins_query).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/statisticComplaint', 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/enterpriseDistribution.vue

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

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

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

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

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

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

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

operationSupport/src/views/patrolManagement/popups/schedulingAdd.vue

@@ -14,7 +14,7 @@
         <template v-for="(item, index) in timePeriod">
             <el-form-item :label="item.partrolTime" :key="index">
                 <el-cascader
-                    :ref="`userName${index}`"
+                    :ref="`userName`"
                     v-model="item.partolUserId"
                     :props="defaultProps"
                     :options="findUser"
@@ -37,6 +37,7 @@ export default {
                 value: 'id', // 唯一标识
                 label: 'label', // 标签显示
                 children: 'children',
+                multiple: true,
                 emitPath: false
             },
             formData: {
@@ -67,28 +68,46 @@ export default {
     },
     methods: {
         findUserToggle(index) {
-            let thisObj = this.$refs[`userName${index}`][0].getCheckedNodes()[0];
-            this.timePeriod[index].partolName = thisObj.label;
+            // let thisObj = this.$refs[`userName${index}`][0].getCheckedNodes()[0];
+            // this.timePeriod[index].partolName = thisObj.label;
         },
         submit() {
+            let selectAll = this.$refs[`userName`];
+            let rosterUserDtos = [];
+            selectAll.map((item, index) => {
+                let partolNames = [],
+                    partolUserIds = [];
+                item.getCheckedNodes().map((items) => {
+                    if (items.level !== 1 && items.children.length == 0) {
+                        partolNames.push(items.label);
+                        partolUserIds.push(items.value);
+                    }
+                });
+                rosterUserDtos.push({
+                    partolName: partolNames.join(','),
+                    partolUserId: partolUserIds.join(','),
+                    partrolTime: this.timePeriod[index].partrolTime
+                });
+            });
             if (!this.params.isSingle) {
                 this.$refs['formRu'].validate((valid) => {
                     if (valid) {
-                        this.add();
+                        this.add(rosterUserDtos);
                     }
                 });
             } else {
-                this.add();
+                this.add(rosterUserDtos);
             }
         },
-        add() {
+        add(rosterUserDtos) {
             let data = this.params.thisObj;
             let initData = {
                 communityId: data.communityId,
                 patrolRouteId: data.id,
                 periodType: data.periodType,
                 periodValue: data.periodValue,
-                rosterUserDtos: this.timePeriod,
+                // rosterUserDtos: this.timePeriod,
+                rosterUserDtos: rosterUserDtos,
                 partrolDate: this.thisDay.day,
                 startDate: data.startDate,
                 endDate: data.endDate

operationSupport/vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
                 viewportWidth: 1920 //传参
             });
 
-        // // // 配置每次打包浏览器缓存文件名的随机性
-        // const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
-        // config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename);
+        // // 配置每次打包浏览器缓存文件名的随机性
+        const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
+        config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename);
     },
     // 配置全局样式变量
     css: {
@@ -59,12 +59,12 @@ module.exports = {
             //         resources: path.relative(__dirname, '../src/assets/css/punlic-style.scss')
             //     }
             // })
+        },
+        extract: {
+            // 打包后css文件名称添加时间戳
+            filename: `css/[name].${new Date().getTime()}.css`,
+            chunkFilename: `css/chunk.[id].${new Date().getTime()}.css`
         }
-        // extract: {
-        //     // 打包后css文件名称添加时间戳
-        //     filename: `css/[name].${new Date().getTime()}.css`,
-        //     chunkFilename: `css/chunk.[id].${new Date().getTime()}.css`
-        // }
     },
     configureWebpack: {
         externals: {