Prechádzať zdrojové kódy

添加用户最后登录时间显示
新闻查询添加类型查询

yanliming 1 rok pred
rodič
commit
29820eb010

+ 3 - 3
src/views/base/enterpriseInfo-detail.vue

@@ -160,9 +160,9 @@
           const isJPG = file.type === 'image/jpeg';
           const isLt2M = file.size / 1024 / 1024 < 2;
   
-          if (!isJPG) {
-              this.$message.error('上传头像图片只能是 JPG 格式!');
-          }
+          // if (!isJPG) {
+          //     this.$message.error('上传头像图片只能是 JPG 格式!');
+          // }
           if (!isLt2M) {
               this.$message.error('上传头像图片大小不能超过 2MB!');
           }

+ 3 - 3
src/views/base/newsInfo-detail.vue

@@ -168,9 +168,9 @@
           const isJPG = file.type === 'image/jpeg';
           const isLt2M = file.size / 1024 / 1024 < 2;
   
-          if (!isJPG) {
-              this.$message.error('上传头像图片只能是 JPG 格式!');
-          }
+          // if (!isJPG) {
+          //     this.$message.error('上传头像图片只能是 JPG 格式!');
+          // }
           if (!isLt2M) {
               this.$message.error('上传头像图片大小不能超过 2MB!');
           }

+ 22 - 1
src/views/base/newsInfo-list.vue

@@ -17,6 +17,16 @@
         <el-form-item label="标题" prop="title">
           <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
         </el-form-item>
+        <el-form-item label="类型" prop="category">
+          <el-select v-model="queryModel.category" placeholder="请选择" size="mini">
+            <el-option
+              v-for="item in categoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -102,6 +112,7 @@
   <script>
   import newsInfoApi from "@/api/base/newsInfo";
   import newsInfoDetail from "./newsInfo-detail";
+  import dataDictionaryApi from "@/api/sys/dataDictionary";
   
   export default {
     name: 'baseNewsInfoList',
@@ -111,6 +122,7 @@
       return {
         queryModel: {
           name: "",
+          category:"",
         },
         loading: false,
         tableData: [],
@@ -127,7 +139,7 @@
         showModal: false,
         dialogFormVisible:false,
         newPassword:"",
-        roleResult:[],
+        categoryList:[],
         props: {
           // 配置项(必选)
           value: "id",
@@ -136,6 +148,13 @@
         },
       };
     },
+    created() {
+        dataDictionaryApi.findByCatalogName({catalogName: "新闻类型",})
+        .then((response) => {
+            var jsonData = response.data;
+            this.categoryList = jsonData.data;
+        });
+    },
     methods: {
       changePage(pageIndex) {
         var self = this;
@@ -149,6 +168,8 @@
         formData.append("pageSize", self.pageSize);
   
         formData.append("name", self.queryModel.name);
+        formData.append("category", self.queryModel.category);
+        
         
   
         self.loading = true;

+ 2 - 1
src/views/base/personInfo-list.vue

@@ -86,7 +86,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column  prop="realName"  label="姓名"></el-table-column>
         <el-table-column  prop="phone"  label="联系电话"></el-table-column>
-        <el-table-column  prop="idCard"  label="身份证号"></el-table-column>
+        <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
         <el-table-column  prop="gender"  label="性别">
             <template slot-scope="{row}">
                 <span v-if="row.gender=='0'">女</span>
@@ -94,6 +94,7 @@
           </template>
         </el-table-column>
         <el-table-column  prop="age"  label="年龄"></el-table-column>
+        <el-table-column  prop="lastLoginTime"  label="最后登录时间" width="180"></el-table-column>
         <el-table-column  prop="status"  label="认证状态">
             <template slot-scope="{row}">
                 <span v-if="row.status=='0'" style="color: #F56C6C;">未认证</span>

+ 3 - 3
src/views/base/trainingInfo-detail.vue

@@ -230,9 +230,9 @@
           const isJPG = file.type === 'image/jpeg';
           const isLt2M = file.size / 1024 / 1024 < 2;
   
-          if (!isJPG) {
-              this.$message.error('上传头像图片只能是 JPG 格式!');
-          }
+          // if (!isJPG) {
+          //     this.$message.error('上传头像图片只能是 JPG 格式!');
+          // }
           if (!isLt2M) {
               this.$message.error('上传头像图片大小不能超过 2MB!');
           }