cn.com.taiji.myapp/src/main/resources/templates/sys/new_index.html

@@ -38,11 +38,11 @@
 <!--           </li> -->
         </ul>
         <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-          <li class="layui-nav-item" lay-unselect="">
-            <a lay-href="/batchapply/wishlistList" title="我的申请箱" layadmin-event="wishlist" lay-text="我的申请箱">
-             		<i class="icon iconfont icon-cunrucaogaoxiang" ></i> 我的申请箱
-            </a>
-          </li>
+<!--          <li class="layui-nav-item" lay-unselect="">-->
+<!--            <a lay-href="/batchapply/wishlistList" title="我的申请箱" layadmin-event="wishlist" lay-text="我的申请箱">-->
+<!--             		<i class="icon iconfont icon-cunrucaogaoxiang" ></i> 我的申请箱-->
+<!--            </a>-->
+<!--          </li>-->
           <li class="layui-nav-item" lay-unselect="">
             <a lay-href="/messageinfo/infolist" title="消息中心" layadmin-event="message" lay-text="消息中心">
               <i class="layui-icon layui-icon-notice" ></i>  

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/domain/TinfoClass.java

@@ -449,6 +449,14 @@ public class TinfoClass implements Serializable {
     private String grxxgm;//个人信息规模
     @Column(name = "sjjb")
     private String sjjb;//数据级别
+    @Column(name = "gjfwmc")
+    private String gjfwmc;//挂接服务名称
+    @Column(name = "gjfwdz")
+    private String gjfwdz;//挂接服务地址
+    @Column(name = "gjqqfs")
+    private String gjqqfs;//挂接请求方式
+    @Column(name = "gjsypt")
+    private String gjsypt;//挂接数源平台
 
     public Long getHitchSize() {
 		return hitchSize;
@@ -1322,4 +1330,36 @@ public class TinfoClass implements Serializable {
     public void setSjjb(String sjjb) {
         this.sjjb = sjjb;
     }
+
+    public String getGjfwmc() {
+        return gjfwmc;
+    }
+
+    public void setGjfwmc(String gjfwmc) {
+        this.gjfwmc = gjfwmc;
+    }
+
+    public String getGjfwdz() {
+        return gjfwdz;
+    }
+
+    public void setGjfwdz(String gjfwdz) {
+        this.gjfwdz = gjfwdz;
+    }
+
+    public String getGjqqfs() {
+        return gjqqfs;
+    }
+
+    public void setGjqqfs(String gjqqfs) {
+        this.gjqqfs = gjqqfs;
+    }
+
+    public String getGjsypt() {
+        return gjsypt;
+    }
+
+    public void setGjsypt(String gjsypt) {
+        this.gjsypt = gjsypt;
+    }
 }

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/dto/TinfoClassDto.java

@@ -298,6 +298,10 @@ public class TinfoClassDto implements Serializable{
     private String sfbhgrxx;//是否包含个人信息
     private String grxxgm;//个人信息规模
     private String sjjb;//数据级别
+    private String gjfwmc;//挂接服务名称
+    private String gjfwdz;//挂接服务地址
+    private String gjqqfs;//挂接请求方式
+    private String gjsypt;//挂接数源平台
 
 
     public Integer getParentState() {
@@ -1190,4 +1194,36 @@ public class TinfoClassDto implements Serializable{
     public void setSjjb(String sjjb) {
         this.sjjb = sjjb;
     }
+
+    public String getGjfwmc() {
+        return gjfwmc;
+    }
+
+    public void setGjfwmc(String gjfwmc) {
+        this.gjfwmc = gjfwmc;
+    }
+
+    public String getGjfwdz() {
+        return gjfwdz;
+    }
+
+    public void setGjfwdz(String gjfwdz) {
+        this.gjfwdz = gjfwdz;
+    }
+
+    public String getGjqqfs() {
+        return gjqqfs;
+    }
+
+    public void setGjqqfs(String gjqqfs) {
+        this.gjqqfs = gjqqfs;
+    }
+
+    public String getGjsypt() {
+        return gjsypt;
+    }
+
+    public void setGjsypt(String gjsypt) {
+        this.gjsypt = gjsypt;
+    }
 }

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/SsoSyncService.java

@@ -105,7 +105,7 @@ public class SsoSyncService {
                         userDto.setFlag(1);
                         userDto.setPassword("Taiji@2024#YJJ");
                         userDto.setState("1");
-                        userDto.setPhoneNum("13111111111");
+                        userDto.setPhoneNum(ssoUserDto.getMOBILE());
                         userDto.setDeptid(dept.getDeptId());
                         userDto.setPdeptids(dept.getPdeptids());
                         userDto.setPriority("0");
@@ -174,7 +174,7 @@ public class SsoSyncService {
 
     public static void main(String args[]){
         SsoSyncService ssoSyncService= new SsoSyncService();
-        ssoSyncService.syncDept();
+        ssoSyncService.syncUser();
     }
 
 

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/TinfoClassHitchController.java

@@ -367,6 +367,10 @@ public class TinfoClassHitchController {
 	if (!"1".equals(checkinfo)) {
 		info.setDbid(dto.getDbid()); // 数据库信息
 		info.setHitch(dto.getHitch()); // 挂接情况说明
+		info.setGjfwdz(dto.getGjfwdz());
+		info.setGjfwmc(dto.getGjfwmc());
+		info.setGjqqfs(dto.getGjqqfs());
+		info.setGjsypt(dto.getGjsypt());
 	}
 	if("2".equals(info.getGjcheckstate())) {
 		info.setHitchStatus(1); // 挂接情况状态  1是已挂接   0未挂接
@@ -375,6 +379,7 @@ public class TinfoClassHitchController {
 		info.setHitchStatus(0);
 	}
 
+
 	tinfoClassService.saveTinfoClass(new TinfoClass(info));
 	if("1,2,3".contains(info.getGjcheckstate())) {
 		String result="审核通过";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/mysubscrilist.js

@@ -19,8 +19,8 @@ layui.config({
           	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"qxdy\"><i class=\"layui-icon layui-icon-edit\"></i>取消订阅</a>";
   			  return str;
             }}
-          ,{field:'infocode', title:'信息类编码',sort: true}
-          ,{field:'infoname', title:'信息类名称',
+          ,{field:'infocode', title:'数据资源目录编号',sort: true}
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>';
                 }
@@ -28,7 +28,7 @@ layui.config({
           ,{field:'versionid', title:'版本号', templet: function(res){
         	  return "<a class=\"layui-table-link\" href=\"javascript:viewVersionList(\'"+res.sourceid+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>"+res.versionid+"."+res.subversionid+"</a>"
           }}
-          ,{field:'isopensocial', title:'开放类型'}
+          // ,{field:'isopensocial', title:'开放类型'}
           ,{field:'hitchStatus', title:'是否挂接',templet: function(res){
         	  if(res.hitchStatus=="1"){
         		  return "<a  class=\"layui-table-link\" href=\"javascript:viewHitchInfo(\'"+res.id+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>是</a>";
@@ -37,8 +37,8 @@ layui.config({
         		  return "<a class=\"layui-table-link\"  href=\"javascript:viewHitchInfo(\'"+res.id+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>否</a>";
         	  }
           }}
-          ,{field:'infotypename', title:'资源分类',width:300 }
-          ,{field:'providebmname', title:'提供方部门'}
+          // ,{field:'infotypename', title:'资源分类',width:300 }
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_myyslist.js

@@ -24,14 +24,14 @@ layui.config({
            ,{ title:'审核意见',templet:function(res){
           	  return res.hisTaskDto.opinion;
             }}
-          ,{field:'infoname', title:'信息类名称',
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');" href="javascript:void();"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
           }
-          ,{field:'isopensocial', title:'开放类型', sort: true}
+          // ,{field:'isopensocial', title:'开放类型', sort: true}
           ,{field:'infotypename', title:'资源分类',width:300 }
-          ,{field:'providebmname', title:'提供方部门'}
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_resClassifyList.js

@@ -19,47 +19,47 @@ layui.config({
         	 ]
         ,cols: [[
            {type: 'checkbox', fixed: 'left'}
-           ,{title:'操作',width:300, templet:function(res){
-         	  var str="";
-         	  if(privs=="1"){
-         		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jc\"><i class=\"iconfont icon-rizhichaxun1\"></i>检查</a>"; 
-         	  }
-         	  if(res.sharetype!="3"&&(viewrole==false||type=='qs')&&res.infocode.indexOf("3")==0){
-         		  if(res.sharemodetypename!='接口'){
-         			 str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"gxsq\"><i class=\"layui-icon layui-icon-edit\"></i>共享申请</a>";
-         		  }
-         		  else{
-         			 str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"fwsq\"><i class=\"layui-icon layui-icon-edit\"></i>服务申请</a>";
-
-         		  }
-             	  
-         	  }
-//         	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"sjgxt\"><i class=\"layui-icon iconfont icon-get\"></i>数据关系图</a>";          
-// 			  
-         	  return str;
-           }}
-          ,{field:'infocode', title:'信息类编码', width:230,  unresize: true, sort: true,hide:false}
+//            ,{title:'操作',width:300, templet:function(res){
+//          	  var str="";
+//          	  if(privs=="1"){
+//          		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jc\"><i class=\"iconfont icon-rizhichaxun1\"></i>检查</a>";
+//          	  }
+//          	  if(res.sharetype!="3"&&(viewrole==false||type=='qs')&&res.infocode.indexOf("3")==0){
+//          		  if(res.sharemodetypename!='接口'){
+//          			 str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"gxsq\"><i class=\"layui-icon layui-icon-edit\"></i>共享申请</a>";
+//          		  }
+//          		  else{
+//          			 str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"fwsq\"><i class=\"layui-icon layui-icon-edit\"></i>服务申请</a>";
+//
+//          		  }
+//
+//          	  }
+// //         	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"sjgxt\"><i class=\"layui-icon iconfont icon-get\"></i>数据关系图</a>";
+// //
+//          	  return str;
+//            }}
+          ,{field:'infocode', title:'数据资源目录编号', width:230,  unresize: true, sort: true,hide:false}
           ,{field:'sharemodetypename', title:'共享方式',width:150}
-          ,{field:'infoname', title:'信息类名称',width:200,
+          ,{field:'infoname', title:'数据资源名称',width:200,
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
           }
-          ,{field:'isglqz', title:'是否关联权责',width:110}
-          ,{field:'managetype', title:'是否系统支撑',width:110}
-          ,{field:'subversionid',title:'建表sql',width:240, templet: function(res){
-        	  var str="";
-        	  if(privs=="1"){
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>"; 	
-        	  }
-        	  else{
-        		  str+="无";
-        	  }
-        	  return str;
-          }}
+          // ,{field:'isglqz', title:'是否关联权责',width:110}
+          // ,{field:'managetype', title:'是否系统支撑',width:110}
+          // ,{field:'subversionid',title:'建表sql',width:240, templet: function(res){
+        	//   var str="";
+        	//   if(privs=="1"){
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>";
+        	//   }
+        	//   else{
+        	// 	  str+="无";
+        	//   }
+        	//   return str;
+          // }}
           ,{field:'versionid', title:'版本号',width:100, templet: function(res){
         	  return "<a class=\"layui-table-link\" href=\"javascript:viewVersionList(\'"+res.sourceid+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>"+res.versionid+"."+res.subversionid+"</a>"
           }}
@@ -72,10 +72,22 @@ layui.config({
         	  }
           }}
           ,{field:'updatetime', title:'发布时间',width:200}
-          ,{field:'isopensocial', width:150,title:'开放类型', sort: true}
-          ,{field:'infotypename', width:200,title:'资源分类' }
-          ,{field:'fltag', title:'资源分类标签',width:300}
-          ,{field:'providebmname',width:200, title:'提供方部门'}
+          // ,{field:'isopensocial', width:150,title:'开放类型', sort: true}
+          // ,{field:'infotypename', width:200,title:'资源分类' }
+          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
+          	if (res.fltag=="0001"){
+          		return "三维数据";
+			}else if (res.fltag=="0002"){
+          		return "二维数据";
+			}else if (res.fltag=="0003"){
+          		return "结构化数据";
+			}else if (res.fltag=="0004"){
+          		return "半结构化数据";
+			}else {
+          		return " ";
+			}
+				}}
+          ,{field:'providebmname',width:200, title:'数据资源管理单位'}
           ,{field:'sharetype',width:200, title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_tqlist.js

@@ -44,15 +44,15 @@ layui.config({
          	  }
          	   return str;
            }}
-           ,{field:'isused', title:'是否被使用',
-         	  templet: function(res){
-         		  if(res.isused=="是")
-                   return '<a class="layui-table-link"  href="javascript:viewIsUseInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.isused+'</a>'
-                   else{
-                	 return   res.isused;
-                   }
-         	  }
-           }
+           // ,{field:'isused', title:'是否被使用',
+         	//   templet: function(res){
+         	// 	  if(res.isused=="是")
+           //         return '<a class="layui-table-link"  href="javascript:viewIsUseInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.isused+'</a>'
+           //         else{
+           //      	 return   res.isused;
+           //         }
+         	//   }
+           // }
            ,{field:'disablestate', title:'停用情况',templet:function(res){
         	   var str="";
         	   if(res.disablestate=='1'){
@@ -70,21 +70,21 @@ layui.config({
         	   }
         	   return str;
            }}
-          ,{field:'infocode', title:'信息类编码', unresize:true,hide:true,  unresize: true, sort: true}
-          ,{field:'infoname', title:'信息类名称',
+          ,{field:'infocode', title:'数据资源目录编号', unresize:true,hide:true,  unresize: true, sort: true}
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
           }
           
-          ,{field:"subversionid",width:240,title:'建表sql', templet: function(res){
-        	  var str="";
-    		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-    		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-    		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-    		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>"; 
-    	  return str;
-          }}
+          // ,{field:"subversionid",width:240,title:'建表sql', templet: function(res){
+        	//   var str="";
+    		//   str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+    		//   str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+    		//   str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+    		//   str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>";
+    	  // return str;
+          // }}
           ,{field:'versionid', title:'版本号', templet: function(res){
         	  return "<a class=\"layui-table-link\" href=\"javascript:viewVersionList(\'"+res.sourceid+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>"+res.versionid+"."+res.subversionid+"</a>"
           }}
@@ -97,9 +97,9 @@ layui.config({
         	  }
           }}
           ,{field:'updatetime', title:'发布时间'}
-          ,{field:'isopensocial', title:'开放类型', sort: true}
-          ,{field:'infotypename', title:'资源分类',width:300 }
-          ,{field:'providebmname', title:'提供方部门'}
+          // ,{field:'isopensocial', title:'开放类型', sort: true}
+          // ,{field:'infotypename', title:'资源分类',width:300 }
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_yslist.js

@@ -36,25 +36,25 @@ layui.config({
          	 
          	   return str;
            }}
-          ,{field:'infocode', title:'信息类编码'}
-          ,{field:'infoname', title:'信息类名称',
+          ,{field:'infocode', title:'数据资源目录编号'}
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
           }
-          ,{field:'providebmname', title:'提供方部门'}
-          ,{field:'isglqz', title:'是否关联权责',width:200}
-          ,{field:'managetype', title:'是否系统支撑',width:200}
+          ,{field:'providebmname', title:'数据资源管理单位'}
+          // ,{field:'isglqz', title:'是否关联权责',width:200}
+          // ,{field:'managetype', title:'是否系统支撑',width:200}
         
           
-          ,{field:'subversionid',width:240,title:'建表sql',templet: function(res){
-        	  var str="";
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>"; 
-        	  return str;
-          }}
+          // ,{field:'subversionid',width:240,title:'建表sql',templet: function(res){
+        	//   var str="";
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>";
+        	//   return str;
+          // }}
           ,{field:'versionid', title:'版本号', templet: function(res){
         	  return "<a class=\"layui-table-link\" href=\"javascript:viewVersionList(\'"+res.sourceid+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>"+res.versionid+"."+res.subversionid+"</a>"
           }}
@@ -78,9 +78,21 @@ layui.config({
         	  }
         	  
           }}
-          ,{field:'isopensocial', title:'开放类型', sort: true}
-          ,{field:'infotypename', title:'资源分类',width:300 }
-          ,{field:'fltag', title:'资源分类标签',width:300}
+          // ,{field:'isopensocial', title:'开放类型', sort: true}
+          // ,{field:'infotypename', title:'资源分类',width:300 }
+          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
+					if (res.fltag=="0001"){
+						return "三维数据";
+					}else if (res.fltag=="0002"){
+						return "二维数据";
+					}else if (res.fltag=="0003"){
+						return "结构化数据";
+					}else if (res.fltag=="0004"){
+						return "半结构化数据";
+					}else {
+						return " ";
+					}
+				}}
           
           ,{field:'updatetime', title:'发布时间'}
          

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_zclist.js

@@ -42,9 +42,9 @@ layui.config({
 
              }}
           ,{field:'infocode', title:'信息类编码', sort: true,hide:true}
-          ,{field:'isglqz', title:'是否关联权责',width:200}
-          ,{field:'managetype', title:'是否系统支撑',width:200}
-          ,{field:'infoname', title:'信息类名称',
+          // ,{field:'isglqz', title:'是否关联权责',width:200}
+          // ,{field:'managetype', title:'是否系统支撑',width:200}
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
@@ -73,18 +73,18 @@ layui.config({
         		  return "审核不通过";
         	  }
           }}
-          ,{field:"subversionid",width:240,title:'建表sql', templet: function(res){
-        	  if(res.inprocess!="2") return "未发布";
-        	  else{
-        		  var str="";
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>"; 
-        		  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>"; 
-        	  return str;
-        	  }
-        	 
-          }}
+          // ,{field:"subversionid",width:240,title:'建表sql', templet: function(res){
+        	//   if(res.inprocess!="2") return "未发布";
+        	//   else{
+        	// 	  var str="";
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_oracle\"><i class=\"iconfont icon-oracle\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_mysql\"><i class=\"iconfont icon-Mysql\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "<a class=\"layui-table-link\" href=\"javascript:void();\"   lay-event=\"jb_sqlserver\"><i class=\"iconfont icon-sqlserver\" style=\"font-size:30px\"></i>&nbsp;&nbsp;&nbsp;</a>";
+        	// 	  str+=  "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"jb_gbase\"><i class=\"iconfont icon-gbase\" style=\"font-size:30px\"></i></a>";
+        	//   return str;
+        	//   }
+        	//
+          // }}
           ,{field:'versionid', title:'版本号', templet: function(res){
         	  return "<a class=\"layui-table-link\" href=\"javascript:viewVersionList(\'"+res.sourceid+"\');\"><i class=\"iconfont icon-rizhichaxun1\"></i>"+res.versionid+"."+res.subversionid+"</a>"
           }}
@@ -105,10 +105,22 @@ layui.config({
         	  }
         	  
           }}
-          ,{field:'isopensocial', title:'开放类型', sort: true}
-          ,{field:'infotypename', title:'资源分类',width:300  }
-          ,{field:'fltag', title:'资源分类标签',width:300}
-          ,{field:'providebmname', title:'提供方部门'}
+          // ,{field:'isopensocial', title:'开放类型', sort: true}
+          // ,{field:'infotypename', title:'资源分类',width:300  }
+          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
+					if (res.fltag=="0001"){
+						return "三维数据";
+					}else if (res.fltag=="0002"){
+						return "二维数据";
+					}else if (res.fltag=="0003"){
+						return "结构化数据";
+					}else if (res.fltag=="0004"){
+						return "半结构化数据";
+					}else {
+						return " ";
+					}
+				}}
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";
@@ -121,24 +133,24 @@ layui.config({
         	  }
         	  
           }}
-          ,{field:'bgid', title:'是否属于变更任务', sort: true,templet: function(res){
-        	  if(res.bgid!=""&&res.bgid!=null){
-        		  return "是";
-        	  }
-        	  else {
-        		  return "否";
-        	  }
-        	  
-          }}
-          ,{field:'bmid', title:'是否属于编目任务', sort: true,templet: function(res){
-        	  if(res.bmid!=""&&res.bmid!=null){
-        		  return "是";
-        	  }
-        	  else {
-        		  return "否";
-        	  }
-        	  
-          }}
+          // ,{field:'bgid', title:'是否属于变更任务', sort: true,templet: function(res){
+        	//   if(res.bgid!=""&&res.bgid!=null){
+        	// 	  return "是";
+        	//   }
+        	//   else {
+        	// 	  return "否";
+        	//   }
+        	//
+          // }}
+          // ,{field:'bmid', title:'是否属于编目任务', sort: true,templet: function(res){
+        	//   if(res.bmid!=""&&res.bmid!=null){
+        	// 	  return "是";
+        	//   }
+        	//   else {
+        	// 	  return "否";
+        	//   }
+        	//
+          // }}
         ]]
     	,limits:[10,20,30,40,50,100,200,500,1000]
         ,page:{

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_zcshlist.js

@@ -37,7 +37,7 @@ layui.config({
  				
  			  
            }}
-          ,{field:'infoname', title:'信息类名称',
+          ,{field:'infoname', title:'数据资源名称',
         	  templet: function(res){
                   return '<a class="layui-table-link"  href="javascript:viewInfo(\''+res.id+'\');"><i class="iconfont icon-rizhichaxun1"></i>'+res.infoname+'</a>'
                 }
@@ -49,12 +49,12 @@ layui.config({
           ,{ title:'流程图',templet:function(res){
         	  return   "&nbsp;<a class=\"layui-table-link\" href=\"javascript:void();\"  lay-event=\"lct\"><i class=\"layui-icon iconfont icon-liucheng1\"></i>流程图</a>";
           }}
-          ,{field:'isopensocial', title:'开放类型', sort: true}
-          ,{field:'infotypename', title:'资源分类',width:300 }
+          // ,{field:'isopensocial', title:'开放类型', sort: true}
+          // ,{field:'infotypename', title:'资源分类',width:300 }
           ,{title:'提交审核时间',width:300,templet:function(res){
         	  return res.vtaskDto.taskstart;
           } }
-          ,{field:'providebmname', title:'提供方部门'}
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/mysubscrilist.html

@@ -18,39 +18,39 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">资源分类</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
+<!--            </div>-->
+<!--          </div>-->
           <div class="layui-inline">
-            <label class="layui-form-label">资源分类</label>
-            <div class="layui-input-inline">
-              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">信息类编码</label>
+            <label class="layui-form-label">数据资源目录编号</label>
             <div class="layui-input-inline">
               <input type="text" name="infocode" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
           
           
-         <div class="layui-inline">
-            <label class="layui-form-label">开放类型</label>
-            <div class="layui-input-inline">
-              <select name="isopensocial">
-                <option value="">请选择标签</option>
-                <option value="不予开放">不予开放</option>
-                <option value="有条件开放">有条件开放</option>
-                <option value="无条件开放">无条件开放</option>
-               
-              </select>
-            </div>
-          </div>
+<!--         <div class="layui-inline">-->
+<!--            <label class="layui-form-label">开放类型</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <select name="isopensocial">-->
+<!--                <option value="">请选择标签</option>-->
+<!--                <option value="不予开放">不予开放</option>-->
+<!--                <option value="有条件开放">有条件开放</option>-->
+<!--                <option value="无条件开放">无条件开放</option>-->
+<!--               -->
+<!--              </select>-->
+<!--            </div>-->
+<!--          </div>-->
                <div class="layui-inline">
-            <label class="layui-form-label">提供方部门</label>
+            <label class="layui-form-label">数据资源管理单位</label>
             <div class="layui-input-inline">
               <input type="text" name="providebmname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_myyslist.html

@@ -18,17 +18,17 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">资源分类</label>
-            <div class="layui-input-inline">
-              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>
-            </div>
-          </div>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">资源分类</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
+<!--            </div>-->
+<!--          </div>-->
          
           <div class="layui-inline">
             <label class="layui-form-label">共享类型</label>
@@ -41,15 +41,15 @@
               </select>
             </div>
           </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">所处环节</label>
-            <div class="layui-input-inline">
-               <input type="text" name="actName" placeholder="请输入" autocomplete="off" class="layui-input"/>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">所处环节</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--               <input type="text" name="actName" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
 
-            </div>
-          </div>
+<!--            </div>-->
+<!--          </div>-->
           <div class="layui-inline">
-            <label class="layui-form-label">提供方部门</label>
+            <label class="layui-form-label">数据资源管理单位</label>
             <div class="layui-input-inline">
               <input type="text" name="providebmname" id="providebmname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_resClassifyList.html

@@ -15,7 +15,7 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
@@ -33,7 +33,7 @@
 <!--             </div> -->
 <!--           </div> -->
           <div class="layui-inline">
-            <label class="layui-form-label">信息类编码</label>
+            <label class="layui-form-label">数据资源目录编号</label>
             <div class="layui-input-inline">
               <input type="text" name="infocode" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
@@ -118,7 +118,7 @@
             </div>
           </div>
                      <div class="layui-inline">
-            <label class="layui-form-label">资源分类标签</label>
+            <label class="layui-form-label">数据内容分类</label>
             <div class="layui-input-inline">
             <select name="fltag" id="fltag" class="input-select" >
                        <option value="" title="请选择">请选择</option>
@@ -146,8 +146,8 @@
                 <button type="button" class="layui-btn layui-btn-sm" lay-event="dcxxx"><i class="layui-icon iconfont icon-yunduanxiazai"></i>信息项导出excel</button>
                 <button type="button" class="layui-btn layui-btn-sm" lay-event="dcxxl"><i class="layui-icon iconfont icon-yunduanxiazai"></i>导出excel</button>
 				<button type="button" th:if="${viewrole==false}"  class="layui-btn layui-btn-sm" lay-event="dingyue"><i class="layui-icon layui-icon-add-1"></i>订阅</button>
-				<button type="button" th:if="${viewrole==false}" class="layui-btn layui-btn-sm" lay-event="addwish"><i class="layui-icon layui-icon-add-1"></i>加入申请箱</button>
-				<button type="button" lay-event="norecourceApply" th:if="${zgbmgl_role==false}" class="layui-btn layui-btn-sm" ><i class="layui-icon layui-icon-add-1"></i>无资源申请</button>
+<!--				<button type="button" th:if="${viewrole==false}" class="layui-btn layui-btn-sm" lay-event="addwish"><i class="layui-icon layui-icon-add-1"></i>加入申请箱</button>-->
+<!--				<button type="button" lay-event="norecourceApply" th:if="${zgbmgl_role==false}" class="layui-btn layui-btn-sm" ><i class="layui-icon layui-icon-add-1"></i>无资源申请</button>-->
               
             </div>
        

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_tqlist.html

@@ -18,39 +18,39 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">资源分类</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
+<!--            </div>-->
+<!--          </div>-->
           <div class="layui-inline">
-            <label class="layui-form-label">资源分类</label>
-            <div class="layui-input-inline">
-              <input type="text" name="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">信息类编码</label>
+            <label class="layui-form-label">数据资源目录编号</label>
             <div class="layui-input-inline">
               <input type="text" name="infocode" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
           
           
-          <div class="layui-inline">
-            <label class="layui-form-label">开放类型</label>
-            <div class="layui-input-inline">
-              <select name="isopensocial">
-                <option value="">请选择标签</option>
-                <option value="不予开放">不予开放</option>
-                <option value="有条件开放">有条件开放</option>
-                <option value="无条件开放">无条件开放</option>
-               
-              </select>
-            </div>
-          </div>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">开放类型</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <select name="isopensocial">-->
+<!--                <option value="">请选择标签</option>-->
+<!--                <option value="不予开放">不予开放</option>-->
+<!--                <option value="有条件开放">有条件开放</option>-->
+<!--                <option value="无条件开放">无条件开放</option>-->
+<!--               -->
+<!--              </select>-->
+<!--            </div>-->
+<!--          </div>-->
                <div class="layui-inline">
-            <label class="layui-form-label">提供方部门</label>
+            <label class="layui-form-label">数据资源管理单位</label>
             <div class="layui-input-inline">
               <input type="text" name="providebmname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
@@ -102,7 +102,7 @@
             </div>
           </div>
               <div class="layui-inline">
-            <label class="layui-form-label">资源分类标签</label>
+            <label class="layui-form-label">数据内容分类</label>
             <div class="layui-input-inline">
             <select name="fltag" id="fltag" class="input-select" >
                        <option value="" title="请选择">请选择</option>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_yslist.html

@@ -18,7 +18,7 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
@@ -36,7 +36,7 @@
 <!--             </div> -->
 <!--           </div> -->
           <div class="layui-inline">
-            <label class="layui-form-label">信息类编码</label>
+            <label class="layui-form-label">数据资源目录编号</label>
             <div class="layui-input-inline">
               <input type="text" name="infocode" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_zclist.html

@@ -36,7 +36,7 @@
 <!--            </div>-->
 <!--          </div>-->
           <div class="layui-inline">
-            <label class="layui-form-label">信息类编码</label>
+            <label class="layui-form-label">数据资源目录编号</label>
             <div class="layui-input-inline">
               <input type="text" name="infocode" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_zcshlist.html

@@ -18,34 +18,34 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" id="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">资源分类</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <input type="text" name="infotypename" id="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
+<!--            </div>-->
+<!--          </div>-->
           <div class="layui-inline">
-            <label class="layui-form-label">资源分类</label>
-            <div class="layui-input-inline">
-              <input type="text" name="infotypename" id="infotypename" placeholder="请输入" autocomplete="off" class="layui-input"/>
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">提供方部门</label>
+            <label class="layui-form-label">数据资源管理单位</label>
             <div class="layui-input-inline">
               <input type="text" name="providebmname" id="providebmname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>
           </div>
-            <div class="layui-inline">
-            <label class="layui-form-label">开放类型</label>
-            <div class="layui-input-inline">
-              <select name="isopensocial" id="isopensocial">
-                <option value="" title="请选择">请选择</option>
-                <option value="有条件开放" title="有条件开放">有条件开放</option>
-                <option value="无条件开放" title="无条件开放">无条件开放</option>
-                <option value="不予开放" title="不予开放">不予开放</option>
-              </select>
-            </div>
-          </div>
+<!--            <div class="layui-inline">-->
+<!--            <label class="layui-form-label">开放类型</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--              <select name="isopensocial" id="isopensocial">-->
+<!--                <option value="" title="请选择">请选择</option>-->
+<!--                <option value="有条件开放" title="有条件开放">有条件开放</option>-->
+<!--                <option value="无条件开放" title="无条件开放">无条件开放</option>-->
+<!--                <option value="不予开放" title="不予开放">不予开放</option>-->
+<!--              </select>-->
+<!--            </div>-->
+<!--          </div>-->
          
           <div class="layui-inline">
             <label class="layui-form-label">共享类型</label>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfohitchclass/tinfoclass_onlyview.html

@@ -96,6 +96,22 @@
                        <td id="dbPwd">
                        </td>
                  </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务名称</th>
+                        <td th:text="${info.gjfwmc}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务地址</th>
+                        <td th:text="${info.gjfwdz}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>请求方式</th>
+                        <td th:text="${info.gjqqfs}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>数源平台</th>
+                        <td th:text="${info.gjsypt}"></td>
+                    </tr>
                     <tr>
                         <th>挂接情况说明</th>
                        <td >

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfohitchclass/tinfoclass_view.html

@@ -117,6 +117,30 @@
                        <td id="dbPwd">
                        </td>
                  </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务名称</th>
+                        <td>
+                       		<input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjfwmc" th:value="${info.gjfwmc}" id="gjfwmc" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务地址</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjfwdz" th:value="${info.gjfwdz}" id="gjfwdz" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>请求方式</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjqqfs" th:value="${info.gjqqfs}" id="gjqqfs" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>数源平台</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjsypt" th:value="${info.gjsypt}" id="gjsypt" />
+                        </td>
+                    </tr>
                     <tr>
                         <th><font class="fontred">*</font>挂接情况说明</th>
                        <td>
@@ -237,6 +261,11 @@
          if (checkinfo == "1") {
              $("#dbid").attr("disabled","disabled");
              $("#hitch").attr("disabled","disabled");
+             $("#gjfwdz").attr("disabled","disabled");
+             $("#gjfwmc").attr("disabled","disabled");
+             $("#gjqqfs").attr("disabled","disabled");
+             $("#gjsypt").attr("disabled","disabled");
+
          }
      });
  var changeDbId = function(options){