Merge remote-tracking branch 'origin/yanyan_dev' into shenzhen-dev

src/views/projectAdmin/zjsj/command/index.vue

@@ -39,7 +39,7 @@
 <script>
 import LeftOne from './leftOne'
 import LeftTwo from './leftTwo'
-import LeftThree from './LeftThree'
+import LeftThree from './leftThree'
 import LeftFour from './leftFour'
 import Center from './center'
 import CenterBOne from './centerBOne'

src/views/projectFront/quality/material/weighInfo.vue

@@ -26,10 +26,10 @@
           <el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
           <el-table-column prop="tareTime" label="毛重时间" align="center"></el-table-column>
           <el-table-column prop="grossTime" label="皮重时间" align="center"></el-table-column>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <div class="tableBtns">
-                <div @click="seePhonegrap(scope.row)" class="operationText">
+                <div @click="seePhonegrap(scope.row.weighPicList)" class="operationText">
                   <i class="el-icon-delete" style="color: #eb5760; font-size: 16px; margin-right: 2px"></i>
                   <span>查看过磅照片</span>
                 </div>
@@ -49,21 +49,31 @@
           :total="Number(total)"
         ></el-pagination>
       </vue-scroll>
-      <el-dialog title="过磅照片" :visible.sync="dialogVisiblePhone" width="40%" :before-close="handleClose">
+      <el-dialog title="过磅照片" :modal-append-to-body="false" :visible.sync="dialogVisiblePhone" width="40%" :before-close="handleClose" @close="closeDialog">
         <div>
           <div>
             <h6>第一次称重照片</h6>
-            <img src="@/assets/images/test.png" alt="" />
+            <div v-if="srcList.length !== 0">
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.emptyPic1}`" :preview-src-list="srcList"> </el-image>
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.emptyPic2}`" :preview-src-list="srcList"> </el-image>
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.emptyPic3}`" :preview-src-list="srcList"> </el-image>
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.emptyPic4}`" :preview-src-list="srcList"> </el-image>
+            </div>
+            <div v-else>
+              暂无数据
+            </div>
           </div>
           <div>
             <h6>第二次称重照片</h6>
-            <img src="@/assets/images/test.png" alt="" />
+            <div v-if="srcList.length !== 0">
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.fullPic1}`" :preview-src-list="srcList"> </el-image>
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.fullPic2}`" :preview-src-list="srcList"> </el-image>
-            <img src="@/assets/images/test.png" alt="" />
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.fullPic3}`" :preview-src-list="srcList"> </el-image>
+              <el-image class="imgStyle" :src="`${imgUrl}/image/${phoneList.fullPic4}`" :preview-src-list="srcList"> </el-image>
+            </div>
+            <div v-else>
+              暂无数据
+            </div>
           </div>
         </div>
       </el-dialog>
@@ -80,6 +90,7 @@ import {
   deleteWeighInfoItem,
   weighTypeList
 } from '@/assets/js/api/quality.js'
+import axios from 'axios'
 
 export default {
   components: {
@@ -97,8 +108,9 @@ export default {
       pageSize: -1,
       total: 0,
       dialogVisiblePhone: false,
-      devId: '',
+      phoneList: [],
-      fuel: ''
+      imgUrl: axios.defaults.baseURL,
+      srcList: []
     }
   },
   created() {
@@ -107,12 +119,27 @@ export default {
   },
   methods: {
     seePhonegrap(val) {
-      console.log(val)
       this.dialogVisiblePhone = true
+      if (val) {
+        this.phoneList = val[0]
+      }else{
+        this.phoneList = []
+      }
+      console.log(this.phoneList)
+      let arr = Object.values(this.phoneList)
+      arr.forEach((item, index, array) => {
+        if (index !== 0 && index < 9) {
+          this.srcList.push(`${this.imgUrl}/image/${array[index]}`)
+        }
+      })
     },
     handleClose(done) {
       done()
     },
+    closeDialog(){
+      this.srcList.splice(0, this.srcList.length)
+      console.log("关闭",this.srcList);
+    },
     //获取列表数据
     getListData() {
       let data = {
@@ -203,4 +230,9 @@ th {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.imgStyle {
+  width: 170px;
+  height: 100px;
+  margin-left: 10px;
+}
 </style>