Browse Source

页面更新

sr 4 years ago
parent
commit
4550bfa043

+ 0 - 1
ruoyi-ui/src/components/DynamicForms/index.vue

@@ -110,7 +110,6 @@
       }else{
         this.formConfig.disabshow = false
       }
-      console.log(this.formConfig.fkInfo.fkTableName)
       if(this.formConfig.fkInfo == null){
           this.formConfig.fkInfo=false
       }

+ 2 - 0
ruoyi-ui/src/main.js

@@ -27,6 +27,8 @@ import DynamicForm from "@/components/DynamicForm"
 import DynamicForms from "@/components/DynamicForms"
 import MemoranDum from "@/components/MemoranDum"
 import 'burgeon-ui/dist/styles/burgeon-ui.css';
+import BigPicture from "@/components/BigPicture";
+Vue.component('BigPicture', BigPicture)
 import BurgeonUi from 'burgeon-ui';
 Vue.use(BurgeonUi);
 // 全局方法挂载

+ 11 - 5
ruoyi-ui/src/views/system/surface/index.vue

@@ -8,7 +8,7 @@
           :key="index">{{item | btnConversion}}</el-button>
       </div>
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-        <dynamic-form :ref="item.columnName" :config="queryParams" @inputs="changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList"
+        <dynamic-forms :ref="item.columnName" :config="queryParams" @inputs="changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList"
           :key='index' />
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -23,7 +23,7 @@
         <template v-for="(item, index) in tabData">
           <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" :key="index">
             <template slot-scope="scope">
-              <img class="img_icon" :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="" v-if="item.htmlType=='imageUpload'">
+              <img class="img_icon" v-if="item.htmlType=='imageUpload'&&scope.row[scope.column.property]" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)" :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="">
               <span v-else>{{ scope.row[scope.column.property] }}</span>
             </template>
           </el-table-column>
@@ -31,7 +31,8 @@
       </el-table>
       <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
         @pagination="getList" />
-    </div>
+    </div>
+    <BigPicture ref="BigPicture" :urls="pir_imgs"></BigPicture>
   </div>
 </template>
 
@@ -51,7 +52,8 @@
   export default {
     name: "index",
     data() {
-      return {
+      return {
+        pir_imgs: '', // 图片链接
         tabData: [],
         multiple: true,
         single: true,
@@ -133,7 +135,11 @@
       this.init();
       this.getList();
     },
-    methods: {
+    methods: {
+      imgBtn(url) {
+        this.pir_imgs = url
+        this.$refs.BigPicture.hidden.status = true
+      },
       routerFn(id, tables) {
         if (this.queryData.viewType == 'crud') {
           this.$router.push({