更新
This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-08-22 14:57:50
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:48:06
 | 
			
		||||
 * @LastEditTime: 2024-01-22 10:41:58
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<!DOCTYPE html>
 | 
			
		||||
@@ -37,7 +37,7 @@
 | 
			
		||||
  <!-- 开发环境 -->
 | 
			
		||||
  <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
 | 
			
		||||
    <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://192.168.1.44:8080/ym-spc
 | 
			
		||||
    </script>
 | 
			
		||||
@@ -57,7 +57,7 @@
 | 
			
		||||
  <!-- 生产环境 -->
 | 
			
		||||
  <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
 | 
			
		||||
    <script>
 | 
			
		||||
      window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
 | 
			
		||||
      window.SITE_CONFIG['apiURL'] = '/spcserver';
 | 
			
		||||
    </script>
 | 
			
		||||
  <% } %>
 | 
			
		||||
</head>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:44:29
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-28 15:11:18
 | 
			
		||||
 * @LastEditTime: 2024-01-19 16:42:06
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -18,6 +18,8 @@
 | 
			
		||||
              type="daterange"
 | 
			
		||||
              v-model="dataForm.time"
 | 
			
		||||
              format="yyyy-MM-dd"
 | 
			
		||||
              value-format="yyyy-MM-dd hh:mm:ss"
 | 
			
		||||
              :default-time="['00:00:00', '23:59:59']"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              :start-placeholder="$t('module.basicData.startTime')"
 | 
			
		||||
              :end-placeholder="$t('module.basicData.endTime')"
 | 
			
		||||
@@ -49,7 +51,7 @@
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.product')" prop="productId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.productId"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.product')"
 | 
			
		||||
              :placeholder="$t('placeholder.second') + $t('module.basicData.product')"
 | 
			
		||||
              @change="getWorkingprocedureByProductId"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
@@ -70,7 +72,7 @@
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.inspectionStage"
 | 
			
		||||
              @change="getFeaturesList()"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.inspectionType')"
 | 
			
		||||
              :placeholder="$t('placeholder.second') + $t('module.basicData.inspectionType')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -89,7 +91,7 @@
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.workingProcedureId"
 | 
			
		||||
              @change="$forceUpdate(), getFeaturesList()"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
 | 
			
		||||
              :placeholder="$t('placeholder.second') + $t('module.basicData.procedure')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -108,7 +110,7 @@
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.features')" prop="productFeaturesId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.productFeaturesId"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.features')"
 | 
			
		||||
              :placeholder="$t('placeholder.second') + $t('module.basicData.features')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -127,7 +129,7 @@
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              v-model="dataForm.sampleSize"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
 | 
			
		||||
              :placeholder="$t('placeholder.first') + $t('module.basicData.sampleSize')"
 | 
			
		||||
              :step="1"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
@@ -135,9 +137,9 @@
 | 
			
		||||
        <el-col :span="6" v-if="groupTypeShow">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.grouping')" prop="groupType">
 | 
			
		||||
            <el-radio-group v-model="dataForm.groupType">
 | 
			
		||||
              <el-radio :label="1">{{ $t('Year') }}</el-radio>
 | 
			
		||||
              <el-radio :label="2">{{ $t('Month') }}</el-radio>
 | 
			
		||||
              <el-radio :label="3">{{ $t('Day') }}</el-radio>
 | 
			
		||||
              <el-radio :label="1">{{ $t("Year") }}</el-radio>
 | 
			
		||||
              <el-radio :label="2">{{ $t("Month") }}</el-radio>
 | 
			
		||||
              <el-radio :label="3">{{ $t("Day") }}</el-radio>
 | 
			
		||||
            </el-radio-group>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -145,21 +147,21 @@
 | 
			
		||||
          <el-form-item>
 | 
			
		||||
            <el-button size="small" @click="getDataList()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
 | 
			
		||||
              {{ $t('query')}}
 | 
			
		||||
              {{ $t("query") }}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button v-if="showRaw" size="small" type="primary" @click="rawData()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#历史记录"></use></svg>
 | 
			
		||||
              {{ $t('module.basicData.rawData')}}
 | 
			
		||||
              {{ $t("module.basicData.rawData") }}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button size="small" type="primary" @click="exportHandle()">
 | 
			
		||||
              <svg class="icon-svg">
 | 
			
		||||
                <use xlink:href="#导出"></use>
 | 
			
		||||
              </svg>
 | 
			
		||||
              {{ $t('export')}}
 | 
			
		||||
              {{ $t("export") }}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button v-if="!groupTypeShow" size="small" type="primary" @click="showScheme()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#方案管理"></use></svg>
 | 
			
		||||
              {{ $t('module.basicData.configurationAnalysisPlan')}}
 | 
			
		||||
              {{ $t("module.basicData.configurationAnalysisPlan") }}
 | 
			
		||||
            </el-button>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -200,7 +202,7 @@ export default {
 | 
			
		||||
    showRaw: {
 | 
			
		||||
      type: Boolean,
 | 
			
		||||
      default: false,
 | 
			
		||||
    }
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  components: {
 | 
			
		||||
    interpretationScheme,
 | 
			
		||||
 
 | 
			
		||||
		Referens i nytt ärende
	
	Block a user