Merge branch 'dev_org_staff' into dev

src/views/modules/base/organization/organization.vue

@@ -1897,7 +1897,7 @@ export default {
             const url = '/gov/org/agency/agencydetail'
 
             let params = {
-                agencyId: localStorage.getItem('agencyId')
+                agencyId: this.currentAgencyId
             }
 
             const { data, code, msg } = await requestPost(url,params)

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -110,8 +110,8 @@
                     </div>
 
                     <div class="detail"
-                         v-if="item.processName == '处理响应' && item.assistanceUnitName">
+                         v-if="item.assistanceUnitName">
-                      <div class="detail-field">协 办：</div>
+                      <div class="detail-field">协办单位：</div>
                       <div class="detail-value">
                         <fold-text :row="3">{{ item.assistanceUnitName }}</fold-text>
                       </div>

src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@@ -52,7 +52,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="服务人"
+      <el-form-item label="需求人"
                     label-width="150px"
                     prop="demandUserName">
         <el-input v-model="formData.demandUserName"
@@ -187,9 +187,9 @@ function iniFmData () {
     reportUserName: '',//	上报人姓名	
     reportUserMobile: '',//	自身上报时存储注册居民的手机号	
     reportTime: '',//	上报时间	
-    demandUserId: '',//	服务人：user.id或者ic_resi_user.id	
+    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	服务人姓名	
+    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//服务人联系电话	
+    demandUserMobile: '',//需求人联系电话	
     wantServiceTime: '',//	希望服务时间
     serviceType: '',
     serverId: '',
@@ -249,7 +249,7 @@ export default {
           { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
         demandUserName: [
-          { required: true, message: "服务人不能为空", trigger: "blur" },
+          { required: true, message: "需求人不能为空", trigger: "blur" },
         ],
         demandUserMobile: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },

src/views/modules/shequzhili/event/eventList.vue

@@ -237,7 +237,7 @@
             <template slot-scope="scope">
 
               <span v-if="scope.row.status==='processing'">处理中</span>
-              <span v-else-if="scope.row.status==='closed_case'">已办结</span>
+              <span v-else-if="scope.row.status==='closed_case'">已完成</span>
               <span v-else>--</span>
             </template>
           </el-table-column>
@@ -609,7 +609,7 @@ export default {
 
         this.tableData.forEach(item => {
           if (item.operationType === '2') {
-            item.operationTypeShow = '已转需求'
+            item.operationTypeShow = '已转服务'
           }
           if (item.operationType === '1') {
             item.operationTypeShow = '已立项'

src/views/modules/visual/basicinfo/basicInfoMain.vue

@@ -172,8 +172,8 @@ let iconSource; // icon
 let polygonSource;//变电站标注多边形
 let select;//选中标注
 
-let xoffset = 0.0051
+let xoffset = 0
-let yoffset = 0.0002
+let yoffset = 0
 
 
 //url图标
@@ -634,10 +634,10 @@ const vueGis = {
             coorArray.forEach((item, index) => {
 
               if (index % 2 == 0) {//偶
-                item = (parseFloat(item) + xoffset) + ''
+                item = (parseFloat(item) + parseFloat(xoffset)) + ''
                 itemArray.push(item)
               } else {//奇
-                item = (parseFloat(item) + yoffset) + ''
+                item = (parseFloat(item) + parseFloat(yoffset)) + ''
                 itemArray.push(item)
 
                 polygonArray.push(itemArray)
@@ -703,12 +703,12 @@ const vueGis = {
             coorArray.forEach((item, index) => {
               // itemArray.push(item)
               if (index % 2 == 0) {//偶
-                item = (parseFloat(item) + xoffset) + ''
+                item = (parseFloat(item) + parseFloat(xoffset)) + ''
                 itemArray.push(item)
 
               } else {//奇
 
-                item = (parseFloat(item) + yoffset) + ''
+                item = (parseFloat(item) + parseFloat(yoffset)) + ''
                 itemArray.push(item)
                 polygonArray.push(itemArray)
                 itemArray = []