11

ebts-ui/src/views/sist/file/index.vue

@@ -94,7 +94,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleFileUpdate"
-          v-hasPermi="['system:file:edit']"
+          v-hasPermi="['sist:file:edit']"
         >文件上传
         </el-button>
       </el-col>
@@ -118,7 +118,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:file:remove']"
+          v-hasPermi="['sist:file:remove']"
         >删除
         </el-button>
       </el-col>
@@ -129,7 +129,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:file:export']"
+          v-hasPermi="['sist:file:export']"
         >导出
         </el-button>
       </el-col>
@@ -168,7 +168,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:file:remove']"
+            v-hasPermi="['sist:file:remove']"
           >删除
           </el-button>
           <el-button
@@ -221,7 +221,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="文件上传">
-          <FileUpload v-model="addFile.url" @changeAddress="changeAddress"/>
+          <FileUpload v-model="addFile.url" @change="changeAddress"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -260,10 +260,10 @@
             </el-switch>
           </el-form-item>
           <el-form-item label="图片上传" v-show="!fileForm.fileType">
-            <ImageUpload v-model="fileForm.url" @changeAddress="changeAddress"/>
+            <ImageUpload v-model="fileForm.url" @change="changeAddress"/>
           </el-form-item>
           <el-form-item label="文件上传" v-show="fileForm.fileType">
-            <FileUpload v-model="fileForm.url" @changeAddress="changeAddress"/>
+            <FileUpload v-model="fileForm.url" @change="changeAddress"/>
           </el-form-item>
         </div>
       </el-form>

ebts-ui/src/views/sist/navigation/index.vue

@@ -112,6 +112,12 @@
         <el-form-item label="英语名称" prop="englishTitle">
           <el-input v-model="form.englishTitle" placeholder="英语名称"/>
         </el-form-item>
+        <el-form-item label="显示网站">
+          <el-radio-group v-model="form.displayType">
+            <el-radio-button v-for="dict in displayTypeOptions" :key="dict.dictValue"
+                             :label="dict.dictValue">{{ dict.dictLabel }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item v-show="anvTypeEdit" label="导航类型" prop="type">
           <!--          <el-input v-model="form.link" placeholder="请输入导航链接"/>-->
           <el-radio-group v-model="form.type" @change="navigationTypeChang(form.type)">
@@ -243,6 +249,7 @@ export default {
       direTypeOptions: [],
       sistDireTypeOptions: [],
       labDireTypeOptions: [],
+      displayTypeOptions: [],
       navigationType: [],
       navList: [],
       anvTypeEdit: true,
@@ -279,6 +286,9 @@ export default {
     this.getDicts("navigation_type").then(res => {
       this.navigationTypeOptions = res.data;
     })
+    this.getDicts("display_type").then(res => {
+      this.displayTypeOptions = res.data;
+    })
     this.getDicts("dire_type").then(res => {
       let direList = res.data
       for (let dire of direList) {
@@ -354,6 +364,7 @@ export default {
         sort: null,
         refId: null,
         enRefId: null,
+        displayType: '1',
       };
       this.anvTypeEdit = true
       this.resetForm("form");
@@ -460,10 +471,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          //if (this.imageShow&&this.form.link){
-          //  this.msgError("图片不能为空,若您已上传请稍等一下!");
-          //  return
-          //}
+          if (this.imageShow&&this.form.link){
+            this.msgError("图片不能为空,若您已上传请稍等一下!");
+            return
+          }
           if (this.form.id != null) {
             updateNavigation(this.form).then(response => {
               this.msgSuccess("修改成功");