123123

src/main/java/com/izouma/awesomeadmin/web/StationInfoController.java

@@ -72,6 +72,14 @@ public class StationInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, StationInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
+
         Map<String, Object> result = new HashMap<>();
 
         List<StationInfo> pp =stationInfoService.getStationInfoByPage(page, record);

src/main/vue/src/pages/ClickHistorys.vue

@@ -1,31 +1,6 @@
 <template>
     <div>
         <div class="filters-container">
-        
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/clickHistory',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
         </div>
         <el-table
                 :data="tableData"

src/main/vue/src/pages/CommonQuerys.vue

@@ -400,6 +400,7 @@ export default {
         $route() {
             this.getTableBase()
         }
+        
     },
 
 }

src/main/vue/src/pages/ExhibitionContents.vue

@@ -2,31 +2,6 @@
     <div>
         <div class="filters-container">
 
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/exhibitionContent',query:{column:$route.query.column}})"
-                       type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
         </div>
         <el-table
             :data="tableData"
@@ -73,7 +48,7 @@
                 min-width="150"
             >
                 <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>发布新版</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -311,13 +286,22 @@
                 }
             },
             editRow(row) {
-                this.$router.push({
-                    path: '/exhibitionContent',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
+
+                var data ={} ;
+                data.id = row.id;
+                data.version = ++row.version;
+                
+                this.$http.post({
+                    url: '/exhibitionContent/update',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                    } else {
+                        this.$message.warning('失败')
                     }
-                })
+                });
+
             },
             operation1() {
                 this.$notify({

src/main/vue/src/pages/FileInfo.vue

@@ -106,7 +106,7 @@ export default {
       saving: false,
       formData: {},
       rules: {
-       url: [{ required: true, message: "请上传资源", trigger: "blur" }],
+        url: [{ required: true, message: "请上传资源", trigger: "blur" }]
       },
       typeOptions: [{ value: 0, label: "video" }, { value: 1, label: "app" }],
       subColumn: "",

src/main/vue/src/pages/FinancialData.vue

@@ -1,125 +1,143 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
-                <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
-                    <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
-                    </el-option>
-                </el-select>
-
-            </el-form-item>
-            <el-form-item prop="stationId" label="提示" v-if="userInfo.departId!='2'">
-                是否确认创建金融数据模块？
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
+  <div>
+    <el-form
+      :model="formData"
+      :rules="rules"
+      ref="form"
+      label-width="80px"
+      label-position="right"
+      size="small"
+      style="max-width: 500px;"
+    >
+      <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
+        <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
+          <el-option
+            v-for="item in stations"
+            :key="item.id"
+            :label="item.stationName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="stationId" label="提示" v-if="userInfo.departId!='2'">是否确认创建金融数据模块？</el-form-item>
+      <el-form-item>
+        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+        <el-button @click="$router.go(-1)">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
-    import { mapState } from "vuex";
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
-
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/financialData/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-
+import formValidator from "../formValidator";
+import { mapState } from "vuex";
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
 
-                        this.formData = res.data;
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/financialData/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                        if (this.$route.query.column) {
-                            this.formData[this.subColumn] = this.subValue;
-                        }
-                    }
-                })
-            } else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+    }
 
-            this.$http.get({
-                url: '/stationInfo/all'
-            }).then(res => {
-                if (res.success) {
-                    this.stations = res.data;
-                }
-            });
-
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                    stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
-                },
-                subColumn: '',
-                stations: [],
-                subValue: '',
-            }
-        },
-          computed: {
-            ...mapState(["userInfo"]),
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/financialData/update' : '/financialData/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/financialData/del',
-                        data: {id: this.formData.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
+    this.$http
+      .get({
+        url: "/stationInfo/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.stations = res.data;
+        }
+      });
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        stationId: [
+          { required: true, message: "请选择营业厅", trigger: "blur" }
+        ]
+      },
+      subColumn: "",
+      stations: [],
+      subValue: ""
+    };
+  },
+  computed: {
+    ...mapState(["userInfo"])
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
         }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id
+            ? "/financialData/update"
+            : "/financialData/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/financialData/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
     }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/FinancialDatas.vue

@@ -2,30 +2,6 @@
     <div>
         <div class="filters-container">
 
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/financialData',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
         </div>
         <el-table
             :data="tableData"

src/main/vue/src/pages/ImgInfo.vue

@@ -1,127 +1,138 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-            <el-form-item prop="imgUrl" label="图片">
-                <single-upload v-model="formData.url" :disabled="'imgUrl'==subColumn"></single-upload>
-            </el-form-item>
-            <el-form-item v-if="false" prop="type" label="分类">
-                <el-input v-model="formData.type" :disabled="subType!=''"></el-input>
-            </el-form-item>
-            <el-form-item v-if="false" prop="fatherId" label="父级id">
-            <el-input v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
-        </el-form-item>
-            <el-form-item prop="rank" label="图片排序">
-                <el-input-number v-model="formData.rank" :disabled="'rank'==subColumn"></el-input-number>
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
+  <div>
+    <el-form
+      :model="formData"
+      :rules="rules"
+      ref="form"
+      label-width="80px"
+      label-position="right"
+      size="small"
+      style="max-width: 500px;"
+    >
+      <el-form-item prop="imgUrl" label="图片">
+        <single-upload v-model="formData.url" :disabled="'imgUrl'==subColumn"></single-upload>
+      </el-form-item>
+      <el-form-item v-if="false" prop="type" label="分类">
+        <el-input v-model="formData.type" :disabled="subType!=''"></el-input>
+      </el-form-item>
+      <el-form-item v-if="false" prop="fatherId" label="父级id">
+        <el-input v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
+      </el-form-item>
+      <el-form-item prop="rank" label="图片排序">
+        <el-input-number v-model="formData.rank" :disabled="'rank'==subColumn"></el-input-number>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+        <el-button @click="$router.go(-1)">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from "../formValidator";
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
-            if (this.$route.query.type) {
-                this.subType = this.$route.query.type;
-            }
-
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/imgInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-
-
-                        this.formData = res.data;
-
-                        if (this.$route.query.column) {
-                            this.formData[this.subColumn] = this.subValue;
-                        }
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
+    if (this.$route.query.type) {
+      this.subType = this.$route.query.type;
+    }
 
-                        if (this.$route.query.type) {
-                            this.formData.type = Number(this.subType);
-                        }
-                    }
-                })
-            } else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/imgInfo/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                if (this.$route.query.type) {
-                    this.formData.type = Number(this.subType);
-                }
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
 
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                    imgUrl: [{ required: true, message: "请上传图片", trigger: "blur" }],
-                },
-                subColumn: '',
-                subValue: '',
-                subType: '',
+            if (this.$route.query.type) {
+              this.formData.type = Number(this.subType);
             }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/imgInfo/update' : '/imgInfo/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/imgInfo/del',
-                        data: {id: this.formData.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+
+      if (this.$route.query.type) {
+        this.formData.type = Number(this.subType);
+      }
+    }
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        imgUrl: [{ required: true, message: "请上传图片", trigger: "blur" }]
+      },
+      subColumn: "",
+      subValue: "",
+      subType: ""
+    };
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
         }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id ? "/imgInfo/update" : "/imgInfo/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/imgInfo/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
     }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/MenuInfo.vue

@@ -1,158 +1,182 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-            <el-form-item prop="menuName" label="栏目名称">
-                <el-input v-model="formData.menuName" :disabled="'menuName'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="imgUrl" label="栏目图标">
-                <single-upload v-model="formData.imgUrl" :disabled="'imgUrl'==subColumn"></single-upload>
-            </el-form-item>
-                    <el-form-item prop="abstractInfo" label="栏目概要">
-                        <el-input v-model="formData.abstractInfo" :disabled="'abstractInfo'==subColumn"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="statusFlag" label="栏目类型">
-                        <template>
-                    <el-select v-model="formData.type" clearable placeholder="请选择"
-                               :disabled="'type'==subColumn">
-                        <el-option
-                            v-for="item in types"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
+  <div>
+    <el-form
+      :model="formData"
+      :rules="rules"
+      ref="form"
+      label-width="80px"
+      label-position="right"
+      size="small"
+      style="max-width: 500px;"
+    >
+      <el-form-item prop="menuName" label="栏目名称">
+        <el-input v-model="formData.menuName" :disabled="'menuName'==subColumn"></el-input>
+      </el-form-item>
+      <el-form-item prop="imgUrl" label="栏目图标">
+        <single-upload v-model="formData.imgUrl" :disabled="'imgUrl'==subColumn"></single-upload>
+      </el-form-item>
+      <el-form-item prop="abstractInfo" label="栏目概要">
+        <el-input v-model="formData.abstractInfo" :disabled="'abstractInfo'==subColumn"></el-input>
+      </el-form-item>
+      <el-form-item prop="statusFlag" label="栏目类型">
+        <template>
+          <el-select
+            v-model="formData.type"
+            clearable
+            placeholder="请选择"
+            :disabled="'type'==subColumn"
+          >
+            <el-option
+              v-for="item in types"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-form-item>
 
-            <el-form-item prop="stationInfo" label="营业厅" v-if="userInfo.departId=='2'">
-                <el-select v-model="formData.stationInfo" filterable placeholder="请选择" size="small">
-                    <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
-                    </el-option>
-                </el-select>
+      <el-form-item prop="stationInfo" label="营业厅" v-if="userInfo.departId=='2'">
+        <el-select v-model="formData.stationInfo" filterable placeholder="请选择" size="small">
+          <el-option
+            v-for="item in stations"
+            :key="item.id"
+            :label="item.stationName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 
-            </el-form-item>
-
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
+      <el-form-item>
+        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+        <el-button @click="$router.go(-1)">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
-    import { mapState } from "vuex";
-
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
-
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/menuInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-
+import formValidator from "../formValidator";
+import { mapState } from "vuex";
 
-                        this.formData = res.data;
-
-                        if (this.$route.query.column) {
-                            this.formData[this.subColumn] = this.subValue;
-                        }
-                    }
-                })
-            } else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
-            }
-
-            this.$http.get({
-                url: '/stationInfo/all'
-            }).then(res => {
-                if (res.success) {
-                    this.stations = res.data;
-                }
-            });
-
-
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                    menuName: [{ required: true, message: "请输入名称", trigger: "blur" }],
-                        abstractInfo: [{ required: true, message: "请输入栏目概要", trigger: "blur" }],
-                        statusFlag: [{ required: true, message: "请选择栏目类型", trigger: "blur" }],
-                        stationInfo: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
-                },
-                types: [{label: '子栏目', value: '1'}, {label: '长图模式', value: '2'}, {label: '从业人员', value: '3'}],
-                stations: [],
-                subColumn: '',
-                subValue: '',
-            }
-        },
-          computed: {
-            ...mapState(["userInfo"]),
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
 
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/menuInfo/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-    submit()
-    {
-        var data = JSON.parse(JSON.stringify(this.formData));
-        this.$http.post({
-            url: this.formData.id ? '/menuInfo/update' : '/menuInfo/save',
-            data: data
-        }).then(res => {
-            if (res.success) {
-                this.$message.success('成功');
-                this.$router.go(-1);
-            } else {
-                this.$message.warning('失败')
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
+          }
         });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
     }
-    ,
-    onDelete()
-    {
-        this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-            return this.$http.post({
-                url: '/menuInfo/del',
-                data: {id: this.formData.id}
-            })
-        }).then(() => {
-            this.$message.success('删除成功');
+
+    this.$http
+      .get({
+        url: "/stationInfo/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.stations = res.data;
+        }
+      });
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        menuName: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        abstractInfo: [
+          { required: true, message: "请输入栏目概要", trigger: "blur" }
+        ],
+        statusFlag: [
+          { required: true, message: "请选择栏目类型", trigger: "blur" }
+        ],
+        stationInfo: [
+          { required: true, message: "请选择营业厅", trigger: "blur" }
+        ]
+      },
+      types: [
+        { label: "子栏目", value: "1" },
+        { label: "长图模式", value: "2" },
+        { label: "从业人员", value: "3" }
+      ],
+      stations: [],
+      subColumn: "",
+      subValue: ""
+    };
+  },
+  computed: {
+    ...mapState(["userInfo"])
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
+        }
+      });
+    },
+
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id ? "/menuInfo/update" : "/menuInfo/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
             this.$router.go(-1);
-        }).catch(action => {
-            if (action === 'cancel') {
-                this.$message.info('删除取消');
-            } else {
-                this.$message.error('删除失败');
-            }
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/menuInfo/del",
+            data: { id: this.formData.id }
+          });
         })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
     }
-    ,
-    }
-    }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/OperateHistorys.vue

@@ -1,478 +1,483 @@
 <template>
-    <div>
-        <div class="filters-container">
-        
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/operateHistory',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
-        </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
-            </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
-            </el-table-column>
-                                                                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('createTime')"
-                                prop="createTime"
-                                label="创建时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('username')"
-                                prop="username"
-                                label="操作用户名"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('content')"
-                                prop="content"
-                                label="操作内容"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                               <el-table-column
-                        v-if="isColumnShow('stationId')"
-                        prop="stationId"
-                        label="营业厅"
-                        :formatter="stationFormatter"
-                        min-width="100">
-            </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
-                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                <el-button-group v-else>
-                    <el-button size="small" @click="operation1">批量操作1</el-button>
-                    <el-button size="small" @click="operation2">批量操作2</el-button>
-                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
-                </el-button-group>
-            </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
-            </el-pagination>
-        </div>
-        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
-            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="advancedQueryFields">
-
-                <el-table-column prop="link" label="链接符" align="center">
-                    <template slot-scope="{row}">
-                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
-                            <el-option label="AND" value="AND">
-                            </el-option>
-                            <el-option label="OR" value="OR">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="字段" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.name">
-
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="value" label="参数" align="center">
-                    <template slot-scope="{row}">
-                        <el-input v-model="row.value"></el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="排序" :visible.sync="showTableSortDialog">
-            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="tableSortFields">
-
-                <el-table-column prop="name" label="字段" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.name">
-
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="order" label="排序" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.order">
-                            <el-option label="降序" value="desc">
-                            </el-option>
-                            <el-option label="升序" value="asc">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
-            <img width="100%" :src="imgSrc" alt="">
-        </el-dialog>
-
+  <div>
+    <div class="filters-container">
+      <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+      <el-button
+        @click="searchData"
+        type="primary"
+        size="small"
+        icon="el-icon-search"
+        class="filter-item"
+      >搜索</el-button>
+      <el-button
+        @click="showAdvancedQueryDialog = !showAdvancedQueryDialog"
+        type="primary"
+        size="small"
+        icon="el-icon-search"
+        class="filter-item"
+      >高级查询</el-button>
+      <el-button
+        @click="showTableSortDialog = !showTableSortDialog"
+        type="primary"
+        size="small"
+        icon="el-icon-sort"
+        class="filter-item"
+      >排序</el-button>
+      <el-button
+        @click="$router.push({path:'/operateHistory',query:{column:$route.query.column}})"
+        type="primary"
+        size="small"
+        icon="el-icon-edit"
+        class="filter-item"
+      >添加</el-button>
+      <el-button
+        @click="exportExcel"
+        type="primary"
+        size="small"
+        icon="el-icon-share"
+        class="filter-item"
+      >导出EXCEL</el-button>
+      <el-dropdown trigger="click" size="medium" class="table-column-filter">
+        <span>筛选数据
+          <i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+          <el-checkbox
+            v-for="item in tableColumns"
+            :key="item.value"
+            v-model="item.show"
+          >{{item.label}}</el-checkbox>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+      <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
+      <el-table-column type="index" min-width="50" align="center"></el-table-column>
+
+      <el-table-column
+        v-if="isColumnShow('createTime')"
+        prop="createTime"
+        label="创建时间"
+        :formatter="DateTimeFormatter"
+        min-width="100"
+      ></el-table-column>
+
+      <el-table-column
+        v-if="isColumnShow('username')"
+        prop="username"
+        label="操作用户名"
+        min-width="100"
+      ></el-table-column>
+
+      <el-table-column v-if="isColumnShow('content')" prop="content" label="操作内容" min-width="100"></el-table-column>
+
+      <el-table-column
+        v-if="isColumnShow('stationId')"
+        prop="stationId"
+        label="营业厅"
+        :formatter="stationFormatter"
+        min-width="100"
+      ></el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" min-width="150">
+        <template slot-scope="scope">
+          <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+          <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination-wrapper">
+      <div class="multiple-mode-wrapper" v-if="0">
+        <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+        <el-button-group v-else>
+          <el-button size="small" @click="operation1">批量操作1</el-button>
+          <el-button size="small" @click="operation2">批量操作2</el-button>
+          <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+        </el-button-group>
+      </div>
+      <el-pagination
+        background
+        @size-change="pageSizeChange"
+        @current-change="currentPageChange"
+        :current-page="currentPage"
+        :page-sizes="[10, 20, 30, 40, 50]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalNumber"
+      ></el-pagination>
     </div>
+    <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+      <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+      <el-table :data="advancedQueryFields">
+        <el-table-column prop="link" label="链接符" align="center">
+          <template slot-scope="{row}">
+            <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+              <el-option label="AND" value="AND"></el-option>
+              <el-option label="OR" value="OR"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="字段" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.name">
+              <el-option
+                v-for="item in advancedQueryColumns"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.searchMethod">
+              <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="value" label="参数" align="center">
+          <template slot-scope="{row}">
+            <el-input v-model="row.value"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column width="60" align="center">
+          <template slot-scope="{ row, column, $index }">
+            <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="排序" :visible.sync="showTableSortDialog">
+      <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+      <el-table :data="tableSortFields">
+        <el-table-column prop="name" label="字段" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.name">
+              <el-option
+                v-for="item in advancedQueryColumns"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="order" label="排序" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.order">
+              <el-option label="降序" value="desc"></el-option>
+              <el-option label="升序" value="asc"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column width="60" align="center">
+          <template slot-scope="{ row, column, $index }">
+            <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+      <img width="100%" :src="imgSrc" alt>
+    </el-dialog>
+  </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
-            this.getData();
-
-             this.$http.get({
-                url: '/stationInfo/all'
-            }).then(res => {
-                if (res.success) {
-                    this.stations = res.data;
-                }
-            });
+import { mapState } from "vuex";
+import { format } from "date-fns";
+import zh from "date-fns/locale/zh_cn";
+
+export default {
+  created() {
+    this.getData();
+
+    this.$http
+      .get({
+        url: "/stationInfo/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.stations = res.data;
+        }
+      });
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      stations: [],
+      tableData: [],
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "创建时间",
+          value: "createTime",
+          show: true
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                stations: [],
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                        {
-                                label: '创建时间',
-                                value: 'createTime',
-                                show: true
-                            },
-                                                                                                                                            {
-                                label: '操作用户名',
-                                value: 'username',
-                                show: true
-                            },
-                                                                                                {
-                                label: '操作内容',
-                                value: 'content',
-                                show: true
-                            },
-                                                                                                {
-                                label: '营业厅',
-                                value: 'stationId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                        {
-                                label: '创建时间',
-                                value: 'create_time'
-                            },
-                                                                                                                                            {
-                                label: '操作用户名',
-                                value: 'username'
-                            },
-                                                                                                {
-                                label: '操作内容',
-                                value: 'content'
-                            },
-                                                                                                {
-                                label: '营业厅',
-                                value: 'station_id'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        {
+          label: "操作用户名",
+          value: "username",
+          show: true
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
+        {
+          label: "操作内容",
+          value: "content",
+          show: true
         },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
-
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
-
-                this.$http.get({
-                    url: '/operateHistory/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/operateHistory',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
-
-                this.advancedQuerySearchKey = '';
-
-                if (this.advancedQueryFields.length > 0) {
-
-                    var templist = [];
-
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
-
-                this.orderByStr = '';
-
-                if (this.tableSortFields.length > 0) {
-
-                    var templist = [];
-
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.orderByStr = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/operateHistory/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/operateHistory/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
-
-            },
-            stationFormatter(row, column, cellValue) {
-            if (cellValue) {
-                var stationId = "";
-                this.stations.forEach(item => {
-                if (item.id == Number(cellValue)) {
-                    stationId = item.stationName;
-                }
-                });
-
-                return stationId;
-            }
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
-
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
-
+        {
+          label: "营业厅",
+          value: "stationId",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      showTableSortDialog: false,
+      tableSortFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "创建时间",
+          value: "create_time"
+        },
+        {
+          label: "操作用户名",
+          value: "username"
+        },
+        {
+          label: "操作内容",
+          value: "content"
+        },
+        {
+          label: "营业厅",
+          value: "station_id"
         }
+      ],
+      advancedQuerySearchKey: "",
+      orderByStr: "",
+      imgSrc: "",
+      imageDialogVisible: false
+    };
+  },
+  computed: {
+    ...mapState(["tableHeight"]),
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
     }
+  },
+  methods: {
+    pageSizeChange(size) {
+      this.currentPage = 1;
+      this.pageSize = size;
+      this.getData();
+    },
+    currentPageChange(page) {
+      this.currentPage = page;
+      this.getData();
+    },
+    getData() {
+      var data = {
+        currentPage: this.currentPage,
+        pageNumber: this.pageSize,
+        searchKey: this.filter1,
+        advancedQuery: this.advancedQuerySearchKey,
+        orderByStr: this.orderByStr
+      };
+
+      if (this.$route.query.column) {
+        var tempColumn = this.$route.query.column;
+        data[tempColumn.split(",")[1]] = tempColumn.split(",")[0];
+      }
+
+      this.$http
+        .get({
+          url: "/operateHistory/page",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.totalNumber = res.data.page.totalNumber;
+            this.tableData = res.data.pp;
+          }
+        });
+    },
+    isColumnShow(column) {
+      var row = this.tableColumns.find(i => i.value === column);
+      return row ? row.show : false;
+    },
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    editRow(row) {
+      this.$router.push({
+        path: "/operateHistory",
+        query: {
+          id: row.id,
+          column: this.$route.query.column
+        }
+      });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    },
+    addField() {
+      this.advancedQueryFields.push({
+        link: "AND",
+        name: "",
+        searchMethod: "=",
+        value: ""
+      });
+    },
+    removeField(i) {
+      if (this.advancedQueryFields.length > 0) {
+        this.advancedQueryFields.splice(i, 1);
+      }
+    },
+    advancedQuery() {
+      this.advancedQuerySearchKey = "";
+
+      if (this.advancedQueryFields.length > 0) {
+        var templist = [];
+
+        this.advancedQueryFields.forEach(item => {
+          if (item.link && item.name && item.searchMethod && item.value) {
+            var tempItem =
+              item.link +
+              "_," +
+              item.name +
+              "_," +
+              item.searchMethod +
+              "_," +
+              item.value;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.advancedQuerySearchKey = templist.join("_;");
+        }
+      }
+
+      this.getData();
+      this.showAdvancedQueryDialog = false;
+    },
+    addSortField() {
+      this.tableSortFields.push({
+        name: "",
+        order: "asc"
+      });
+    },
+    removeSortField(i) {
+      if (this.tableSortFields.length > 0) {
+        this.tableSortFields.splice(i, 1);
+      }
+    },
+    tableSortQuery() {
+      this.orderByStr = "";
+
+      if (this.tableSortFields.length > 0) {
+        var templist = [];
+
+        this.tableSortFields.forEach(item => {
+          if (item.name && item.order) {
+            var tempItem = item.name + "_," + item.order;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.orderByStr = templist.join("_;");
+        }
+      }
+
+      this.getData();
+      this.showTableSortDialog = false;
+    },
+    exportExcel() {
+      window.location.href =
+        this.$baseUrl +
+        "/operateHistory/exportExcel?searchKey=" +
+        this.filter1 +
+        "&advancedQuery=" +
+        this.advancedQuerySearchKey +
+        "&orderByStr=" +
+        this.orderByStr;
+    },
+    searchData() {
+      this.currentPage = 1;
+      this.getData();
+    },
+    deleteRow(row) {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/operateHistory/del",
+            data: { id: row.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.getData();
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    },
+    DateTimeFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD HH:mm", { locale: zh });
+      }
+    },
+    stationFormatter(row, column, cellValue) {
+      if (cellValue) {
+        var stationId = "";
+        this.stations.forEach(item => {
+          if (item.id == Number(cellValue)) {
+            stationId = item.stationName;
+          }
+        });
+
+        return stationId;
+      }
+    },
+    DateFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD", { locale: zh });
+      }
+    },
+    showImg(img) {
+      this.imgSrc = img;
+      this.imageDialogVisible = true;
+    }
+  }
+};
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/Pinpaijuzhen.vue

@@ -1,137 +1,145 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
+  <div>
+    <el-form
+      :model="formData"
+      :rules="rules"
+      ref="form"
+      label-width="80px"
+      label-position="right"
+      size="small"
+      style="max-width: 500px;"
+    >
+      <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
+        <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
+          <el-option
+            v-for="item in stations"
+            :key="item.id"
+            :label="item.stationName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 
-            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
-                <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
-                    <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
-                    </el-option>
-                </el-select>
+      <el-form-item prop="stationId" label="提示" v-if="userInfo.departId!='2'">是否确认创建金融数据模块？</el-form-item>
 
-            </el-form-item>
-
-              <el-form-item prop="stationId" label="提示" v-if="userInfo.departId!='2'">
-                是否确认创建金融数据模块？
-            </el-form-item>    
-
-            <el-form-item>
-
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
+      <el-form-item>
+        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+        <el-button @click="$router.go(-1)">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
-    import formValidator from "../formValidator";
-    import { mapState } from "vuex";
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(",")[1];
-                this.subValue = this.$route.query.column.split(",")[0];
-            }
+import formValidator from "../formValidator";
+import { mapState } from "vuex";
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
 
-            if (this.$route.query.id) {
-                this.$http
-                    .get({
-                        url: "/pinpaijuzhen/getOne",
-                        data: {
-                            id: this.$route.query.id
-                        }
-                    })
-                    .then(res => {
-                        if (res.success) {
-                            this.formData = res.data;
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/pinpaijuzhen/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                            if (this.$route.query.column) {
-                                this.formData[this.subColumn] = this.subValue;
-                            }
-                        }
-                    });
-            } else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+    }
 
-            this.$http
-                .get({
-                    url: "/stationInfo/all"
-                })
-                .then(res => {
-                    if (res.success) {
-                        this.stations = res.data;
-                    }
-                });
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                        stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
-                },
-                subColumn: "",
-
-                stations: [],
-                subValue: ""
-            };
-        },
-          computed: {
-            ...mapState(["userInfo"]),
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http
-                    .post({
-                        url: this.formData.id ? "/pinpaijuzhen/update" : "/pinpaijuzhen/save",
-                        data: data
-                    })
-                    .then(res => {
-                        if (res.success) {
-                            this.$message.success("成功");
-                            this.$router.go(-1);
-                        } else {
-                            this.$message.warning("失败");
-                        }
-                    });
-            },
-
-            onDelete() {
-                this.$alert("删除将无法恢复，确认要删除么？", "警告", {type: "error"})
-                    .then(() => {
-                        return this.$http.post({
-                            url: "/pinpaijuzhen/del",
-                            data: {id: this.formData.id}
-                        });
-                    })
-                    .then(() => {
-                        this.$message.success("删除成功");
-                        this.$router.go(-1);
-                    })
-                    .catch(action => {
-                        if (action === "cancel") {
-                            this.$message.info("删除取消");
-                        } else {
-                            this.$message.error("删除失败");
-                        }
-                    });
-            }
+    this.$http
+      .get({
+        url: "/stationInfo/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.stations = res.data;
         }
+      });
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        stationId: [
+          { required: true, message: "请选择营业厅", trigger: "blur" }
+        ]
+      },
+      subColumn: "",
+
+      stations: [],
+      subValue: ""
     };
+  },
+  computed: {
+    ...mapState(["userInfo"])
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
+        }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id ? "/pinpaijuzhen/update" : "/pinpaijuzhen/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/pinpaijuzhen/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/Pinpaijuzhens.vue

@@ -2,30 +2,6 @@
     <div>
         <div class="filters-container">
 
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/pinpaijuzhen',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
         </div>
         <el-table
             :data="tableData"

src/main/vue/src/pages/Pinpaimenmians.vue

@@ -1,31 +1,6 @@
 <template>
     <div>
         <div class="filters-container">
-
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/pinpaimenmian',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
         </div>
         <el-table
             :data="tableData"

src/main/vue/src/pages/PlayInfo.vue

@@ -1,187 +1,250 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-            <el-form-item prop="url" label="资源上传">
-                <el-upload class="upload-demo" :file-list="fileList" :multiple="false" :action="$baseUrl+'/assets/uploadFile'" :on-success='haleSuccess'>
-                    <el-button size="small" type="primary">点击上传</el-button>
-                    <div slot="tip" class="el-upload__tip">视频格式:H264/MP4   &nbsp;&nbsp;   分辨率:1920*1080</div>
-                    <div slot="tip" class="el-upload__tip">图片格式:JPG    &nbsp;&nbsp;&nbsp;&nbsp;       分辨率:1920*1080</div>
+  <div>
+    <el-form
+      :model="formData"
+      :rules="rules"
+      ref="form"
+      label-width="80px"
+      label-position="right"
+      size="small"
+      style="max-width: 500px;"
+    >
+      <el-form-item prop="url" label="资源上传">
+        <el-upload
+          class="upload-demo"
+          :file-list="fileList"
+          :multiple="false"
+          :action="$baseUrl+'/assets/uploadFile'"
+          :on-success="haleSuccess"
+          :before-upload="handleUpload"
+        >
+          <el-button size="small" type="primary">点击上传</el-button>
+          <div slot="tip" class="el-upload__tip">视频格式:H264/MP4 &nbsp;&nbsp; 分辨率:1920*1080</div>
+          <div slot="tip" class="el-upload__tip">图片格式:JPG &nbsp;&nbsp;&nbsp;&nbsp; 分辨率:1920*1080</div>
+        </el-upload>
+      </el-form-item>
 
-                </el-upload>
-            </el-form-item>
-
-             <el-form-item prop="url" label="资源地址">
-                <el-input v-model="formData.url" :disabled="true"></el-input>
-            </el-form-item>
-            <el-form-item prop="loopnum" label="循环次数">
-                <el-input-number v-model="formData.loopnum" :disabled="'loopnum'==subColumn"></el-input-number>
-            </el-form-item>
-            <el-form-item prop="switchTime" label="切换间隔(秒)">
-                <el-input-number @input="handleInput" v-model="formData.switchTime" :disabled="'switchTime'==subColumn"></el-input-number>
-            </el-form-item>
-            <el-form-item v-if="false" prop="type" label="分类">
-                <template>
-                    <el-select v-model="formData.type" clearable placeholder="请选择" >
-                        <el-option
-                            v-for="item in typeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-             <el-form-item prop="fileType" label="文件类型">
-                <template>
-                    <el-select v-model="formData.fileType" clearable placeholder="请选择" >
-                        <el-option
-                            v-for="item in typeOptions1"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <el-form-item v-if="false" prop="fatherId" label="父级分类的id">
-                <el-input v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="rank" label="排序">
-                <el-input-number v-model="formData.rank" :disabled="'rank'==subColumn"></el-input-number>
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
+      <el-form-item prop="url" label="资源地址">
+        <el-input v-model="formData.url" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item prop="loopnum" label="循环次数">
+        <el-input-number v-model="formData.loopnum" :disabled="'loopnum'==subColumn"></el-input-number>
+      </el-form-item>
+      <el-form-item prop="switchTime" label="切换间隔(秒)">
+        <el-input-number
+          @input="handleInput"
+          v-model="formData.switchTime"
+          :disabled="'switchTime'==subColumn"
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item v-if="false" prop="type" label="分类">
+        <template>
+          <el-select v-model="formData.type" clearable placeholder="请选择">
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-form-item>
+      <el-form-item prop="fileType" label="文件类型">
+        <template>
+          <el-select v-model="formData.fileType" clearable placeholder="请选择">
+            <el-option
+              v-for="item in typeOptions1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-form-item>
+      <el-form-item v-if="false" prop="fatherId" label="父级分类的id">
+        <el-input v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
+      </el-form-item>
+      <el-form-item prop="rank" label="排序">
+        <el-input-number v-model="formData.rank" :disabled="'rank'==subColumn"></el-input-number>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+        <el-button @click="$router.go(-1)">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
-    import formValidator from "../formValidator";
+import formValidator from "../formValidator";
+
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
+
+    if (this.$route.query.type >= 0) {
+      this.subType = this.$route.query.type;
+    }
+
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/playInfo/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-    export default {
-        created() {
             if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(",")[1];
-                this.subValue = this.$route.query.column.split(",")[0];
+              this.formData[this.subColumn] = this.subValue;
             }
 
-             if (this.$route.query.type>=0) {
-                this.subType = this.$route.query.type;
+            if (this.$route.query.type >= 0) {
+              this.formData.type = Number(this.subType);
             }
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+
+      if (this.$route.query.type >= 0) {
+        this.formData.type = Number(this.subType);
+      }
+    }
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        url: [{ required: true, message: "请上传资源", trigger: "blur" }],
+        loopnum: [
+          { required: true, message: "请输入循环次数", trigger: "blur" }
+        ],
+        switchTime: [
+          { required: true, message: "请输入切换间隔", trigger: "blur" }
+        ],
+        rank: [{ required: true, message: "请输入排序", trigger: "blur" }]
+      },
+      subColumn: "",
+      fileList: [],
+      typeOptions: [
+        { value: 1, label: "品牌门面上中/屏" },
+        { value: 2, label: "品牌门面下屏" }
+      ],
+      typeOptions1: [
+        { value: "0", label: "video" },
+        { value: "1", label: "photo" }
+      ],
+      subValue: "",
+      subType: ""
+    };
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
+        }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id ? "/playInfo/update" : "/playInfo/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+    
+    handleUpload(file) {
 
+    const isJPG = (file.type === 'image/jpeg' || file.type === 'video/mp4');
+    if (!isJPG) {
+    this.$message({
+    message: '文件类型为'+file.type+'不符合',
+    type: 'warning'
+    });
+    return false
+    }
 
-            if (this.$route.query.id) {
-                this.$http
-                    .get({
-                        url: "/playInfo/getOne",
-                        data: {
-                            id: this.$route.query.id
-                        }
-                    })
-                    .then(res => {
-                        if (res.success) {
-                            this.formData = res.data;
+    if (file.type === 'video/mp4') {
+      this.formData.fileType = 0;
+    }
 
-                            if (this.$route.query.column) {
-                                this.formData[this.subColumn] = this.subValue;
-                            }
+    if (file.type === 'image/jpeg') {
+      this.formData.fileType = 1;
+    }
 
-                            if (this.$route.query.type>=0) {
-                            this.formData.type = Number(this.subType);
-                        }
-                        }
-                    });
-            } else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
+    if (this.needName) {
+    var position = file.name.lastIndexOf('.')
+    var fileName = file.name.substring(0, position)
 
-                if (this.$route.query.type>=0) {
-                            this.formData.type = Number(this.subType);
-                        }
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                     url: [{ required: true, message: "请上传资源", trigger: "blur" }],
-                        loopnum: [{ required: true, message: "请输入循环次数", trigger: "blur" }],
-                        switchTime: [{ required: true, message: "请输入切换间隔", trigger: "blur" }],
-                        rank: [{ required: true, message: "请输入排序", trigger: "blur" }],
-                },
-                subColumn: "",
-                 fileList: [],
-                 typeOptions:[ { value: 1, label: '品牌门面上中/屏' }, { value: 2, label: '品牌门面下屏' }],
-                 typeOptions1:[{ value: '0', label: 'video' }, { value: '1', label: 'photo' }],
-                subValue: "",
-                subType: '',
-            };
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http
-                    .post({
-                        url: this.formData.id ? "/playInfo/update" : "/playInfo/save",
-                        data: data
-                    })
-                    .then(res => {
-                        if (res.success) {
-                            this.$message.success("成功");
-                            this.$router.go(-1);
-                        } else {
-                            this.$message.warning("失败");
-                        }
-                    });
-            },
-             haleSuccess(file) {
-                // console.log(file)
-                file.data.forEach(item => {
-                    var nameList = item.split('/')
-                    var jsonp = {
-                        name: nameList[nameList.length - 1],
-                        url: item
-                    }
-                    this.fileList.splice(0, 1, jsonp)
-                    this.formData.url = item
-                })
-            },
-            onDelete() {
-                this.$alert("删除将无法恢复，确认要删除么？", "警告", {type: "error"})
-                    .then(() => {
-                        return this.$http.post({
-                            url: "/playInfo/del",
-                            data: {id: this.formData.id}
-                        });
-                    })
-                    .then(() => {
-                        this.$message.success("删除成功");
-                        this.$router.go(-1);
-                    })
-                    .catch(action => {
-                        if (action === "cancel") {
-                            this.$message.info("删除取消");
-                        } else {
-                            this.$message.error("删除失败");
-                        }
-                    });
-            }
-        }
-    };
+    if (fileName != this.needName) {
+    this.$message({
+    message: '文件名无法匹配，请检查文件',
+    type: 'warning'
+    });
+    return false
+    }
+    }
+
+    this.loading = true;
+    this.$emit('start')
+    return true;
+    },
+    haleSuccess(file) {
+      // console.log(file)
+      file.data.forEach(item => {
+        var nameList = item.split("/");
+        var jsonp = {
+          name: nameList[nameList.length - 1],
+          url: item
+        };
+        this.fileList.splice(0, 1, jsonp);
+        this.formData.url = item;
+      });
+    },
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/playInfo/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/StationInfos.vue

@@ -1,422 +1,470 @@
 <template>
-    <div>
-        <div class="filters-container">
-        
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/stationInfo',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
-            </el-button>
-            <el-dropdown trigger="click" size="medium" class="table-column-filter">
-                <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
-                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
-                    </el-checkbox>
-                </el-dropdown-menu>
-            </el-dropdown>
-        </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
-            </el-table-column>
-               <el-table-column
-                                prop="id"
-                                label="营业厅id"
-                                min-width="100">
-                        </el-table-column>
-                                            <el-table-column
-                                v-if="isColumnShow('stationName')"
-                                prop="stationName"
-                                label="营业厅名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('info')"
-                                prop="info"
-                                label="营业厅信息"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
-                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                <el-button-group v-else>
-                    <el-button size="small" @click="operation1">批量操作1</el-button>
-                    <el-button size="small" @click="operation2">批量操作2</el-button>
-                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
-                </el-button-group>
-            </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
-            </el-pagination>
-        </div>
-        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
-            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="advancedQueryFields">
-
-                <el-table-column prop="link" label="链接符" align="center">
-                    <template slot-scope="{row}">
-                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
-                            <el-option label="AND" value="AND">
-                            </el-option>
-                            <el-option label="OR" value="OR">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="字段" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.name">
-
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="value" label="参数" align="center">
-                    <template slot-scope="{row}">
-                        <el-input v-model="row.value"></el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="排序" :visible.sync="showTableSortDialog">
-            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="tableSortFields">
-
-                <el-table-column prop="name" label="字段" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.name">
-
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="order" label="排序" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.order">
-                            <el-option label="降序" value="desc">
-                            </el-option>
-                            <el-option label="升序" value="asc">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
-            <img width="100%" :src="imgSrc" alt="">
-        </el-dialog>
-
+  <div>
+    <div class="filters-container">
+      <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+      <el-button
+        @click="searchData"
+        type="primary"
+        size="small"
+        icon="el-icon-search"
+        class="filter-item"
+      >搜索</el-button>
+      <el-button
+      v-if="userInfo.departId=='2'"
+        @click="$router.push({path:'/stationInfo',query:{column:$route.query.column}})"
+        type="primary"
+        size="small"
+        icon="el-icon-edit"
+        class="filter-item"
+      >添加</el-button>
+      <el-dropdown trigger="click" size="medium" class="table-column-filter">
+        <span>筛选数据
+          <i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+          <el-checkbox
+            v-for="item in tableColumns"
+            :key="item.value"
+            v-model="item.show"
+          >{{item.label}}</el-checkbox>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+      <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
+      <el-table-column prop="id" label="营业厅id" min-width="100"></el-table-column>
+      <el-table-column
+        v-if="isColumnShow('stationName')"
+        prop="stationName"
+        label="营业厅名称"
+        min-width="100"
+      ></el-table-column>
+      <el-table-column v-if="isColumnShow('info')" prop="info" label="营业厅信息" min-width="100"></el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" min-width="150">
+        <template slot-scope="scope">
+          <el-button v-if="pageType == '1'" @click="editExhibition(scope.row)" type="primary" size="mini" plain>发布管理</el-button>
+          <el-button v-if="pageType == '2'" @click="editMenu(scope.row)" type="primary" size="mini" plain>栏目管理</el-button>
+          <el-button v-if="pageType == '2'" @click="editBanner(scope.row)" type="primary" size="mini" plain>banner管理</el-button>
+          <el-button v-if="pageType == '2'" @click="editMember(scope.row)" type="primary" size="mini" plain>成员管理</el-button>
+          <el-button v-if="pageType == '3'" @click="editEquipment(scope.row)" type="primary" size="mini" plain>设备管理</el-button>
+          <el-button v-if="pageType == '1'" @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+          <el-button v-if="pageType == '1'&&userInfo.departId=='2'" @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination-wrapper">
+      <div class="multiple-mode-wrapper" v-if="0">
+        <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+        <el-button-group v-else>
+          <el-button size="small" @click="operation1">批量操作1</el-button>
+          <el-button size="small" @click="operation2">批量操作2</el-button>
+          <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+        </el-button-group>
+      </div>
+      <el-pagination
+        background
+        @size-change="pageSizeChange"
+        @current-change="currentPageChange"
+        :current-page="currentPage"
+        :page-sizes="[10, 20, 30, 40, 50]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalNumber"
+      ></el-pagination>
     </div>
+    <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+      <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+      <el-table :data="advancedQueryFields">
+        <el-table-column prop="link" label="链接符" align="center">
+          <template slot-scope="{row}">
+            <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+              <el-option label="AND" value="AND"></el-option>
+              <el-option label="OR" value="OR"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="字段" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.name">
+              <el-option
+                v-for="item in advancedQueryColumns"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.searchMethod">
+              <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="value" label="参数" align="center">
+          <template slot-scope="{row}">
+            <el-input v-model="row.value"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column width="60" align="center">
+          <template slot-scope="{ row, column, $index }">
+            <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="排序" :visible.sync="showTableSortDialog">
+      <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+      <el-table :data="tableSortFields">
+        <el-table-column prop="name" label="字段" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.name">
+              <el-option
+                v-for="item in advancedQueryColumns"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="order" label="排序" align="center">
+          <template slot-scope="{row}">
+            <el-select v-model="row.order">
+              <el-option label="降序" value="desc"></el-option>
+              <el-option label="升序" value="asc"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column width="60" align="center">
+          <template slot-scope="{ row, column, $index }">
+            <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+      <img width="100%" :src="imgSrc" alt>
+    </el-dialog>
+  </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '营业厅名称',
-                                value: 'stationName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '营业厅信息',
-                                value: 'info',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '营业厅名称',
-                                value: 'station_name'
-                            },
-                                                                                                {
-                                label: '营业厅信息',
-                                value: 'info'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+import { mapState } from "vuex";
+import { format } from "date-fns";
+import zh from "date-fns/locale/zh_cn";
+
+export default {
+  created() {
+
+
+    this.getData();
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      tableData: [],
+      pageType: '',
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "营业厅名称",
+          value: "stationName",
+          show: true
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
+        {
+          label: "营业厅信息",
+          value: "info",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      showTableSortDialog: false,
+      tableSortFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "营业厅名称",
+          value: "station_name"
         },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
-
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
-
-                this.$http.get({
-                    url: '/stationInfo/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/stationInfo',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
-
-                this.advancedQuerySearchKey = '';
-
-                if (this.advancedQueryFields.length > 0) {
-
-                    var templist = [];
-
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
-
-                this.orderByStr = '';
-
-                if (this.tableSortFields.length > 0) {
-
-                    var templist = [];
-
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.orderByStr = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/stationInfo/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/stationInfo/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
-
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        {
+          label: "营业厅信息",
+          value: "info"
+        }
+      ],
+      advancedQuerySearchKey: "",
+      orderByStr: "",
+      imgSrc: "",
+      imageDialogVisible: false
+    };
+  },
+  computed: {
+    ...mapState(["tableHeight"]),
+    ...mapState(["userInfo"]),
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
+    }
+  },
+  methods: {
+    pageSizeChange(size) {
+      this.currentPage = 1;
+      this.pageSize = size;
+      this.getData();
+    },
+    currentPageChange(page) {
+      this.currentPage = page;
+      this.getData();
+    },
+    getData() {
+
+
+      var data = {
+        currentPage: this.currentPage,
+        pageNumber: this.pageSize,
+        searchKey: this.filter1,
+        advancedQuery: this.advancedQuerySearchKey,
+        orderByStr: this.orderByStr
+      };
+
+        this.pageType = '';
+      if (this.$route.query.pageType) {
+          this.pageType = this.$route.query.pageType
+      }
+
+      this.$http
+        .get({
+          url: "/stationInfo/page",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.totalNumber = res.data.page.totalNumber;
+            this.tableData = res.data.pp;
+          }
+        });
+    },
+    isColumnShow(column) {
+      var row = this.tableColumns.find(i => i.value === column);
+      return row ? row.show : false;
+    },
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    editRow(row) {
+      this.$router.push({
+        path: "/stationInfo",
+        query: {
+          id: row.id,
+          column: this.$route.query.column
+        }
+      });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    },
+    addField() {
+      this.advancedQueryFields.push({
+        link: "AND",
+        name: "",
+        searchMethod: "=",
+        value: ""
+      });
+    },
+    removeField(i) {
+      if (this.advancedQueryFields.length > 0) {
+        this.advancedQueryFields.splice(i, 1);
+      }
+    },
+    advancedQuery() {
+      this.advancedQuerySearchKey = "";
+
+      if (this.advancedQueryFields.length > 0) {
+        var templist = [];
+
+        this.advancedQueryFields.forEach(item => {
+          if (item.link && item.name && item.searchMethod && item.value) {
+            var tempItem =
+              item.link +
+              "_," +
+              item.name +
+              "_," +
+              item.searchMethod +
+              "_," +
+              item.value;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.advancedQuerySearchKey = templist.join("_;");
+        }
+      }
+
+      this.getData();
+      this.showAdvancedQueryDialog = false;
+    },
+    addSortField() {
+      this.tableSortFields.push({
+        name: "",
+        order: "asc"
+      });
+    },
+    removeSortField(i) {
+      if (this.tableSortFields.length > 0) {
+        this.tableSortFields.splice(i, 1);
+      }
+    },
+    tableSortQuery() {
+      this.orderByStr = "";
+
+      if (this.tableSortFields.length > 0) {
+        var templist = [];
+
+        this.tableSortFields.forEach(item => {
+          if (item.name && item.order) {
+            var tempItem = item.name + "_," + item.order;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.orderByStr = templist.join("_;");
+        }
+      }
+
+      this.getData();
+      this.showTableSortDialog = false;
+    },
+    exportExcel() {
+      window.location.href =
+        this.$baseUrl +
+        "/stationInfo/exportExcel?searchKey=" +
+        this.filter1 +
+        "&advancedQuery=" +
+        this.advancedQuerySearchKey +
+        "&orderByStr=" +
+        this.orderByStr;
+    },
+    searchData() {
+      this.currentPage = 1;
+      this.getData();
+    },
+    deleteRow(row) {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/stationInfo/del",
+            data: { id: row.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.getData();
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    },
+    DateTimeFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD HH:mm", { locale: zh });
+      }
+    },
+    DateFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD", { locale: zh });
+      }
+    },
+    showImg(img) {
+      this.imgSrc = img;
+      this.imageDialogVisible = true;
+    },
+    editExhibition(row) {
+      this.$router.push({
+        path: "/exhibitionContents",
+        query: {
+          id: row.id,
+          column: row.id + ",stationId"
+        }
+      });
+    },
+    editMenu(row) {
+      this.$router.push({
+        path: "/menuInfos",
+        query: {
+          id: row.id,
+          column: row.id + ",stationInfo"
+        }
+      });
+    },
+    editBanner(row) {
+      this.$router.push({
+        path: "/bannerInfos",
+        query: {
+          id: row.id,
+          column: row.id + ",stationId"
+        }
+      });
+    },
+    editMember(row) {
+      this.$router.push({
+        path: "/memberInfos",
+        query: {
+          id: row.id,
+          column: row.id + ",stationId"
+        }
+      });
+    },
+     editEquipment(row) {
+      this.$router.push({
+        path: "/equipmentInfos",
+        query: {
+          id: row.id,
+          column: row.id + ",stationId"
+        }
+      });
+    },
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+  },
+  
 
+    watch: {
+        $route() {
+            this.getData();
         }
-    }
+        
+    },
+
+};
 </script>
 <style lang="less" scoped>
-
 </style>