Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-07 3e28bc3615652fb8b2bd8f77c579f46f5cba8c3f

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 npminstall-debug.log

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,197 @@
{
  root: 'D:\\WorkSpace\\mes-ocea-before',
  registry: 'https://registry.npmmirror.com',
  pkgs: [],
  production: false,
  cacheStrict: false,
  cacheDir: 'C:\\Users\\86134\\.npminstall_tarball',
  env: {
    npm_config_registry: 'https://registry.npmmirror.com',
    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86134\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","-g","node-sass"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86134\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","-g","node-sass"]}',
    npm_config_user_agent: 'npminstall/7.11.1 npm/? node/v14.18.3 win32 x64',
    npm_config_cache: 'C:\\Users\\86134\\.npminstall_tarball',
    NODE: 'D:\\WorkSpace\\nodejs\\node.exe',
    npm_node_execpath: 'D:\\WorkSpace\\nodejs\\node.exe',
    npm_execpath: 'C:\\Users\\86134\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
    npm_config_userconfig: 'C:\\Users\\86134\\.cnpmrc',
    npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
    npm_config_r: 'https://registry.npmmirror.com',
    COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
    NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
    NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
    PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
    CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
    OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
    CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
    ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
    ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
    SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
    SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
    NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
    PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
    PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
    PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
    SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
    SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
    RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
    RE2_DOWNLOAD_SKIP_PATH: 'true',
    PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
    npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
    npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
    npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
    npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
    npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
    npm_rootpath: 'D:\\WorkSpace\\mes-ocea-before',
    INIT_CWD: 'D:\\WorkSpace\\mes-ocea-before'
  },
  binaryMirrors: {
    ENVS: {
      COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
      NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
      NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
      PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
      CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
      OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
      CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
      ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
      ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
      SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
      SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
      NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
      PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
      PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
      PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
      SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
      SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
      RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
      RE2_DOWNLOAD_SKIP_PATH: 'true',
      PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
      npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
      npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
      npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
      npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
      npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs'
    },
    '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' },
    sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] },
    '@tensorflow/tfjs-node': {
      replaceHostFiles: [Array],
      replaceHostRegExpMap: [Object],
      replaceHostMap: [Object]
    },
    cypress: {
      host: 'https://cdn.npmmirror.com/binaries/cypress',
      newPlatforms: [Object]
    },
    'utf-8-validate': {
      host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}'
    },
    xprofiler: {
      remote_path: './xprofiler/v{version}/',
      host: 'https://cdn.npmmirror.com/binaries'
    },
    leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' },
    couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' },
    gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' },
    sqlite3: {
      host: 'https://cdn.npmmirror.com/binaries/sqlite3',
      remote_path: 'v{version}'
    },
    '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' },
    grpc: {
      host: 'https://cdn.npmmirror.com/binaries',
      remote_path: '{name}/v{version}'
    },
    'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' },
    wrtc: {
      host: 'https://cdn.npmmirror.com/binaries',
      remote_path: '{name}/v{version}'
    },
    fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' },
    nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' },
    canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' },
    'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' },
    'flow-bin': {
      replaceHost: 'https://github.com/facebook/flow/releases/download/v',
      host: 'https://cdn.npmmirror.com/binaries/flow/v'
    },
    'jpegtran-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin'
    },
    'cwebp-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/cwebp-bin'
    },
    'zopflipng-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin'
    },
    'optipng-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/optipng-bin'
    },
    mozjpeg: {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin'
    },
    gifsicle: {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin'
    },
    'pngquant-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/pngquant-bin',
      replaceHostMap: [Object]
    },
    'pngcrush-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin'
    },
    'jpeg-recompress-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin'
    },
    'advpng-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/advpng-bin'
    },
    'pngout-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/pngout-bin'
    },
    'jpegoptim-bin': {
      replaceHost: [Array],
      host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin'
    },
    argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' },
    'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' },
    'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' },
    'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' },
    'libpg-query': { host: 'https://cdn.npmmirror.com/binaries' }
  },
  forbiddenLicenses: null,
  flatten: false,
  proxy: undefined,
  prune: false,
  disableFallbackStore: false,
  workspacesMap: Map(0) {},
  enableWorkspace: false,
  workspaceRoot: 'D:\\WorkSpace\\mes-ocea-before',
  isWorkspaceRoot: true,
  isWorkspacePackage: false,
  offline: false,
  strictSSL: true,
  ignoreScripts: false,
  foregroundScripts: false,
  ignoreOptionalDependencies: false,
  detail: true,
  forceLinkLatest: false,
  trace: false,
  engineStrict: false,
  registryOnly: false,
  client: false,
  autoFixVersion: [Function: autoFixVersion],
  targetDir: null,
  binDir: null
}

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -96,6 +96,7 @@
                        <el-table-column prop="required" label="标准值" width="240" ></el-table-column>
                        <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                            width="240" style="text-align: center;">
                            
                            <template slot-scope="scope">
                                <el-col v-if="scope.row.itype === '1'">
                                    <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 

 src/views/quality/processInspect/processInspect-form.vue

@@ -130,14 +130,36 @@
                                    <span v-if="resultVal != null && scope.row.iname != null"
                                        v-text="scope.row.ename"></span>
                                    <div v-else>
<<<<<<< HEAD
                                        <el-select style="width:100%" v-model="scope.row.eId" 
                                        v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                            <el-option v-for="(item,index) in deviceList" 
                                            :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
=======
                                        <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                            filterable @change="updateDevice(scope.row, scope.$index)">
                                            <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                :label="item.code + '-' + item.name"></el-option>
>>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                                        </el-select>
                                    </div>
                                </template>
                            </el-table-column>
                            <el-table-column  label="检验描述"
                                width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                        <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 
                                        class="item" effect="dark" content="请先选择设备！"
                                            placement="top-start">
                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.inote"
                                         placeholder="请输入检验描述"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id!=null" v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                </template>
                            </el-table-column>



                            <el-table-column label="结论" fixed="right" min-width="100">
                                <template slot-scope="scope">
                                    <div v-if="scope.row.iname != null">
@@ -231,6 +253,33 @@
    beforeUpdate() {
        this.$nextTick(() => {
            this.$refs.table.doLayout();
<<<<<<< HEAD
          })
        },
        created() {
        },
        mounted() {
            this.getDeviceList()
            this.processInspectVo.id = this.$route.query.id
            this.resultVal = this.$route.query.resultVal
            if(this.resultVal == null){
                let val = sessionStorage.getItem("process-resultVal-"+this.processInspectVo.id);
                val == undefined ? this.resultVal=null : this.resultVal = val
            }
            this.init()
        },
        methods: {
            
            submitSave(){
                let pro = 0
                console.log(this.inspectionItems);
                this.inspectionItems.forEach(item => {
                    if(item.children){
                        let arr = item.children.filter(obj=>{
                                return obj.iresult == 0;
                        })
                        pro+=arr.length
=======
        })
    },
    created() {
@@ -267,6 +316,7 @@
                    let data = {
                        id: this.processInspectVo.id,
                        number: value
>>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                    }
                    updateProcessInspectsById(data).then(res => {
                        let data = res.data.data
@@ -370,6 +420,178 @@
                        obj.children[index - 1].empiricalValueAddss = []
                    }
                })
<<<<<<< HEAD
                this.resultVal = resultVal
                this.inspectionResultForm[0].result = resultVal
                sessionStorage.setItem("process-resultVal-"+this.processInspectVo.id,resultVal)
            },
            init(){
                let id = this.processInspectVo.id
                if(id != null){
                    queryById(id).then(res=>{
                        console.log(res)
                        let result = res.data.data
                        this.processInspectVo.orderNumber = result.orderNumber
                        this.processInspectVo.materialCode = result.materialCode
                        this.processInspectVo.material = result.material
                        this.processInspectVo.technologyOperationId = result.technologyOperationName
                        this.processInspectVo.specs = result.specs
                        this.processInspectVo.unit = result.punit
                        this.processInspectVo.quantity = result.quantity
                        let userList = []
                        result.children.forEach(item=>{
                            item.iid = Math.random()
                            if(item.children != undefined){
                            
                                item.children.forEach(obj=>{
                                    let arr = []
                                    if(obj.userName){
                                        userList.push(obj.userName)
                                    }
                                    if(obj.inspectionValue){
                                        arr = obj.inspectionValue.split(",")
                                    }
                                    obj.empiricalValueAddss = arr
                                    if(obj.note){
                                        snote=obj.inote
                                    }
                                    if(arr.length > this.empiricalValueAdd){
                                        this.empiricalValueAdd = arr.length
                                    }
                                })
                            }
                        })
                        this.inspectionItems = result.children
                        console.log(result.children)
                        this.inspectionResultForm = [{
                            materialCode: result.materialCode,
                            material: result.material,
                            userName: Array.from(new Set(userList)).join(","),
                            result: this.resultVal == null ? '' : this.resultVal,
                        }]
                    }).catch(error=>{
                        console.log(error)
                    })
                }
            },
            getDeviceList(){
                selectDevice(null).then(res=>{
                    this.deviceList = res.data.data
                    console.log(this.deviceList);
                })
            },
            updateDevice(row,index){
                console.log(row);
                updateDeviceBypppId({equiomentId:row.eId,ppid:row.iId}).then(res=>{
                    this.inspectionItems.forEach(obj=>{
                        if(obj.children){
                            obj.children[index-1].inspectionValue = ''
                            obj.children[index-1].iresult = null
                            obj.children[index-1].empiricalValueAddss = []
                             obj.children[index-1].inote=''
                        }
                    })
                }).catch(error=>{
                    console.log(error)
                })
            },
            //产品名称，选择
            changeOptionsSamplename(val) {
                let sample = this.optionsSamplename.filter(o=>{
                    return o.materialCode == val
                })[0]
                this.processInspectVo.materialCode = sample.materialCode
                this.processInspectVo.specs = sample.specs
                this.processInspectVo.unit = sample.unit
                this.processInspectVo.material = sample.material
                this.technologyList = sample.children
            },
            changeState(row, index) {
                console.log(row)
                
                if (row.iid != null && row.iid != '') {
                    let str = ""
                    row.empiricalValueAddss.forEach(e => {
                        str += e + ","
                    })
                    str = str.slice(0,-1);
                    if (str === undefined || str === '' || str === null ) {
                        return
                    }

                // if ( note === undefined || str === '' || str === null ) {
                //         return
                //     }
                    
                    let obj = {
                        equiomentId: row.eId,
                        ppid: row.iid,
                        inspectionValue: str,
                        note:row.inote,
                    
                    }
                  
                    updateProcessInsProduct(obj).then(res=>{
                        if(res.data.code == 0){
                            this.$message.success("更新成功")
                        }else{
                            this.$message.error("更新失败")
                        }
                        this.init()
                    })
                }
            },
            addTestProject() {
                let val = this.processInspectVo
                addProcess(val).then(res=>{
                    let id = res.data.data
                    if(id != null){
                        queryById(id).then(response=>{
                            console.log(response.data.data.children)
                            let proList = response.data.data.children
                            proList.forEach(item=>{
                                item.iid = Math.random();
                                if(item.children != undefined){
                                    item.children.forEach(obj=>{
                                        obj.empiricalValueAddss = []
                                        // obj.note=[];
                                    })
                                }
                            })
                            this.inspectionItems = proList
                        }).catch(error=>{
                            console.log(error);
                        })
                    }
                }).catch(error=>{
                    console.log(error)
                })
            },
            selectInfoByOrderId() {
                chooseMater({
                        orderNumber: this.processInspectVo.orderNumber
                    }).then(res => {
                    
                    if (res.data.data != null) {
                        this.optionsSamplename = res.data.data.children
                        
                    } else {
                        this.$message({
                            message: '没有该订单号！',
                            type: 'warning'
                        });
                        this.optionsSamplename = []
                        this.processInspectVo.materialCode = null
                        this.processInspectVo.material = null
                        this.processInspectVo.specs = null
                        this.processInspectVo.unit = null
                    }
                })
            },
            // åˆ é™¤æ£€éªŒå€¼åˆ—
            clickDeleteInspectionColumn() {
                if (this.empiricalValueAdd - 1 === 0) {
=======
            }).catch(error => {
                console.log(error)
            })
@@ -441,6 +663,7 @@
            }).then(res => {
                if (res.data.data != null) {
                    this.optionsSamplename = res.data.data.children
>>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                } else {
                    this.$message({
                        message: '没有该订单号！',

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -114,7 +114,16 @@
                :data="list" border style="width: 100%;" height="400">
                  <el-table-column type="index" label="序号" width="60">
                  </el-table-column>

                  <el-table-column prop="father" label="检验项目" width="260">
                    <template slot-scope="scope">
                      <el-input :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="note" label="检验描述" width="260">
                    <template slot-scope="scope">
                      <el-input :disabled="dataForm.id != null" v-model="scope.row.note" placeholder="检验描述"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="260">
                    <template slot-scope="scope">
                      <el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
@@ -315,6 +324,8 @@
      this.init()
      this.getDeviceList()
      this.restaurants = this.loadAll();
      
      console.log(this.dataForm);
    },
    watch:{
      dialogVisible(newVal){