添加首页统计报表

enterprise-manager-ui/admin/src/views/labels/drawershow.vue

@@ -5,14 +5,14 @@
             :visible.sync="open"
             :direction="direction"
             :destroy-on-close="true"
-            size="50%">
+            size="70%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/>
-                            <Field label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/>
-                            <Field label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field>
-                            <Field label="排序" prop="sort" v-model="form.sort" placeholder="请输入排序"/>
-                            <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
+                            <Field :span="20" label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/>
+                            <Field :span="20" label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/>
+                            <Field :span="20" label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field>
+                            <Field :span="20" label="排序" prop="sort" type="num" v-model="form.sort" placeholder="请输入排序"/>
+                            <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>
 

enterprise-manager-ui/admin/src/views/labels/list.vue

@@ -48,9 +48,21 @@
 
                         {label: "标签描述", prop: "labelDesc"},
 
-                        {label: "标签图标", prop: "labelLogoPath"},
 
-                        {label: "创建用户", prop: "createUserId", formatter: this.formatter},
+                      {label: "标签图标", prop: "labelLogoPath",formatter: (row) => {
+                          return row.labelLogoPath != "" ? (
+                              <el-image
+                                  style="width: 70px; height: 70px"
+                                  src={row.labelLogoPath}
+                                  preview-src-list={[row.labelLogoPath]}
+                              ></el-image>
+                          ) : (
+                              "--"
+                          );
+                        },},
+
+
+                      {label: "创建时间", prop: "createTime", formatter: this.formatterDate},
                         {
                             label: "操作",
                             width: 240,
@@ -65,4 +77,4 @@
             };
         }
     };
-</script>
+</script>
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/base/web/BaseAreaController.java

@@ -43,5 +43,4 @@ public class BaseAreaController extends BaseCRUDJsonBodyMappingController<BaseAr
     }
 
 
-
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

@@ -7,6 +7,10 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
+import com.mortals.xhx.module.company.service.CompanyLabelsService;
+import com.mortals.xhx.module.labels.model.LabelsQuery;
+import com.mortals.xhx.module.labels.service.LabelsService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.converter.json.JsonbHttpMessageConverter;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,6 +54,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private LabelsService labelsService;
+
     public CompanyController() {
         super.setModuleDesc("公司");
     }
@@ -59,6 +66,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
         this.addDict(model, "totalEmployees", paramService.getParamBySecondOrganize("Company", "totalEmployees"));
         this.addDict(model, "softNum", paramService.getParamBySecondOrganize("Company", "softNum"));
         this.addDict(model, "patentNum", paramService.getParamBySecondOrganize("Company", "patentNum"));
+
+        this.addDict(model, "labels", labelsService.find(new LabelsQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getLabelName(),(o,n)->n)));
+
+
         super.init(model, context);
     }