Merge branch 'dev' of licailing/zhirongip into master

src/main/vue/src/views/Settings.vue

@@ -1,25 +1,25 @@
 <template>
     <div class="menus">
-        <el-row :gutter="20">
-            <el-col :span="12">
-                <div class="menu-tree">
-                    <el-tree
-                        :data="menus"
-                        :render-content="renderContent"
-                        :highlight-current="true"
-                        :expand-on-click-node="true"
-                        node-key="id"
-                        v-loading="loading"
-                        accordion
-                        @node-click="nodeClick"
-                        :default-expanded-keys="expandKeys"
-                        :default-checked-keys="expandKeys"
-                    >
-                    </el-tree>
-                    <el-button type="text" @click="addRootMenu" style="margin-left: 24px;">添加 </el-button>
-                </div>
-            </el-col>
-            <transition name="el-fade-in">
+        <!-- <el-row :gutter="20"> -->
+        <!-- <el-col :span="20"> -->
+        <div class="menu-tree" style="width: 700px">
+            <el-tree
+                :data="menus"
+                :render-content="renderContent"
+                :highlight-current="true"
+                :expand-on-click-node="true"
+                node-key="id"
+                v-loading="loading"
+                accordion
+                @node-click="nodeClick"
+                :default-expanded-keys="expandKeys"
+                :default-checked-keys="expandKeys"
+            >
+            </el-tree>
+            <el-button type="text" @click="addRootMenu" style="margin-left: 24px;">添加 </el-button>
+        </div>
+        <!-- </el-col> -->
+        <!-- <transition name="el-fade-in">
                 <el-col :span="12" v-if="dialogVisible">
                     <div class="menu-tree">
                         <div style="font-weight:bold;padding:10px 0">{{ menu.id ? '编辑' : '新增' }}</div>
@@ -31,9 +31,6 @@
                             >
                                 <el-input v-model="menu.name"></el-input>
                             </el-form-item>
-                            <!-- <el-form-item label="代码" prop="code">
-                                <el-input v-model="menu.code"></el-input>
-                            </el-form-item> -->
                         </el-form>
                         <div slot="footer">
                             <el-button @click="dialogVisible = false">取消 </el-button>
@@ -41,8 +38,27 @@
                         </div>
                     </div>
                 </el-col>
-            </transition>
-        </el-row>
+            </transition> -->
+        <!-- </el-row> -->
+
+        <el-dialog :visible.sync="dialogVisible" width="500px">
+            <el-form :model="menu" ref="form" label-position="top">
+                <el-form-item
+                    label="名称"
+                    prop="name"
+                    :rules="[{ required: true, message: '请填写名称', trigger: 'blur' }]"
+                >
+                    <el-input v-model="menu.name"></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="代码" prop="code">
+                                <el-input v-model="menu.code"></el-input>
+                            </el-form-item> -->
+            </el-form>
+            <div slot="footer">
+                <el-button @click="dialogVisible = false">取消 </el-button>
+                <el-button type="primary" @click="addMenu" :loading="loading">保存 </el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 <script>

src/main/zhi-rong-web/src/components/MultiUpload.vue

@@ -83,9 +83,10 @@ export default {
             );
         },
         handleBefore(file) {
-            console.log(file);
+            // console.log(file);
             const isLt = file.size / 1024 / 1024 < this.size;
-            const isJPG = file.type === 'image/jpg' || file.type === 'image/png';
+            const isJPG = file.type === 'image/jpg' || file.type === 'image/png' || file.type === 'image/jpeg';
+            // console.log(isJPG);
             if (!isJPG) {
                 this.$message.error('上传图片只能是JPG、PNG格式');
             }

src/main/zhi-rong-web/src/views/detail/TechnicalManager.vue

@@ -3,7 +3,8 @@
         <div class="main" v-loading="loading">
             <div class="top">
                 <div class="img">
-                    <el-carousel height="360px">
+                    <el-image :src="getImg(info.avatar)" fit="fill"></el-image>
+                    <!-- <el-carousel height="360px">
                         <el-carousel-item v-for="(item, index) in imgs" :key="index">
                             <el-image
                                 :src="item"
@@ -11,7 +12,7 @@
                                 style="width: 100%; height: 100%; border-radius: 100%"
                             ></el-image>
                         </el-carousel-item>
-                    </el-carousel>
+                    </el-carousel> -->
                 </div>
 
                 <div class="info">
@@ -109,13 +110,13 @@ export default {
         };
     },
     computed: {
-        imgs() {
-            if (this.info.avatar && this.info.avatar.length > 0) {
-                return this.info.avatar;
-            } else {
-                return [this.getImg()];
-            }
-        }
+        // imgs() {
+        //     if (this.info.avatar && this.info.avatar.length > 0) {
+        //         return this.info.avatar;
+        //     } else {
+        //         return [this.getImg()];
+        //     }
+        // }
     },
     watch: {
         $route() {