2024-06-26

功能优化

build/utils.js

@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        fallback: 'vue-style-loader'
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
       })
     } else {
       return ['vue-style-loader'].concat(loaders)

src/api/qc/qc.js

@@ -181,3 +181,4 @@ export const getFQCItemObjectList = data => createAPI(`/pms/qc/getFQCItemObjectL
 export const getIPQCItemObjectList = data => createAPI(`/pms/qc/getIPQCItemObjectList`,'post',data)
 export const getInspectionStandards = data => createAPI(`/pms/qc/getInspectionStandards`,'post',data)
 export const saveInspectionStandard = data => createAPI(`/pms/qc/saveInspectionStandard`,'post',data)
+export const dataAcquisitionByItem = data => createAPI(`/pms/qc/dataAcquisitionByItem`,'post',data)

src/main.js

@@ -8,6 +8,7 @@ import dayjs from 'dayjs';
 import '@/element-ui'                         // api: https://github.com/ElemeFE/element
 import '@/icons'                              // api: http://www.iconfont.cn/
 import '@/element-ui-theme'
+import 'element-ui/lib/theme-chalk/icon.css'
 import '@/assets/scss/index.scss'
 import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios
 

src/views/modules/qc/FAIResultEntry.vue

@@ -390,7 +390,8 @@
           <el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+          <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
+<!--          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>-->
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
         </el-form-item>
       </el-form>
@@ -429,10 +430,11 @@
           prop=""
           header-align="center"
           align="center"
-          min-width="60"
+          min-width="90"
           label="操作">
           <template slot-scope="scope">
             <el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
+            <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -737,6 +739,11 @@
 
     <!-- 文件清单 -->
     <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item v-if="detailInformationFlag">
+          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :height="350"
         :data="fileContentList"
@@ -883,7 +890,7 @@
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传文件的modal -->
-    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
 
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@@ -923,6 +930,7 @@
     dataAcquisition, // 数据采集
     getResponsibleOperatorList, // 获取责任人列表
     getFAIItemObjectList, // 查询项目设备
+    dataAcquisitionByItem, // 根据项目数据采集
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -2403,6 +2411,35 @@
         })
       },
 
+      // 根据项目数据采集
+      dataAcquisitionByItem (row) {
+        this.loadFlag = true
+        let tempDate = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          itemNo: row.itemNo,
+          flag: 'fai'
+        }
+        dataAcquisitionByItem(tempDate).then(({data}) => {
+          if (data.code === 0) {
+            this.changeMyString(data.rows)
+            this.$message({
+              message: '数据采集成功',
+              type: 'success',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'warning',
+              duration: 1500
+            })
+          }
+          this.loadFlag = false
+        })
+      },
+
       // 获取用户角色
       getUserRoleList () {
         getUserRoleList().then(({data}) => {

src/views/modules/qc/FQCResultEntry.vue

@@ -375,7 +375,8 @@
           <el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+          <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
+<!--          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>-->
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
         </el-form-item>
       </el-form>
@@ -414,10 +415,11 @@
           prop=""
           header-align="center"
           align="center"
-          min-width="60"
+          min-width="90"
           label="操作">
           <template slot-scope="scope">
             <el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
+            <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -656,6 +658,11 @@
 
     <!-- 文件清单 -->
     <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item v-if="detailInformationFlag">
+          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :height="350"
         :data="fileContentList"
@@ -859,7 +866,7 @@
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传文件的modal -->
-    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
 
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@@ -900,6 +907,7 @@
     dataAcquisition, // 数据采集
     getResponsibleOperatorList, // 获取责任人列表
     getFQCItemObjectList, // 查询项目设备
+    dataAcquisitionByItem, // 根据项目数据采集
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -2378,6 +2386,35 @@
         })
       },
 
+      // 根据项目数据采集
+      dataAcquisitionByItem (row) {
+        this.loadFlag = true
+        let tempDate = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          itemNo: row.itemNo,
+          flag: 'fqc'
+        }
+        dataAcquisitionByItem(tempDate).then(({data}) => {
+          if (data.code === 0) {
+            this.changeMyString(data.rows)
+            this.$message({
+              message: '数据采集成功',
+              type: 'success',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'warning',
+              duration: 1500
+            })
+          }
+          this.loadFlag = false
+        })
+      },
+
       // 获取用户角色
       getUserRoleList () {
         getUserRoleList().then(({data}) => {

src/views/modules/qc/IPQCResultEntry.vue

@@ -388,7 +388,8 @@
           <el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+          <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
+<!--          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>-->
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
         </el-form-item>
       </el-form>
@@ -427,10 +428,11 @@
           prop=""
           header-align="center"
           align="center"
-          min-width="60"
+          min-width="90"
           label="操作">
           <template slot-scope="scope">
             <el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
+            <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -518,7 +520,7 @@
     </el-dialog>
 
     <!-- 子明细信息 -->
-    <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="572px">
+    <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="736px">
       <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
       <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button>
       <el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button>
@@ -544,10 +546,16 @@
             <el-input v-else :ref="`${row.xh-1}` + `b`" v-model="tableData[row.xh-1].samplingLocationB" @keyup.enter.native="nextFocus2(row.xh-1)" placeholder="请输入抽样位置B"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="150">
+        <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值A" width="150">
+          <template slot-scope="{row}">
+            <el-input v-if="tableData[row.xh-1].isSubmit === 'Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值A"></el-input>
+            <el-input v-else :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值A"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="subDetailValueB" header-align="center" align="center" :required="true" label="实测值B" width="150">
           <template slot-scope="{row}">
-            <el-input v-if="tableData[row.xh-1].isSubmit === 'Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
-            <el-input v-else :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值"></el-input>
+            <el-input v-if="tableData[row.xh-1].isSubmit === 'Y'" v-model="tableData[row.xh-1].subDetailValueB" readonly placeholder="请输入实测值B"></el-input>
+            <el-input v-else :ref="`${row.xh-1}` + `d`" v-model="tableData[row.xh-1].subDetailValueB" @keyup.enter.native="nextFocus4(row.xh-1)" placeholder="请输入实测值B"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -735,6 +743,11 @@
 
     <!-- 文件清单 -->
     <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item v-if="detailInformationFlag">
+          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :height="350"
         :data="fileContentList"
@@ -880,7 +893,7 @@
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传文件的modal -->
-    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
 
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@@ -920,6 +933,7 @@
     dataAcquisition, // 数据采集
     getResponsibleOperatorList, // 获取责任人列表
     getIPQCItemObjectList, // 查询项目设备
+    dataAcquisitionByItem, // 根据项目数据采集
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -2432,6 +2446,35 @@
         })
       },
 
+      // 根据项目数据采集
+      dataAcquisitionByItem (row) {
+        this.loadFlag = true
+        let tempDate = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          itemNo: row.itemNo,
+          flag: 'ipqc'
+        }
+        dataAcquisitionByItem(tempDate).then(({data}) => {
+          if (data.code === 0) {
+            this.changeMyString(data.rows)
+            this.$message({
+              message: '数据采集成功',
+              type: 'success',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'warning',
+              duration: 1500
+            })
+          }
+          this.loadFlag = false
+        })
+      },
+
       // 获取用户角色
       getUserRoleList () {
         getUserRoleList().then(({data}) => {
@@ -3607,9 +3650,12 @@
       handleAddBtn (td) {
         checkIPQCIsSubmit(td).then(({data}) => {
           if (data.flag !== 1) {
-            let obj = {}
-            obj.subDetailValue = ""
-            obj.samplingLocation = ""
+            let obj = {
+              subDetailValue: '',
+              samplingLocation: '',
+              samplingLocationB: '',
+              subDetailValueB: ''
+            }
             this.tableData.push(obj)
           } else {
             this.$alert("记录已提交！", '错误', {
@@ -3635,10 +3681,12 @@
       // 批量新增行
       batchHandleAddModal () {
         for (let i = 0; i < this.batchAddData.samplingNumber; i++) {
-          let obj = {}
-          obj.samplingLocation = this.batchAddData.samplingLocation
-          obj.samplingLocationB = this.batchAddData.samplingLocationB
-          obj.subDetailValue = ""
+          let obj = {
+            samplingLocation: this.batchAddData.samplingLocation,
+            samplingLocationB: this.batchAddData.samplingLocationB,
+            subDetailValue: '',
+            subDetailValueB: ''
+          }
           this.tableData.push(obj)
         }
         this.batchHandleAddModalFlag = false
@@ -3663,6 +3711,12 @@
           this.$refs[a3].focus()
         })
       },
+      nextFocus4 (index) {
+        let a3 = `${index + 1}` + `d`
+        this.$nextTick(() => {
+          this.$refs[a3].focus()
+        })
+      },
       focusNextInput (index, type) {
         let aaa = ''
         if (this.detailList.length - 1 === index) {

src/views/modules/qc/IQCResultEntry.vue

@@ -260,7 +260,8 @@
           <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+          <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
+<!--          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>-->
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
         </el-form-item>
       </el-form>
@@ -299,10 +300,11 @@
             prop=""
             header-align="center"
             align="center"
-            min-width="60"
+            min-width="90"
             label="操作">
             <template slot-scope="scope">
               <el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
+              <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -368,7 +370,7 @@
             prop=""
             header-align="center"
             align="right"
-            min-width="75"
+            min-width="90"
             label="项目检验结论">
             <template slot-scope="scope">
               <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
@@ -391,6 +393,11 @@
 
     <!-- 文件清单 -->
     <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item v-if="detailInformationFlag">
+          <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :height="350"
         :data="fileContentList"
@@ -594,7 +601,7 @@
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传文件的modal -->
-    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
 
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@@ -625,6 +632,7 @@
     dataAcquisition, // 数据采集
     getResponsibleOperatorList, // 获取责任人列表
     getIQCItemObjectList, // 查询项目设备
+    dataAcquisitionByItem, // 根据项目数据采集
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -1716,6 +1724,35 @@
         })
       },
 
+      // 根据项目数据采集
+      dataAcquisitionByItem (row) {
+        this.loadFlag = true
+        let tempDate = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          itemNo: row.itemNo,
+          flag: 'iqc'
+        }
+        dataAcquisitionByItem(tempDate).then(({data}) => {
+          if (data.code === 0) {
+            this.changeMyString(data.rows)
+            this.$message({
+              message: '数据采集成功',
+              type: 'success',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'warning',
+              duration: 1500
+            })
+          }
+          this.loadFlag = false
+        })
+      },
+
       // 获取用户角色
       getUserRoleList () {
         getUserRoleList().then(({data}) => {

src/views/modules/qc/qcItem.vue

@@ -197,7 +197,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="采集数据来源">
-          <el-select multiple v-model="modalData.collectionSourceList" style="width: 260px">
+          <el-select multiple collapse-tags v-model="modalData.collectionSourceList" style="width: 220px">
             <el-option label="采集数据01" value="value0"></el-option>
             <el-option label="采集数据02" value="value1"></el-option>
             <el-option label="采集数据03" value="value2"></el-option>
@@ -209,13 +209,15 @@
             <el-option label="采集数据09" value="value8"></el-option>
             <el-option label="采集数据10" value="value9"></el-option>
             <el-option label="图片采集" value="photo_value1"></el-option>
+            <el-option label="文件采集" value="file_value1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="采集数据方式">
-          <el-select multiple v-model="modalData.collectionMethodList" style="width: 180px">
-            <el-option label="PLC" value="plc"></el-option>
-            <el-option label="文件" value="file"></el-option>
-            <el-option label="图片" value="image"></el-option>
+          <el-select multiple collapse-tags v-model="modalData.collectionMethodList" style="width: 220px">
+            <el-option label="PLC数据" value="plc"></el-option>
+            <el-option label="文件数据" value="file"></el-option>
+            <el-option label="图片路径" value="image"></el-option>
+            <el-option label="文件路径" value="fileUrl"></el-option>
           </el-select>
         </el-form-item>
       </el-form>

src/views/modules/qc/qc_FAI_upload_file.vue

@@ -123,6 +123,8 @@ export default {
           this.$refs.uploadFile.clearFiles()
           this.pageData.fileRemark = ''
           this.fileList = []
+          // 刷新报工的页面
+          this.$emit('refreshPageTables')
         } else {
           this.$message.warning(data.msg)
         }