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

components/file/entrust-file-manage/FilesList.vue

@@ -75,7 +75,7 @@
               <li v-for="item in getPage.records" :key="item.id">
                 <div class="thumbnailStyleImg">
                   <Tooltip placement="top">
-                    <img :src=" bigUrl+item.type+'.png' "/>
+                    <img :class="item.type === 'jpg'||item.type === 'png'?'samllJpg':' ' " :src=" item.type==='jpg'||item.type === 'png'?imgUrl+item.id:bigUrl+item.type+'.png' "/>
                     <div slot="content" style="white-space: normal">
                       <p>名称：{{item.fileName}}</p>
                     </div>
@@ -193,7 +193,7 @@ export default {
       Ids: [],
       smallUrl: global.staticURL + '/img/smallfile/',
       bigUrl: global.staticURL + '/img/bigfile/',
-
+      imgUrl: '',
       action: '',
       dataObj: {
         file: ''
@@ -234,6 +234,7 @@ export default {
       this.idsObj = idsObj
       this.urlData = data
       this.action = global.baseURL + data.uploadFileUrl + data.id
+      this.imgUrl = global.baseURL + data.downloadFileUrl
       this.downloadFileUrlFile = data.downloadFileUrl
       this.$nextTick(() => {
         this._page()

components/file/file-manage/FilesList.vue

@@ -60,7 +60,7 @@
               fixed="right">
               <template slot-scope="scope">
                 <VXEIconList
-                  :msg="iconMsg"
+                  :msg="scope.row.type === 'jpg'||scope.row.type === 'pdf'||scope.row.type === 'png' ?iconMsgJpg:iconMsg"
                   @on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>
               </template>
             </vxe-table-column>
@@ -193,7 +193,7 @@ export default {
       Ids: [],
       smallUrl: global.staticURL + '/img/smallfile/',
       bigUrl: global.staticURL + '/img/bigfile/',
-      imgUrl: global.baseURL + '/soil/v1/entrust_annex/download/',
+      imgUrl: '',
       action: '',
       dataObj: {
         file: ''
@@ -234,6 +234,7 @@ export default {
       this.idsObj = idsObj
       this.urlData = data
       this.action = global.baseURL + data.uploadFileUrl + data.id
+      this.imgUrl = global.baseURL + data.downloadFileUrl
       this.downloadFileUrlFile = data.downloadFileUrl
       this.$nextTick(() => {
         this._page()
@@ -328,6 +329,12 @@ export default {
         case 'pdf':
           this.$pdfView(data.objectKey)
           break
+        case 'png':
+          const pngViewList = []
+          pngViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
+          this.imgViewList = pngViewList
+          this.imgViewIndex = 0
+          break
       }
       // console.log(data)
       // if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {

components/file/photo-manage/PhotoList.vue

@@ -74,7 +74,7 @@
               <li v-for="item in getPage.records" :key="item.id">
                 <div class="thumbnailStyleImg">
                   <Tooltip placement="top">
-                    <img :src=" bigUrl+item.type+'.png' "/>
+                    <img :class="item.type === 'jpg'||item.type === 'png'?'samllJpg':' ' " :src=" item.type==='jpg'||item.type === 'png'?imgUrl+item.id:bigUrl+item.type+'.png' "/>
                     <div slot="content" style="white-space: normal">
                       <p>名称：{{item.fileName}}</p>
                     </div>
@@ -185,7 +185,7 @@ export default {
       Ids: [],
       smallUrl: global.staticURL + '/img/smallfile/',
       bigUrl: global.staticURL + '/img/bigfile/',
-
+      imgUrl: '',
       action: '',
       dataObj: {
         file: ''
@@ -223,6 +223,7 @@ export default {
       this.idsObj = idsObj
       this.urlData = data
       this.action = global.baseURL + data.uploadFileUrl + data.id
+      this.imgUrl = global.baseURL + data.downloadFileUrl
       this.downloadFileUrlFile = data.downloadFileUrl
       this.$nextTick(() => {
         this._page()

components/flow/FlowBranch.vue

@@ -80,16 +80,16 @@ export default {
       // const list_0_value = this.list[0].value
       const listZeroValue = this.list[0].value
       // if (current_value) {
-      if (currentValue === false || currentValue === undefined) {
-        return undefined
+      if (currentValue === false) {
+        return false
       } else if (currentValue) {
         return endValue
       } else {
         // undefined,说明要接着向下走
         // eslint-disable-next-line no-lonely-if
-        if (listZeroValue !== undefined && endValue) {
+        if (listZeroValue === true && endValue) {
           return true
-        } else if (listZeroValue !== undefined && endValue === false) {
+        } else if (listZeroValue === false) {
           return false
         }
       }
@@ -102,7 +102,8 @@ export default {
 .flow-start-border {
   width: 2px;
   height: 133px;
-  background: #666;
+  /*background: #666;*/
+  background: #eb6877;
   position: absolute;
   top: 30px;
 }
@@ -112,6 +113,7 @@ export default {
 }
 
 .red-flow-start-border {
-  background: #eb6877;
+  /*background: #eb6877;*/
+  background: #666;
 }
 </style>

components/flow/PtArrow.vue

@@ -47,12 +47,14 @@ export default {
 <style scoped>
 .arrow-left {
   height: 2px;
-  background: #666;
+  /*background: #666;*/
+  background: #eb6877;
 }
 
 .arrow-right {
   border: 6px solid transparent;
-  border-left: 10px solid #666;
+  /*border-left: 10px solid #666;*/
+  border-left: 10px solid #eb6877;
   width: 0;
   height: 0px;
   margin-top: -5px;
@@ -74,7 +76,7 @@ export default {
 }
 
 .red-color-left {
-  background: #eb6877;
+  background: #666;
 }
 
 .blue-color-right {
@@ -82,6 +84,6 @@ export default {
 }
 
 .red-color-right {
-  border-left-color: #eb6877;
+  border-left-color: #666;
 }
 </style>

components/flow/PtCircle.vue

@@ -47,12 +47,14 @@ export default {
 .circle {
   width: 60px;
   height: 60px;
-  border: 1px solid #999;
-  background: #999;
+  /*border: 1px solid #999;*/
+  /*background: #999;*/
   color: #fff;
   border-radius: 50%;
   text-align: center;
   font-size: 12px;
+  border-color: #eb6877;
+  background-color: #eb6877;
 }
 
 .circle span {
@@ -76,8 +78,9 @@ export default {
 }
 
 .red-color {
-  border-color: #eb6877;
-  background-color: #eb6877;
+  /*border-color: #eb6877;*/
+  /*background-color: #eb6877;*/
   color: #fff;
+  background: #999;
 }
 </style>

components/flow/PtRect.vue

@@ -42,8 +42,9 @@ export default {
 
 <style scoped>
 .rect {
-  border: 1px solid #999;
-  background: #999;
+  border: 1px solid #eb6877;
+  /*background: #999;*/
+  background: #eb6877;
   color: #fff;
   font-size: 12px;
   width: 80px;
@@ -62,8 +63,9 @@ export default {
 }
 
 .red-color {
-  border-color: #eb6877;
-  background-color: #eb6877;
+  border-color: #999;
+  /*background-color: #eb6877;*/
+  background-color: #999;
   color: #fff;
 }
 </style>

layouts/defaultGds.vue

+<template>
+  <div >
+    <div :class="{'shrink-iview-layout-nuxt':isShrink}">
+      <nuxt v-if="isRouterAlive" />
+    </div>
+  </div>
+</template>
+<script>
+// import Store from 'store2'
+import Global from '../api/config'
+
+export default {
+  components: {},
+  data() {
+    return {
+      isShrink: false,
+      crumbsList: [],
+      show: false,
+      isRouterAlive: false
+    }
+  },
+  watch: {
+    $route(newRoute) {
+      this._setBreadCrumb(newRoute)
+    }
+  },
+  mounted() {
+    // this.show = true
+    this._setBreadCrumb(this.$route)
+    this.$nextTick(() => {
+      this._initLoad()
+    })
+  },
+  methods: {
+    // 刷新
+    _reload() {
+      this.isRouterAlive = false
+      this.$nextTick(() => {
+        this.isRouterAlive = true
+      })
+    },
+    // 初始化加载
+    _initLoad() {
+      if (!Global.getLn()) {
+        // 暂时没有登录-跳到首页
+        window.location.href = Global.ssoURL
+      } else {
+        this._reload()
+      }
+    },
+    // 设置面包屑
+    _setBreadCrumb(route) {
+      this.crumbsList = this.$showBread(route)
+      this._onpopstate(route)
+    },
+    _headerMenuResult(data) {
+      this.isShrink = data
+    },
+    // 判断当前页面是否可以退回
+    _onpopstate(route) {
+      // 现在就剩如何获取上一个界面的路由？？？
+      window.onpopstate = () => {
+        history.go(1)
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.iview-layout-nuxt {
+  position: absolute;
+  top: 100px;
+  left: 200px;
+  background: #fff;
+  width: -moz-calc(100% - 200px);
+  width: -webkit-calc(100% - 200px);
+  width: calc(100% - 200px);
+  height: -moz-calc(100% - 100px);
+  height: -webkit-calc(100% - 100px);
+  height: calc(100% - 100px);
+  overflow: auto;
+  padding: 10px;
+}
+.shrink-iview-layout-nuxt {
+  left: 60px;
+  width: -moz-calc(100% - 60px);
+  width: -webkit-calc(100% - 60px);
+  width: calc(100% - 60px);
+}
+</style>

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -100,12 +100,13 @@ export default {
           type: 'success',
           id: '',
           name: '提交至评审'
-        },
-        {
-          type: 'success',
-          id: '',
-          name: '提交'
         }
+        // ,
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '提交'
+        // }
       ],
       iconMsg: [
         {

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -250,7 +250,7 @@ export default {
     },
     _uploadPhoto(data) {
       // 上传照片文件
-      this.currentComponent = 'PhotoManage'
+      this.currentComponent = 'FileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(data.id, 'aloneSampleId')
       })

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue

@@ -14,6 +14,18 @@
               <Form-item class="search-item" label="样品编号:">
                 <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable/>
               </Form-item>
+              <Form-item class="search-item" label="库房号:">
+                <Input @on-enter="_formSearch" v-model="formObj.warehouse" name="warehouse" placeholder="请输入库房号" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="架位号:">
+                <Input @on-enter="_formSearch" v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请输入架位号" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="项目名称:">
+                <Input @on-enter="_formSearch" v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="钻孔名称:">
+                <Input @on-enter="_formSearch" v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" clearable/>
+              </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
@@ -31,7 +43,7 @@
               <vxe-table-column
                 :field="item.key"
                 :title="item.title"
-                :min-width="item.width?item.width:200"
+                :min-width="item.width?item.width:150"
                 :fixed="item.fixed?item.fixed:undefined"
                 v-for="item in pageColumns"
                 :key="item.key" sortable>
@@ -98,12 +110,13 @@ export default {
       btn: [],
       // 表格
       pageColumns: [
-        { title: '委托商', key: 'client' },
+        { title: '委托商', key: 'client', width: 170 },
         { title: '委托编号', key: 'entrustCode' },
         { title: '钻孔名称', key: 'boreholeName' },
         { title: '委托日期', key: 'entrustDate', date: true },
         { title: '样品编号', key: 'sampleCode' },
         { title: '现场编号', key: 'siteNo' },
+        { title: '项目名称', key: 'projectName' },
         { title: '库房号', key: 'warehouse' },
         { title: '架位号', key: 'receiveLocation' },
         { title: '进度', key: 'progress' }

pages/soil-test-manage/test-input/ViewGdsData.vue

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" width="1200">
-      <p slot="header">{{modalTitle}}</p>
       <Row>
         <Col span="24">
         <div style="overflow-y: auto">
@@ -88,6 +86,19 @@
         </Col>
         <Col span="24">
       <div>
+<!--        <element-table ref="pageTable" :tableHeight="500"  @on-result-change="_tableResultChange" :getPage="getPage">-->
+<!--          <el-table-column-->
+<!--            :prop="item.key"-->
+<!--            :label="item.title"-->
+<!--            :width="item.width"-->
+<!--            :fixed="item.fixed?item.fixed:undefined"-->
+<!--            v-for="item in pageColumns"-->
+<!--            :key="item.key" show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{scope.row[item.key]}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </element-table>-->
         <PTVXETable
           ref="pageTable"
           :form-id="formId"
@@ -119,10 +130,6 @@
       </div>
         </Col>
     </Row>
-      <div slot="footer">
-        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
-      </div>
-    </Modal>
   </div>
 </template>
 <script>
@@ -131,6 +138,8 @@
  */
 import { soilTest } from '../../../api'
 export default {
+  // layout: 'blank-layout',
+  layout: 'defaultGds',
   components: {},
   data() {
     return {
@@ -226,6 +235,10 @@ export default {
       aptitudeData: []
     }
   },
+  mounted() {
+    console.log(this.$route.query.id)
+    this._openEdit(this.$route.query.id)
+  },
   methods: {
     /** *modal-footer */
     _footerResult(name) {

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -240,8 +240,15 @@ export default {
         }
       })
     },
+    // _viewGdsData(id) {
+    //   this.$refs.viewGds._openEdit(id)
+    // },
     _viewGdsData(id) {
-      this.$refs.viewGds._openEdit(id)
+      const routeData = this.$router.resolve({
+        path: '/blank/GdsData',
+        query: { id: id }
+      })
+      window.open(routeData.href, '_blank')
     },
     _operationRecord(id) {
       this.$refs.Operation._open(id)

pages/workbench/flowIndex.vue

@@ -187,28 +187,21 @@ export default {
     // 上面连接线颜色
     upLineClassObj() {
       const valueZero = this.list.end[0].value
-      const upValue = this.list.branch[0][2].value
+      // const upValue = this.list.branch[0][2].value
       const upValueZero = this.list.branch[0][0].value
-      if (
-        upValue === undefined ||
-        upValueZero === undefined ||
-        upValue === false
-      ) {
-        return undefined
+      if (upValueZero === false) {
+        return false
       } else {
         return valueZero
       }
     },
     // 下面连接线颜色
     downLineClassObj() {
-      const valueZero = this.list.end[0].value
-      const downValue = this.list.branch[2][2].value
-      const downValueZero = this.list.branch[2][0].value
-      if (
-        downValue !== undefined ||
-        (downValue === undefined && downValueZero === undefined)
-      ) {
-        return undefined
+      const valueZero = this.list.end[0].value // true  报告编制
+      // const downValue = this.list.branch[2][2].value // false 高级自校版
+      const downValueZero = this.list.branch[2][0].value // false 高级
+      if (downValueZero === false) {
+        return false
       } else {
         return valueZero
       }
@@ -224,13 +217,20 @@ export default {
       const branchOne = this.list.branch[1][0].value
       const branchTwo = this.list.branch[2][0].value
       if (index === 2) {
-        if (branchZero !== undefined) {
+        if (branchZero !== false) {
+          if (
+            (branchZero === undefined) &
+            (branchOne === true || branchTwo === true)
+          ) {
+            return true
+          } else {
             return branchZero
           }
-        if (branchOne !== undefined) {
+        }
+        if (branchOne !== false) {
           return branchOne
         }
-        if (branchTwo !== undefined) {
+        if (branchTwo !== false) {
           return branchTwo
         }
       } else {

pages/workbench/messagePanel.vue

@@ -3,9 +3,9 @@
     <Card style="width:100%">
       <div class="config_meta">
         <p class="fl">
-          消息通知 {{ total }}
+          消息通知
         </p>
-        <div class="fr" @click="_detail">
+        <div @click="_detail" class="fr">
           <Tooltip content="查看更多" placement="left">
             <Icon type="ios-more" size="30" color="#2d8cf0" style="cursor:pointer;" />
           </Tooltip>
@@ -13,27 +13,16 @@
         <div class="clear" />
       </div>
       <div style="width: 100%;">
-        <element-table
-          ref="pageTable"
-          :page-columns="pageColumns"
-          :table-height="tableHeight"
-          :get-page="tableData"
-          show-check-box
-          hide-page
-          @on-result-change="_tableResultChange"
-        >
-          <el-table-column
-            v-for="item in pageColumns"
-            :key="item.key"
-            show-overflow-tooltip
-            sortable
-            :prop="item.key"
-            :label="item.title"
-            :align="item.align"
-            :width="item.width"
-            :min-width="200"
+        <PTVXETableHeight ref="pageTable"
+                          :table-height="300"
+                    @on-result-change="_tableResultChange" :getPage="tableData" hide-checkbox="true">
+          <vxe-table-column
+                  :field="item.key"
+                  :title="item.title"
+                  :min-width="item.width?item.width:150"
                   :fixed="item.fixed?item.fixed:undefined"
-          >
+                  v-for="item in pageColumns"
+                  :key="item.key" sortable>
             <template slot-scope="scope">
               <span v-if="item.datetime">
                 {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):'' }}
@@ -45,8 +34,8 @@
                 {{ scope.row[item.key] }}
               </span>
             </template>
-          </el-table-column>
-        </element-table>
+          </vxe-table-column>
+        </PTVXETableHeight>
       </div>
     </Card>
     <!--&lt;!&ndash;未完成检测项目列表&ndash;&gt;-->
@@ -68,7 +57,7 @@ export default {
         { title: '内容', key: 'content' },
         { title: '创建时间', key: 'ctime', datetime: true }
       ],
-      total: ''
+      formObj: {}
     }
   },
   computed: {
@@ -87,13 +76,11 @@ export default {
     _tableResultChange(msg) {},
     async _request() {
       this.$refs.pageTable._hideLoading()
-      const data = {
-        page: 1,
-        rows: 10
-      }
-      const result = await workbench.myMessagePage(data)
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await workbench.myMessagePage(this.formObj)
       if (result) {
         this.tableData = result
+        this.$refs.pageTable._hideLoading()
       }
       // this.$store.dispatch('ManufactContract/messagePage', {page: 1, rows: 7}).then(() => {
       //   let tableData = this.$store.state.ManufactContract.page.records

router/routes.js

@@ -2,7 +2,7 @@
  * 地址路由
  */
 import Lock from '../pages/Lock.vue' // 锁屏
-import workbench from '../pages/soil-sample-manage/sample-preparation/PreparationOther'
+import viewGdsData from '../pages/soil-test-manage/test-input/ViewGdsData'
 import Index from '~/pages/index'
 import Blank from '~/pages/blank'
 import SoilRouters from '~/router/soil-routes'
@@ -26,8 +26,8 @@ export default [
     meta: { title: '土工试验LIMS' }
   },
   {
-    path: '/blank/item_by_method',
-    component: workbench
+    path: '/blank/GdsData',
+    component: viewGdsData
   },
   { path: '*', redirect: '/' }
 ]