kxc

src/api/base.js

@@ -237,7 +237,6 @@ export function setUserUnlock(data) {
 export function getCompany(data) {
   return request({
     url: '/base/department/list',
-    //url: '/tofly-admin/api.admin/v1/depts',
     method: 'get',
     data
   })

src/api/work.js

@@ -8,7 +8,7 @@ import request from '@/utils/request'
 // 获取工单类型数据
 export function getWorkOrderList(params) {
   return request({
-    url: '/tofly-xrtymis/bmgdlx/page',
+    url: '/work-xrtymis/bmgdlx/page',
     method: 'get',
     params
   })
@@ -17,7 +17,7 @@ export function getWorkOrderList(params) {
 // 新增工单类型
 export function addWorkOrderType(data) {
   return request({
-    url: '/tofly-xrtymis/bmgdlx/save',
+    url: '/work-xrtymis/bmgdlx/save',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function addWorkOrderType(data) {
 // 修改工单类型
 export function editWorkOrderType(data) {
   return request({
-    url: '/tofly-xrtymis/bmgdlx/update',
+    url: '/work-xrtymis/bmgdlx/update',
     method: 'put',
     data
   })
@@ -35,7 +35,7 @@ export function editWorkOrderType(data) {
 // 删除工单类型
 export function delWorkOrderType(params) {
   return request({
-    url: '/tofly-xrtymis/bmgdlx/deleteByIds',
+    url: '/work-xrtymis/bmgdlx/deleteByIds',
     method: 'delete',
     params
   })
@@ -44,7 +44,7 @@ export function delWorkOrderType(params) {
 // 获取接警来源列表
 export function getWorkOrderSourceList(params) {
   return request({
-    url: '/tofly-xrtymis/bmjjly/page',
+    url: '/work-xrtymis/bmjjly/page',
     method: 'get',
     params
   })
@@ -53,7 +53,7 @@ export function getWorkOrderSourceList(params) {
 // 删除接警来源列表
 export function delWorkOrderSource(params) {
   return request({
-    url: '/tofly-xrtymis/bmjjly/deleteByIds',
+    url: '/work-xrtymis/bmjjly/deleteByIds',
     method: 'delete',
     params
   })
@@ -62,7 +62,7 @@ export function delWorkOrderSource(params) {
 // 新增接警来源列表
 export function addWorkOrderSource(data) {
   return request({
-    url: '/tofly-xrtymis/bmjjly/save',
+    url: '/work-xrtymis/bmjjly/save',
     method: 'post',
     data
   })
@@ -71,7 +71,7 @@ export function addWorkOrderSource(data) {
 // 修改接警来源列表
 export function editWorkOrderSource(data) {
   return request({
-    url: '/tofly-xrtymis/bmjjly/update',
+    url: '/work-xrtymis/bmjjly/update',
     method: 'put',
     data
   })
@@ -80,7 +80,7 @@ export function editWorkOrderSource(data) {
 // 获取故障来源列表
 export function getFaultList(params) {
   return request({
-    url: '/tofly-xrtymis/bmgzlx/page',
+    url: '/work-xrtymis/bmgzlx/page',
     method: 'get',
     params
   })
@@ -89,7 +89,7 @@ export function getFaultList(params) {
 // 删除故障源列表
 export function delFault(params) {
   return request({
-    url: '/tofly-xrtymis/bmgzlx/deleteByIds',
+    url: '/work-xrtymis/bmgzlx/deleteByIds',
     method: 'delete',
     params
   })
@@ -98,7 +98,7 @@ export function delFault(params) {
 // 新增故障来源列表
 export function addFault(data) {
   return request({
-    url: '/tofly-xrtymis/bmgzlx/save',
+    url: '/work-xrtymis/bmgzlx/save',
     method: 'post',
     data
   })
@@ -107,7 +107,7 @@ export function addFault(data) {
 // 修改故障来源列表
 export function editFault(data) {
   return request({
-    url: '/tofly-xrtymis/bmgzlx/update',
+    url: '/work-xrtymis/bmgzlx/update',
     method: 'put',
     data
   })
@@ -116,7 +116,7 @@ export function editFault(data) {
 // 获取施工人员
 export function getBuilderList(params) {
   return request({
-    url: '/tofly-xrtymis/gdglsgry/page',
+    url: '/work-xrtymis/gdglsgry/page',
     method: 'get',
     params
   })
@@ -125,7 +125,7 @@ export function getBuilderList(params) {
 // 删除施工人员
 export function delBuilder(params) {
   return request({
-    url: '/tofly-xrtymis/gdglsgry/deleteByIds',
+    url: '/work-xrtymis/gdglsgry/deleteByIds',
     method: 'delete',
     params
   })
@@ -134,7 +134,7 @@ export function delBuilder(params) {
 // 新增施工人员
 export function addBuilder(data) {
   return request({
-    url: '/tofly-xrtymis/gdglsgry',
+    url: '/work-xrtymis/gdglsgry',
     method: 'post',
     data
   })
@@ -143,7 +143,7 @@ export function addBuilder(data) {
 // 修改施工人员
 export function editBuilder(data) {
   return request({
-    url: '/tofly-xrtymis/gdglsgry',
+    url: '/work-xrtymis/gdglsgry',
     method: 'put',
     data
   })
@@ -152,7 +152,7 @@ export function editBuilder(data) {
 // 获取施工班组
 export function getBuildTeamList(params) {
   return request({
-    url: '/tofly-xrtymis/gdglsgbz/page',
+    url: '/work-xrtymis/gdglsgbz/page',
     method: 'get',
     params
   })
@@ -161,7 +161,7 @@ export function getBuildTeamList(params) {
 // 删除施工班组
 export function delBuildTeam(params) {
   return request({
-    url: '/tofly-xrtymis/gdglsgbz/deleteByIds',
+    url: '/work-xrtymis/gdglsgbz/deleteByIds',
     method: 'delete',
     params
   })
@@ -170,7 +170,7 @@ export function delBuildTeam(params) {
 // 新增施工班组
 export function addBuildTeam(data) {
   return request({
-    url: '/tofly-xrtymis/gdglsgbz',
+    url: '/work-xrtymis/gdglsgbz',
     method: 'post',
     data
   })
@@ -179,7 +179,7 @@ export function addBuildTeam(data) {
 // 修改施工班组
 export function editBuildTeam(data) {
   return request({
-    url: '/tofly-xrtymis/gdglsgbz',
+    url: '/work-xrtymis/gdglsgbz',
     method: 'put',
     data
   })
@@ -188,7 +188,7 @@ export function editBuildTeam(data) {
 // 获取工单列表
 export function getRegisterList(params) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/pageNew',
+    url: '/work-xrtymis/gdglgdxx/pageNew',
     method: 'get',
     params
   })
@@ -197,7 +197,7 @@ export function getRegisterList(params) {
 // 删除工单列表
 export function delRegister(params) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/deleteByIds',
+    url: '/work-xrtymis/gdglgdxx/deleteByIds',
     method: 'delete',
     params
   })
@@ -206,7 +206,7 @@ export function delRegister(params) {
 // 新增工单列表
 export function addRegister(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/save',
+    url: '/work-xrtymis/gdglgdxx/save',
     method: 'post',
     data
   })
@@ -215,7 +215,7 @@ export function addRegister(data) {
 // 修改工单列表
 export function editRegister(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/update',
+    url: '/work-xrtymis/gdglgdxx/update',
     method: 'put',
     data
   })
@@ -224,7 +224,7 @@ export function editRegister(data) {
 // 审核工单列表
 export function checkOrder(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/check',
+    url: '/work-xrtymis/gdglgdxx/check',
     method: 'put',
     data
   })
@@ -233,8 +233,8 @@ export function checkOrder(data) {
 // 获取派发工单
 export function getSellList(params) {
   return request({
-    // url: `/tofly-xrtymis/gdglpgjl/${params.id}`,
-    url: '/tofly-xrtymis/gdglpgjl/pageNew',
+    // url: `/work-xrtymis/gdglpgjl/${params.id}`,
+    url: '/work-xrtymis/gdglpgjl/pageNew',
     method: 'get',
     params
   })
@@ -243,7 +243,7 @@ export function getSellList(params) {
 // 派发工单
 export function sellOrder(data) {
   return request({
-    url: '/tofly-xrtymis/gdglpgjl',
+    url: '/work-xrtymis/gdglpgjl',
     method: 'post',
     data
   })
@@ -252,7 +252,7 @@ export function sellOrder(data) {
 // 工单处理
 export function orderHandle(data) {
   return request({
-    url: '/tofly-xrtymis/gdglpgjl/handle',
+    url: '/work-xrtymis/gdglpgjl/handle',
     method: 'put',
     data
   })
@@ -261,7 +261,7 @@ export function orderHandle(data) {
 // 工单回访
 export function addRerurn(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/finish',
+    url: '/work-xrtymis/gdglgdxx/finish',
     method: 'put',
     data
   })
@@ -270,7 +270,7 @@ export function addRerurn(data) {
 // 重新派单
 export function reOrder(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/resend',
+    url: '/work-xrtymis/gdglgdxx/resend',
     method: 'put',
     data
   })
@@ -278,7 +278,7 @@ export function reOrder(data) {
 
 export function writeOff(data) {
   return request({
-    url: '/tofly-xrtymis/gdglgdxx/archive',
+    url: '/work-xrtymis/gdglgdxx/archive',
     method: 'put',
     data
   })

src/assets/style/customStyle.scss

@@ -1,6 +1,6 @@
 // 地址搜索弹窗气泡样式
 .markDiv {
-    min-width: 100px;
+    min-width: 200px;
     max-width: 440px;
     padding: 10px 10px;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.3);

src/components/Hotline/index.vue

@@ -66,7 +66,7 @@ export default {
         ExtPhone: '10001001', // 分机号
         Password: '11111111', // 密码
         cid: '1000', // 企业ID
-        CidName: '同飞', // 企业名称
+        CidName: '', // 企业名称
         HotlineNumberList: '87348740', // 热线号码列表， 以$分割
         Code: '1002', // 工号
         CodeName: '1002', // 姓名

src/components/RightPanel/manage/index.vue

@@ -247,7 +247,7 @@ export default {
         ExtPhone: '10001001', // 分机号
         Password: '11111111', // 密码
         cid: '1000', // 企业ID
-        CidName: '同飞', // 企业名称
+        CidName: '', // 企业名称
         HotlineNumberList: '87348740', // 热线号码列表， 以$分割
         Code: '1001', // 工号
         CodeName: '1001', // 姓名

src/layout/components/Header/index.vue

@@ -34,9 +34,12 @@
 
       <el-dialog title="修改密码" :visible.sync="passWord" width="400px" :append-to-body="true" :modal-append-to-body="false">
         <!-- <span>修改密码</span> -->
-        <input-item type="password" placeholder="请输入原始密码" title="原密码：" nominate="originalPassword" custom-style="width: 320px;line-height:32px;" :value="originalPassword" :max-length="50" :disabled="false" :required="true" @changeValue="onInput" />
-        <input-item type="password" placeholder="请输入新密码" title="新密码：" nominate="newPassword" custom-style="width: 320px;line-height:32px; margin: 20px 0" :value="newPassword" :max-length="50" :disabled="false" :required="true" @changeValue="onInput" />
-        <input-item type="password" placeholder="请确认密码" title="确认密码：" nominate="confirmPassword" custom-style="width: 320px;line-height:32px;" :value="confirmPassword" :max-length="50" :disabled="false" :required="true" @changeValue="onInput" />
+        <input-item type="password" placeholder="请输入原始密码" title="原密码：" nominate="originalPassword" custom-style="width: 320px;line-height:32px;" :value="originalPassword" :max-length="50" :disabled="false" :required="true"
+          @changeValue="onInput" />
+        <input-item type="password" placeholder="请输入新密码" title="新密码：" nominate="newPassword" custom-style="width: 320px;line-height:32px; margin: 20px 0" :value="newPassword" :max-length="50" :disabled="false" :required="true"
+          @changeValue="onInput" />
+        <input-item type="password" placeholder="请确认密码" title="确认密码：" nominate="confirmPassword" custom-style="width: 320px;line-height:32px;" :value="confirmPassword" :max-length="50" :disabled="false" :required="true"
+          @changeValue="onInput" />
         <span slot="footer" class="dialog-footer">
           <el-button @click="passWord = false">取 消</el-button>
           <el-button type="primary" @click="confirmModifyPassWord">确 定</el-button>
@@ -62,7 +65,7 @@ import { verification } from '@/utils/index'
 import { geteSessionStorage, Cookyget } from '@/utils/auth'
 import headPortrait from '@/assets/login/headPortrait.png'
 
-import logo from '@/assets/images/indexA_logo.png'
+// import logo from '@/assets/images/index_logo.png'
 import { getSysDics, getSysRegion } from '@/api/common'
 import { async } from 'q'
 
@@ -83,7 +86,6 @@ export default {
       headPortrait,
       dialogPassword: false,
       defaultActiveIndex: '',
-      logo,
       navOffset: 0,
       menu: [],
       fullscreen: false,
@@ -93,6 +95,10 @@ export default {
   },
   computed: {
     ...mapGetters(['sidebar']),
+    logo() {
+      const env = this.$store.state.permission.systemEnv
+      return env == 'K' ? require('@/assets/images/index_logo.png') : require('@/assets/images/indexA_logo.png')
+    },
     avatar() {
       return this.$store.state.user.avatar || geteSessionStorage('avatar')
     },

src/store/modules/permission.js

@@ -16,9 +16,13 @@ const state = {
   sysDics: null,
   addRoutes: [],
   mapConfig: [], // 地图服务配置
+  systemEnv:'J'
 }
 
 const mutations = {
+  SET_ENV: (state, systemEnv) => {
+    state.systemEnv = systemEnv
+  },
   SET_ROUTES: (state, routes) => {
     state.addRoutes = routes
     state.routes = constantRoutes.concat(routes)

src/views/MapView/index.vue

@@ -26,13 +26,13 @@
             </div>
 
             <!-- 地图查询 -->
-            <div class="tofly-map-query">
+            <div class="tmap-map-query">
               <MapQueryTool v-if="map" :map="map" />
             </div>
             <!-- 放大缩小 -->
             <MapZoom v-if="map" :map="map" />
             <!-- 工具条 -->
-            <div class="tofly-tools">
+            <div class="tmap-tools">
               <!-- 数据维护 -->
               <!-- <div class="tool-item">
                 <FeatureEdit v-if="map" :map="map" :mapConfig='config'/>
@@ -52,21 +52,21 @@
             <!-- 23D视图切换 -->
             <viewChange />
             <!-- 默认范围 -->
-            <div ref="tofly-map-reset" class="tofly-map-resetMap iconfont icon-fang" title="默认范围" @click="ResetMap" />
+            <div ref="tmap-map-reset" class="tmap-map-resetMap iconfont icon-fang" title="默认范围" @click="ResetMap" />
 
             <!-- 图例 -->
             <mapLegend />
 
             <!-- 鹰眼 -->
-            <div ref="tofly-map-OverviewMap" class="tofly-map-OverviewMap" />
+            <div ref="tmap-map-OverviewMap" class="tmap-map-OverviewMap" />
 
             <!-- 比例尺 -->
-            <div class="tofly-map-ScaleLine">
+            <div class="tmap-map-ScaleLine">
               <span>比例尺：</span>
-              <div ref="tofly-map-ScaleLine" />
+              <div ref="tmap-map-ScaleLine" />
             </div>
             <!-- 鼠标坐标 -->
-            <div ref="tofly-map-MousePosition" class="tofly-map-MousePosition" />
+            <div ref="tmap-map-MousePosition" class="tmap-map-MousePosition" />
             <!-- 气泡弹窗 -->
             <popupWindow v-if="map" ref="popupWindow" :map="map"></popupWindow>
           </div>
@@ -385,7 +385,7 @@ export default {
       arrControls.push(
         new ScaleLine({
           units: 'metric',
-          target: this.$refs['tofly-map-ScaleLine']
+          target: this.$refs['tmap-map-ScaleLine']
         })
       )
 
@@ -395,14 +395,14 @@ export default {
           coordinateFormat: coordinate => {
             return format(coordinate, '经度：{x}  纬度：{y}', 6)
           }, // 保留6位小数位
-          target: this.$refs['tofly-map-MousePosition']
+          target: this.$refs['tmap-map-MousePosition']
         })
       )
 
       // 添加一个鹰眼控件
       arrControls.push(
         new OverviewMap({
-          target: this.$refs['tofly-map-OverviewMap'],
+          target: this.$refs['tmap-map-OverviewMap'],
           layers: this.viewTileLayers,
           collapseLabel: '',
           label: '',
@@ -662,7 +662,7 @@ export default {
     background-color: #fffff2;
     height: 100%;
 
-    .tofly-Tool-mapControl {
+    .tmap-Tool-mapControl {
       position: absolute;
       width: 350px;
       height: 400px;
@@ -674,7 +674,7 @@ export default {
       border: 1px solid #e2e2e2;
     }
 
-    .tofly-map-query {
+    .tmap-map-query {
       position: absolute;
       width: auto;
       height: 40px;
@@ -685,7 +685,7 @@ export default {
       // opacity: 0.9;
     }
 
-    .tofly-map-ScaleLine {
+    .tmap-map-ScaleLine {
       position: absolute;
       width: 300px;
       color: #000;
@@ -711,7 +711,7 @@ export default {
       }
     }
 
-    .tofly-map-resetMap {
+    .tmap-map-resetMap {
       position: absolute;
       background-color: rgb(255, 255, 255);
       border-radius: 2px;
@@ -730,7 +730,7 @@ export default {
         color: #006eb8;
       }
     }
-    .tofly-tools {
+    .tmap-tools {
       position: absolute;
       top: 10px;
       right: 15px;
@@ -750,7 +750,7 @@ export default {
         // background-color: rgba(255, 255, 255, 0.9);
       }
     }
-    .tofly-map-MousePosition {
+    .tmap-map-MousePosition {
       position: absolute;
       width: 400px;
       height: 35px;
@@ -761,7 +761,7 @@ export default {
       color: #000;
       // font-weight: 600;
     }
-    .tofly-map-OverviewMap {
+    .tmap-map-OverviewMap {
       position: absolute;
       z-index: 333;
       width: 32px;
@@ -829,7 +829,7 @@ export default {
     }
   }
 }
-.tofly-overviewmap {
+.tmap-overviewmap {
   right: 100px;
 }
 

src/views/MapView/map.config.js

@@ -427,7 +427,7 @@ export function buildMapConfig(sourcList) {
                 legendUrl: item.legendVal ? iServerBaseUrl + item.legendVal : '',
                 type: item.systemName,
                 isGroup: true,
-                securityClass:item.securityClass,
+                securityClass: item.securityClass,
                 visible: item.name == '卫星影像' ? false : true // 默认关闭卫星影像图层
             }
             switch (item.systemName) {
@@ -451,6 +451,7 @@ export function buildMapConfig(sourcList) {
         if (item.dataUrl) {
             switch (item.systemName) {
                 case '1': // 基础gis
+                    console.log('数据服务', item);
                     iServerUrl.basicGISDataServer['url'] = iServerBaseUrl + item.dataUrl
                     iServerUrl.basicGISDataServer['dataSource'] = item.dataSource
                     iServerUrl.basicGISDataServer.dataSet.push(item.dataSets)
@@ -459,7 +460,7 @@ export function buildMapConfig(sourcList) {
                         type: item.dataType,
                         label: item.name,
                         s3mName: item.dname,
-                        securityClass:item.securityClass,
+                        securityClass: item.securityClass,
                     })
                     break;
                 case '2':
@@ -473,7 +474,7 @@ export function buildMapConfig(sourcList) {
                         label: item.name,
                         s3mName: item.dname,
                         attachName: item.pipeNodeDatasetsName,
-                        securityClass:item.securityClass,
+                        securityClass: item.securityClass,
                     })
                     break;
                 case '3':
@@ -486,7 +487,7 @@ export function buildMapConfig(sourcList) {
                         type: item.dataType,
                         label: item.name,
                         s3mName: item.dname,
-                        securityClass:item.securityClass,
+                        securityClass: item.securityClass,
                     })
                     if (item.systemName == '3')
                         iServerUrl.publicHouseDataServer.houseDataSets.push({
@@ -494,7 +495,7 @@ export function buildMapConfig(sourcList) {
                             type: item.dataType,
                             label: item.name,
                             s3mName: item.dname,
-                            securityClass:item.securityClass,
+                            securityClass: item.securityClass,
                         })
                     else if (item.systemName == '6')
                         iServerUrl.publicHouseDataServer.groundDataSets.push({
@@ -502,7 +503,7 @@ export function buildMapConfig(sourcList) {
                             type: item.dataType,
                             label: item.name,
                             s3mName: item.dname,
-                            securityClass:item.securityClass,
+                            securityClass: item.securityClass,
                         })
                     break
             }
@@ -564,7 +565,7 @@ export function buildMapConfig(sourcList) {
                 datasetName_his: item.dataSource + ':' + item.historyDatasetsName,
                 dataSetName_his: item.historyDatasetsName,
                 systemName: item.systemName,
-                securityClass:item.securityClass,
+                securityClass: item.securityClass,
             }
             iServerUrl.webEditServer.push(editConfig)
         }

src/views/MapView/mapViewTools/mapQuery.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="map-control">
-    <el-autocomplete ref="autocomplete" class="inline-input input-with-select" v-model="inputInfo" :fetch-suggestions="querySearch" :placeholder="placeholder" :trigger-on-focus="false" @select="handleSelect" clearable @clear="clearInput" :popper-append-to-body="false" :popper-class="suggestionClass">
+    <el-autocomplete ref="autocomplete" class="inline-input input-with-select" v-model="inputInfo" :fetch-suggestions="querySearch" :placeholder="placeholder" :trigger-on-focus="false" @select="handleSelect" clearable @clear="clearInput"
+      :popper-append-to-body="false" :popper-class="suggestionClass">
       <el-select v-model="selectType" slot="prepend" class="select-type" @change="changeSelect">
         <el-option label="地名搜索" value="address"></el-option>
         <el-option label="坐标定位" value="coord"></el-option>
@@ -62,10 +63,10 @@ export default {
       }
     },
     querySearch(queryString, cb) {
-      this.sqlQueryu(queryString)
-      setTimeout(() => {
-        cb(this.featuresRes.features)
-      }, 500)
+      this.sqlQueryu(queryString).then(res => {
+        this.featuresRes = res
+        cb(res.features)
+      })
     },
     /**
      *@description 点击提示事件
@@ -101,6 +102,7 @@ export default {
      *@decription 清除搜索框
      **/
     clearInput() {
+      this.featuresRes = null
       this.clearLayer()
     },
     /**
@@ -109,6 +111,7 @@ export default {
     _query(keyWords, flag) {
       if (this.selectType == 'address') {
         this.clearLayer()
+        if (!this.featuresRes) return
         // 显示模糊匹配的所有结果
         this.showResult(
           new GeoJSON().readFeatures(JSON.stringify(this.featuresRes))
@@ -151,16 +154,17 @@ export default {
       let sqlParam = new SuperMap.GetFeaturesBySQLParameters({
         queryParameter: {
           // name: "Countries@World",
-          attributeFilter: "name like '%" + str + "%'"
+          attributeFilter: "(NAME like '%" + str + "%') or (TYPE like '%" + str + "%') "
         },
         datasetNames: datasetNames
       })
-      //向服务器发送请求，并对返回的结果进行处理
-      new FeatureService(url).getFeaturesBySQL(sqlParam, serviceResult => {
-        //获取返回的features数据
-        let features = serviceResult.result.features
-        // console.log("查询结果：：：：", features)
-        this.featuresRes = features
+      return new Promise((resolve, reject) => {
+        new FeatureService(url).getFeaturesBySQL(sqlParam, serviceResult => {
+          //获取返回的features数据
+          let features = serviceResult.result.features
+          this.featuresRes = features
+          resolve(features)
+        })
       })
     },
     /**
@@ -182,7 +186,7 @@ export default {
     /**
      * 创建弹窗
      */
-    showMark(coordinates, txt) {
+    showMark(coordinates, properties) {
       if (this.markDiv == null) {
         this.markDiv = document.createElement('div')
         this.markDiv.className = 'markDiv'
@@ -193,9 +197,9 @@ export default {
         this.markDiv.appendChild(corner)
       }
       this.txtSpan.innerHTML = `
-        <h3>${txt}</h3>
-        <p>地址：四川省绵阳市涪城区涪城路14号</p>
-        <p>电话：(0816)2224469</p>
+        <h3>${properties.NAME}</h3>
+        <p>地址：${properties.ADDRESS || '-'}</p>
+        <p>电话：${properties.PHONE || '-'}</p>
       `
       let overlay = new Overlay({
         element: this.markDiv,
@@ -240,16 +244,16 @@ export default {
         if (feature.selected.length > 0) {
           this.showMark(
             feature.selected[0].getGeometry().getCoordinates(),
-            feature.selected[0].get('NAME')
+            feature.selected[0].getProperties()
           )
           // 地图动画,,,异步
-          setTimeout(() => {
-            this.map.getView().setZoom(15)
-            this.map.getView().animate({
-              center: feature.selected[0].getGeometry().getCoordinates(),
-              duration: 600
-            })
-          }, 200)
+          // setTimeout(() => {
+          //   this.map.getView().setZoom(15)
+          //   this.map.getView().animate({
+          //     center: feature.selected[0].getGeometry().getCoordinates(),
+          //     duration: 600
+          //   })
+          // }, 200)
         } else {
           this.map.removeOverlay(this.map.getOverlayById('markOverlay'))
         }
@@ -400,4 +404,7 @@ export default {
     }
   }
 }
+.advice-item::before {
+  margin-right: 5px !important;
+}
 </style>

src/views/MapView/mapViewTools/mapZoom.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tofly-ol-Zoom ol-unselectable ol-control">
+  <div class="tmap-ol-Zoom ol-unselectable ol-control">
     <button class="iconfont iconfdsj" title="放大" @click="mapZoom(false)"></button>
     <!-- <button class="iconfont icon-move" title="移动" @click="mapMove()"></button> -->
     <button class="iconfont iconsxsj" title="缩小" @click="mapZoom(true)"></button>
@@ -64,7 +64,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tofly-ol-Zoom {
+.tmap-ol-Zoom {
   position: absolute;
   height: 64px;
   width: 32px;

src/views/MapView/mapViewTools/sceneFly.vue

@@ -21,6 +21,13 @@
       <el-checkbox v-model="checked1" @change="showStop">显示飞行站点</el-checkbox>
       <el-checkbox v-model="checked2" @change="showLine">显示飞行线路</el-checkbox>
     </div>
+
+    <el-dialog title="设置标记点名称" :visible="dialogVisible" width="400px" :close-on-click-modal="false" :modal="false" :show-close="false">
+      <label>标记点名称：<el-input v-model="siteName" placeholder="标记点名称" style="display:inline-block;width:260px;"></el-input></label>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="" size="small" @click="setName">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -36,7 +43,11 @@ export default {
       checked2: true,
       flyManager: null,
       drawHandler: null,
+      drawPointHandler: null,
       flyLine: null,
+      dialogVisible: false,
+      siteName: '',
+      siteNames: []
     }
   },
   mounted() {
@@ -78,6 +89,8 @@ export default {
      */
     clear() {
       this.flyManager.stop();
+      this.stopOptions = []
+      this.value = ''
       let currentRoute = this.flyManager.currentRoute
       // 清除飞行站点
       while (currentRoute.stopCollection.length > 0) {
@@ -105,7 +118,6 @@ export default {
       let routes = new Cesium.RouteCollection(this.viewer.entities)
       //添加fpf飞行文件，fpf由SuperMap iDesktop生成
       routes.fromFile('./systemData/flyPath.fpf')
-      console.log(routes)
 
       //初始化飞行管理
       this.flyManager = new Cesium.FlyManager({
@@ -122,7 +134,6 @@ export default {
         this.stopOptions = []
 
         positions.forEach((item, index) => {
-          console.log('position', item)
           let cartesian3 = new Cesium.Cartesian3(item.x, item.y, item.z);
           let cartographic = Cesium.Cartographic.fromCartesian(cartesian3);
           let lon = Cesium.Math.toDegrees(cartographic.longitude);
@@ -136,13 +147,14 @@ export default {
             waitTime: 0,
             duration: 1,
             speed: 0.1,
-            stopName: '站点' + (index + 1),
+            // stopName: '站点' + (index + 1),
+            stopName: this.siteNames[index] || '站点' + (index + 1),
             heading: this.viewer.scene.camera.heading,
             // tilt: this.viewer.scene.camera.pitch
             tilt: -0.2
           })
           console.log('stop', this.viewer.scene.camera.pitch)
-          this.stopOptions.push({ label: '站点' + (index + 1), value: index })
+          this.stopOptions.push({ label: this.siteNames[index] || '站点' + (index + 1), value: index })
           currentRoute.addStop(stop)
         });
       });
@@ -152,13 +164,29 @@ export default {
      */
     drawRoute() {
       this.drawHandler = new Cesium.DrawHandler(this.viewer, Cesium.DrawMode.Line, Cesium.ClampMode.Space);
+      this.drawPointHandler = new Cesium.DrawHandler(this.viewer, Cesium.DrawMode.Point, Cesium.ClampMode.Space);
+
       this.drawHandler.drawEvt.addEventListener(result => {
-        console.log("绘制的线：：", result)
-        console.log("绘制的线的坐标", result.object._positions)
         this.drawHandler.clear()
+        this.drawPointHandler.clear()
         this.initFlay(result.object._positions)
       })
+      this.drawPointHandler.drawEvt.addEventListener(result => {
+        this.drawPointHandler.activate()
+        this.dialogVisible = true
+        this.siteName = ''
+      });
       this.drawHandler.activate()
+      this.drawPointHandler.activate()
+    },
+    /**
+     * 设置站点
+     */
+    setName() {
+      this.dialogVisible = false
+      if (this.siteName) this.siteNames.push(this.siteName)
+      else this.siteNames.push(`站点${this.siteNames.length + 1}`)
+      // this.setName = ''
     }
   }
 }

src/views/MapView/mapViewTools/screenShots.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tofly-map-screenShots" title="地图快照">
+  <div class="tmap-map-screenShots" title="地图快照">
     <div class="el-icon-camera" @click="getImg()" />
   </div>
 </template>
@@ -29,7 +29,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tofly-map-screenShots {
+.tmap-map-screenShots {
   position: absolute;
   background-color: rgba(255, 255, 255, 0.4);
   border-radius: 4px;

src/views/MapView/mapViewTools/viewToggle.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tofly-ol-view-toggle ol-unselectable ol-control">
+  <div class="tmap-ol-view-toggle ol-unselectable ol-control">
     <button class="iconfont iconsydtsj" title="上一视图" @click="preView()"></button>
     <button class="iconfont iconxydtsj" title="下一视图" @click="nextView()"></button>
   </div>
@@ -77,7 +77,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tofly-ol-view-toggle {
+.tmap-ol-view-toggle {
   position: absolute;
   height: 64px;
   width: 32px;

src/views/MapView/miniMap/index.vue

@@ -527,7 +527,7 @@ export default {
     position: relative;
     height: 100%;
     width: 100%;
-    .tofly-map-query {
+    .tmap-map-query {
       position: absolute;
       width: 420px;
       height: 40px;

src/views/currentSystem/authorityManagement/serviceConfig/index.vue

@@ -18,9 +18,8 @@
           </el-form>
         </div>
         <div class="table_width">
-          <el-table :data="dicTableData" ref="dicTable" stripe highlight-current-row @current-change="currentChange"
-                    :header-cell-style="{fontSize: '14px', fontWeight:'600',background:'#e1f0fd',color:'#60627e'}" style="width: 100%"
-                    height="100%">
+          <el-table :data="dicTableData" ref="dicTable" stripe highlight-current-row @current-change="currentChange" :header-cell-style="{fontSize: '14px', fontWeight:'600',background:'#e1f0fd',color:'#60627e'}" style="width: 100%"
+            height="100%">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column sortable prop="name" label="名称" align="center"></el-table-column>
             <el-table-column sortable prop="code" label="编码" align="center"></el-table-column>
@@ -36,9 +35,8 @@
           <!-- <el-pagination :current-page="pagination1.current" :page-sizes="[20, 40, 60, 80]" :page-size="pagination1.size"
                          layout="total, sizes, prev, pager, next, jumper" :total="pagination1.total">
           </el-pagination> -->
-          <el-pagination @size-change="handleSizeTypeChange" @current-change="handleCurrentTypeChange" :current-page="pagination1.current"
-                         :page-sizes="[20, 40, 60, 80]" :page-size="pagination1.size" background
-                         layout="total, sizes, prev, pager, next, jumper" :total="pagination1.total"></el-pagination>
+          <el-pagination @size-change="handleSizeTypeChange" @current-change="handleCurrentTypeChange" :current-page="pagination1.current" :page-sizes="[20, 40, 60, 80]" :page-size="pagination1.size" background
+            layout="total, sizes, prev, pager, next, jumper" :total="pagination1.total"></el-pagination>
         </div>
       </el-col>
       <!-- 地图服务 -->
@@ -49,24 +47,21 @@
               <el-input v-model="sourceName" placeholder="请输入服务名称" size="small" clearable></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;"
-                         @click="getSourceList({current: 1,size: 20 })">查 询</el-button>
+              <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="getSourceList({current: 1,size: 20 })">查 询</el-button>
               <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="openForm2(1,null)">新 增</el-button>
               <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="removeSources">删 除</el-button>
             </el-form-item>
           </el-form>
         </div>
         <div class="table_width">
-          <el-table :data="tableData" ref="tableData" stripe
-                    :header-cell-style="{fontSize: '14px', fontWeight:'600',background:'#e1f0fd',color:'#60627e'}" style="width: 100%"
-                    height="100%">
+          <el-table :data="tableData" ref="tableData" stripe :header-cell-style="{fontSize: '14px', fontWeight:'600',background:'#e1f0fd',color:'#60627e'}" style="width: 100%" height="100%">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column sortable prop="name" label="服务名称" align="center" show-overflow-tooltip width="160"></el-table-column>
-            <el-table-column sortable prop="cval" label="服务链接" align="center" show-overflow-tooltip></el-table-column>
-            <!-- <el-table-column sortable prop="cval" label="服务链接" align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column sortable prop="cval" label="服务链接" align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column sortable prop="cval" label="服务链接" align="center" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column sortable prop="BUILDING" label="密级" align="center"></el-table-column> -->
+            <el-table-column sortable prop="cval" label="服务链接" align="center" show-overflow-tooltip>
+              <!-- <template slot-scope="{row}">
+                <span>{{row.cal||row.dataUrl||row.dcval||row.netService||''}}</span>
+              </template> -->
+            </el-table-column>
             <el-table-column label="操作" align="center" width="120">
               <template slot-scope="scope">
                 <el-button type="text" @click="openForm2(2,scope.row)">修 改</el-button>
@@ -79,9 +74,8 @@
           <!-- <el-pagination :current-page="pagination2.current" :page-sizes="[20, 40, 60, 80]" :page-size="pagination2.size"
                          layout="total, sizes, prev, pager, next, jumper" :total="pagination2.total">
           </el-pagination> -->
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pagination2.current"
-                         :page-sizes="[20, 40, 60, 80]" :page-size="pagination2.size" background
-                         layout="total, sizes, prev, pager, next, jumper" :total="pagination2.total"></el-pagination>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pagination2.current" :page-sizes="[20, 40, 60, 80]" :page-size="pagination2.size" background
+            layout="total, sizes, prev, pager, next, jumper" :total="pagination2.total"></el-pagination>
         </div>
       </el-col>
     </el-row>
@@ -107,8 +101,7 @@
       </div>
     </el-dialog>
     <!-- 服务表单 -->
-    <el-dialog :title="dialogFormTitle" width="1000px" :visible.sync="dialogFormVisible2" top="50px" class="dialogFormVisible2"
-               :close-on-click-modal="false">
+    <el-dialog :title="dialogFormTitle" width="1000px" :visible.sync="dialogFormVisible2" top="50px" class="dialogFormVisible2" :close-on-click-modal="false">
       <el-form ref="form2" label-width="auto" label-position="right" :model="form2" class="demo-form-inline">
         <el-row>
           <el-col :span="12">
@@ -142,9 +135,7 @@
               <!-- <el-select v-model="form2.departmentId" size="medium" placeholder="请选择所属单位">
                 <el-option v-for="item in departmentList" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select> -->
-              <el-cascader size="small" v-model="form2.departmentId" :options="deptTreeData"
-                           :props="{ expandTrigger: 'hover',checkStrictly: true }" clearable @change="companyChange" :key="isResouceShow"
-                           style="width:100%">
+              <el-cascader size="small" v-model="form2.departmentId" :options="deptTreeData" :props="{ expandTrigger: 'hover',checkStrictly: true }" clearable @change="companyChange" :key="isResouceShow" style="width:100%">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -270,7 +261,8 @@ import {
   modifySourcedic,
   addSource,
   removeSource,
-  modifySource, execUpdate} from '@/api/kxc/serviceConfig'
+  modifySource, execUpdate
+} from '@/api/kxc/serviceConfig'
 import { getCompany } from '@/api/base'
 export default {
   name: 'ServiceConfig',
@@ -418,7 +410,7 @@ export default {
       if (type == 1) { // 新增
         this.opFlag1 = 1
         this.$nextTick(() => {
-          this.$refs['form1'].resetFields()
+          this.$refs['form1'].clearValidate()
         })
         this.form1 = {}
         this.dialogFormTitle = '新增分组'
@@ -435,7 +427,7 @@ export default {
       if (type == 1) { // 新增
         this.opFlag2 = 1
         this.$nextTick(() => {
-          this.$refs['form2'].resetFields()
+          this.$refs['form2'].clearValidate()
         })
         this.form2 = {}
         this.dialogFormTitle = '新增服务'

src/views/currentSystem/authorityManagement/userRights/mergeUser/index.vue

@@ -55,7 +55,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="CA标志" prop="caCode">
-          <el-input v-model="ruleForm.caCode" size="medium" placeholder="用户CA标志" :maxlength="20" />
+          <el-input v-model="ruleForm.caCode" size="medium" placeholder="用户CA标志" :maxlength="40" />
         </el-form-item>
       </el-col>
     </el-row>

src/views/kxcSystem/functionManage/spatialDataImport/template.js

@@ -115,13 +115,13 @@ export default {
   created() {
     this.config = this.data.that.config
     this.map = this.data.that.map
-    if (this.$store.state.permission.hasOwnProperty('sysDics')) {
-      if (this.$store.state.permission.sysDics.hasOwnProperty('iserverPath')) {
-        this.iserverPath = this.$store.state.permission.sysDics.iserverPath
-      } else {
-        this.$message.error('未获取到iserver地址字典信息,通知管理员检查问题!')
-      }
-    }
+    // if (this.$store.state.permission.hasOwnProperty('sysDics')) {
+    //   if (this.$store.state.permission.sysDics.hasOwnProperty('iserverPath')) {
+    //     this.iserverPath = this.$store.state.permission.sysDics.iserverPath
+    //   } else {
+    //     this.$message.error('未获取到iserver地址字典信息,通知管理员检查问题!')
+    //   }
+    // }
   },
   mounted() {
     this.init()
@@ -162,7 +162,7 @@ export default {
      * 初始化
      */
     init() {
-      if (this.iserverPath.length > 0) this.url = this.iserverPath[0].value
+      // if (this.iserverPath.length > 0) this.url = this.iserverPath[0].value
       // this.getLayerInfo();
       this.getSouceList()
     },

src/views/login/index.scss

@@ -10,6 +10,15 @@
     background-size: 100% 100%;
     background-repeat: no-repeat;
     position: relative;
+
+    .loginA {
+        background: url('../../assets/images/login/bb.jpg') no-repeat;
+    }
+
+    .loginB {
+        background: url('../../assets/images/login/bb.png') no-repeat;
+    }
+
     .login_box {
         width: 1000px;
         height: 550px;
@@ -20,26 +29,32 @@
         transform: translate(-50%, -50%);
         box-shadow: 0 1px 6px 0 rgba(32, 33, 36, 0.2);
         border-radius: 10px;
+
         .b_box {
             height: 100%;
             float: left;
+
             &.b-left {
                 width: 540px;
-                background: url('../../assets/images/login/bb.jpg') no-repeat;
+                // background: url('../../assets/images/login/bb.png') no-repeat;
                 box-sizing: 100%;
                 border-top-left-radius: 10px;
                 border-bottom-left-radius: 10px;
             }
+
             &.b-right {
                 position: relative;
                 width: 460px;
                 background-color: #fff;
                 border-top-right-radius: 10px;
                 border-bottom-right-radius: 10px;
+
                 .el-radio-group {
                     width: 100%;
+
                     .el-radio-button {
                         width: 50%;
+
                         .el-radio-button__inner {
                             width: 100%;
                             height: 50px;
@@ -51,6 +66,7 @@
                             color: #598eeb;
                             background-color: #e3edfc;
                         }
+
                         &.is-active {
                             .el-radio-button__inner {
                                 color: #606266;
@@ -61,6 +77,7 @@
                         }
                     }
                 }
+
                 .el-form {
                     width: 100%;
                     padding: 0 70px;
@@ -68,13 +85,16 @@
                     top: 50%;
                     left: 50%;
                     transform: translate(-50%, -50%);
+
                     .shu {
                         .el-form-item__content {
                             line-height: 0;
+
                             .el-button {
                                 padding: 0;
                                 font-size: 16px;
                                 color: #2c2c2c;
+
                                 &::before {
                                     margin-right: 5px;
                                     color: #2d74e7;
@@ -84,6 +104,7 @@
                     }
                 }
             }
+
             // .head {
             //   width: 100%;
             //   height: 100%;

src/views/login/index.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="login-container">
     <div class="login_box">
-      <div class="b_box b-left"></div>
+      <div :class="leftBoxClass"></div>
       <div class="b_box b-right">
         <el-radio-group class="select-type" v-model="loginType">
           <el-radio-button :label="1">KEY登录</el-radio-button>
           <el-radio-button :label="2">账号登录</el-radio-button>
         </el-radio-group>
-        <el-form ref="formData" :model="formData" :rules="loginRules" label-width="auto " class="login-form" auto-complete="on"
-                 label-position="left">
+        <el-form ref="formData" :model="formData" :rules="loginRules" label-width="auto " class="login-form" auto-complete="on" label-position="left">
           <el-form-item :prop="loginType==2?'username':'userName'" style="margin-bottom:40px">
             <el-input ref="password" v-model="formData.username" placeholder="请输入账户" tabindex="1" v-if="loginType==2">
             </el-input>
@@ -18,8 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="password" :style="{marginBottom:loginType==1?'20px':'60px'}">
-            <el-input ref="password" v-model="formData.password" :type="viewPwd?'text':'password'" placeholder="请输入登录密码" name="password"
-                      tabindex="2" class="input_w" auto-complete="on" @keyup.enter.native="handleLogin">
+            <el-input ref="password" v-model="formData.password" :type="viewPwd?'text':'password'" placeholder="请输入登录密码" name="password" tabindex="2" class="input_w" auto-complete="on" @keyup.enter.native="handleLogin">
               <i slot="suffix" class="eye el-icon-view" :style="{color:viewPwd?'#f40':'#c4cbd4'}" @click="viewPwd = !viewPwd"></i>
             </el-input>
           </el-form-item>
@@ -75,6 +73,7 @@ export default {
       loginEvn: null, // 系统环境
       device: null,
       selectCert: {},
+      leftBoxClass: ['b_box', 'b-left', 'loginA']
     }
   },
   computed: {
@@ -184,7 +183,7 @@ export default {
         });
         if (this.dnArr.length > 0) {
           // this.formData.userName = this.dnArr[0];
-          this.$set(this.formData,'userName',this.dnArr[0])
+          this.$set(this.formData, 'userName', this.dnArr[0])
           this.userName = this.handleGetCN(this.dnArr[0]);
         }
       } catch (error) {
@@ -206,7 +205,7 @@ export default {
       return arr1[1];
     },
     async handleLoginByA() {
-      await this.handleGetCertLists();
+      await this.handleGetOriginalData()
       const index = this.dnArr.indexOf(this.minItem);
       const sn = this.snArr[index];
       try {
@@ -223,6 +222,7 @@ export default {
             singed_data: message,
             authType: 'J'
           }
+          console.log('A网：', formData);
           this.$store.dispatch('user/login', formData).then(res => {
             this.$router.push({ path: '/map' })
             this.loading = false
@@ -303,7 +303,7 @@ export default {
           }));
           this.selectCert = this.options[0];
           // this.formData.userName = this.selectCert["value"];
-          this.$set(this.formData,'userName',this.selectCert['value'])
+          this.$set(this.formData, 'userName', this.selectCert["value"])
         } else {
           console.error('CA登录获取认证信息失败！')
           // throw new Error("CA登录获取认证信息失败！");
@@ -431,14 +431,14 @@ export default {
       await getLoginType().then(res => {
         if (res.code == 1) {
           this.loginEvn = res.result.loginType
+          this.$store.commit('permission/SET_ENV',this.loginEvn)
           if (res.result.loginType == 'K') {
+            this.leftBoxClass = ['b_box', 'b-left', 'loginB']
             // B网
             this.handleInitCADevice();
           } else {
             // A网
-            // this.handleGetOriginalData().then(res => {
-            //   if (res) this.handleGetCertLists();
-            // });
+            this.leftBoxClass = ['b_box', 'b-left', 'loginA']
             this.handleGetCertLists();
           }
         }