|
|
@@ -110,8 +110,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="icon" v-if="activeName==0" label="图标" align="center" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <img :src="scope.row.icon" alt="">
|
|
|
-
|
|
|
+ <img v-if="scope.row.icon != '#'" style="width: 20px;height: 20px;" :src="scope.row.icon" alt="">
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -245,9 +244,8 @@
|
|
|
/>
|
|
|
</el-input>
|
|
|
</el-popover>
|
|
|
-
|
|
|
- <imgUpload v-else type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>
|
|
|
-
|
|
|
+<!-- <imgUpload type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>-->
|
|
|
+ <base-image v-else v-model="form.icon" ></base-image>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -426,10 +424,11 @@ import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
import IconSelect from "@/components/IconSelect";
|
|
|
import imgUpload from "@/components/ImageUpload/index.vue";
|
|
|
+import BaseImage from "@/components/BaseImage"
|
|
|
export default {
|
|
|
name: "Menu",
|
|
|
dicts: ["sys_show_hide", "sys_normal_disable", "sys_platform_type"],
|
|
|
- components: { Treeselect, IconSelect, imgUpload },
|
|
|
+ components: { Treeselect, IconSelect, imgUpload,BaseImage },
|
|
|
data() {
|
|
|
return {
|
|
|
// platformType 平台类型 0APP 1PC
|
|
|
@@ -501,7 +500,6 @@ export default {
|
|
|
this.menuList = this.handleTree(
|
|
|
response.data.filter((item) => item.platformType == this.activeName)
|
|
|
);
|
|
|
-
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|