BUG

operationSupport/src/components/common/index.js

@@ -20,10 +20,11 @@ import xkUpload from './XKUpload';
 import select from './select';
 import buildingTree from './buildingTree';
 import treeHouse from './treeHouse.vue';
-import echart from "./echart";
+import echart from './echart';
 import workModal from './workBenchModal';
-import datepickerQuarter from './datepickerQuarter'
-import uploadList from './uploadList'
+import datepickerQuarter from './datepickerQuarter';
+import uploadList from './uploadList';
+import uploadListImg from './uploadListImg';
 // 注册全局组件
 export default {
     install() {
@@ -45,7 +46,8 @@ export default {
             echart,
             workModal,
             datepickerQuarter,
-            uploadList
+            uploadList,
+            uploadListImg
         ];
         _.each(components, (v) => {
             Vue.component(v.name, v);

operationSupport/src/components/common/organTree.vue

@@ -49,7 +49,6 @@ export default {
         .then(({ status, data, msg }) => {
           if (status === 0 && data) {
             this.dimension(data);
-            debugger
             this.organList = data;
             this.$nextTick().then(() => {
               const firstNode = document.querySelector('.el-tree-node');

operationSupport/src/components/common/uploadListImg.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="clickUpload">
+    <div
+      class="clickUpText ulrTrue"
+      :class="!typeVideo(item) && !typeIcon(item) ? 'fileName' : ''"
+      v-for="(item, index) in uploadArr"
+      :key="item"
+    >
+      <i
+        class="el-icon-delete deletes"
+        @click="delet(item, index)"
+      ></i>
+      <video
+        v-if="typeVideo(item)"
+        :src="item"
+      ></video>
+      <img
+        v-else-if="typeIcon(item)"
+        class="dataImg"
+        :src="item"
+      />
+      <div v-else>{{ item }}</div>
+    </div>
+    <div class="clickUpText">
+      <div
+        class="addImg"
+        @click="clickFile"
+      ><i class="el-icon-plus ashText"></i></div>
+    </div>
+    <el-upload
+      style="display: none"
+      :headers="token"
+      ref="upload"
+      :limit="limit"
+      :action="uploadUrl"
+      :on-success="uploadsuccess"
+      :before-upload="beforeAvatarUpload"
+      :auto-upload="true"
+      :name="name"
+    >
+    </el-upload>
+  </div>
+</template>
+<script>
+export default {
+  name: 'bzUploadImg',
+  data () {
+    return {
+      token: {
+        [localStorage.getItem('CZC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('CZC_token')
+      }
+    };
+  },
+  props: {
+    uploadUrl: {
+      type: String,
+      default: '/czc-community/upload/uploadFile'
+    },
+    type: {
+      type: String,
+      default: 'img,video'
+    },
+    className: {
+      type: Boolean,
+      default: false
+    },
+    name: {
+      type: String,
+      default: 'file'
+    },
+    uploadArr: {
+      type: Array,
+      default: () => []
+    },
+    limit: {
+      type: Number,
+      default: 3
+    }
+  },
+  methods: {
+    uploadsuccess (response, file, fileList) {
+      this.$refs.upload.clearFiles();
+      if (0 === response.status) {
+        this.uploadArr.push(response.data);
+      }
+    },
+    beforeAvatarUpload (file) {
+      let isType = true;
+      if (this.type == 'video') {
+        isType = ['video/mp4'].includes(file.type);
+        if (!isType) {
+          this.$message.error('请上传mp4视频!');
+        }
+      } else if (this.type == 'img') {
+        isType = ['image/jpeg', 'image/jpg', 'image/png'].includes(file.type);
+        if (!isType) {
+          this.$message.error('请上传图片!');
+        }
+      }
+      return isType;
+    },
+    typeVideo (str) {
+      let type = str.slice(str.lastIndexOf('.') + 1, str.length);
+      let videoType = ['mp4'];
+      return videoType.includes(type);
+    },
+    typeIcon (str) {
+      let type = str.slice(str.lastIndexOf('.') + 1, str.length);
+      let imgType = ['png', 'jpeg', 'jpg'];
+      return imgType.includes(type);
+    },
+    clickFile () {
+      this.$refs['upload'].$children[0].$refs.input.click();
+    },
+    delet (item, index) {
+      this.uploadArr.splice(index, 1);
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.clickUpload {
+    display: flex;
+    .clickUpText {
+        height: 60px;
+        width: 80px;
+        border: 1px solid #e0e1e3;
+        box-sizing: border-box;
+        background: white;
+        border-radius: 5px;
+        margin-right: 5px;
+        z-index: 1;
+        position: relative;
+        img.dataImg {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            border-radius: 5px;
+        }
+        .addImg {
+            line-height: 65px;
+            text-align: center;
+            cursor: pointer;
+            & > i {
+                font-size: 30px;
+            }
+        }
+        video {
+            width: 100%;
+            height: 100%;
+        }
+    }
+
+    .deletes {
+        display: none;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        cursor: pointer;
+        z-index: 100;
+    }
+    .ulrTrue {
+        &:hover {
+            .deletes {
+                display: block;
+            }
+        }
+    }
+    .fileName {
+        height: initial !important;
+        width: initial !important;
+        border: none;
+    }
+}
+</style>

operationSupport/src/views/businessManagement/InvestmentResources/index.js

@@ -9,11 +9,15 @@ export default {
                 {
                     label: '房屋地址',
                     slot: 'address',
-                    width: "200px"
+                    width: '200px'
                 },
                 {
-                    label: '房屋编号',
-                    prop: 'assetNumber',
+                    label: '房东'
+                    // prop: 'assetNumber'
+                },
+                {
+                    label: '房东电话',
+                    prop: 'phone'
                 },
                 {
                     label: '房屋类型',
@@ -37,21 +41,21 @@ export default {
                         }
                     }
                 },
-                {
-                    label: '租售状态',
-                    prop: 'salesStatus',
-                    format(val) {
-                        if (val == 0) {
-                            return '待租售';
-                        } else if (val == 1) {
-                            return '已售';
-                        } else if (val == 2) {
-                            return '已租';
-                        }
-                    }
-                },
-                {
-                    label: '招商人员',
+                // {
+                //     label: '租售状态',
+                //     prop: 'salesStatus',
+                //     format(val) {
+                //         if (val == 0) {
+                //             return '待租售';
+                //         } else if (val == 1) {
+                //             return '已售';
+                //         } else if (val == 2) {
+                //             return '已租';
+                //         }
+                //     }
+                // },
+                {
+                    label: '招租人员',
                     prop: 'username'
                 },
                 {
@@ -67,14 +71,13 @@ export default {
                 },
                 {
                     label: '发布时间',
-                    prop: 'releaseDate',
-                    width: '80'
+                    prop: 'releaseDate'
                 },
                 {
                     label: '操作',
                     prop: 'id',
                     slot: 'opt',
-                    width: 80
+                    width: 100
                 }
             ],
             buildingType: ['住宅', '商业'],
@@ -127,7 +130,7 @@ export default {
                     label: '广告位',
                     value: 12
                 }
-            ],
+            ]
         };
-    },
-}
+    }
+};

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

@@ -1,138 +1,189 @@
 <template>
   <div class="content main">
-    <organ-tree @organId="currentOrganId"></organ-tree>
-    <div class="content-right">
-      <div class="search">
-        <el-input
-          clearable
-          placeholder="商铺号/招商人员"
-          class="search-input"
-          v-trim
-          v-model.trim="mixins_query.name"
-        ></el-input>
-        <el-select
-          v-model="mixins_query.releaseStatus"
-          placeholder="发布状态"
-          clearable
+    <!-- <organ-tree @organId="currentOrganId"></organ-tree> -->
+    <!-- <div class="content-right"> -->
+    <div class="search">
+      <el-input
+        clearable
+        placeholder="商铺号/招商人员"
+        class="search-input"
+        v-trim
+        v-model.trim="mixins_query.name"
+      ></el-input>
+      <el-select
+        v-model="mixins_query.communityId"
+        placeholder="所属社区"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in communityArr"
+          :key="index"
+          :label="item.communityName"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+
+      <el-select
+        v-model="mixins_query.salesType"
+        placeholder="房屋类型"
+        clearable
+      >
+        <el-option
+          label="住宅"
+          :value="1"
+        ></el-option>
+        <el-option
+          label="商业"
+          :value="2"
+        ></el-option>
+      </el-select>
+
+      <el-select
+        v-model="mixins_query.releaseStatus"
+        placeholder="发布状态"
+        clearable
+      >
+        <el-option
+          label="未发布"
+          :value="0"
+        ></el-option>
+        <el-option
+          label="已发布"
+          :value="1"
+        ></el-option>
+      </el-select>
+      <!-- <el-select
+        v-model="mixins_query.salesType"
+        placeholder="租售类型"
+        clearable
+      >
+        <el-option
+          label="可租可售"
+          :value="1"
+        ></el-option>
+        <el-option
+          label="只租"
+          :value="2"
+        ></el-option>
+        <el-option
+          label="只售"
+          :value="3"
+        ></el-option>
+      </el-select> -->
+      <el-button
+        class="search-btn"
+        type="primary"
+        @click="mixins_search()"
+        :disabled="mixins_onQuery"
+        :loading="mixins_onQuery"
+        icon="el-icon-search"
+      >查询</el-button>
+      <div class="search-icon">
+        <el-tooltip
+          class="item"
+          effect="light"
+          placement="bottom"
+          content="新增"
         >
-          <el-option
-            label="未发布"
-            :value="0"
-          ></el-option>
-          <el-option
-            label="已发布"
-            :value="1"
-          ></el-option>
-        </el-select>
-        <el-select
-          v-model="mixins_query.salesType"
-          placeholder="租售类型"
-          clearable
+          <i
+            class="zoniot_font zoniot-icon-tianjia2"
+            @click="add('add','')"
+          ></i>
+        </el-tooltip>
+        <el-tooltip
+          class="item"
+          effect="light"
+          placement="bottom"
+          content="分配招商人员"
         >
-          <el-option
-            label="可租可售"
-            :value="1"
-          ></el-option>
-          <el-option
-            label="只租"
-            :value="2"
-          ></el-option>
-          <el-option
-            label="只售"
-            :value="3"
-          ></el-option>
-        </el-select>
-        <el-button
-          class="search-btn"
-          type="primary"
-          @click="mixins_search()"
-          :disabled="mixins_onQuery"
-          :loading="mixins_onQuery"
-          icon="el-icon-search"
-        >查询</el-button>
-        <div class="search-icon">
-          <el-tooltip
-            class="item"
-            effect="light"
-            placement="bottom"
-            content="分配招商人员"
-          >
-            <i
-              class="zoniot_font zoniot-icon-fenpeirenyuan"
-              @click="distribution"
-            ></i>
-          </el-tooltip>
+          <i
+            class="zoniot_font zoniot-icon-fenpeirenyuan"
+            @click="distribution"
+          ></i>
+        </el-tooltip>
+        <el-tooltip
+          class="item"
+          effect="light"
+          placement="bottom"
+          content="发布"
+        >
+          <i
+            class="zoniot_font zoniot-icon-fabu2"
+            @click="release"
+          ></i>
+        </el-tooltip>
+        <el-tooltip
+          class="item"
+          effect="light"
+          placement="bottom"
+          content="下架"
+        >
+          <i
+            class="zoniot_font zoniot-icon-xiajia"
+            @click="offTheShelf"
+          ></i>
+        </el-tooltip>
+      </div>
+    </div>
+    <zz-table
+      :settings="{ showCheckbox: true, stripe: true }"
+      :cols="cols"
+      :loading="mixins_onQuery"
+      :data="mixins_list"
+      :pageset="mixins_pageset"
+      @page-change="pageChange"
+      @selection-change="selectionChange"
+    >
+      <template
+        slot-scope="scope"
+        slot="address"
+      >
+        {{
+                        `${!!scope.row.buildingName ? scope.row.buildingName : ''}${!!scope.row.unitName ? '-' + scope.row.unitName : ''}${
+                            !!scope.row.roomNumber ? '-' + scope.row.roomNumber : ''
+                        }`
+                    }}
+      </template>
+      <template
+        slot-scope="scope"
+        slot="buildingType"
+      >
+        {{ !!scope.row.buildingType ? `${buildingType[Number(scope.row.buildingType) - 1]}` : ''
+                    }}
+        <!-- {{ !!scope.row.residenceType ? `-${residenceType[Number(scope.row.residenceType) + 1]['label']}` : '' }} -->
+      </template>
+
+      <template
+        slot-scope="scope"
+        slot="opt"
+      >
+        <div class="opt">
           <el-tooltip
             class="item"
             effect="light"
             placement="bottom"
-            content="发布"
+            content="招商方案"
           >
             <i
-              class="zoniot_font zoniot-icon-fabu2"
-              @click="release"
+              class="zoniot_font zoniot-icon-bianji"
+              @click="programme(scope.row)"
             ></i>
           </el-tooltip>
+
           <el-tooltip
-            class="item"
             effect="light"
             placement="bottom"
-            content="下架"
+            content="删除"
           >
             <i
-              class="zoniot_font zoniot-icon-xiajia"
-              @click="offTheShelf"
+              class="zoniot_font zoniot-icon-shanchu redText"
+              @click="deleteOne(scope.row.id)"
             ></i>
           </el-tooltip>
         </div>
-      </div>
-      <zz-table
-        :settings="{ showCheckbox: true, stripe: true }"
-        :cols="cols"
-        :loading="mixins_onQuery"
-        :data="mixins_list"
-        :pageset="mixins_pageset"
-        @page-change="pageChange"
-        @selection-change="selectionChange"
-      >
-        <template
-          slot-scope="scope"
-          slot="address"
-        >
-          {{
-                        `${!!scope.row.buildingName ? scope.row.buildingName : ''}${!!scope.row.unitName ? '-' + scope.row.unitName : ''}${
-                            !!scope.row.roomNumber ? '-' + scope.row.roomNumber : ''
-                        }`
-                    }}
-        </template>
-        <template
-          slot-scope="scope"
-          slot="buildingType"
-        >
-          {{ !!scope.row.buildingType ? `${buildingType[Number(scope.row.buildingType) - 1]}` : ''
-                    }}{{ !!scope.row.residenceType ? `-${residenceType[Number(scope.row.residenceType) + 1]['label']}` : '' }}
-        </template>
-
-        <template
-          slot-scope="scope"
-          slot="opt"
-        >
-          <div class="opt">
-            <el-tooltip
-              class="item"
-              effect="light"
-              placement="bottom"
-              content="招商方案"
-            >
-              <i
-                class="zoniot_font zoniot-icon-bianji"
-                @click="programme(scope.row)"
-              ></i>
-            </el-tooltip>
-          </div>
-        </template>
-      </zz-table>
-    </div>
+      </template>
+    </zz-table>
+    <!-- </div> -->
   </div>
 </template>
 
@@ -145,7 +196,8 @@ export default {
     return {
       currentId: '',
       thisLeftData: {},
-      selectRow: []
+      selectRow: [],
+      communityArr: []
     };
   },
   methods: {
@@ -235,31 +287,75 @@ export default {
       }).then(() => {
         this.mixins_search();
       });
-    }
+    },
+    add (title, data) {
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/businessManagement/InvestmentResources/stepPage/add.vue',
+          width: '880px',
+          height: '600px',
+          props: {
+            title,
+            data,
+            callback: resolve,
+            arrData: this.findUser
+          },
+          title: title == 'add' ? '添加招商信息' : '修改招商信息'
+        });
+      }).then(() => {
+        this.mixins_search();
+      });
+    },
+    deleteOne (id) {
+      // this.$msgBox(`删除`, '删除后将无法恢复，请问是否继续?')
+      //   .then(() => {
+      //     this.$http.get('/czc-community/patrol/point/delete', { id: id }).then(({ status, data, msg }) => {
+      //       if (0 === status) {
+      //         this.$message({
+      //           type: 'success',
+      //           message: '删除成功!'
+      //         });
+      //         this.mixins_search();
+      //       }
+      //     });
+      //   })
+      //   .catch(() => { });
+    },
+    getorgTree () {
+      this.$http
+        .get('/czc-community/assets/community/list')
+        .then((data) => {
+          this.communityArr = data.data;
+          // this.$store.commit('setAreaSelect', data.data);
+        })
+
+        .catch(function () { });
+    },
   },
   watch: {
-    currentId (newValue, oldValue) {
-      this.mixins_query.communityId = '';
-      this.mixins_query.buildingId = '';
-      this.mixins_query.unitName = '';
-      this.mixins_query.houseId = '';
-      if (newValue.type) {
-        if (newValue.type === 'community') {
-          this.mixins_query.communityId = newValue.communityId;
-        } else if (newValue.type === 'building') {
-          this.mixins_query.buildingId = newValue.buildingId;
-        } else if (newValue.type === 'unit') {
-          this.mixins_query.buildingId = newValue.buildingId;
-          this.mixins_query.unitName = newValue.unitId;
-        } else if (newValue.type === 'room') {
-          this.mixins_query.houseId = newValue.houseId;
-        }
-      }
-      this.thisLeftData = newValue;
-      this.mixins_search();
-    }
+    // currentId (newValue, oldValue) {
+    //   this.mixins_query.communityId = '';
+    //   this.mixins_query.buildingId = '';
+    //   this.mixins_query.unitName = '';
+    //   this.mixins_query.houseId = '';
+    //   if (newValue.type) {
+    //     if (newValue.type === 'community') {
+    //       this.mixins_query.communityId = newValue.communityId;
+    //     } else if (newValue.type === 'building') {
+    //       this.mixins_query.buildingId = newValue.buildingId;
+    //     } else if (newValue.type === 'unit') {
+    //       this.mixins_query.buildingId = newValue.buildingId;
+    //       this.mixins_query.unitName = newValue.unitId;
+    //     } else if (newValue.type === 'room') {
+    //       this.mixins_query.houseId = newValue.houseId;
+    //     }
+    //   }
+    //   this.thisLeftData = newValue;
+    //   this.mixins_search();
+    // }
   },
   created () {
+    this.getorgTree();
     this.mixins_dataUrl = '/czc-community/merchants/page'; // 分页查询接口
     this.mixins_search();
   }

operationSupport/src/views/businessManagement/InvestmentResources/stepPage/add.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="formContent">
+    <el-form
+      ref="formData"
+      :model="formData"
+      :rules="rules"
+      label-width="120px"
+      class="demo-ruleForm"
+    >
+      <div class="formContent-item_title">房屋信息</div>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            label="招租房屋"
+            prop="name"
+            class="show-required-icon-star"
+          >
+            <!-- <template> -->
+            <el-select
+              placeholder="请选择"
+              v-model="formData.name"
+            >
+              <el-option
+                v-for="(item, index) in informTypes"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <!-- </template> -->
+
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row
+        :gutter="100"
+        class="ma_bot"
+      >
+        <el-col :span="24">
+          <el-col :span="8">租售类型：{{this.rentSaleType}}</el-col>
+          <el-col :span="8">房屋类型：{{this.houseType}}</el-col>
+          <el-col :span="8">楼层：{{this.floor}}</el-col>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="100"
+        class="ma_bot"
+      >
+        <el-col :span="24">
+          <el-col :span="8">朝向：{{this.orientation}}</el-col>
+          <el-col :span="8">户型：{{this.house}}</el-col>
+          <el-col :span="8">建筑面积：{{this.builtArea}}㎡</el-col>
+        </el-col>
+      </el-row>
+
+      <div class="formContent-item_title">房屋配置</div>
+      <el-form-item
+        label="房屋配置"
+        class="show-required-icon-star"
+      >
+        <el-row>
+          <el-col
+            :span="6"
+            v-for="(item,index) in houseConfiguration"
+            :key="index"
+          >
+            <el-checkbox-group v-model="formData.checkboxGroup1">
+              <el-checkbox-button
+                :label="item.value"
+                :key="item.value"
+              >{{item.label}}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-col>
+        </el-row>
+
+      </el-form-item>
+
+      <el-form-item
+        label="房屋亮点"
+        class="show-required-icon-star"
+      >
+        <el-row>
+          <el-col
+            :span="6"
+            v-for="(item,index) in houseHighlights"
+            :key="index"
+          >
+            <el-checkbox-group v-model="formData.checkboxGroup1">
+              <el-checkbox-button
+                :label="item"
+                :key="item"
+              >{{item}}</el-checkbox-button>
+            </el-checkbox-group>
+
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <el-form-item
+        label="招租要求"
+        class="show-required-icon-star"
+      >
+        <el-row>
+          <el-col
+            :span="6"
+            v-for="(item,index) in rentalRequirements"
+            :key="index"
+          >
+            <el-checkbox-group v-model="formData.checkboxGroup1">
+              <el-checkbox-button
+                :label="item"
+                :key="item"
+              >{{item}}</el-checkbox-button>
+            </el-checkbox-group>
+
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <div class="formContent-item_title">招租信息</div>
+      <el-form-item
+        label="招租标题："
+        prop="name"
+        class="show-required-icon-star"
+      >
+        <el-col :span="24">
+          <el-input
+            placeholder="请输入招租标题"
+            v-model="formData.name"
+            clearable
+          >
+          </el-input>
+        </el-col>
+      </el-form-item>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            label="租赁方式："
+            prop="name"
+            class="show-required-icon-star"
+          >
+            <el-radio-group v-model="formData.resource">
+              <el-radio label="1">整租</el-radio>
+              <el-radio label="2">合租</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            label="月租金额(元)："
+            prop="name"
+            class="show-required-icon-star"
+          >
+            <el-input v-model="formData.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            label="收租周期："
+            :prop="this.formData.name1 != '' ? 'name2' :'name1'"
+            class="show-required-icon-star"
+          >
+            押
+            <el-input
+              v-model="formData.name1"
+              placeholder=""
+              style="width: 47px; margin-right: 5px;"
+            ></el-input>
+            付
+            <el-input
+              v-model="formData.name2"
+              placeholder=""
+              style="width: 47px; margin-right: 5px;"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-col :span="24">
+        <el-form-item
+          label="房屋图片："
+          prop="businessLicense"
+          class="show-required-icon-star"
+        >
+          <bz-upload-img
+            type="img"
+            :uploadArr="pictureArr"
+            :limit="3"
+          ></bz-upload-img>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24">
+        <el-form-item
+          label="房屋视频："
+          prop="businessLicensed"
+          class="show-required-icon-star"
+        >
+          <bz-upload-img
+            type="video"
+            :uploadArr="pictureArred"
+            :limit="3"
+          ></bz-upload-img>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24">
+
+        <el-form-item label="招商描述：">
+          <tinymce
+            v-model="formData.description"
+            ref="endit"
+            :height="150"
+          />
+        </el-form-item>
+      </el-col>
+
+    </el-form>
+  </div>
+</template>
+
+
+
+
+<script>
+import Tinymce from '@/components/Tinymce';
+export default {
+  components: { Tinymce },
+  data () {
+    return {
+      token: {
+        [localStorage.getItem('CZC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('CZC_token')
+      },
+      formData: {
+        name: '',
+        checkboxGroup1: [],
+        resource: '1',
+        name1: '',
+        name2: '',
+        businessLicense: '',
+        businessLicensed: '',
+        description: ''
+      },
+      pictureArr: [],
+      pictureArred: [],
+      informTypes: [
+        {
+          label: '1111',
+          value: '1'
+        }, {
+          label: '22',
+          value: '2'
+        }
+      ],
+      fileType: [],
+      rentSaleType: '可租',//租售类型
+      houseType: '商业',//房屋类型
+      floor: '2层/12层',//楼层
+      orientation: '东南',//朝向
+      house: '一室一厅一卫',//户型
+      builtArea: '70',//建筑面积
+      houseConfiguration: [],//房屋配置
+      houseHighlights: ['近地铁', '有电梯', '有车位', '南北通透', '大阳台', '民水民电'],//房屋亮点
+      rentalRequirements: ['不可做饭', '禁止宠物', '只租单身女性', '1年起租', '只租30岁以下白领'],//招租要求
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' },
+        ],
+        name1: [
+          { required: true, message: '请输入名称1', trigger: 'blur' },
+        ],
+        name2: [
+          { required: true, message: '请输入名称2', trigger: 'blur' },
+        ],
+        businessLicense: [
+          { required: true, message: '请选择活动区域', trigger: 'change' }
+        ],
+        businessLicensed: [
+          { required: true, message: '请选择活动区域', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  watch: {
+    pictureArr (val) {
+      this.formData.businessLicense = val.join();
+    },
+    pictureArred (val) {
+      this.formData.businessLicensed = val.join();
+    }
+  },
+  methods: {
+
+    submit () {
+
+      this.$refs.formData.validate((valid) => {
+        if (valid) {
+
+        } else {
+
+        }
+      })
+    },
+    configuration () {
+      this.$api.common.getDictionaryData('CZC_INVESTMENT_CONFIGURATION').then(({ msg, status, data }) => {
+        if (status == 0) {
+          this.houseConfiguration = [];
+          data.map((item, index) => {
+            this.houseConfiguration.push({
+              label: item.dictValue,
+              value: item.dictCode
+            })
+          })
+        }
+      })
+    },
+  },
+  created () {
+    this.configuration();
+  }
+}
+
+
+</script>
+
+
+
+<style lang="scss" scoped>
+.ma_bot {
+    margin-bottom: 20px;
+}
+/deep/ .el-checkbox-button:last-child .el-checkbox-button__inner {
+    border-radius: 0px !important;
+    margin-bottom: 20px;
+    width: 130px;
+}
+.clickUpload {
+    display: flex;
+    .clickUpText {
+        height: 76px;
+        width: 76px;
+        border: 1px solid #e0e1e3;
+        box-sizing: border-box;
+        background: white;
+        border-radius: 5px;
+        margin-right: 5px;
+        z-index: 1;
+        img.dataImg {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            border-radius: 5px;
+        }
+        .addImg {
+            line-height: 76px;
+            text-align: center;
+            cursor: pointer;
+            & > i {
+                font-size: 30px;
+            }
+        }
+        video {
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+</style>

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

@@ -408,7 +408,6 @@ export default {
       this.$emit('initPage');
     },
     submit () {
-      console.log('this.formData.intentionLevel', this.formData.intentionLevel);
       this.$refs.formData.validate((valid) => {
         if (valid) {
           let url = '/czc-community/business/add';

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

@@ -67,12 +67,6 @@ export default {
     getData () {
       this.$http.get('/czc-community/patrol/record/standard/statistics/content', this.mixins_query).then(({ status, data, msg }) => {
         if (status == 0) {
-
-          var dateTime = new Date();
-
-          var strDate = dateTime.getDate() - 1;
-
-
           let name = [];
           let resData = [];
           let date1 = []; let date2 = []; let date3 = []; let date4 = []; let date5 = [];
@@ -82,7 +76,6 @@ export default {
 
               for (let k = 0; k < data[i].list.length; k++) {
                 if (data[i].list[k].patrolType == '1') {
-
                   date1.push(data[i].list[k].count || 0)
                 } else if (data[i].list[k].patrolType == '2') {
                   date2.push(data[i].list[k].count || 0)
@@ -103,6 +96,7 @@ export default {
               date5.push(0);
             }
           }
+          name = Array.from(new Set(name));
           name.map((item, index) => {
             resData.push({
               name: item,