pc端显示调整

sp-admin/sa-frame/nav/nav-logo.vue

@@ -32,6 +32,6 @@
 		margin-left: 22px;
 	}
 	
-	.admin-title{padding-right: 0.5em; margin-left: 0.5em; font-size: 1.05em;}
+	.admin-title{padding-right: 0.5em; margin-left: 2em; font-size: 1.05em;}
 	
 </style>

sp-admin/sa-view-sp/sp-admin/admin-list.html

@@ -24,23 +24,23 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<h4 class="c-title">检索参数</h4>
 				<el-form>
-					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
+					<sa-item type="text" name="用户名" v-model="p.name"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br>
-					<sa-item name="综合排序" class="s-radio-text">
-						<el-radio-group v-model="p.sort_type">
-							<el-radio :label="0">最近添加</el-radio>
-							<el-radio :label="2">最近登录</el-radio>
-							<el-radio :label="3">登录次数</el-radio>
-						</el-radio-group>
-					</sa-item>
+<!--					<sa-item name="综合排序" class="s-radio-text">-->
+<!--						<el-radio-group v-model="p.sort_type">-->
+<!--							<el-radio :label="0">最近添加</el-radio>-->
+<!--							<el-radio :label="2">最近登录</el-radio>-->
+<!--							<el-radio :label="3">登录次数</el-radio>-->
+<!--						</el-radio-group>-->
+<!--					</sa-item>-->
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
 				<sa-item type="fast-btn" show="add,get,delete,export,reset"></sa-item>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="selection"></sa-td>
-					<sa-td type="user-avatar" name="昵称" prop="name,avatar" min-width="120px"></sa-td>
+					<sa-td type="user-avatar" name="用户名" prop="name,avatar" min-width="120px"></sa-td>
 					<sa-td type="text" name="手机" prop="phone"></sa-td>
 					<sa-td name="创建人" >
 						<template slot-scope="s">

sp-admin/sa-view/tb-business/tb-business-list.html

@@ -41,7 +41,7 @@
 					<!-- 	<el-button size="mini" type="primary" v-if="perCode.indexOf('tb-business-confirm')!=-1"
 						@click="confirmBatch()">确认</el-button> -->
 					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
-					<el-button size="mini" type="danger" @click="deleteByIds()">删除</el-button>
+					<!-- <el-button size="mini" type="danger" @click="deleteByIds()">删除</el-button> -->
 					<!-- <el-button size="mini" type="warning" icon="el-icon-download" @click="sa.exportExcel()">导出</el-button> -->
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>

sp-admin/sa-view/tb-costomer/customer-admin-list.html

@@ -24,7 +24,7 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<h4 class="c-title">检索参数</h4>
 				<el-form>
-					<sa-item type="text" name="登录名" v-model="p.name"></sa-item>
+					<sa-item type="text" name="用户名" v-model="p.name"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br>
 
@@ -34,7 +34,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="selection"></sa-td>
-					<sa-td type="text" name="登录名" prop="name" min-width="120px"></sa-td>
+					<sa-td type="text" name="用户名" prop="name" min-width="120px"></sa-td>
 					<sa-td type="datetime" name="创建时间" prop="createTime" width="150px"></sa-td>
 					<sa-td type="datetime" name="最后登录" prop="loginTime" width="150px"></sa-td>
 					<sa-td type="text" name="登录次数" prop="loginCount" not="0" width="100px"></sa-td>
@@ -154,8 +154,8 @@
 					},
 					// 查看详情
 					getInfo: function(data) {
-						//sa.showIframe('账号详情', 'admin-info.html?id=' + data.id, '700px', '80%');
-						sa.$page.openAdminInfo(data.id, data.name);
+						sa.showIframe('账号详情', '../../sa-view-sp/sp-admin/admin-info.html?id=' + data.id, '700px', '80%');
+						//sa.$page.openAdminInfo(data.id, data.name);
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sp-server/src/main/java/com/pj/project/tb_item/TbItem.java

@@ -47,8 +47,6 @@ public class TbItem extends Model<TbItem> implements Serializable {
      * 项目编号
      */
     private String itemCode;
-    private String typeName;
-
 
     /**
      * 项目名称
@@ -64,5 +62,7 @@ public class TbItem extends Model<TbItem> implements Serializable {
     private double maxWeight;
     private int status;
 
+    @TableField(exist = false)
+    private String typeName;
 
 }

sp-server/src/main/java/com/pj/project/tb_item/TbItemMapper.xml

@@ -47,11 +47,13 @@
         <result property="carLength" column="car_length" />
         <result property="maxWeight" column="max_weight" />
         <result property="status" column="status" />
+        <result property="typeName" column="type_name" />
     </resultMap>
 
     <!-- 公共查询sql片段 -->
     <sql id="select_sql">
-		select *
+		select *,
+		(select name from tb_item_type where id = tb_item.type_id) as type_name
 		from tb_item
 	</sql>
 

sp-server/src/main/java/com/pj/project/tb_item/TbItemService.java

@@ -2,14 +2,19 @@ package com.pj.project.tb_item;
 
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pj.project.tb_item_type.TbItemType;
+import com.pj.project.tb_item_type.TbItemTypeService;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
 
+import javax.annotation.Resource;
+
 /**
  * Service: tb_item -- 作业配置项
  * @author qzy 
@@ -43,7 +48,7 @@ public class TbItemService extends ServiceImpl<TbItemMapper,TbItem> implements I
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
 	List<TbItem> getList(SoMap so) {
-		return tbItemMapper.getList(so);	
+        return tbItemMapper.getList(so);
 	}