去除导入功能地址中的prod-api前缀

src/utils/request.js

@@ -100,9 +100,15 @@ service.interceptors.response.use(
   error => {
     console.log(error) // for debug
     console.log('request.js err.response=', error.response) // for debug
-    // error.response.data.message = error.response.data.message || '未知错误'
+    let errmsg = error.response.data.message || '未知错误'
+    if (error.toString().indexOf('Network') > -1) {
+      errmsg = '网络请求失败'
+    } else if (error.toString().indexOf('timeout') > -1) {
+      errmsg = '网络请求超时'
+    }
+    error.response.data.message = errmsg
     Message({
-      message: error.toString().indexOf('Network') > -1 ? '网络请求失败' : '' + error.response.data.message,
+      message: errmsg,
       type: 'error',
       duration: 3 * 1000,
       offset: window.screen.height / 3

src/views/device/components/ModelFormCommandOpt104.vue

@@ -82,6 +82,7 @@
             placeholder="请输入"
             type="number"
             maxlength="5"
+            oninput="if(value.length>5)value=value.slice(0,5)"
             :disabled="inputvalueFlag"
             style="width:180px;margin-right: 2rem;"
           />
@@ -100,13 +101,13 @@
         <div style="border: 1px solid #ccc;padding: 3rem 5rem;">
           <div style="margin: 2rem 0;">
             <el-button
-              style="padding: 1rem 5rem;"
+              style="padding: 1rem 4rem;"
               type="primary"
-              :class="yaoTiaoCommnad.result===1 ? dark-button:''"
+              class="dark-button"
               size="big"
-              :disabled="yaoTiaoCommnad.result!==1"
+              :disabled="yaoTiaoCommnad.result!==-1"
               @click="commitYaoTiaoExecute"
-            >执行</el-button>
+            >遥调执行</el-button>
           </div>
           <div style="margin: 2rem 0;">
             <el-button
@@ -419,7 +420,7 @@ export default {
       }
       this.yaoTiaoCommnad.result2 = 0
       this.yaoTiaoCommnad.result2Text = '执行中'
-      this.yaoTiaoCommnad.result = -1
+      this.yaoTiaoCommnad.result = 0
       // this.inputvalueFlag = true
       var urlencoded = new URLSearchParams()
       urlencoded.append('stage', 'execute')
@@ -427,6 +428,7 @@ export default {
       urlencoded.append('value', v)
       postData(`/iec104/master/${this.modelParames.curPlanId}/normalized`, urlencoded).then((res) => {
         // 操作成功
+        this.yaoTiaoCommnad.result = -1
         this.inputvalueFlag = false
         this.yaoTiaoCommnad.result2 = 1
         this.yaoTiaoCommnad.result2Text = '执行成功！'

src/views/device/components/ModelFormFileTransferOpt104.vue

@@ -57,6 +57,7 @@
                           :show-file-list="false"
                           :auto-upload="true"
                           accept="*"
+                          :data="{filename:uploadFileName}"
                           :disabled="isUploadFileIng"
                           :headers="uplaodHeader"
                           :before-upload="(file) => updateActionUrl2(file,scope.row.id)"
@@ -174,6 +175,7 @@ export default {
       getFileDir: '/', // 拉取文件的目录名称
       uploadFileUrl: '', // 文件上传地址
       fid: '',
+      uploadFileName: '', // 上传的文件名称
       uploadSize: 0, // 上传文件的大小
       isUploadFileIng: false, // 文件是否在上传中
       isSendFileId: 0, // 文件是不是正在下发中
@@ -330,6 +332,7 @@ export default {
     updateActionUrl2(obj, id) {
       return new Promise((r) => {
         this.$nextTick(() => {
+          this.uploadFileName = obj.name
           this.uploadFileUrl = '/test/file/' + id + '/bytes' // 文件上传地址
           r()
         })

src/views/device/tables/Sample.vue

@@ -221,10 +221,9 @@ export default {
   //   }
   // },
   created() {
-    const envUrl = process.env.VUE_APP_BASE_API
     // 网页加载完成后执行
     // 接口 导入测点 /test/plan/:plan/points.csv
-    this.importCsvActionStr = envUrl + `/test/plan/${this.componentParames.curPlanId}/points.csv`
+    this.importCsvActionStr = `/test/plan/${this.componentParames.curPlanId}/points.csv`
     // console.log('this.importCsvActionStr=', this.importCsvActionStr)
     // 在bus上挂载刷新事件
     EventBus.$on('refreshManualSample', this.refreshManual)

src/views/plan/components/PlanCheckPoint.vue

@@ -427,7 +427,6 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      // const envUrl = process.env.VUE_APP_BASE_API
       // 网页加载完成后执行
       this.importCsvActionStr = `/product/model/0/models.csv`
       if (this.currentPlanData.id > 0) {

src/views/plan/components/PlanCheckPoint_master104.vue

@@ -361,13 +361,12 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      const envUrl = process.env.VUE_APP_BASE_API
       // 网页加载完成后执行
-      this.importCsvActionStr = envUrl + `/product/model/0/models.csv`
+      this.importCsvActionStr = `/product/model/0/models.csv`
       if (this.currentPlanData.id > 0) {
         // 如果获取到了PlanId再加载详细信息
         this.getPlanCheckPoint()
-        this.importCsvActionStr = envUrl + `/product/model/${this.currentPlanData.product}/models.csv`
+        this.importCsvActionStr = `/product/model/${this.currentPlanData.product}/models.csv`
       }
       this.initFunctions()
     })

src/views/system/components/TempList.vue

@@ -124,9 +124,8 @@ export default {
     // 点击上传文件按钮事件
     updataUsers(row) {
       // console.log('upDatarow =', row)
-      const envUrl = process.env.VUE_APP_BASE_API
       const thisProductType = this.protocolOptions.find(par => par.name === row.name)
-      this.importCsvActionStr = envUrl + `/product/type/${thisProductType.id}/report.docx`
+      this.importCsvActionStr = `/product/type/${thisProductType.id}/report.docx`
     },
     // 导入
     submitUpload() {