更新公司环境

.env.production

@@ -5,5 +5,5 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-# VUE_APP_BASE_API = 'http://39.101.188.84:9115'
-VUE_APP_BASE_API = 'http://20.1.0.164/api'
+VUE_APP_BASE_API = 'http://39.101.188.84:9115'
+# VUE_APP_BASE_API = 'http://20.1.0.164/api'

src/utils/request.js

@@ -15,8 +15,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  // baseURL: process.env.VUE_APP_BASE_API,
-  baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API,
+  baseURL: process.env.VUE_APP_BASE_API,
+  // baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API,
   // 超时
   timeout: 50000
 })

src/views/auditPages/assetsManagement/email.vue

@@ -239,8 +239,8 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData"
-        url: location.origin + "/api/tc/assetEmail/importData"
+        url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData"
+        // url: location.origin + "/api/tc/assetEmail/importData"
       },
     }
   },

src/views/auditPages/assetsManagement/index.vue

@@ -258,8 +258,8 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
-        url: location.origin + "/api/tc/assetCurrent/importData"
+        url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
+        // url: location.origin + "/api/tc/assetCurrent/importData"
       },
     }
   },

src/views/auditPages/assetsManagement/mobileApplication.vue

@@ -265,8 +265,8 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData"
-        url: location.origin + "/api/tc/assetApp/importData"
+        url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData"
+        // url: location.origin + "/api/tc/assetApp/importData"
       },
     }
   },

src/views/auditPages/assetsManagement/officialAccount.vue

@@ -251,8 +251,8 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData"
-        url: location.origin + "/api/tc/assetOfficialAccount/importData"
+        url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData"
+        // url: location.origin + "/api/tc/assetOfficialAccount/importData"
       },
     }
   },

src/views/auditPages/assetsManagement/program.vue

@@ -250,8 +250,8 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData"
-        url: location.origin + "/api/tc/miniPrograms/importData"
+        url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData"
+        // url: location.origin + "/api/tc/miniPrograms/importData"
       },
     }
   },

src/views/components/myUpload/index.vue

@@ -67,10 +67,10 @@ export default {
     return {
       number: 0,
       uploadList: [],
-      // baseUrl: process.env.VUE_APP_BASE_API,
-      baseUrl: location.origin + '/api',
-      // uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      uploadFileUrl: location.origin + '/api/common/upload',
+      baseUrl: process.env.VUE_APP_BASE_API,
+      // baseUrl: location.origin + '/api',
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      // uploadFileUrl: location.origin + '/api/common/upload',
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/components/renwuType/index_v1.vue

@@ -222,26 +222,28 @@
                               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+         
+        </el-form>
+
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
             v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
             <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
-
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
           </el-row>
-        </el-form>
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
           <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
-        </el-row>
-        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-          v-else>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
         </el-row>
+       
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>

src/views/components/renwuType/index_v2.vue

@@ -311,29 +311,29 @@
                               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+         
+        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
             v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
             <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-            <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+            <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
           </el-row>
-
-        </el-form>
-
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
         </el-row>
-        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-          v-else>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
-        </el-row>
+      
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>

src/views/components/renwuType/index_v3.vue

@@ -165,28 +165,29 @@
                               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+         
+
+        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
             v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
             <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
           </el-row>
-
-
-        </el-form>
-        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-          v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
-          <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-if="pageType == 'look'">
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-          v-else>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
+          <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
+          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
         </el-row>
+      
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>

src/views/components/renwuType/index_v4.vue

@@ -152,29 +152,30 @@
                               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+         
+
+        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
             v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
             <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
           </el-row>
-
-
-        </el-form>
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
         </el-row>
-        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-          v-else>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
-        </el-row>
+      
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>

src/views/components/renwuType/webType1.vue

@@ -2484,8 +2484,7 @@
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="$route.query.pageType == 'change'">
           <el-button type="danger" @click="newAssets(0)">不通过</el-button>
-          <el-button type="success" @click="newAssets(1)">通过</el-button>
-          <el-button type="primary" @click="sendBack" class="fanhuipiaofu" size='mini'>返回</el-button>
+          <el-button type="primary" @click="newAssets(1)">通过</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-else>

src/views/components/renwuType/webType2DW.vue

@@ -2744,7 +2744,6 @@
               <el-button @click="newAssets(1)">取消</el-button>
               <el-button type="warning" @click="newAssets(2)">暂存</el-button>
               <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-              <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
             </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-else>
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>

src/views/login.vue

@@ -109,6 +109,12 @@ export default {
     }
   },
   created() {
+    if(localStorage.getItem("ismypaginationTow")){
+      localStorage.removeItem("ismypaginationTow")
+    }
+    if(localStorage.getItem("ismypagination")){
+      localStorage.removeItem("ismypagination")
+    }
     this.getCode();
     this.getCookie();
   },

vue.config.js

@@ -18,8 +18,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  // publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/",
-  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）