From 3523dcade702bfcf46ae24a76a032e2071c9be00 Mon Sep 17 00:00:00 2001
From: jiangyinzhi <jiangyinzhi@163.com>
Date: Fri, 6 Jun 2025 09:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                              |  2 +-
 public/index.html                            |  2 +-
 src/api/config.js                            | 12 +---
 src/config/index.js                          | 38 -------------
 src/main.js                                  |  2 -
 src/settings.js                              |  6 +-
 src/utils/index.js                           | 60 --------------------
 src/views/energyEfficiency/clockIn/index.vue | 13 +++--
 8 files changed, 13 insertions(+), 122 deletions(-)
 delete mode 100644 src/config/index.js

diff --git a/.env.production b/.env.production
index a255385..423bc5d 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@ NODE_ENV=production
 # 测试0 生产1
 VUE_APP_ENV = '1'
 # 定义变量
-VUE_APP_CITY_TYPE = 'xj'
+VUE_APP_CITY_TYPE = ''
 
 # base api
 VUE_APP_BASE_API = ''
diff --git a/public/index.html b/public/index.html
index eea6118..df1aeb1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
     content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <script src="static/lib/echarts.min.js"></script>
-  <script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.min.js"></script>
+  <!-- <script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.min.js"></script> -->
   
   <!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
   <script>
diff --git a/src/api/config.js b/src/api/config.js
index 6177a3a..f5a1212 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -4,15 +4,9 @@ let baseURL = ''
 if (process.env.NODE_ENV === 'development') {
   // 测试环境
   // baseURL = 'http://172.29.69.38:28083/'  //后端ip和端口
-  // baseURL = 'http://192.168.1.116:28083/' //南京国网测试后端ip和端口
-  baseURL = 'http://172.29.69.38:19012/' //南京国网测试后端ip和端口
-  // baseURL = 'https://portal.xt.nfjbill.ren:30004/proxy-ah/' //后端ip和端口
-
-  // baseURL = 'https://www.greensgcc.com/proxy-ah/effcicency/' //安徽本地测试
-  // baseURL = 'https://www.greensgcc.com/proxy-nx/' //宁夏本地测试
-  // baseURL = 'https://www.greensgcc.com/proxy-xj/' //新疆本地测试
-  // baseURL = 'https://www.greensgcc.com/proxy-sx/' //山西本地测试
-  
+  // baseURL = 'http://192.168.1.116:28083/' //测试后端ip和端口
+  baseURL = 'http://172.29.69.38:19012/' //测试后端ip和端口
+ 
 } else {
   // 生产环境
   // baseURL = '' // 本地 打包以后只需要空路径就行
diff --git a/src/config/index.js b/src/config/index.js
deleted file mode 100644
index 0a40d54..0000000
--- a/src/config/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// 在运行和打包前根据不同的环境切换对应地址和缓存的地址
-// picBaseUrl 为接口请求图片的地址前缀 picCachingUrl 为缓存图片的地址前缀 打包前请两者都对应修改
-// 民防环境
-// const picBaseUrl = 'https://mam1.ft-power.com.cn:10001/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = 'http://mam6.ft-power.com.cn:10030/fzSP/fileAction.do?method=execute&'
-
-// 策划部环境
-// const picBaseUrl = 'https://mam2.ft-power.com.cn:19092/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = 'https://mam4.ft-power.com.cn:9001/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = 'http://10.20.32.134:7002/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = 'http://10.20.32.36:7001/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = 'http://10.20.32.128:10010/fzSP/fileAction.do?method=execute&'
-// 公司本地环境地址
-// const picBaseUrl = 'http://10.30.15.7:7009/fzSP/fileAction.do?method=execute&'
-// const picBaseUrl = "http://webapp.hoperun.com:9002/fzSP/fileAction.do?method=execute&"
-// 生产地址IP和端口
-// const picBaseUrl = 'http://10.20.32.161:7007/fzSP/fileAction.do?method=execute&'
- const picBaseUrl = 'https://mam.sgcc.com.cn:443/fzSP/fileAction.do?method=execute&'
-//  const picBaseUrl = 'http://127.0.0.1:10086/fzSP/fileAction.do?method=execute&'
-
-// 缓存图片地址 使用tempFile
- const picCachingUrl = 'https://mam.sgcc.com.cn:443/fzSP/tempFile/'
-// const picCachingUrl = 'https://mam1.ft-power.com.cn:10001/fzSP/tempFile/'
-// const picCachingUrl = 'http://mam6.ft-power.com.cn:10030/fzSP/tempFile/'
-// const picCachingUrl = 'https://mam2.ft-power.com.cn:19092/fzSP/tempFile/'
-// const picCachingUrl = 'http://10.20.32.134:7002/fzSP/tempFile/'
-// const picCachingUrl = 'http://10.30.15.7:7009/fzSP/tempFile/'
-// const picCachingUrl = "http://webapp.hoperun.com:9002/fzSP/tempFile/"
-
-// const picCachingUrl = 'http://10.20.32.161:7007/fzSP/tempFile/'
-
-// const picCachingUrl = 'http://10.20.32.36:7001/fzSP/tempFile/'
-// const picCachingUrl = 'http://10.20.32.128:10010/fzSP/tempFile/'
-//  暂时无用的地址
-// http://10.20.32.36:7001/fzSP/
-// const picCachingUrl = 'http://10.30.15.7:7009/fzSP/fileAction.do?method=execute&'
-// const picCachingUrl = 'http://10.20.32.134:7002/fzSP/fileAction.do?method=execute&'
-export { picBaseUrl, picCachingUrl }
diff --git a/src/main.js b/src/main.js
index 005b946..f3d8a4e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,8 +24,6 @@ Vue.use(inputDirective);
 Vue.use(Vant);
 Vue.prototype.Regexp = Regexp
 Vue.prototype.$store = store
-// Vue.prototype.$picBaseUrl = picBaseUrl
-// Vue.prototype.$picCachingUrl = picCachingUrl
 const bus = new Vue()
 Vue.prototype.$bus = bus
 
diff --git a/src/settings.js b/src/settings.js
index 7e5c490..97bb2fb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -10,11 +10,7 @@ module.exports = {
    */
   sidebarLogo: true,
   menuExclude: [],
-  // ${process.env.VUE_APP_BASE_API}
-  // https://portal.xt.nfjbill.ren:30004
-  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-sx/file/minio/download/`,
-  // downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`,
-  // downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`,
+  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-cq/file/minio/download/`,
   uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,
   statusCode: {
     SUCCESS: 0
diff --git a/src/utils/index.js b/src/utils/index.js
index 71ceea9..c63b038 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -154,8 +154,6 @@ export function callApi(funName, params) {
 export function fileDown (downLoadUrl, fileName, id,data) {
   // 测试app
 
-  // let url = `https://mam.zeus2.top:10030/xtkb-web/file/fileDownload?id=${downLoadUrl}`
-  // const url = `https://mamjs.sgcc.com.cn:10443/xtkb-web/file/fileDownload?id=${downLoadUrl}`
   //正式app
   if (process.env.NODE_ENV === 'production') {
     let url = `/xtkb-web/file/fileDownload?id=${downLoadUrl}`
@@ -163,64 +161,6 @@ export function fileDown (downLoadUrl, fileName, id,data) {
   }else{
 
   }
-//   // let url = `https://mamjs.sgcc.com.cn:10443/xtkb-web/file/fileDownload?id=${downLoadUrl}`
-//   function success (result) {
-//     let type = result.data.event
-//     switch (type) {
-//       case 'fail':
-//         Toast.$create({
-//           txt: '下载失败',
-//           type: 'error'
-//         }).show();
-//         break;
-//       case 'progress':
-//         Toast.$create({
-//           txt: '正在下载',
-//           type: 'warn'
-//         }).show();
-//         break;
-//       case 'success':
-//         Toast.$create({
-//           txt: '下载成功',
-//           type: 'success'
-//         }).show();
-//         // let urlData = result.fileUrl.split('/serverfile')
-//         // let newUrl
-//         // if (urlData.length === 2) {
-//         //   newUrl = urlData[0] + '/serverfile/' + fileName
-//         // } else {
-//         //   newUrl = result.fileUrl
-//         // }
-//         // let dataUrl = data.split('data:')
-//         mam.navigator.appfilemanage.openFile(url,fileName);
-//         break;
-//     }
-//   }
-//   // JSINTXTKB
-//   Dialog.$create({
-//     type: 'confirm',
-//     icon: 'cubeic-alert',
-//     title: '文件',
-//     content: '是否下载文件',
-//     confirmBtn: {
-//       text: '确定下载',
-//       active: true,
-//       disabled: false,
-//       href: 'javascript:;'
-//     },
-//     cancelBtn: {
-//       text: '取消下载',
-//       active: false,
-//       disabled: false,
-//       href: 'javascript:;'
-//     },
-//     onConfirm: () => {
-//       // JSINTXTWZS
-//       mam.navigator.appfilemanage.fileDownload2(success, 'JSINTXTWZS', '', url, '/serverfile', fileName, id, { id: id })
-//     },
-//     onCancel: () => {
-//     }
-//   }).show()
 }
 // function diyDownload()
 // {
diff --git a/src/views/energyEfficiency/clockIn/index.vue b/src/views/energyEfficiency/clockIn/index.vue
index 3bba623..b95ab19 100644
--- a/src/views/energyEfficiency/clockIn/index.vue
+++ b/src/views/energyEfficiency/clockIn/index.vue
@@ -148,11 +148,12 @@ export default {
       getPositionData({taskId: this.taskId}).then(res => {
         console.log(res.code , res.data);
         if(res.code == 0&&res.data){
-          for (const key in this.formData) {
-            if (Object.hasOwnProperty.call(this.formData, key)) {
-             this.formData[key] = res.data[key]
-            }
-          }
+          // for (const key in this.formData) {
+          //   if (Object.hasOwnProperty.call(this.formData, key)) {
+          //    this.formData[key] = res.data[key]
+          //   }
+          // }
+          this.formData = res.data
           if (res.data.fileId) {
             this.$set(this.text1,0, { 
               fileName: res.data.fileName,
@@ -162,7 +163,7 @@ export default {
             console.log(this.text1);
           }
           this.$forceUpdate()
-          this.showSubmit = false
+          this.showSubmit = true
         }else{
           this.showSubmit = true
           this.getLocation()