renren/spc
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
朱文强 2024-01-23 15:10:32 +08:00
parent 5a4568a495
commit 8648c0ffb2
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/index.html
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-08-22 14:57:50 * @Date: 2022-08-22 14:57:50
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-06-27 15:48:06 * @LastEditTime: 2024-01-22 10:41:58
* @Description: * @Description:
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -37,7 +37,7 @@
<!-- 开发环境 --> <!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.44:8999/ym-spc'; window.SITE_CONFIG['apiURL'] = 'http://192.168.1.65:8080/ym-spc';
//http://demo.open.renren.io/renren-security-server //http://demo.open.renren.io/renren-security-server
//http://192.168.1.44:8080/ym-spc //http://192.168.1.44:8080/ym-spc
</script> </script>
@ -57,7 +57,7 @@
<!-- 生产环境 --> <!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc'; window.SITE_CONFIG['apiURL'] = '/spcserver';
</script> </script>
<% } %> <% } %>
</head> </head>

30
src/views/process-inspection/query-form.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-09-15 10:44:29 * @Date: 2022-09-15 10:44:29
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-06-28 15:11:18 * @LastEditTime: 2024-01-19 16:42:06
* @Description: * @Description:
--> -->
<template> <template>
@ -18,6 +18,8 @@
type="daterange" type="daterange"
v-model="dataForm.time" v-model="dataForm.time"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss"
:default-time="['00:00:00', '23:59:59']"
:style="{ width: '100%' }" :style="{ width: '100%' }"
:start-placeholder="$t('module.basicData.startTime')" :start-placeholder="$t('module.basicData.startTime')"
:end-placeholder="$t('module.basicData.endTime')" :end-placeholder="$t('module.basicData.endTime')"
@ -49,7 +51,7 @@
<el-form-item :label="$t('module.basicData.product')" prop="productId"> <el-form-item :label="$t('module.basicData.product')" prop="productId">
<el-select <el-select
v-model="dataForm.productId" v-model="dataForm.productId"
:placeholder="$t('placeholder.second')+$t('module.basicData.product')" :placeholder="$t('placeholder.second') + $t('module.basicData.product')"
@change="getWorkingprocedureByProductId" @change="getWorkingprocedureByProductId"
filterable filterable
clearable clearable
@ -70,7 +72,7 @@
<el-select <el-select
v-model="dataForm.inspectionStage" v-model="dataForm.inspectionStage"
@change="getFeaturesList()" @change="getFeaturesList()"
:placeholder="$t('placeholder.second')+$t('module.basicData.inspectionType')" :placeholder="$t('placeholder.second') + $t('module.basicData.inspectionType')"
filterable filterable
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -89,7 +91,7 @@
<el-select <el-select
v-model="dataForm.workingProcedureId" v-model="dataForm.workingProcedureId"
@change="$forceUpdate(), getFeaturesList()" @change="$forceUpdate(), getFeaturesList()"
:placeholder="$t('placeholder.second')+$t('module.basicData.procedure')" :placeholder="$t('placeholder.second') + $t('module.basicData.procedure')"
filterable filterable
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -108,7 +110,7 @@
<el-form-item :label="$t('module.basicData.features')" prop="productFeaturesId"> <el-form-item :label="$t('module.basicData.features')" prop="productFeaturesId">
<el-select <el-select
v-model="dataForm.productFeaturesId" v-model="dataForm.productFeaturesId"
:placeholder="$t('placeholder.second')+$t('module.basicData.features')" :placeholder="$t('placeholder.second') + $t('module.basicData.features')"
filterable filterable
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -127,7 +129,7 @@
<el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize"> <el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize">
<el-input-number <el-input-number
v-model="dataForm.sampleSize" v-model="dataForm.sampleSize"
:placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')" :placeholder="$t('placeholder.first') + $t('module.basicData.sampleSize')"
:step="1" :step="1"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
@ -135,9 +137,9 @@
<el-col :span="6" v-if="groupTypeShow"> <el-col :span="6" v-if="groupTypeShow">
<el-form-item :label="$t('module.basicData.grouping')" prop="groupType"> <el-form-item :label="$t('module.basicData.grouping')" prop="groupType">
<el-radio-group v-model="dataForm.groupType"> <el-radio-group v-model="dataForm.groupType">
<el-radio :label="1">{{ $t('Year') }}</el-radio> <el-radio :label="1">{{ $t("Year") }}</el-radio>
<el-radio :label="2">{{ $t('Month') }}</el-radio> <el-radio :label="2">{{ $t("Month") }}</el-radio>
<el-radio :label="3">{{ $t('Day') }}</el-radio> <el-radio :label="3">{{ $t("Day") }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -145,21 +147,21 @@
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button size="small" @click="getDataList()">
<svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg> <svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
{{ $t('query')}} {{ $t("query") }}
</el-button> </el-button>
<el-button v-if="showRaw" size="small" type="primary" @click="rawData()"> <el-button v-if="showRaw" size="small" type="primary" @click="rawData()">
<svg class="icon-svg"><use xlink:href="#历史记录"></use></svg> <svg class="icon-svg"><use xlink:href="#历史记录"></use></svg>
{{ $t('module.basicData.rawData')}} {{ $t("module.basicData.rawData") }}
</el-button> </el-button>
<el-button size="small" type="primary" @click="exportHandle()"> <el-button size="small" type="primary" @click="exportHandle()">
<svg class="icon-svg"> <svg class="icon-svg">
<use xlink:href="#导出"></use> <use xlink:href="#导出"></use>
</svg> </svg>
{{ $t('export')}} {{ $t("export") }}
</el-button> </el-button>
<el-button v-if="!groupTypeShow" size="small" type="primary" @click="showScheme()"> <el-button v-if="!groupTypeShow" size="small" type="primary" @click="showScheme()">
<svg class="icon-svg"><use xlink:href="#方案管理"></use></svg> <svg class="icon-svg"><use xlink:href="#方案管理"></use></svg>
{{ $t('module.basicData.configurationAnalysisPlan')}} {{ $t("module.basicData.configurationAnalysisPlan") }}
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -200,7 +202,7 @@ export default {
showRaw: { showRaw: {
type: Boolean, type: Boolean,
default: false, default: false,
} },
}, },
components: { components: {
interpretationScheme, interpretationScheme,