update

package-lock.json

@@ -7018,11 +7018,6 @@
       "integrity": "sha512-I5XeHI1x/mRSGl96LFOaSk528LA/yZG3m3iQgImGujjO8gotd/DL8QaI1R1h1dg5ATeI2jqPblMpKq4Tr5iKfQ==",
       "dev": true
     },
-    "canvas2image": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/canvas2image/-/canvas2image-1.0.5.tgz",
-      "integrity": "sha512-IrHS9EjnsdWj45WjcsylHMBD4SmQKm4ylfKrsmlqvVyL3GkQlGoP8FDF+piNrYLM4h0JTjQk7xbjqtNJTmpTBQ=="
-    },
     "canvg": {
       "version": "3.0.7",
       "resolved": "https://registry.npm.taobao.org/canvg/download/canvg-3.0.7.tgz",

package.json

@@ -16,7 +16,6 @@
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "babel-loader": "^8.2.4",
-    "canvas2image": "^1.0.5",
     "cross-env": "^7.0.3",
     "echarts": "^5.2.0",
     "echarts-gl": "^2.0.8",

src/views/groupPage/districtPageModules/commonModules/SearchBox.vue

@@ -19,7 +19,7 @@
           @changeProjectName="changeProjectName($event)"
         />
       </div>
-      <div class="lifting">
+      <!-- <div class="lifting">
         <span>抬升：</span>
         <el-input-number v-model="layerdown" size="small" controls-position="right"></el-input-number>
         <span class="unit">米</span>
@@ -29,7 +29,7 @@
         <el-input-number v-model="opacity" size="small" controls-position="right" :min="0" :max="100" :step="10">
         </el-input-number>
         <span class="unit">%</span>
-      </div>
+      </div> -->
     </div>
   </transition>
 </template>

src/views/groupPage/districtPageModules/commonModules/ToolBox.vue

@@ -15,10 +15,11 @@
           v-show="isFold"
           @click="activeEvent(item.name)"
         >
-          <img :src="item.imgUrl" />
+          <img v-if="item.name == '数据面板'" :src="dataPanelImg" />
+          <img v-else :src="item.imgUrl" />
         </div>
         <div class="list-item" :title="'工具栏'" @click="isFold = !isFold">
-          <img :src="unfoldUrl" />
+          <img :src="!isFold ? unfoldUrl : foldUrl" />
         </div>
       </div>
       <div class="roam-panel" v-show="isRoaming">
@@ -41,6 +42,7 @@ const viewMemoryType = {
 @Component({ name: 'ToolBox', components: { ViewManagement } })
 export default class ToolBox extends Vue {
   toolList: Array<any> = [
+    { name: '数据面板' },
     { imgUrl: require('@/views/groupPage/images/工具栏/基础地图.png'), name: '基础地图' },
     { imgUrl: require('@/views/groupPage/images/工具栏/初始范围.png'), name: '初始范围' },
     { imgUrl: require('@/views/groupPage/images/工具栏/俯视.png'), name: '俯视' },
@@ -50,7 +52,9 @@ export default class ToolBox extends Vue {
     // { imgUrl: require('@/views/groupPage/images/工具栏/图片.png'), name: '截图' },
     // { imgUrl: require('@/views/groupPage/images/工具栏/鹰眼.png'), name: '鹰眼' }
   ]
+  dataPanelImg = null
   unfoldUrl = require('@/views/groupPage/images/工具栏/展开.png')
+  foldUrl = require('@/views/groupPage/images/工具栏/收起.png')
   isFold: boolean = false
   isRoaming: boolean = false //漫游面板
   g_preViews = [] //前一视图
@@ -63,18 +67,28 @@ export default class ToolBox extends Vue {
   get isInitViewer() {
     return this.$store.state.bigScreen.isInitViewer
   }
+  get isDataPanelShow() {
+    return this.$store.state.bigScreen.currentActive
+  }
   @Watch('isInitViewer')
   onChangeMethod() {
     this.viewer = (window as any).viewer
     this.cameraMoveEvent()
   }
+  @Watch('isDataPanelShow', { immediate: true })
+  onShowMethod(n) {
+    if (n != '') {
+      this.dataPanelImg = require('@/views/groupPage/images/工具栏/收起-面板.png')
+    } else {
+      this.dataPanelImg = require('@/views/groupPage/images/工具栏/展开-面板.png')
+    }
+  }
   mounted() {
     let target = this.$refs['widget-ToolBox'] as any
     target.style.setProperty('--right', '2.291667rem')
   }
   activeEvent(type) {
-    var id = type
-    switch (id) {
+    switch (type) {
       case '初始范围':
         this.initPosition()
         break
@@ -90,6 +104,16 @@ export default class ToolBox extends Vue {
       case '漫游':
         this.roaming()
         break
+      case '数据面板':
+        this.activePanel()
+        break
+    }
+  }
+  activePanel() {
+    if (this.$store.state.bigScreen.currentActive != '') {
+      this.$store.state.bigScreen.currentActive = ''
+    } else {
+      this.$store.state.bigScreen.currentActive = 'ProjectPanoramic'
     }
   }
   //初始位置

src/views/groupPage/districtPageModules/customTools/viewManagement.vue

@@ -38,7 +38,7 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
-import Canvas2Image from 'canvas2image'
+import { Canvas2Image } from '@/utils/mapCommon/tools'
 import axios from '@/utils/request'
 import CesiumViewTool from '@/utils/mapCommon/CesiumViewTool'
 const Cesium = (window as any).Cesium

src/views/groupPage/header/config.json

@@ -1,4 +1,4 @@
 {
-    "title":"三峡发展智慧EPC综合决策分析中心",
-    "subtitle":"THREE GORGES DEVELOPMENT INTELLIGENT EPC COMPREHENSIVE DECISION ANALYSIS CENTER"
+    "title": "三峡发展智慧EPC综合决策分析平台",
+    "subtitle": "THREE GORGES DEVELOPMENT INTELLIGENT EPC COMPREHENSIVE DECISION ANALYSIS PLATFORM"
 }

src/views/groupPage/header/header.vue

@@ -11,7 +11,7 @@
           <div class="sysIcon"></div>
           <div class="titleInfo">
             <div class="maintitle">
-              <div class="caption" @click="captionClick()">{{ title }}</div>
+              <div class="caption">{{ title }}</div>
               <div class="splitLine"></div>
               <el-select
                 ref="stlectTree"
@@ -116,6 +116,9 @@ export default {
     },
     routerData() {
       return this.$store.state.routeSetting.addRoutes
+    },
+    currentX() {
+      return this.$store.state.bigScreen.currentActive
     }
   },
   mounted() {
@@ -146,6 +149,11 @@ export default {
         this.$store.state.bigScreen.currentActive = n
       }
       // immediate:true
+    },
+    currentX: {
+      handler(n, o) {
+        this.currentProjectActive = n
+      }
     }
   },
   methods: {

src/views/groupPageDataManagement/IndexManagement/IndexForm.vue

@@ -123,7 +123,7 @@ export default class IndexForm extends Vue {
       { label: '项目名称', name: 'projectName' },
       { label: '管理领域', name: 'mangeField' },
       { label: '指标分类', name: 'indexType' },
-      { label: '指标代码', name: 'indexCode', required: true },
+      { label: '指标代码', name: 'indexCode', required: true, disabled: this.formData.id ? true : false },
       { label: '指标名称', name: 'indexName', required: true },
       { label: '指标值', name: 'indexValue', required: true },
       { label: '指标单位', name: 'unit' }

src/views/groupPageDataManagement/IndexManagement/widget.vue

@@ -84,7 +84,7 @@ export default class IndexManagement extends Vue {
       try {
         this.tableData = res.result.map((item) => {
           Object.keys(item).forEach((val) => (item[val] = item[val] || '/'))
-          return { ...item, source: item.source == '1' ? '本地导入' : '', isNew: item.isNew == '1' ? '是' : '否' }
+          return { ...item, source: item.source == '1' ? '本地导入' : '人工', isNew: item.isNew == '1' ? '是' : '否' }
         })
       } catch (error) {
         console.log(error)
@@ -120,6 +120,7 @@ export default class IndexManagement extends Vue {
   async onSubmit(data) {
     this.loading[data.id ? 'update' : 'add'] = true
     data['isNew'] = data['isNew'] == '是' ? 1 : 0
+    data['source'] = '人工'
     try {
       const { result } = await (data.id ? editIndexData({ ...data }) : addIndexData({ ...data }))
       this.$message[result ? 'success' : 'error'](`${data.id ? '修改' : '新增'}指标${result ? '成功!' : '失败!'}`)