update

dict/index.js

@@ -0,0 +1,2 @@
+export const newsColumn = ['政务动态', '通知通告', '科技新闻', '媒体聚焦', '信息公开'];
+// export default ['政务动态', '通知通告', '科技新闻', '媒体聚焦', '信息公开'];

src/components/adminCommon/frame.vue

@@ -7,8 +7,8 @@
       <el-container class="container">
         <el-aside width="200px" class="aside">
           <el-menu :default-active="$route.path" class="el-menu-vertical-demo" router overflow-y: scroll>
-            <el-menu-item index="/adminCnter/homeIndex">首页</el-menu-item>
-            <el-menu-item index="/adminCnter/news">新闻管理</el-menu-item>
+            <el-menu-item index="/adminCenter/homeIndex">首页</el-menu-item>
+            <el-menu-item index="/adminCenter/news">新闻管理</el-menu-item>
           </el-menu>
         </el-aside>
         <el-main class="main">

src/components/frame/filter-page-table.vue

@@ -1,41 +1,49 @@
 <template>
   <div id="data-table">
     <el-form :model="searchInfo" :inline="true" style="padding:0.9rem 1.875rem ;" size="mini" v-if="useFilter">
-      <el-form-item v-for="(item, index) in filterList" :key="index">
-        <template v-if="item.filter === 'select'">
-          <el-select
-            v-model="searchInfo[item.prop]"
-            size="mini"
-            clearable
-            filterable
-            :placeholder="`请选择${item.label}`"
-            @clear="toClear(item.prop)"
-            @change="data => filterReturn(data, item)"
-          >
-            <slot name="options" v-bind="{ item }"></slot>
-          </el-select>
-        </template>
-        <template v-else-if="item.filter === 'date'">
-          <el-date-picker
-            v-model="searchInfo[item.prop]"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable
-          >
-          </el-date-picker>
-        </template>
-        <template v-else>
-          <el-input v-model="searchInfo[item.prop]" clearable size="mini" :placeholder="`请输入${item.label}`" @clear="toClear(item.prop)"></el-input>
-        </template>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="filterSearch">查询</el-button>
-      </el-form-item>
+      <el-row type="flex">
+        <el-col :span="22">
+          <el-form-item v-for="(item, index) in filterList" :key="index">
+            <template v-if="item.filter === 'select'">
+              <el-select
+                v-model="searchInfo[item.prop]"
+                size="mini"
+                clearable
+                filterable
+                :placeholder="`请选择${item.label}`"
+                @clear="toClear(item.prop)"
+                @change="data => filterReturn(data, item)"
+              >
+                <slot name="options" v-bind="{ item }"></slot>
+              </el-select>
+            </template>
+            <template v-else-if="item.filter === 'date'">
+              <el-date-picker
+                v-model="searchInfo[item.prop]"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                clearable
+              >
+              </el-date-picker>
+            </template>
+            <template v-else>
+              <el-input v-model="searchInfo[item.prop]" clearable size="mini" :placeholder="`请输入${item.label}`" @clear="toClear(item.prop)"></el-input>
+            </template>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="filterSearch">查询</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <slot name="selfbtn"></slot>
+        </el-col>
+      </el-row>
     </el-form>
+
     <el-table
       ref="table"
       row-key="id"

src/components/frame/form.md

@@ -70,7 +70,7 @@
 |url|String|`-`|是|上传地址|
 |limit|Number|`-`|是|限制上传数量|
 |data|any|`-`|否|上传数据|
-|type|String|`-`|否|上传返回的字段|
+|model|String|`-`|否|上传返回的字段|
 |isBtn|Boolean|false|否|是否只显示按钮|
 |showList|Boolean|true|否|是否显示上传列表|
 |accept|String|`-`|否|可以上传的文件类型,不写就没限制|
@@ -80,4 +80,4 @@
 >### method
 >|方法名|返回参数|说明|
 |:-:|:-:|:-:|
-|upload|{type,data}|上传成功返回
+|upload|{model,data}|上传成功返回

src/components/frame/upload.vue

@@ -40,7 +40,7 @@ export default {
     url: { type: null },
     limit: { type: Number },
     data: { type: null },
-    type: { type: String },
+    model: { type: String },
     isBtn: { type: Boolean, default: false },
     uploadBtn: { type: Boolean, default: false },
     showList: { type: Boolean, default: true },
@@ -75,7 +75,7 @@ export default {
     handleRemove(file, fileList) {
       this.$set(this, `fileList`, []);
       // let index = fileList.findIndex(f => _.isEqual(f, file));
-      this.$emit('delete', { file, type: this.type });
+      this.$emit('delete', { file, model: this.model });
       return false;
     },
     outLimit() {
@@ -83,7 +83,7 @@ export default {
     },
     onSuccess(response, file, fileList) {
       //将文件整理好传回父组件
-      this.$emit('upload', { type: this.type, data: { ...response, name: file.name } });
+      this.$emit('upload', { model: this.model, data: { ...response, name: file.name } });
     },
     beforeUpload(file) {
       const sizeLimit = file.size / 1024 / 1024 < 100;
@@ -117,4 +117,8 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-upload-list__item.is-ready {
+  display: none;
+}
+</style>

src/components/upload/uploadArray.vue

@@ -116,4 +116,8 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-upload-list__item.is-ready {
+  display: none;
+}
+</style>