Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java

@@ -116,4 +116,19 @@ public class CmsHomePageController /*extends JeecgController<CmsColumn, ICmsColu
     }
 
 
+    @ApiOperation(value = "查询全部新闻", notes = "查询全部新闻")
+    @GetMapping(value = "/cmsfindallnews")
+    public Result<?> cmsfindallnews(CmsArticle cmsArticle,
+                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest req) {
+        QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
+        queryWrapper.eq("status", "1");
+        queryWrapper.last("order by publish_time desc");
+        Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
+        IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
 }

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java

@@ -78,6 +78,7 @@ public class Expert implements Serializable {
     private String research;
 	/**学历*/
 	@Excel(name = "学历", width = 15)
+    @Dict(dicCode = "xl")
     @ApiModelProperty(value = "学历")
     private String educationcal;
 	/**专家简介*/
@@ -132,6 +133,10 @@ public class Expert implements Serializable {
     @Dict(dicCode = "examstures")
     @ApiModelProperty(value = "管理员审核")
     private java.lang.String adminopen;
-
+    /**职称*/
+    @Excel(name = "职称", width = 15, dicCode = "zc")
+    @Dict(dicCode = "zc")
+    @ApiModelProperty(value = "职称")
+    private java.lang.String zc;
 
 }

jeecgboot-vue3/.env

@@ -2,10 +2,10 @@
 VITE_PORT = 3500
 
 #  网站标题
-VITE_GLOB_APP_TITLE = 驻马店是科技大市场管理平台
+VITE_GLOB_APP_TITLE = 驻马店市科技大市场管理平台
 
 # 简称，此变量只能是字符/下划线
-VITE_GLOB_APP_SHORT_NAME = 驻马店是科技大市场管理平台
+VITE_GLOB_APP_SHORT_NAME = 驻马市科技大市场管理平台
 
 # 单点登录服务端地址
 VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas

jeecgboot-vue3/index.html

@@ -157,7 +157,7 @@
       </style>
       <div class="app-loading">
         <div class="app-loading-wrap">
-          <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
+<!--          <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />-->
           <div class="app-loading-dots">
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
           </div>

jeecgboot-vue3/src/components/Application/src/AppLogo.vue

@@ -4,8 +4,8 @@
 -->
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
-    <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
+<!--    <img src="../../../assets/images/logo.png" />-->
+    <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" style="font-size: small;" v-show="showTitle">
       {{ shortTitle }}
     </div>
   </div>

jeecgboot-vue3/src/layouts/default/tabs/index.vue

@@ -24,13 +24,13 @@
         <!-- 列表页全屏
         <FoldButton v-if="getShowFold" />-->
         <!-- <FullscreenOutlined /> -->
-        <router-link to="/ai" class="ai-icon">
-          <a-tooltip title="AI助手" placement="left">
+<!--        <router-link to="/ai" class="ai-icon">
+          <a-tooltip title="AI助手88" placement="left">
             <svg t="1706259688149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2056" width="17" height="17">
               <path d="M826.368 325.632c0-7.168 2.048-10.24 10.24-10.24h123.904c7.168 0 10.24 2.048 10.24 10.24v621.568c0 7.168-2.048 10.24-10.24 10.24h-122.88c-8.192 0-10.24-4.096-10.24-10.24l-1.024-621.568z m-8.192-178.176c0-50.176 35.84-79.872 79.872-79.872 48.128 0 79.872 32.768 79.872 79.872 0 52.224-33.792 79.872-81.92 79.872-46.08 1.024-77.824-27.648-77.824-79.872zM462.848 584.704C441.344 497.664 389.12 307.2 368.64 215.04h-2.048c-16.384 92.16-58.368 247.808-92.16 369.664h188.416zM243.712 712.704l-62.464 236.544c-2.048 7.168-4.096 8.192-12.288 8.192H54.272c-8.192 0-10.24-2.048-8.192-12.288l224.256-783.36c4.096-13.312 7.168-26.624 8.192-65.536 0-6.144 2.048-8.192 7.168-8.192H450.56c6.144 0 8.192 2.048 10.24 8.192l250.88 849.92c2.048 7.168 0 10.24-7.168 10.24H573.44c-7.168 0-10.24-2.048-12.288-7.168l-65.536-236.544c1.024 1.024-251.904 0-251.904 0z" fill="#333333" p-id="19816"></path>
             </svg>
           </a-tooltip>
-        </router-link>
+        </router-link>-->
       </template>
     </Tabs>
   </div>

jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts

@@ -67,8 +67,8 @@ export default {
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
 
-    signInTitle: 'Jeecg Boot',
-    signInDesc: '是中国最具影响力的 企业级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
+    signInTitle: 'Jeecg Boot888',
+    signInDesc: '8888是中国最具影响力的 企业级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
     policy: '我同意敲敲云隐私政策5',
     scanSign: `扫码后，即可完成登录`,
     scanSuccess: `扫码成功，登录中`,

jeecgboot-vue3/src/views/expert/admin/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
 
   {
@@ -75,10 +83,9 @@ export const superQuerySchema = {
   seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/admin/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -72,7 +72,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -220,6 +220,31 @@
         label: '编辑',
         onClick: handleEdit.bind(null, record),
       },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }, {
+        label: '通过审核',
+        popConfirm: {
+          title: '是否通过审核',
+          confirm: handleupadmin.bind(null, record),
+          placement: 'topLeft',
+        },
+      }, {
+        label: '驳回审核',
+        popConfirm: {
+          title: '是否v',
+          confirm: handlebackadmin.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
     ];
   }
 
@@ -302,4 +327,12 @@
       width: 100%;
     }
   }
+  :deep(.ant-table-wrapper .ant-table-tbody >tr >td){
+    height: 140px;
+  }
+  :deep(.jeecg-basic-table-action){
+    height: 140px;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
 </style>

jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue

@@ -70,8 +70,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
-                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向"  allow-clear />
+              <a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
+                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域"  allow-clear />
               </a-form-item>
             </a-col>
 						<a-col :span="24">
@@ -81,7 +81,12 @@
 						</a-col>
             <a-col :span="24">
               <a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
-								<a-input v-model:value="formData.educationcal" placeholder="请输入学历"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历"  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
+                <j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称"  allow-clear />
               </a-form-item>
             </a-col>
 						 <a-col :span="24">
@@ -155,6 +160,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     compopen: '',
     adminopen: '',
     backinfo: '',
+    zc: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
 
   {
@@ -75,10 +83,9 @@ export const superQuerySchema = {
   seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">

jeecgboot-vue3/src/views/expert/county/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
   {
     title: '部门审核',
@@ -58,10 +66,9 @@ export const superQuerySchema = {
   seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/county/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -22,23 +22,6 @@
               <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="研究类型">研究类型</span></template>
-                <a-input placeholder="请输入研究类型" v-model:value="queryParam.research" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :lg="6">
-              <a-form-item name="adminopen">
-                <template #label><span title="管理员审核">管理员审</span></template>
-                <j-switch placeholder="请选择管理员审核" v-model:value="queryParam.adminopen"  query />
-              </a-form-item>
-            </a-col>
-
-
-          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -79,7 +62,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -227,6 +210,31 @@
         label: '编辑',
         onClick: handleEdit.bind(null, record),
       },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }, {
+        label: '通过审核',
+        popConfirm: {
+          title: '是否确认通过审核',
+          confirm: handleup.bind(null, record),
+          placement: 'topLeft',
+        },
+      }, {
+        label: '驳回',
+        popConfirm: {
+          title: '是否确认通过审核',
+          confirm: handlebackcount.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
     ];
   }
 
@@ -309,4 +317,13 @@
       width: 100%;
     }
   }
+  :deep(.ant-table-wrapper .ant-table-tbody >tr >td){
+    height: 140px;
+  }
+  :deep(.jeecg-basic-table-action){
+    height: 140px;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
+
 </style>

jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue

@@ -70,8 +70,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
-                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向"  allow-clear />
+              <a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
+                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域"  allow-clear />
               </a-form-item>
             </a-col>
 						<a-col :span="24">
@@ -81,7 +81,12 @@
 						</a-col>
             <a-col :span="24">
               <a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
-								<a-input v-model:value="formData.educationcal" placeholder="请输入学历"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历"  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
+                <j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称"  allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">

jeecgboot-vue3/src/views/expert/firm/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
   {
     title: '部门审核',
@@ -59,10 +67,9 @@ export const superQuerySchema = {
   seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/firm/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
             <a-col :lg="6">
               <a-form-item name="compopen">
@@ -76,7 +76,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -222,7 +222,32 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
+      },{
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }, {
+        label: '通过审查',
+        popConfirm: {
+          title: '通过审查',
+          confirm: handleup.bind(null, record),
+          placement: 'topLeft',
         },
+      }, {
+        label: '驳回审查',
+        popConfirm: {
+          title: '驳回审查',
+          confirm: handleback.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
+
        ];
   }
 
@@ -305,4 +330,12 @@
       width: 100%;
     }
   }
+  :deep(.ant-table-wrapper .ant-table-tbody >tr >td){
+    height: 140px;
+  }
+  :deep(.jeecg-basic-table-action){
+    height: 140px;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
 </style>

jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue

@@ -70,8 +70,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
-                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向"  allow-clear />
+              <a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
+                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域"  allow-clear />
               </a-form-item>
             </a-col>
 						<a-col :span="24">
@@ -81,7 +81,12 @@
 						</a-col>
             <a-col :span="24">
               <a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
-								<a-input v-model:value="formData.educationcal" placeholder="请输入学历"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历"  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
+                <j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称"  allow-clear />
               </a-form-item>
             </a-col>
 						 <a-col :span="24">

jeecgboot-vue3/src/views/expert/self/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
   {
     title: '部门审核',
@@ -54,13 +62,11 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/self/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">

jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue

@@ -68,8 +68,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
-                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向"  allow-clear />
+              <a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
+                <j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域"  allow-clear />
               </a-form-item>
             </a-col>
 						<a-col :span="24">
@@ -79,7 +79,12 @@
 						</a-col>
             <a-col :span="24">
               <a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
-								<a-input v-model:value="formData.educationcal" placeholder="请输入学历"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历"  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
+                <j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称"  allow-clear />
               </a-form-item>
             </a-col>
 						 <a-col :span="24">

jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts

@@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '姓名',
     align: "center",
-    dataIndex: 'seusername'
+    dataIndex: 'realname'
+  },
+  {
+    title: '性别',
+    align: "center",
+    dataIndex: 'sex',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]);
+    },
   },
   {
     title: '毕业院校',
@@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'major'
   },
   {
-    title: '研究方向',
+    title: '研究领域',
     align: "center",
     dataIndex: 'directioncal_dictText'
   },
@@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [
   {
     title: '学历',
     align: "center",
-    dataIndex: 'educationcal'
+    dataIndex: 'educationcal_dictText'
   },
   {
-    title: '专家简介',
+    title: '职称',
     align: "center",
-    dataIndex: 'expinfo'
+    dataIndex: 'zc_dictText'
   },
   {
     title: '部门审核',
@@ -70,10 +78,9 @@ export const superQuerySchema = {
   seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
-  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
   research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
-  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
 };

jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue

@@ -12,8 +12,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="directioncal">
-              <template #label><span title="研究方向">研究方向</span></template>
-              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+              <template #label><span title="研究领域">研究领域</span></template>
+              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -48,12 +48,12 @@
         <j-upload-button  type="primary"   preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
-            <a-menu>
+<!--            <a-menu>
               <a-menu-item key="1" @click="batchHandleDelete">
                 <Icon icon="ant-design:delete-outlined"></Icon>
                 删除
               </a-menu-item>
-            </a-menu>
+            </a-menu>-->
           </template>
           <a-button>批量操作
             <Icon icon="mdi:chevron-down"></Icon>
@@ -64,7 +64,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -201,8 +201,8 @@
   function getTableAction(record) {
     return [
       {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
       },
     ];
   }

jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue

@@ -4,7 +4,7 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
           <a-row>
-            <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
+            <a-col :span="24" >
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
                 <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear  disabled="true"></a-input>
               </a-form-item>

jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts

@@ -7,7 +7,12 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '专家类型',
+    title: '项目名称',
+    align:"center",
+    dataIndex: 'proname'
+  },
+   {
+    title: '研究领域',
     align:"center",
     dataIndex: 'exptype_dictText'
    },

jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue

@@ -56,7 +56,7 @@
       </template>
        <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <!--字段回显插槽-->
       <template v-slot:bodyCell="{ column, record, index, text }">
@@ -196,6 +196,24 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+         },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft'
+           },
+         }, {
+           label: '随机抽取专家',
+           popConfirm: {
+             title: '是否随机随机抽取专家',
+             confirm: createexp.bind(null, record),
+             placement: 'topLeft'
+           },
          }
        ]
    }

jeecgboot-vue3/src/views/expproject/admin/components/ExpprojectForm.vue

@@ -10,13 +10,13 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="专家类型" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
+							<a-form-item label="研究领域" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
 								<j-search-select v-model:value="formData.exptype" dict="discipline_fieid,name,id"  allow-clear />
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
               <a-form-item label="需要专家个数" v-bind="validateInfos.needexp" id="ExpprojectForm-needexp" name="needexp">
-								<a-input-number v-model:value="formData.needexp" placeholder="请输入需要专家个数" style="width: 100%" />
+                <a-input-number v-model:value="formData.needexp" placeholder="请输入需要专家个数(正整数)" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -105,7 +105,9 @@
 
       //表单验证
       const validatorRules = reactive({
-        needexp: [{ required: false}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
+        needexp: [{ required: false},
+          {pattern: /^\d+$/, // 只接受正整数（包括0，如果不需要0，请改为/^[1-9]\d*$/）
+          message: '请输入正整数!'},],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};

jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts

@@ -7,7 +7,12 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '专家类型',
+    title: '项目名称',
+    align:"center",
+    dataIndex: 'proname'
+  },
+   {
+    title: '研究领域',
     align:"center",
     dataIndex: 'exptype_dictText'
    },

jeecgboot-vue3/src/views/expproject/self/components/ExpprojectForm.vue

@@ -10,7 +10,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="专家类型" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
+							<a-form-item label="研究领域" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
 								<j-search-select v-model:value="formData.exptype" dict="discipline_fieid,name,id"  allow-clear />
 							</a-form-item>
 						</a-col>

jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue

@@ -104,7 +104,7 @@
                   </div>
                 </div>
               </div>
-              <a-form @keyup.enter.native="loginHandleClick">
+<!--              <a-form @keyup.enter.native="loginHandleClick">
                 <div class="aui-flex aui-third-text">
                   <div class="aui-flex-box aui-third-border">
                     <span>{{ t('sys.login.otherSignIn') }}</span>
@@ -132,7 +132,7 @@
                     </div>
                   </div>
                 </div>
-              </a-form>
+              </a-form>-->
             </div>
           </div>
         </div>
@@ -177,8 +177,8 @@
   import MiniForgotpad from './MiniForgotpad.vue';
   import MiniRegister from './MiniRegister.vue';
   import MiniCodelogin from './MiniCodelogin.vue';
-  import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
-  import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
+  import logoImg from '/@/assets/loginmini/icon/jeecg_ad_text3.png';
+  // import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useDesign } from "/@/hooks/web/useDesign";

jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts

@@ -30,7 +30,7 @@ export const settingList = [
     img1: geren1,
     img2: geren2,
   },
-  {
+  /*{
     key: '2',
     name: '我的组织',
     component: 'TenantSetting',
@@ -38,7 +38,7 @@ export const settingList = [
     icon:'ant-design:team-outlined',
     img1: zuhu1,
     img2: zuhu2,
-  },
+  },*/
    {
     key: '3',
     name: '账号安全',
@@ -47,14 +47,14 @@ export const settingList = [
     img1: anquan1,
     img2: anquan2,
   },
-  {
+  /*{
     key: '4',
     name: '第三方APP',
     component: 'WeChatDingSetting',
     icon: 'ant-design:contacts-outlined',
     img1: app1,
     img2: app2,
-  },
+  },*/
 ];