列表

project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue

@@ -54,45 +54,45 @@
               <el-form ref="form" :model="form" :rules="formRules" size="small"  label-width="150px">
 
                 <el-form-item label="活动名称" prop="title">
-                  <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="100"></el-input>
+                  <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="64"></el-input>
                 </el-form-item>
 
                 <el-form-item label="活动说明">
-                  <el-input type="textarea" :rows="5" v-model="form.votingInstructions" placeholder="请输入" show-word-limit maxlength="500"></el-input>
+                  <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
                 </el-form-item>
 
-                <el-form-item label="行政地区" prop="title">
+                <!-- <el-form-item label="行政地区" prop="title">
                   <ai-area-get v-model="form.areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect"/>
-                </el-form-item>
+                </el-form-item> -->
 
-                <el-form-item label="地图位置" prop="title">
+                <el-form-item style="width: 100%" label="地理位置" prop="location">
                   <el-button @click="showMap = true">地图标绘</el-button>
                 </el-form-item>
 
-                <el-form-item label="打卡范围" prop="title">
-                  <el-input v-model="form.title" placeholder="请输入" >
+                <el-form-item label="打卡范围" prop="clockRange">
+                  <el-input v-model="form.clockRange" placeholder="请输入" >
                     <template slot="append">米</template>
                   </el-input>
                 </el-form-item>
 
-                <el-form-item label="进场打卡时间" prop="title">
-                  <el-date-picker v-model="form.value1" type="datetimerange" start-placeholder="开始日期" 
+                <el-form-item label="进场打卡时间" prop="intoTime">
+                  <el-date-picker v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" 
                   end-placeholder="结束日期" :default-time="['00:00:00']"></el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="进场得积分" prop="title">
-                  <el-input v-model="form.title" type="number" placeholder="请输入" >
+                <el-form-item label="进场得积分" prop="intoIntegral">
+                  <el-input v-model="form.intoIntegral" type="number" placeholder="请输入" >
                     <template slot="append">积分</template>
                   </el-input>
                 </el-form-item>
 
-                <el-form-item label="离场打卡时间" prop="title">
-                  <el-date-picker v-model="form.value1" type="datetimerange" start-placeholder="开始日期" 
+                <el-form-item label="离场打卡时间" prop="exitTime">
+                  <el-date-picker v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" 
                   end-placeholder="结束日期" :default-time="['00:00:00']"></el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="离场得积分" prop="title">
-                  <el-input v-model="form.title" type="number" placeholder="请输入" >
+                <el-form-item label="离场得积分" prop="exitIntegral">
+                  <el-input v-model="form.exitIntegral" type="number" placeholder="请输入" >
                     <template slot="append">积分</template>
                   </el-input>
                 </el-form-item>
@@ -107,7 +107,7 @@
         <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
-    <ai-dialog title="地图" :visible.sync="showMap" @opened="getCorpLocation" width="800px" class="mapDialog" @onConfirm="selectMap">
+    <ai-dialog title="地图" :visible.sync="showMap" @opened="initMap" width="800px" class="mapDialog" @onConfirm="selectMap">
       <div id="map"></div>
       <el-form label-width="80px" style="padding: 10px 20px 0 20px;">
         <el-row type="flex" justify="space-between">
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import AMapLoader from '@amap/amap-jsapi-loader'
 import { mapState } from "vuex";
 export default {
   name: "activitiesAdd",
@@ -138,32 +139,20 @@ export default {
   },
 
   data() {
-    let validCandidate = (rule, value, callback) => {
-      if (!value.length) {
-        return callback(new Error('请选择候选人'));
+    var validLocation =  (rule, value, callback) => {
+      if(!this.form.lat || !this.form.lng) {
+        return callback(new Error('请标绘地理位置'))
       } else {
-        callback();
+        callback()
       }
-    };
-    let validVote = (rule, value, callback) => {
-      if (!value.length) {
-        return callback(new Error('请选择投票人'));
-      } else {
-        callback();
-      }
-    };
+    }
     return {
       form: {
         title: '',
-        votingInstructions: '',
-        organizationName: '',
-        electionMethod: '',
-        chooseNumber: '',
-        votingDate: '',
-        candidateUsers: [],
-        voteUsers: [],
-        partyOrganizations: [],
-        partyOrgId: ''
+        detail: '',
+        lng: '',
+        lat: '',
+        clockRange: '',
       },
       formRules: {
         title: [{required: true, message: "请输入标题", trigger: "blur"}],
@@ -171,8 +160,8 @@ export default {
         electionMethod: [{required: true, message: "请选择选举方式", trigger: "blur"}],
         chooseNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
         votingDate: [{required: true, message: "请选择投票日期", trigger: "blur"}],
-        candidateUsers: [{required: true,validator: validCandidate, trigger: "blur"}],
-        voteUsers: [{required: true,validator: validVote, trigger: "blur"}],
+        candidateUsers: [{required: true,validator: validLocation, trigger: "blur"}],
+        voteUsers: [{required: true,validator: validLocation, trigger: "blur"}],
       },
       id: '',
       isEdit: false,
@@ -183,6 +172,7 @@ export default {
       chooseVoteList: [],
       areaRootId: '',
       map: null,
+      placeSearch: null,
       placeDetail: {
         lng: '',
         lat: '',
@@ -197,14 +187,15 @@ export default {
       this.getDetail()
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
+    // this.initMap()
   },
   computed: {
     ...mapState(['user'])
   },
   methods: {
     selectMap() {
-      this.formData.lng = this.placeDetail.lng
-      this.formData.lat = this.placeDetail.lat
+      this.form.lng = this.placeDetail.lng
+      this.form.lat = this.placeDetail.lat
       this.showMap = false
     },
     getCorpLocation() {
@@ -215,18 +206,16 @@ export default {
       })
     },
 
-    initMap({ lng, lat }) {
+    initMap() {
       AMapLoader.load({
-        key: 'b553334ba34f7ac3cd09df9bc8b539dc',
+        key: '54a02a43d9828a8f9cd4f26fe281e74e',
         version: '2.0',
         plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'],
       }).then((AMap) => {
-        this.placeDetail.lng = this.formData.lng
-        this.placeDetail.lat = this.formData.lat
         this.map = new AMap.Map('map', {
           resizeEnable: true,
           zooms: [6, 20],
-          center: [lng, lat],
+          // center: [lng, lat],
           zoom: 11,
         })
         this.placeSearch = new AMap.PlaceSearch({ map: this.map })
@@ -254,6 +243,7 @@ export default {
       })
     },
 
+
     movePosition(center) {
       if (this.map) {
         this.map.clearMap()
@@ -281,7 +271,7 @@ export default {
     },
 
     getDetail() {
-      this.instance.post(`/app/appgeneralelectioninfo/queryDetailById`,null, {
+      this.instance.post(`/appactivityinfo/queryDetailById`,null, {
         params: {id:this.id}
       }).then((res) => {
         if(res?.data) {
@@ -318,7 +308,7 @@ export default {
                 return this.$message.error('候选人数应多于应选人数')
               }
             }
-            this.instance.post(`/app/appgeneralelectioninfo/addOrUpdate`,{
+            this.instance.post(`/appactivityinfo/addOrUpdate`,{
               ...this.form
             }).then(res => {
               if(res.code == 0) {
@@ -339,6 +329,13 @@ export default {
 .activitiesAdd {
   height: 100%;
 
+  ::v-deep .amap-logo {
+    display: none!important;
+  }
+  ::v-deep .amap-copyright {
+    display: none!important;
+  }
+
   ::v-deep .el-date-editor .el-input {
     width: 100%;
   }