123123

src/main/vue/src/pages/App.vue

@@ -23,7 +23,7 @@
                     </div>
                 </div>
                 <div style="flex-grow: 1; margin-left: 20px;">
-                    <router-link :to="{name:'dashboard'}">一个很厉害的后台管理</router-link>
+                    <router-link :to="{name:'dashboard'}">华泰证券管理后台</router-link>
                 </div>
 
                 <el-tooltip effect="dark" :content="isFullscreen ? '退出全屏' : '全屏'" placement="bottom" :open-delay="1000">
@@ -142,7 +142,7 @@
         watch: {
             $route(val) {
                 this.findActiveMenu(this.rawMenus);
-                
+
             },
             isFullscreen(val) {
                 this.$refs.fullscreen.innerHTML = '';

src/main/vue/src/pages/ExhibitionContent.vue

@@ -6,7 +6,7 @@
                 <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="version" label="版本号">
-                <el-input v-model="formData.version" :disabled="'version'==subColumn"></el-input>
+                <el-input-number v-model="formData.version" :disabled="'version'==subColumn"></el-input-number>
             </el-form-item>
             <el-form-item prop="stationId" label="营业厅">
                 <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
@@ -69,7 +69,11 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                rules: {
+                     name: [{ required: true, message: "请输入展示名称", trigger: "blur" }],
+                        version: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+                        stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
+                },
                 subColumn: '',
                 stations: [],
                 subValue: '',

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

@@ -1,161 +1,180 @@
 <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-input v-model="formData.url" ></el-input>
-            </el-form-item>
-            <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">文件大小限制 </div>
-                </el-upload>
-            </el-form-item>
-            <el-form-item prop="type" label="类型：0：data_video  1:data_app">
-                <template>
-                    <el-select v-model="formData.type" clearable placeholder="请选择" :disabled="subType!=''">
-                        <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 v-if="formData.type==0" prop="image" label="video配图">
-                <single-upload v-model="formData.image" :disabled="'imgUrl'==subColumn"></single-upload>
-            </el-form-item>
-            <el-form-item prop="fatherId" label="父类id">
-                <el-input type="number" v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
-            </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="url" label="资源地址">
+        <el-input v-model="formData.url" :disabled="true"></el-input>
+      </el-form-item>
+      <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">文件大小限制</div>
+        </el-upload>
+      </el-form-item>
+      <el-form-item v-if="formData.type<0" prop="type" label="类型：0：data_video  1:data_app">
+        <template>
+          <el-select v-model="formData.type" clearable placeholder="请选择" :disabled="subType!=''">
+            <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 v-if="formData.type==0" prop="image" label="video配图">
+        <single-upload v-model="formData.image" :disabled="'imgUrl'==subColumn"></single-upload>
+      </el-form-item>
+      <el-form-item v-if="formData.type<0" prop="fatherId" label="父类id">
+        <el-input type="number" v-model="formData.fatherId" :disabled="'fatherId'==subColumn"></el-input>
+      </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: '/fileInfo/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];
+    }
 
-                        if (this.$route.query.column) {
-                            this.formData[this.subColumn] = this.subValue;
-                        }
-                        var nameList = res.data.url.split('/')
-                        var jsonp = {
-                            name: nameList[nameList.length - 1],
-                            url: res.data.url
-                        }
-                        this.fileList.push(jsonp)
+    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.id) {
+      this.$http
+        .get({
+          url: "/fileInfo/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                if (this.$route.query.type>=0) {
-                    this.formData.type = Number(this.subType);
-                }
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
+            var nameList = res.data.url.split("/");
+            var jsonp = {
+              name: nameList[nameList.length - 1],
+              url: res.data.url
+            };
+            this.fileList.push(jsonp);
 
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {},
-                typeOptions:[{ value: 0, label: 'video' }, { value: 1, label: 'app' }],
-                subColumn: '',
-                subValue: '',
-                fileList: [],
-                subType: '',
+            if (this.$route.query.type >= 0) {
+              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 ? '/fileInfo/update' : '/fileInfo/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: '/fileInfo/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 >= 0) {
+        this.formData.type = Number(this.subType);
+      }
+    }
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+       url: [{ required: true, message: "请上传资源", trigger: "blur" }],
+      },
+      typeOptions: [{ value: 0, label: "video" }, { value: 1, label: "app" }],
+      subColumn: "",
+      subValue: "",
+      fileList: [],
+      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 ? "/fileInfo/update" : "/fileInfo/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: "/fileInfo/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/FinancialData.vue

@@ -66,7 +66,9 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                rules: {
+                    stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
+                },
                 subColumn: '',
                 stations: [],
                 subValue: '',

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

@@ -5,14 +5,14 @@
             <el-form-item prop="imgUrl" label="图片">
                 <single-upload v-model="formData.url" :disabled="'imgUrl'==subColumn"></single-upload>
             </el-form-item>
-            <el-form-item prop="type" label="分类">
+            <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 prop="fatherId" label="父级id">
+            <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 v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+                <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>
@@ -71,7 +71,9 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                rules: {
+                    imgUrl: [{ required: true, message: "请上传图片", trigger: "blur" }],
+                },
                 subColumn: '',
                 subValue: '',
                 subType: '',

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

@@ -89,7 +89,12 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                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: '',

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

@@ -71,8 +71,11 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                rules: {
+                                        stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
+                },
                 subColumn: "",
+
                 stations: [],
                 subValue: ""
             };

src/main/vue/src/pages/Pinpaimenmian.vue

@@ -69,7 +69,10 @@ export default {
     return {
       saving: false,
       formData: {},
-      rules: {},
+      rules: {
+                            stationId: [{ required: true, message: "请选择营业厅", trigger: "blur" }],
+
+      },
       stations: [],
       subColumn: "",
       subValue: ""

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

@@ -5,20 +5,22 @@
             <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">文件大小限制 </div>
+                    <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-form-item prop="url" label="播放地址">
-                <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
+             <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 v-model="formData.loopnum" :disabled="'loopnum'==subColumn"></el-input>
+                <el-input-number v-model="formData.loopnum" :disabled="'loopnum'==subColumn"></el-input-number>
             </el-form-item>
-            <el-form-item prop="switchTime" label="切换间隔描述">
-                <el-input v-model="formData.switchTime" :disabled="'switchTime'==subColumn"></el-input>
+            <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 prop="type" label="分类">
+            <el-form-item v-if="false" prop="type" label="分类">
                 <template>
                     <el-select v-model="formData.type" clearable placeholder="请选择" >
                         <el-option
@@ -42,11 +44,11 @@
                     </el-select>
                 </template>
             </el-form-item>
-            <el-form-item prop="fatherId" label="父级分类的id">
+            <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 v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+                <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>
@@ -66,6 +68,11 @@
                 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({
@@ -81,24 +88,38 @@
                             if (this.$route.query.column) {
                                 this.formData[this.subColumn] = this.subValue;
                             }
+
+                            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: {},
+                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: 0, label: '品牌矩阵' }, { value: 1, label: '品牌门面上中/屏' }, { value: 2, label: '品牌门面下屏' }],
+                 typeOptions:[ { value: 1, label: '品牌门面上中/屏' }, { value: 2, label: '品牌门面下屏' }],
                  typeOptions1:[{ value: '0', label: 'video' }, { value: '1', label: 'photo' }],
-                subValue: ""
+                subValue: "",
+                subType: '',
             };
         },
         methods: {

src/main/vue/src/pages/PlayInfos.vue

@@ -11,7 +11,7 @@
             <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
                        icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/playInfo',query:{column:$route.query.column}})" type="primary"
+            <el-button @click="$router.push({path:'/playInfo',query:{column:$route.query.column,type:$route.query.type}})" type="primary"
                        size="small" icon="el-icon-edit"
                        class="filter-item">添加
             </el-button>

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

@@ -37,11 +37,6 @@
                     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
                                 prop="id"

src/main/vue/src/pages/SubItem.vue

@@ -10,7 +10,7 @@
                 <single-upload v-model="formData.imgUrl" :disabled="'imgUrl'==subColumn"></single-upload>
             </el-form-item>
 
-            <el-form-item prop="menuInfoId" label="栏目ID">
+            <el-form-item v-if="false" prop="menuInfoId" label="栏目ID">
                 <el-input v-model="formData.menuInfoId" :disabled="'menuInfoId'==subColumn"></el-input>
             </el-form-item>
             <el-form-item>
@@ -58,7 +58,10 @@
             return {
                 saving: false,
                 formData: {},
-                rules: {},
+                rules: {
+                    name: [{ required: true, message: "请输入子项名称", trigger: "blur" }],
+                        imgUrl: [{ required: true, message: "请上传图标", trigger: "blur" }],
+                },
                 subColumn: "",
                 subValue: ""
             };