Merge branch 'dev-tuceng0616' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-tuceng0616

# Conflicts:
#	src/assets/scss/modules/visual/fiveLayerMap.scss

src/assets/scss/modules/visual/fiveLayerMap.scss

@@ -49,7 +49,7 @@
   }
 
   .div_data {
-    flex: 0 0 600px;
+    flex: 0 0 610px;
     margin-left: 12px;
 
     .div_tips{
@@ -91,33 +91,38 @@
       .div_category {
         box-sizing: border-box;
         height:238px;
-        padding:0 20px 20px;  
+        padding:0 10px 20px;  
   
         .category_item {
          
           margin-bottom: 15px;
           display: flex;
           justify-content: flex-start;
-         
+          align-items: center;
           // margin:auto;
        
          
           .list_item {
-           
+           display: flex;
             // padding: 18px 59px 0;
             justify-content: flex-start;
-            flex:0 0 135px;
+            flex:0 0 145px;
+            align-items: center;
 
             > img {
-              height: 18px;
+              height: 16px;
-              width: 18px;
+              width: 16px;
+       
+              // line-height: 25px;
             }
             .item_content{
-              width:100px;
+              width:120px;
               margin-left:8px;
               font-size: 16px;
               font-family: PingFang SC;
               font-weight: 400;
+       
+            // line-height: 25px;
               color: #e5effa;
             }
 
@@ -166,8 +171,11 @@
         text-align: center;
         width: 559px;
         height: 48px;
-        background: #01106800;
+        background-color: #011168;
-        border-radius: 8px;
+        border-radius: 4px;
+        border: none;
+        box-shadow: 0 0 10px inset #1a5afd;
+        // border-radius: 8px;
         display: flex;
         justify-content: flex-end;
       
@@ -175,25 +183,25 @@
           display: flex;
           align-items: center;
           margin-left: 29px;
-          margin-top: 16px;
+          margin-top: 14px;
       
           > img {
-            width: 24px;
+            width: 20px;
-            height: 24px;
+            height: 20px;
           }
         }
       
         .btn {
           text-align: center;
           flex: 0 0 113px;
-          height: 53px;
+          height: 48px;
-          background: #0082fb;
+          background: linear-gradient(90deg, #1A5AFD, #26C4FF);
-          border-radius: 0px 8px 8px 0px;
+          border-radius: 0px 4px 4px 0px;
           font-size: 20px;
           font-family: PingFang SC;
           font-weight: 400;
           color: #ffffff;
-          line-height: 53px;
+          line-height: 48px;
         }
         .btn:hover {
           cursor: pointer;

src/views/modules/shequzhili/csgltc/csgl.vue

@@ -24,9 +24,9 @@
                      size="small"
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
+                       :key="item.value"
-                       :label="item.categoryName"
+                       :label="item.label"
-                       :value="item.categoryKey">
+                       :value="item.value">
             </el-option>
           </el-select>
 
@@ -202,7 +202,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
@@ -428,8 +428,8 @@ export default {
     async handleExport () {
       let title = '城市管理图层'
 
-      // const url = "/gov/org/icCityManagement/export"
+      const url = "/gov/org/icCityManagement/export"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export"
       let params = {
         ...this.formData
       }

src/views/modules/shequzhili/csgltc/csglDetail.vue

@@ -22,15 +22,6 @@
           <span class="detail_span">{{formData.categoryName}}</span>
 
         </el-form-item>
-        <!--<el-form-item label="服务事项："
-                      prop="serviceMatterList"
-                      label-width="150px"
-                      style="display: block">
-          <p class="detail_span"
-             v-for="(item,index) in formData.serviceMatterList"
-             :key="index">{{item}}</p>
-
-        </el-form-item>-->
         <el-form-item label="占地面积："
                       prop="areaCovered"
                       label-width="150px"
@@ -50,32 +41,29 @@
                       label-width="150px">
           <span class="detail_span">{{formData.address}}</span>
         </el-form-item>
-        <!--<el-form-item label="备注："
+        <el-form-item label="位置坐标"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <span class="detail_span">{{formData.remark?formData.remark:'无'}}</span>
-        </el-form-item>
-        <el-form-item label="地理位置："
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-          <span class="detail_span">{{formData.address}}</span>
-
-        </el-form-item>
-        <el-form-item label="位置坐标："
                       prop="longitude"
                       label-width="150px"
                       style="display: block">
-          <div style="width:500px">
+          <div style="width: 500px">
-
+            <div id="app"
-            <div id="app">
+                 class="div_map"></div>
-
+            <div style="margin-top: 10px">
+              <span>经度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入经度"
+                        v-model="formData.longitude">
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="formData.latitude">
+              </el-input>
             </div>
-
           </div>
-        </el-form-item>-->
+        </el-form-item>
-
       </el-form>
 
     </div>
@@ -106,8 +94,8 @@ export default {
     }
   },
   components: {},
-  mounted () {
+  async mounted () {
-    this.initMap()
+   await this.initMap()
   },
 
   methods: {

src/views/modules/shequzhili/csgltc/csglForm.vue

@@ -48,9 +48,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
+                       :key="item.value"
-                       :label="item.categoryName"
+                       :label="item.label"
-                       :value="item.categoryKey">
+                       :value="item.value">
             </el-option>
           </el-select>
 
@@ -186,7 +186,7 @@ export default {
 
   methods: {
 
-    async initForm (type, unitId) {
+    async initForm (type, icCityManagementId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
@@ -194,9 +194,9 @@ export default {
       await this.loadService()
 
       this.formType = type
-      if (unitId) {
+      if (icCityManagementId) {
-        this.unitId = unitId
+        this.icCityManagementId = icCityManagementId
-        this.formData.id = unitId
+        this.formData.icCityManagementId = icCityManagementId
         await this.loadFormData()
       } else {
         map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
@@ -268,24 +268,13 @@ export default {
 
     },
     async addUnit () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      let url = ''
-      // if (regPhone.test(this.formData.contactMobile) === false) {
+      if (this.formType === 'add'){
-      //   this.btnDisable = false
+        url = '/gov/org/icCityManagement/add'
-      //   this.$message({
+      }else {
-      //     type: 'warning',
+        url = '/gov/org/icCityManagement/edit'
-      //     message: '请输入正确的手机号码'
+      }
-      //   })
-      //   return false;
-      // }
-
-      let url = '/gov/org/icCityManagement/add'
-      // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/add"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
-
       const { data, code, msg } = await requestPost(url, this.formData)
-
       if (code === 0) {
         this.$message({
           type: 'success',
@@ -298,7 +287,6 @@ export default {
         this.btnDisable = false
         this.$message.error(msg)
       }
-
     },
 
     handleCancle () {

src/views/modules/shequzhili/ggfwtc/ggfw.vue

@@ -25,9 +25,9 @@
                        size="small"
                        clearable>
               <el-option v-for="item in serviceList"
-                         :key="item.categoryKey"
+                         :key="item.value"
-                         :label="item.categoryName"
+                         :label="item.label"
-                         :value="item.categoryKey">
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -197,7 +197,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       agencyId: '',

src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

@@ -41,6 +41,29 @@
                       label-width="150px">
           <span class="detail_span">{{formData.address}}</span>
         </el-form-item>
+        <el-form-item label="位置坐标"
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+          <div style="width: 500px">
+            <div id="app"
+                 class="div_map"></div>
+            <div style="margin-top: 10px">
+              <span>经度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入经度"
+                        v-model="formData.longitude">
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="formData.latitude">
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
       </el-form>
 
     </div>

src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

@@ -30,9 +30,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
+                       :key="item.value"
-                       :label="item.categoryName"
+                       :label="item.label"
-                       :value="item.categoryKey">
+                       :value="item.value">
             </el-option>
           </el-select>
 
@@ -154,7 +154,7 @@
           latitude: 120.38945519 //纬度
         },
         serviceList: [],//服务list
-
+        publicServiceData: {},
       }
     },
     components: {},
@@ -210,12 +210,11 @@
         let params = {
           icPublicServiceId: this.icPublicServiceId
         }
-
         const { data, code, msg } = await requestPost(url, params)
-
         if (code === 0) {
-          if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
+          console.log(data)
-            data.serviceMatterList = []
+          if (null != data) {
+            data: this.publicServiceData
           }
 
           this.formData = { ...data }
@@ -247,24 +246,13 @@
 
       },
       async addUnit () {
-        // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        let url = ''
-        // if (regPhone.test(this.formData.contactMobile) === false) {
+        if (this.formType === 'add'){
-        //   this.btnDisable = false
+          url = '/gov/org/icPublicService/add'
-        //   this.$message({
+        }else {
-        //     type: 'warning',
+          url = '/gov/org/icPublicService/edit'
-        //     message: '请输入正确的手机号码'
+        }
-        //   })
-        //   return false;
-        // }
-
-        let url = '/gov/org/icPublicService/add'
-        // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/add"
-        // if (this.formType === 'edit') {
-        //  this.formData.id = this.unitId
-        // }
-
         const { data, code, msg } = await requestPost(url, this.formData)
-
         if (code === 0) {
           this.$message({
             type: 'success',

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

@@ -29,6 +29,14 @@
             <div v-if="typeof item === 'string' || typeof item === 'number'">
               {{ item }}
             </div>
+
+            <div v-if="typeof item === 'object'&& item.type === 'img'">
+              <!-- <span>{{  item.type+  item.src}}</span> -->
+              <img style="width:18px;height:18px"
+                   :src="item.src"
+                   alt="" />
+
+            </div>
             <div v-if="typeof item === 'object' && item && item.type == 'index'">
               <img v-if="highlightTop3 && index == 0"
                    src="@/assets/img/shuju/top/1.png"