Merge branch 'http_test' into insist

src/components/select/searchPeople.vue

@@ -31,7 +31,7 @@ import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 export default {
   props: {
     value: {
-      type: [String, Array],
+      type: [String, Array, Object],
       default: '',
       required: false
     },
@@ -70,11 +70,15 @@ export default {
         if (this.searchValue === newV) {
           return
         }
-        this.searchValue = newV
+        if (newV === null) {
+          this.multiple ? this.searchValue = [] : this.searchValue = ''
+        } else {
+          this.searchValue = newV
+        }
         const type = Object.prototype.toString.call(this.searchValue)
         if (type.indexOf('Array') < 0) {
-          this.remoteMethod(newV)
-        } else if (type.indexOf('Array') > 0 && newV.length > 0 && this.firstGetArr) {
+          this.remoteMethod(this.searchValue)
+        } else if (type.indexOf('Array') > 0 && this.searchValue.length > 0 && this.firstGetArr) {
           this.initMore(this.searchValue)
           this.firstGetArr = false
         }
@@ -93,6 +97,9 @@ export default {
     },
     async getMember(query, initMore = false) {
       const res = await memberQueryMemberInfoByIDAPorName({ memberIDAP: query })
+      if (res.data === null) {
+        return
+      }
       this.loading = false
       const weakMap = new Map()
       for (const item of res.data) {
@@ -103,6 +110,9 @@ export default {
       initMore ? this.options = [...this.options, ...weakMap.values()] : this.options = [...weakMap.values()]
     },
     changeSelect(e) {
+      if (this.searchValue === [] || this.searchValue === '') {
+        this.searchValue = null
+      }
       this.$emit('update:value', this.searchValue)
       if (this.multiple) {
         this.$emit('change', this.searchValue)

src/views/ToConfigure/BusinessDirection/BusinessDirection.vue

@@ -191,7 +191,8 @@ export default {
 
 <style lang="scss" scoped>
 .spacing {
-  margin-left: 15px;
+  margin-left: 5px;
   color:#409EFF;
+  font-size: 14px;
 }
 </style>

src/views/ToConfigure/configure.vue

@@ -165,7 +165,7 @@
                 <el-table-column v-if="false" prop="id" label="ID" width="180" align="center" />
                 <el-table-column prop="moduleName" label="模块名称">
                   <template slot="header">
-                    模块名称<i class="el-icon-circle-plus" @click="handlerModule('add')" />
+                    模块名称<i class="el-icon-circle-plus spacing" @click="handlerModule('add')" />
                   </template>
                 </el-table-column>
                 <el-table-column prop="creator" label="创建人" width="150" align="center" />
@@ -763,8 +763,9 @@ export default {
         margin-bottom: 5%;
         color: #606266;
         i {
-          margin-left: 5%;
-          color: rgb(64, 158, 255);
+          margin-left: 5px;
+          color:#409EFF;
+          font-size: 14px;
         }
       }
       .icon-display {
@@ -803,8 +804,9 @@ export default {
     margin: 0 0 10px 10px;
     flex: 0 1 auto !important;
     i {
-      margin-left: 5%;
-      color: rgb(64, 158, 255);
+      margin-left: 5px;
+  color:#409EFF;
+  font-size: 14px;
     }
     .table-main{
       display: flex;

src/views/projectManage/requirement/requirementDetail.vue

@@ -573,9 +573,7 @@ export default {
           this.form_query.referredClientType = this.form_query.referredClientTypes
         }
         this.availableStatusList = res.data.availableStatusList
-        const rqmtProposer = JSON.parse(JSON.stringify(this.form_query.rqmtProposer))
-        console.log(rqmtProposer, 'cdscc')
-        if (rqmtProposer[0] === '' || rqmtProposer === null) {
+        if (this.form_query.rqmtProposer === null || this.form_query.rqmtProposer === '') {
           this.form_query.rqmtProposer = null
         } else {
           this.form_query.rqmtProposer = this.form_query.rqmtProposer.split(',')

vue.config.js

@@ -112,13 +112,32 @@ module.exports = {
                 libs: {
                   name: 'chunk-libs',
                   test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
+                  priority: -10,
                   chunks: 'initial' // only package third parties that are initially dependent
                 },
                 elementUI: {
                   name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                  priority: 15, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]element-ui[\\/]/, // in order to adapt to cnpm
+                  chunks: 'initial',
+                  reuseExistingChunk: true,
+                  enforce: true
+                },
+                echarts: {
+                  name: 'chunk-echarts',
+                  test: /[\\/]node_modules[\\/]echarts[\\/]/,
+                  chunks: 'all',
+                  priority: 10,
+                  reuseExistingChunk: true,
+                  enforce: true
+                },
+                demo: {
+                  name: 'chunk-demo',
+                  test: /[\\/]src[\\/]views[\\/]/,
+                  chunks: 'all',
+                  priority: 20,
+                  reuseExistingChunk: true,
+                  enforce: true
                 },
                 commons: {
                   name: 'chunk-commons',