Merge remote-tracking branch 'origin/master' into 20240109-yw

# Conflicts:
#	src/views/purchase/cert/supCertAudit.vue

.env.development

@@ -1,10 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = UDI追溯平台
+VUE_APP_TITLE = UDI追溯监管平台
 
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://127.0.0.1:9998'
+# VUE_APP_BASE_API = 'https://ts.udims.com/api/'
+VUE_APP_BASE_API = 'http://192.168.0.166:9998'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = UDI追溯平台
+VUE_APP_TITLE = UDI追溯监管平台
 
 
 

.env.test

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = UDI追溯平台
+VUE_APP_TITLE = UDI追溯监管平台
 
 # 生产环境配置
 ENV = 'test'

src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>欢迎使用UDI追溯平台</h2>
+        <h2>欢迎使用UDI追溯监管平台</h2>
 
       </el-col>
     </el-row>

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">UDI追溯平台</h3>
+      <h3 class="title">UDI追溯监管平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/myLogin.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="textTitle">
       <h3 class="toptitle">医疗器械</h3>
-      <h3 class="topSubtitle">UDI追溯平台</h3>
+      <h3 class="topSubtitle">UDI追溯监管平台</h3>
     </div>
     <el-form
       class="card-box login-form"

src/views/myLogin1.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="textTitle">
       <h3 class="toptitle">医疗器械</h3>
-      <h3 class="topSubtitle">UDI追溯平台</h3>
+      <h3 class="topSubtitle">UDI追溯监管平台</h3>
     </div>
     <el-form
       class="card-box login-form"

src/views/purchase/cert/supCertAudit.vue

@@ -1112,7 +1112,7 @@ export default {
     // },
     supCompanyClick(_this,row) {
       console.log(row);
-      _this.filterManufacturerQuery.customerId = row.customerId;
+      _this.filterManufacturerQuery.customerId = row.id;
       _this.registrationList = [];
       _this.onManufacturerReset();
     },

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || "UDI追溯平台"; // 网页标题
+const name = process.env.VUE_APP_TITLE || "UDI追溯监管平台"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口