部署地址为测试环境

.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://39.101.188.84:9115'
-VUE_APP_BASE_API = 'http://20.1.0.164/api'
+# 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.VUE_APP_BASE_API,
-  baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : 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: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData"
-        url: location.origin + "/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: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
-        url: location.origin + "/api/tc/assetCurrent/importData"
+        // 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: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData"
-        url: location.origin + "/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: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData"
-        url: location.origin + "/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: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData"
-        url: location.origin + "/api/tc/miniPrograms/importData"
+        // url: location.origin + "/api/tc/miniPrograms/importData"
       },
     }
   },

src/views/auditPages/taskManagement/audit copy.vue

@@ -2532,7 +2532,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2759,7 +2767,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload,

src/views/components/assetsType/index.vue

@@ -2613,7 +2613,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2820,7 +2828,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload

src/views/components/myAssetsType/index.vue

@@ -2533,7 +2533,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2761,7 +2769,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload,

src/views/components/myUpload/index.vue

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

src/views/components/renwuType/webType1.vue

@@ -2315,7 +2315,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2512,7 +2520,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload,

src/views/components/renwuType/webType2DW.vue

@@ -2541,7 +2541,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2778,7 +2786,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload, myDialog

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

@@ -2509,7 +2509,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                     required: true, message: '请输入', trigger: 'blur'
                   }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.xjgywxt.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2736,7 +2744,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload,myDialog

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" ? "/demo/TcAssetVerificationPc" : "/",
-  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）