Merge branch 'test' into dev-chaxun

src/main.js

@@ -35,6 +35,7 @@ if (getQueryPara("token")) {
   Cookies.set("token", getQueryPara("token"));
 }
 
+
 window.app = Object.assign(
   {},
   {

src/views/components/editResi.vue

@@ -1,6 +1,6 @@
 <template>
   <div :id="formId" class="resi-container">
-    <el-form :ref="formId" class="resi-form" :model="form" :rules="rules" :label-width="labelWidth">
+    <el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth">
       <template v-if="supportAdd">
         <el-row style="margin-bottom: 10px;">
           <el-col :span="24">
@@ -19,7 +19,7 @@
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select"
+                  clearable class="resi-cell-select" @change="handleChangeGrid"
                   >
                     <el-option
                       v-for="item in optionsG"
@@ -33,10 +33,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item prop="VILLAGE_ID" label="所属小区" required>
+              <el-form-item label="所属家庭" required>
                 <div class="resi-cell-value">
-                  <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
+                  <div class="resi-cell-col">
-                  clearable class="resi-cell-select"
+                    <el-form-item prop="VILLAGE_ID">
+                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
+                      clearable class="resi-cell-select" @change="handleChangeV"
                       >
                         <el-option
                           v-for="item in optionsV"
@@ -45,7 +47,9 @@
                           :value="item.value">
                         </el-option>
                       </el-select>
-                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
+                    </el-form-item>
+                    <el-form-item prop="BUILD_ID">
+                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
                       clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
                       >
                         <el-option
@@ -55,7 +59,9 @@
                           :value="item.value">
                         </el-option>
                       </el-select>
-                  <el-select v-model.trim="form.UNIT_ID" :disabled="disabled" placeholder="请选择单元" size="small"
+                    </el-form-item>
+                    <el-form-item prop="UNIT_ID">
+                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
                       clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
                       >
                         <el-option
@@ -65,7 +71,9 @@
                           :value="item.value">
                         </el-option>
                       </el-select>
-                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择房号" size="small"
+                    </el-form-item>
+                    <el-form-item prop="HOME_ID">
+                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
                       clearable class="resi-cell-select resi-cell-select-middle"
                       >
                         <el-option
@@ -75,6 +83,20 @@
                           :value="item.value">
                         </el-option>
                       </el-select>
+                    </el-form-item>
+                  </div>
+                  <!-- <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col> -->
                 </div>
             </el-form-item>
           </el-col>
@@ -379,7 +401,15 @@ export default {
       tempFormList,
       addCount: 0,
       addList: [],
-      rules,
+      rulesForm: {
+        ...rules,
+        VILLAGE_ID: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
+        GRID_ID: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
+        BUILD_ID: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
+        UNIT_ID: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
+        HOME_ID: [{ required: true, message: `请选择房号`, trigger: 'blur' }]
+      },
+      // rules,
       value: '',
       optionsV: [],
       optionsB: [],
@@ -804,7 +834,12 @@ export default {
   .resi-cell-value .resi-cell-textarea {
     width: 300px;
   }
-
+  .resi-cell-col {
+    display: flex;
+    .el-form-item {
+      margin-right: 10px;
+    }
+  }
   .resi-cell-select {
     width: 180px;
     box-sizing: border-box;

src/views/components/resiForm.vue

@@ -330,13 +330,15 @@ export default {
     }
     let initForm = (obj, arr) => {
       let _form = {}
-      // console.log('formInfo', obj)
+      console.log('formInfo---arr', arr)
       if (Object.keys(obj).length > 0) {
         _form = { ...obj }
         return _form
       }
       arr.forEach(item => {
+
         if (item.multiSelect) _form[item.columnName] = []
+        else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
         else _form[item.columnName] = ''
 
         // if (item.optionSourceType === 'remote') {
@@ -371,7 +373,12 @@ export default {
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [ ...this.formList ].map(item => {
+      return {
+        ...item,
+        isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false
+      }
+    })
     let constForm = {
       ...form,
       GRID_ID: '',

src/views/modules/visual/communityGovern/cpt/issue-info.vue

@@ -23,7 +23,8 @@
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题内容：</span>
               <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
@@ -43,7 +44,8 @@
               <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
@@ -51,11 +53,13 @@
               <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
@@ -181,8 +185,10 @@ export default {
       if (code === 0) {
         this.info = data
 
+        if (this.info.topicInfo && this.info.topicInfo.publishedTime) {
           this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
 
+        }
       } else {
         this.$message.error(msg);
       }

src/views/modules/visual/communityParty/community.vue

@@ -6,8 +6,7 @@
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           区域化党建&nbsp;&nbsp;
-          <el-cascader 
+          <el-cascader v-model="selectAgency"
-            v-model="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"
                        :show-all-levels="false"
@@ -37,8 +36,7 @@
                           prefix-icon="el-icon-caret-bottom"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           :clearable="false"
-                            :default-time="['00:00:00', '23:59:59']"
+                          :default-time="['00:00:00', '23:59:59']">
-                            >
           </el-date-picker>
         </div>
       </div>
@@ -48,7 +46,9 @@
       </div>
       <div class="box-wr box-wr-400">
         <div class="box-left">
-          <div v-for="(item, index) in cateInfo" :key="index" class="box-left-item">
+          <div v-for="(item, index) in cateInfo"
+               :key="index"
+               class="box-left-item">
             <div class="box-label">{{ item.label }}</div>
             <div class="box-num">{{ item.value }}</div>
           </div>
@@ -113,7 +113,8 @@
       </div>
 
     </cpt-card>
-    <dialog-info v-show="showedMoreInfo" :info="detailInfo"
+    <dialog-info v-show="showedMoreInfo"
+                 :info="detailInfo"
                  @close="showedMoreInfo = false" />
   </div>
 </template>
@@ -166,34 +167,7 @@ export default {
       selectAgency: '',
       unitList: [],
       propTree: [],
-      partyItem: [
+      partyItem: [],
-        {
-          name: '楼宇党建',
-          value: 1,
-          color: 'rgba(250, 32, 10, 1)',
-          icon: require('../../../../assets/img/shuju/measure/ly@2x.png')
-        }, {
-          name: '机关直属部门',
-          value: 2,
-          color: 'rgba(65, 181, 104, 1)',
-          icon: require('../../../../assets/img/shuju/measure/jgzs@2x.png')
-        }, {
-          name: '两新党建',
-          value: 3,
-          color: 'rgba(251, 177, 4, 1)',
-          icon: require('../../../../assets/img/shuju/measure/lxdj@2x.png')
-        }, {
-          name: '辖区单位',
-          value: 4,
-          color: 'rgba(80, 194, 237, 1)',
-          icon: require('../../../../assets/img/shuju/measure/xq@2x.png')
-        }, {
-          name: '其他',
-          value: 5,
-          color: 'rgba(192, 21, 195, 1)',
-          icon: require('../../../../assets/img/shuju/measure/qita.png')
-        }
-      ],
       cateInfo: [],
       //地图相关数据
       isfirstInit: true,//记录是否是首次加载地图
@@ -256,7 +230,7 @@ export default {
     await this.getMapUnitList(this.agencyId)
   },
   watch: {
-    timeRange(val) {
+    timeRange (val) {
       console.log('val-www', val)
       this.getList(this.agencyId);
     }
@@ -293,7 +267,7 @@ export default {
       }
       this.visibleLoading = false
     },
-    async getAgencyList() {
+    async getAgencyList () {
       // const url = "/gov/org/customeragency/staffinagencylist";
       // const url = '/gov/org/customeragency/agencygridtree'
       const url = '/gov/org/customeragency/staffinagencylist'
@@ -314,7 +288,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
@@ -330,7 +304,8 @@ export default {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
-            children: this.getTreeData(item.subAgencyList)}
+            children: this.getTreeData(item.subAgencyList)
+          }
         } else {
           _item = {
             label: item.agencyName,
@@ -373,19 +348,19 @@ export default {
         const colorItem = {
           0: {
             color: 'rgba(250, 32, 10, 1)',
-            icon: require('../../../../assets/img/shuju/measure/ly@2x.png')
+            icon: require('../../../../assets/img/shuju/measure/lxdj.png')
           },
           1: {
             color: 'rgba(251, 177, 4, 1)',
-            icon: require('../../../../assets/img/shuju/measure/lxdj@2x.png')
+            icon: require('../../../../assets/img/shuju/measure/lxzz.png')
           },
           2: {
             color: 'rgba(80, 194, 237, 1)',
-            icon: require('../../../../assets/img/shuju/measure/xq@2x.png')
+            icon: require('../../../../assets/img/shuju/measure/qydw.png')
           },
           3: {
             color: 'rgba(65, 181, 104, 1)',
-            icon: require('../../../../assets/img/shuju/measure/jgzs@2x.png')
+            icon: require('../../../../assets/img/shuju/measure/jgzs.png')
           },
           4: {
             color: 'rgba(192, 21, 195, 1)',
@@ -417,11 +392,11 @@ export default {
         this.$message.error(msg)
       }
     },
-    handleCascader(val) {
+    handleCascader (val) {
       console.log('val-vvv', val)
       if (val.length > 0) {
         const _arr = val[val.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
         this.getList(_arr[0])
         this.getMapUnitList(_arr[0])
         this.getCateCount(_arr[0])
@@ -429,14 +404,14 @@ export default {
       }
 
     },
-    initTime() {
+    initTime () {
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
       console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
       this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
     },
-    timeFormat(date) {
+    timeFormat (date) {
       if (!date || typeof date === 'string') {
         return false
       }
@@ -554,11 +529,11 @@ export default {
 
 
         this.iconUrlArray = [
-          require('../../../../assets/img/shuju/measure/ly@2x.png'),//未处理
+          require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
-          require('../../../../assets/img/shuju/measure/jgzs@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
-          require('../../../../assets/img/shuju/measure/lxdj@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
-          require('../../../../assets/img/shuju/measure/xq@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-          require('../../../../assets/img/shuju/measure/qita.png')//已处理
+          require('../../../../assets/img/shuju/measure/qita.png')//其他
         ]
 
 
@@ -589,7 +564,7 @@ export default {
     clickProject (feature) {
       console.log('标注信息', feature.values_.properties)
     },
-    async handleLook(val) {
+    async handleLook (val) {
 
       this.detailId = val.id
       await this.getDetail(val.id)
@@ -636,7 +611,8 @@ export default {
     &::-webkit-scrollbar-corner,
       /* 滚动条角落 */
     &::-webkit-scrollbar-thumb,
-    &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+    &::-webkit-scrollbar-track {
+      /*滚动条的轨道*/
       border-radius: 4px;
     }
 
@@ -644,13 +620,13 @@ export default {
     &::-webkit-scrollbar-track {
       /* 滚动条轨道 */
 
-      background: rgba(12, 129, 254, .24);
+      background: rgba(12, 129, 254, 0.24);
       // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
     }
 
     &::-webkit-scrollbar-thumb {
       /* 滚动条手柄 */
-      background: linear-gradient(270deg, #0063FE, #0095FF);
+      background: linear-gradient(270deg, #0063fe, #0095ff);
     }
   }
 }
@@ -666,7 +642,6 @@ export default {
     margin-right: 6px;
   }
   .title-label {
-
     font-size: 20px;
     font-weight: 800;
     ::v-deep .el-input {
@@ -713,7 +688,6 @@ export default {
     background: #2865fa;
     border-radius: 50%;
   }
-  
 }
 .second-select {
   margin: 0 10px 0 10px;
@@ -758,10 +732,10 @@ export default {
       right: 5px;
     }
   }
-  }
+}
-  .second-select:last-child {
+.second-select:last-child {
   margin-left: 0;
-  }
+}
 .box-wr {
   display: flex;
   box-sizing: border-box;

src/views/modules/visual/components/screen-map/index.vue

@@ -1,5 +1,25 @@
 <template>
   <div class="div_content_map">
+    <!-- <div>
+      <el-input v-model="input_lat"></el-input>
+      <el-input v-model="input_lon"></el-input>
+      <el-button @click="showPosition"></el-button>
+    </div> -->
+
+    <!-- <div id="mouse-position"
+         style="
+        color: #fff;
+        position: absolute;
+        bottom:10px;
+        right:10px;
+        z-index: 10000000;
+        width: 200px;
+        line-height: 30px;
+        background: rgba(0,0,0,0.5);
+    "> 
+
+  </div>-->
+
     <div class="div_map"
          id="map"
          ref="map">
@@ -27,12 +47,15 @@ import GeoJSON from 'ol/format/GeoJSON.js';
 import Point from "ol/geom/Point.js";
 import Feature from "ol/Feature.js";
 import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
+import { Select, DoubleClickZoom } from 'ol/interaction.js';
 import { getCenter, boundingExtent } from 'ol/extent.js';
 import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
 import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
 import { getDistance } from 'ol/sphere';
 
+import MousePosition from 'ol/control/MousePosition';
+import { createStringXY } from 'ol/coordinate';
+import { defaults as defaultControls } from 'ol/control';
 import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 
@@ -141,6 +164,8 @@ const vueGis = {
       iconTextColor: '#ffffff',
       distanceMax: null,//显示的坐标距离中心点的范围                                                    
 
+      input_lat: null,
+      input_lon: null
     }
   },
   async mounted () {
@@ -148,6 +173,10 @@ const vueGis = {
 
   },
   methods: {
+    showPosition () {
+      let array = [this.input_lat, this.input_lon]
+      map.getView().setCenter(array)
+    },
     //加载地图:地图基本信息，多边形区域信息，多边形icon
     loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
       this.mapInfo = mapInfo
@@ -158,6 +187,11 @@ const vueGis = {
       this.iconTextStyle = iconTextStyle
       this.distanceMax = distanceMax
 
+      iconArrays.forEach(item => {
+        console.log(item.type, item.urlIndex, item.latitude, item.longitude)
+      });
+
+
       //初始化地图
       this.initMap()
 
@@ -412,6 +446,7 @@ const vueGis = {
       //初始化map和地图底图
       //创建地图容器
       map = new Map({
+
         layers: [gaodeMapLayer],
         //加载瓦片图层数据
         view: mapView,
@@ -419,6 +454,14 @@ const vueGis = {
         //目标加载到map中
       })
 
+      var mousePositionControl = new MousePosition({
+        coordinateFormat: createStringXY(6),//获取位置
+        projection: 'EPSG:4326',
+        className: 'custom-mouse-position',
+        target: document.getElementById('mouse-position'), //将位置数据放到那里
+        undefinedHTML: '&nbsp'
+      });
+      map.addControl(mousePositionControl);
 
 
       //去除双击放大效果

src/views/modules/visual/cpts/analyse.vue

@@ -83,7 +83,7 @@
 
         <div class="analys-col analys-col-wr analys-col-more list-wr"
              id="scroll-wr">
-          <div class="cate-list cate-list-child">
+          <div class="cate-list cate-list-child" :style="'padding-top:' + computedPd(tempList)">
             <div v-for="(item, index) in tempList"
                  :key="index"
                  class="cate-row">
@@ -275,12 +275,19 @@ export default {
       }
       return statusObj[status]
     },
+    computedPd(list) {
+      if (this.sourceTab == 'group') return '60px'
+      if (list.length == 1) return '330px'
+      else if (list.length == 2) return '240px'
+      else return '60px'
+    },
     handleTabs (type) {
       if (type === 'group') this.tempList = [...this.singleList]
       else if (type === 'event') this.tempList = [...this.moreList]
       this.sourceTab = type
       const _dom = document.getElementById('scroll-wr')
       _dom.scrollTop = 0
+      this.computedPd(this.tempList)
     },
     handleProject (item) {
       this.$emit('project', item)