12

Signed-off-by: liubaiyan <632697560@qq.com>

src/views/engineeringScreen/index.vue

@@ -133,7 +133,8 @@
                   effect="dark"
                 >
                   <template #content>
-                    <span class="tooltip-title">巡检完成率：</span>{{ '所有项目' + getYearAndMonth() + '巡检完成率（所有项目的任务完成数总计*100%/任务总数总计）' }}
+                    <span class="tooltip-title">巡检完成率：</span>
+                    {{ (project ? filterForm.projectName : '所有项目') + getYearAndMonth() + '巡检完成率（' + (project ? filterForm.projectName : '所有项目') + '的任务完成数总计*100%/任务总数总计）' }}
                   </template>
                   <div class="base-info-title base-info-icon3">
                     巡检完成率
@@ -153,7 +154,8 @@
                   effect="dark"
                 >
                   <template #content>
-                    <span class="tooltip-title">维保完成率：</span>{{ '所有项目' + getYearAndMonth() + '维保完成率（所有项目的任务完成数总计*100%/任务总数总计）' }}
+                    <span class="tooltip-title">维保完成率：</span>
+                    {{ (project ? filterForm.projectName : '所有项目') + getYearAndMonth() + '维保完成率（' + (project ? filterForm.projectName : '所有项目') + '的任务完成数总计*100%/任务总数总计）' }}
                   </template>
                   <div class="base-info-title base-info-icon4">
                     维保完成率
@@ -518,6 +520,7 @@ import {
   getDeviceTaskListOfEngineering,
   getMaintenanceTaskDataOfEngineering
 } from 'api/engineering'
+import { getStore } from '../../utils/store'
 export default {
   name: 'EngineeringScreen',
   components: {
@@ -534,7 +537,7 @@ export default {
       project: '',
       projectList: [],
       filterForm: {
-        companyId: localStorage.companyId || 281,
+        companyId: '',
         areaId: '',
         projectId: '',
         projectName: ''
@@ -603,8 +606,9 @@ export default {
     }
   },
   mounted () {
+    this.filterForm.companyId = getStore({ name: 'companyIdScreen' })
     getProjectDictionary({
-      companyId: localStorage.companyId || 281
+      companyId: this.filterForm.companyId
     }).then(res => {
       if (res.status == 200) {
         this.projectList = res.data
@@ -624,7 +628,7 @@ export default {
     //  选取项目过滤图表
     filterCharts (value) {
       this.filterForm = {
-        companyId: localStorage.companyId || 281,
+        companyId: getStore({ name: 'companyIdScreen' }),
         areaId: '',
         projectId: '',
         projectName: ''
@@ -642,7 +646,7 @@ export default {
         }).then(res => {
           if (res.resultCode == 200) {
             this.projectOption = {
-              src: res.data.imagePath,
+              src: res.data.imageFullPath,
               title: res.data.projectName,
               info: res.data.projectDesc
             }
@@ -1456,7 +1460,7 @@ export default {
               this.tableOption.filterForm = {
                 lpCategory: this.tableOption.filterForm.lpCategory,
                 finishType: params.name == '完成率' ? 1 : 2,
-                companyId: localStorage.companyId,
+                companyId: this.filterForm.companyId,
                 projectId: res.data[params.componentIndex].projectId
               }
               this.tableOption.title = params.name == '完成率' ? '已完成任务' : '未完成任务'

src/views/projectScreen/index.vue

@@ -151,7 +151,7 @@ export default {
         value: 'projectId'
       },
       filterForm: {
-        companyId: 249,
+        companyId: '',
         areaId: '',
         projectId: '',
         projectName: ''
@@ -183,9 +183,9 @@ export default {
     }
   },
   mounted () {
-    this.filterForm.companyId = getStore({ name: 'companyIdScreen', type: 'session' }) || 249
+    this.filterForm.companyId = getStore({ name: 'companyIdScreen' })
     getProjectDictionary({
-      companyId: getStore({ name: 'companyIdScreen', type: 'session' }) || 249
+      companyId: this.filterForm.companyId
     }).then(res => {
       if (res.status == 200) {
         this.projectList = res.data
@@ -204,7 +204,7 @@ export default {
     //  选取项目过滤图表
     filterCharts (value) {
       this.filterForm = {
-        companyId: getStore({ name: 'companyIdScreen', type: 'session' }) || 249,
+        companyId: getStore({ name: 'companyIdScreen' }),
         areaId: '',
         projectId: '',
         projectName: ''

src/views/qualityScreen/index.vue

@@ -202,7 +202,7 @@ export default {
         value: 'projectId'
       },
       filterForm: {
-        companyId: 249,
+        companyId: '',
         areaId: '',
         projectId: '',
         projectName: ''
@@ -235,7 +235,7 @@ export default {
     }
   },
   mounted () {
-    this.filterForm.companyId = getStore({ name: 'companyIdScreen', type: 'session' }) || 249
+    this.filterForm.companyId = getStore({ name: 'companyIdScreen' })
     getProjectDictionary({
       companyId: this.filterForm.companyId
     }).then(res => {
@@ -256,7 +256,7 @@ export default {
     //  选取项目过滤图表
     filterCharts (value) {
       this.filterForm = {
-        companyId: getStore({ name: 'companyIdScreen', type: 'session' }) || 249,
+        companyId: getStore({ name: 'companyIdScreen' }),
         areaId: '',
         projectId: '',
         projectName: ''

vite.config.js

@@ -25,22 +25,22 @@ export default ({ command, mode }) => {
         port: 3001,
         proxy:{
           '/landcrm': {
-            target: 'https://wuye.djchina.com/',
-            // target: 'https://ebeitest.wuyeface.com:1188/',
+            // target: 'https://wuye.djchina.com/',
+            target: 'https://ebeitest.wuyeface.com:1188/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/landcrm/, '/landcrm')
           },
           '/neikong': {
-            target: 'https://wuye.djchina.com/',
-            // target: 'https://ebeitest.wuyeface.com:1188/',
+            // target: 'https://wuye.djchina.com/',
+            target: 'https://ebeitest.wuyeface.com:1188/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/neikong/, '/neikong')
           },
           '/datashow': {
-            target: 'https://wuye.djchina.com/',
-            // target: 'https://ebeitest.wuyeface.com:1188/',
+            // target: 'https://wuye.djchina.com/',
+            target: 'https://ebeitest.wuyeface.com:1188/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/datashow/, '/datashow')