部署地址切换正式环境、数据库类型bugfix

.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/auditPages/taskManagement/audit copy.vue

@@ -2533,7 +2533,7 @@
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

src/views/auditPages/unitAutonomicFill/index.vue

@@ -86,7 +86,7 @@
                   <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
                 <!--  -->
-                <div v-if="scope.row.auditState == 1 || scope.row.auditState == 3" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                <div v-if="scope.row.auditState == 1" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
                   @click="delInfo(scope.row)">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info" style="color: #1485EF;">审批</span>

src/views/components/assetsType/index.vue

@@ -2614,7 +2614,7 @@
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

src/views/components/myAssetsType/index.vue

@@ -2534,7 +2534,7 @@
                   required: true, message: '请输入', trigger: 'blur'
                 }">
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

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/webType1.vue

@@ -2316,7 +2316,7 @@
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

src/views/components/renwuType/webType2DW.vue

@@ -2542,7 +2542,7 @@
                   required: true, message: '请输入', trigger: 'blur'
                 }">
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

src/views/unitPages/myTask/audit copy.vue

@@ -2510,7 +2510,7 @@
                     required: true, message: '请输入', trigger: 'blur'
                   }">
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
-                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
                     <el-option
                       v-for="dict in dict.type.database_type"
                       :key="dict.value"

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) 的；（项目打包之后，静态资源会放在这个文件夹下）