8 Revize 935cac9448 ... 0527d7772a

Autor SHA1 Zpráva Datum
  XhuiCoder 0527d7772a 食堂测试系统部署test1.2 před 9 měsíci
  NanMing 9e7a16a307 Merge branch 'yl-service' of sckj/mz-cloud into master před 9 měsíci
  sckj 8b9bddd6cf Merge branch '20240513_sun' of sckj/mz-cloud into master před 9 měsíci
  15143018065 808a566c49 20240513_sun před 9 měsíci
  sckj ec901c45ed Merge branch '20240513_sun' of sckj/mz-cloud into master před 9 měsíci
  15143018065 da140e3e49 20240513_sun před 9 měsíci
  NanMing 89ebf38802 Merge branch 'yl-service' of sckj/mz-cloud into master před 9 měsíci
  NanMing dea5f8395d Merge branch 'yl-service' of sckj/mz-cloud into master před 9 měsíci

+ 3 - 1
ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstSbxxController.java

@@ -95,7 +95,9 @@ public class LnstSbxxController extends BaseController
         LnstSbxx lnstSbxx = new LnstSbxx();
         lnstSbxx.setSbid(object.getString("sysid"));
         StringBuilder sb = new StringBuilder();
-        sb.append("设备型号:").append(object.getString("model")).append("\n")
+        sb.append("设备ID:").append(object.getString("sbid")).append("\n")
+                .append("系统ID:").append(object.getString("sysid")).append("\n")
+                .append("设备型号:").append(object.getString("model")).append("\n")
                 .append("设备品牌:").append(object.getString("brand")).append("\n")
                 .append("产品名称:").append(object.getString("product")).append("\n")
                 .append("系统版本:").append(object.getString("release")).append("\n")

+ 1 - 1
ruoyi-ui/.env.development

@@ -8,7 +8,7 @@ VUE_APP_LOGO = '@/assets/images/shijihome/img_14.png'
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
ruoyi-ui/nginx.conf

@@ -33,7 +33,7 @@ http {
         listen  [::]:80;
         server_name  localhost;
 
-        location /dev-api/ {
+        location /prod-api/ {
            proxy_pass http://172.17.0.1:9090/;
         }
         location /uploadPath/ {

+ 1 - 1
ruoyi-ui/src/views/lnst/sbxx/index.vue

@@ -74,7 +74,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备ID" align="center" prop="sbid" />
-      <el-table-column label="设备描述" align="center" prop="sbms" />
+      <el-table-column label="设备描述" align="center" prop="sbms" width="300"/>
       <el-table-column label="注册时间" align="center" prop="zcsj" width="180">
         <template slot-scope="scope">
             <span>{{ special(scope.row.zcsj,'time') }}</span>