Browse Source

一需求

guoyuanquan@mail.taiji.com.cn 6 months ago
parent
commit
01b3bc9d8e

+ 5 - 5
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>  

+ 52 - 40
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 "有条件共享";

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

@@ -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>