From 8fdd04dca4a054ea545354e4cf20810418f3f1ef Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 23 Nov 2023 13:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=BA=A7=E8=81=94=E4=BB=A5=E5=8F=8Aecharts=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E5=87=86=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/spc/itembasic/index.ts                |   4 +
 src/api/spc/project/index.ts                  |   2 +-
 .../ImportForm/src/DetecImportForm.vue        | 412 ++++++++++++++++++
 src/components/ImportForm/src/ImportForm.vue  | 112 -----
 src/views/Login/components/LoginForm.vue      |   2 +-
 src/views/Login/components/MobileForm.vue     |   2 +-
 src/views/detection/records/index.vue         |   5 +-
 src/views/tjanalysis/zlanalysis/index.vue     |  62 ++-
 8 files changed, 470 insertions(+), 131 deletions(-)
 create mode 100644 src/components/ImportForm/src/DetecImportForm.vue

diff --git a/src/api/spc/itembasic/index.ts b/src/api/spc/itembasic/index.ts
index fd23503..f50d2f9 100644
--- a/src/api/spc/itembasic/index.ts
+++ b/src/api/spc/itembasic/index.ts
@@ -84,4 +84,8 @@ export const importTemplate = () => {
 
 export const selectItems = async () => {
   return await request.get({ url: `/spc/itembasic/selectItems`})
+}
+
+export const selectItemsByProjectCode = async (code:String) => {
+  return await request.get({ url: `/spc/itembasic/selectItemsByProjectCode?code=` + code})
 }
\ No newline at end of file
diff --git a/src/api/spc/project/index.ts b/src/api/spc/project/index.ts
index a43adae..288afb6 100644
--- a/src/api/spc/project/index.ts
+++ b/src/api/spc/project/index.ts
@@ -55,6 +55,6 @@ export const importTemplate = () => {
   return request.download({ url: '/spc/project/get-import-template' })
 }
 
-export const selectAllPros = async () => {
+export const selectAllPros = async () => {//查询所有的项目
   return await request.get({ url: `/spc/project/selectAllPros`})
 }
\ No newline at end of file
diff --git a/src/components/ImportForm/src/DetecImportForm.vue b/src/components/ImportForm/src/DetecImportForm.vue
new file mode 100644
index 0000000..6ef2ff9
--- /dev/null
+++ b/src/components/ImportForm/src/DetecImportForm.vue
@@ -0,0 +1,412 @@
+<!-- 导入组件 -->
+<template>
+  <Dialog v-model="dialogVisible" title="导入" width="800">
+    <el-form
+        :inline="true"
+        :model="queryParams"
+        class="demo-form-inline"
+        style="margin-bottom: 10px"
+        label-width="100px"
+      >
+        <el-form-item label="项目" style="width: calc(26%)">
+          <el-select
+            v-model="queryParams.proCode"
+            placeholder="请选择项目"
+            clearable
+            style="width: 100%"
+            @change="detectionProjectChange"
+          >
+            <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" style="width: calc(26%)">
+          <el-select
+            v-model="queryParams.itemCode"
+            placeholder="请选择物料"
+            clearable
+            style="width: 100%"
+            @change="detectionItemChange"
+          >
+            <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检测类型" style="width: calc(26%)">
+          <el-select
+            v-model="queryParams.detectionType"
+            placeholder="请选择检测类型"
+            clearable
+            style="width: 100%"
+            @change="detectionTypeChange"
+          >
+            <el-option v-for="dict in dictTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-upload v-if="uploadOpen" ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
+      :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
+      :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
+      style="width:300px;margin:0 auto">
+      <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip ml--126px mr--80px">
+          <div class="flex">
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px  w-100px text-right" style="line-height:32px">导入模式</div>
+            <div class="">
+              <div class="radio">
+                <el-radio-group v-model="mode">
+                  <el-radio :label="1" :disabled="updateIsDisable">更新</el-radio>
+                  <el-radio :label="2" :disabled="appendIsDisable">追加</el-radio>
+                  <el-radio :label="3" :disabled="coverIsDisable">覆盖</el-radio>
+                </el-radio-group>
+              </div>
+
+              <div class="tips color-#acaeb3 font-size-14px">
+                <div class="mt-2">更新：新增并修改</div>
+                <div class="mt-2">追加：只新增，不修改</div>
+                <div class="mt-2">覆盖：只修改不新增</div>
+              </div>
+            </div>
+          </div>
+          <div class="flex mt-16px">
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">部分保存</div>
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="updatePart" />
+              </div>
+              <div class="tips color-#acaeb3 font-size-14px">
+                <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
+                <div class="mt-2">全部保存：全部数据正确，才能导入</div>
+              </div>
+            </div>
+          </div>
+          <div class="flex mt-16px" v-if="isShowOut">
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">是否外部资源</div>
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="outFile" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <div class="flex items-center">
+        <div class="flex-1 text-left">
+          <el-button type="primary" plain @click="importTemplate">
+          <Icon icon="ep:download" />
+          下载模板
+        </el-button>
+        </div>
+        <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+
+defineOptions({ name: 'ImportForm' })
+import * as ZlnalysisAPI from '@/api/tjanalysis/zlanalysis'
+import * as ProjecAPI from '@/api/spc/project'
+import * as ItembasicApi from '@/api/spc/itembasic'
+import * as TemplateItemDetailsApi from '@/api/spc/templateItemDetails'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {formatDate} from '@/utils/formatTime'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const file = ref('')
+
+const queryParams = reactive({
+  proCode: '',
+  itemCode: '',
+  detectionType: '',
+  detectionItemContentId: null,
+  ecTab: '1'
+})
+const uploadOpen=ref(false)
+
+ const props = defineProps({
+  importTemplateData: {
+    type: Object,
+    required: true
+  },
+  // 可以导入的文件类型
+  accept: {
+    type: String,
+    required: false,
+    default:'.xlsx,.xls'
+  },
+  // 是否更新已经存在的用户数据.默认值是1
+  mode: {
+    type: Number,
+    required: false,
+    default: 1
+  },
+  // 更新是否禁用,默认值不禁用
+  updateIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 追加是否禁用,默认值不禁用
+  appendIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 覆盖是否禁用,默认值不禁用
+  coverIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 是否部门保存,默认是
+  updatePart: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  url:{
+    type: String,
+    required: false,
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  outFile: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+})
+const importTemplateData= ref(props.importTemplateData)
+const  accept= ref(props.accept)
+const  mode = ref(props.mode)//是否更新已经存在的用户数据.默认值是1
+const updateIsDisable = ref(props.updateIsDisable)//更新是否禁用,默认值不禁用
+const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值不禁用
+const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
+const updatePart = ref(props.updatePart)//是否部门保存
+const outFile = ref(props.outFile)//是否引入外部资源
+
+
+
+// 项目列表
+const projectList = ref()
+// 物料列表
+const itemList = ref()
+
+// 类型列表
+const dictTypeList = ref()
+
+
+
+const getProject = async () => {//获取所有项目数据列表
+  const _projectList = await ProjecAPI.selectAllPros()
+  if (_projectList != null && _projectList.length != 0) {
+    projectList.value = _projectList
+    let  code = projectList.value[0].code;
+    queryParams.proCode = code;
+    await _itemList(code);
+  }
+} 
+
+
+//根据项目code获取物料列表
+const _itemList =async (projectCode)=>{
+  itemList.value = []
+  const _itemList = await ItembasicApi.selectItemsByProjectCode(projectCode);
+  if (_itemList != null && _itemList.length != 0) {
+    itemList.value = _itemList
+    queryParams.itemCode = itemList.value[0].code
+    dictOptions();
+  }
+
+} 
+
+const dictOptions = async () => {//获取物料类型
+    dictTypeList.value = []
+    const dictOptions =  await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE);
+    if (dictOptions != null && dictOptions.length != 0) {
+      dictTypeList.value = dictOptions;
+      queryParams.detectionType = dictOptions[0].value + ''
+      uploadOpen.value = true;
+    }
+  }
+
+
+ const detectionProjectChange =async ()=>{//项目修改
+    if(queryParams.proCode==''){
+      queryParams.itemCode=''
+      queryParams.detectionType=''
+      itemList.value = [];
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      _itemList(queryParams.proCode);
+    }
+ }
+
+ const detectionTypeChange=async()=>{
+    if(queryParams.detectionType==''){
+      uploadOpen.value = false;
+    }else{
+      uploadOpen.value = true;
+    }
+ }
+
+ const detectionItemChange = async ()=>{//物料修改
+    if(queryParams.itemCode==''){
+      queryParams.detectionType=''
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      dictOptions();
+      uploadOpen.value =true;
+    }
+ }
+onMounted(()=>{
+  getProject()
+})
+
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
+
+/** 打开弹窗 */
+const open = () => {
+  console.log(111)
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  file.value = fileList.value[0].name
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId(),
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  formLoading.value = true
+  if(response){
+    if(response.code == 500){
+      message.error('导入失败')
+      return;
+    } else if (response.data.errorCount > 0) {
+      message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+        // download.excel(file, 'file_' + new Date().getTime())
+        // 通过url下载文件
+        // const downloadElement = document.createElement('a')
+        // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
+        // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
+        window.open(import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile ,'222')
+        // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )
+        // 点击下载
+        // downloadElement.click()
+      })
+    }
+  }else{
+    message.success('导入成功')
+  }
+
+  // if (response.code !== 0) {
+  //   message.error(response.msg)
+  //   formLoading.value = false
+  //   return
+  // }
+  // // 拼接提示语
+  // const data = response.data
+  // const create = response.data.importResult[0]
+  // const update = response.data.importResult[1]
+  // const failure = response.data.importResult[2]
+  // let text = '上传成功数量：' + data[create].length + ';'
+  // for (let name of data[create]) {
+  //   text += '< ' + name + ' >'
+  // }
+  // text += '更新成功数量：' + data[update].length + ';'
+  // for (const name of data[update]) {
+  //   text += '< ' + name + ' >'
+  // }
+  // text += '更新失败数量：' + Object.keys(data[failure]).length + ';'
+  // for (const name in data[failure]) {
+  //   text += '< ' + name + ': ' + data[failure][name] + ' >'
+  // }
+  // message.alert(text)
+  
+  // 发送操作成功的事件
+  
+  formLoading.value = false
+  emits('success')
+  dialogVisible.value = false
+}
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+  fileList.value = []
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  const res = importTemplateData.value.templateUrl
+  download.excel(res, importTemplateData.value.templateTitle)
+}
+</script>
+
+<style scoped lang="scss">
+.tips {
+  div {
+    position: relative;
+    padding-left: 22px;
+
+    &::before {
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      content: '';
+      background: #c2c2c2;
+      position: absolute;
+      top: 50%;
+      margin-top: -2px;
+      left: 4px;
+    }
+  }
+}
+</style>
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 37864f2..a1561eb 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -1,63 +1,6 @@
 <!-- 导入组件 -->
 <template>
   <Dialog v-model="dialogVisible" title="导入" width="600">
-    <el-form
-        :inline="true"
-        :model="queryParams"
-        class="demo-form-inline"
-        style="margin-bottom: -17px"
-        label-width="100px"
-      >
-        <el-form-item label="项目" style="width: calc(20% - 32px)">
-          <el-select
-            v-model="queryParams.proCode"
-            placeholder="请选择项目"
-            clearable
-            style="width: 100%"
-          >
-            <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料" style="width: calc(20% - 32px)">
-          <el-select
-            v-model="queryParams.itemCode"
-            placeholder="请选择物料"
-            clearable
-            style="width: 100%"
-            @change="detectionItemChange"
-          >
-            <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料类型" style="width: calc(20% - 32px)">
-          <el-select
-            v-model="queryParams.detectionType"
-            placeholder="请选择检测类型"
-            clearable
-            style="width: 100%"
-            @change="detectionItemChange"
-          >
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检测项" style="width: calc(20% - 32px)">
-          <el-select
-            v-model="queryParams.detectionItemContentId"
-            placeholder="请选择检测项"
-            clearable
-            style="width: 100%"
-            @change="deItemChange"
-          >
-            <el-option v-for=" (item) in detectionItemList" :key="item" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item>
-          <el-button type="info" plain @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
-            搜索
-          </el-button>
-        </el-form-item> -->
-      </el-form>
       <el-upload ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
       :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
       :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
@@ -126,12 +69,6 @@ import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
 
 defineOptions({ name: 'ImportForm' })
-import * as ZlnalysisAPI from '@/api/tjanalysis/zlanalysis'
-import * as ProjecAPI from '@/api/spc/project'
-import * as ItembasicApi from '@/api/spc/itembasic'
-import * as TemplateItemDetailsApi from '@/api/spc/templateItemDetails'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import {formatDate} from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -142,13 +79,6 @@ const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 const file = ref('')
 
-const queryParams = reactive({
-  proCode: '',
-  itemCode: '',
-  detectionType: '',
-  detectionItemContentId: null,
-  ecTab: '1'
-})
 
 
  const props = defineProps({
@@ -217,53 +147,11 @@ const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值
 const updatePart = ref(props.updatePart)//是否部门保存
 const outFile = ref(props.outFile)//是否引入外部资源
 
-
-
-// 项目列表
-const projectList = ref()
-// 物料列表
-const itemList = ref()
-// 检测项列表
-const detectionItemList = ref()
-const pnaLoading = ref(true)
-const tabLoading = ref(true)
-const ec1Loading = ref(true)
-const ec2Loading = ref(true)
-const ec3Loading = ref(true)
-const ec4Loading = ref(true)
-const ec5Loading = ref(true)
-const initQuerys = async () => {
-  const dictOptions = await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE)
-  if (dictOptions != null && dictOptions.length != 0) {
-    queryParams.detectionType = dictOptions[0].value + ''
-  }
-  const _projectList = await ProjecAPI.selectAllPros()
-  if (_projectList != null && _projectList.length != 0) {
-    projectList.value = _projectList
-  }
-  const _itemList = await ItembasicApi.selectItems()
-  if (_itemList != null && _itemList.length != 0) {
-    itemList.value = _itemList
-    queryParams.itemCode = _itemList[0].code
-  }
-  const _detectionItemList = await TemplateItemDetailsApi.selectDetectionItems(queryParams.itemCode , queryParams.detectionType)
-  if (_detectionItemList != null && _detectionItemList.lenght != 0) {
-    detectionItemList.value = _detectionItemList
-    queryParams.detectionItemContentId = _detectionItemList[0].value
-  }
-
-} 
-
-onMounted(()=>{
-  initQuerys()
-})
-
 const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
 
 /** 打开弹窗 */
 const open = () => {
-  console.log(111)
   dialogVisible.value = true
   resetForm()
 }
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 0fa61e7..715757c 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -120,7 +120,7 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
   tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
   loginForm: {
-    tenantName: '闻荫源码',
+    tenantName: '长春华涛',
     username: 'admin',
     password: '123456',
     captchaVerification: '',
diff --git a/src/views/Login/components/MobileForm.vue b/src/views/Login/components/MobileForm.vue
index ebb36b8..29f704c 100644
--- a/src/views/Login/components/MobileForm.vue
+++ b/src/views/Login/components/MobileForm.vue
@@ -132,7 +132,7 @@ const loginData = reactive({
   },
   loginForm: {
     uuid: '',
-    tenantName: '闻荫源码',
+    tenantName: '长春华涛',
     mobileNumber: '',
     code: ''
   }
diff --git a/src/views/detection/records/index.vue b/src/views/detection/records/index.vue
index bdf01c7..2736e51 100644
--- a/src/views/detection/records/index.vue
+++ b/src/views/detection/records/index.vue
@@ -52,7 +52,8 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/detection/records/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <DetecImportForm ref="importFormRef" url="/detection/records/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+
 </template>
 
 <script setup lang="ts">
@@ -219,7 +220,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  //importTemplateData.templateUrl = await RecordsApi.importTemplate()
+  importTemplateData.templateUrl = await RecordsApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/tjanalysis/zlanalysis/index.vue b/src/views/tjanalysis/zlanalysis/index.vue
index 777cbca..25493ac 100644
--- a/src/views/tjanalysis/zlanalysis/index.vue
+++ b/src/views/tjanalysis/zlanalysis/index.vue
@@ -14,6 +14,7 @@
             placeholder="请选择项目"
             clearable
             style="width: 100%"
+            @change="detectionProjectChange"
           >
             <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
           </el-select>
@@ -230,6 +231,7 @@ const tabIndex = ref(0)
 
 // 设置延期未交付数据
 function setChart1(datavv) {
+  console.info("datavv",datavv)
   let chart = echart.init(document.getElementById('myEcharts1'), 'light')
   // 把配置和数据放这里
   chart.setOption({
@@ -355,7 +357,6 @@ function setChart2(rangeData) {
   }
 }
 function setChart3(ztData) {
-  // console.log(ztData , 'daikun')
   if (ztData != null) {
     myEcharts3Ref.value.open(ztData.datas , ztData.downLimit , ztData.upLimit)
   }
@@ -370,11 +371,11 @@ function setChart4(ybData) {
     tooltip: {
       trigger: 'axis'
     },
-    // legend: {
-    //   data: ['Highest', 'Lowest'],
-    //   top: '0',
-    //   right: '3%'
-    // },
+    legend: {
+      data: ['标准上限', '标准下限'],
+      top: '0',
+      right: '3%'
+    },
     grid: {
       left: '3%',
       right: '4%',
@@ -394,7 +395,17 @@ function setChart4(ybData) {
         name: '检测值',
         data: ybData != null ? ybData.yDatas : [],
         type: 'line'
-      }
+      },
+      {
+        name: '标准上限',
+        data: ybData != null ? ybData.bzsx : [],
+        type: 'line'
+      },
+      {
+        name: '标准下限',
+        data: ybData != null ? ybData.bzxx : [],
+        type: 'line'
+      },
     ]
   })
   window.onresize = function () {
@@ -412,11 +423,11 @@ function setChart5(jzData) {
     tooltip: {
       trigger: 'axis'
     },
-    // legend: {
-    //   data: ['Highest', 'Lowest'],
-    //   top: '0',
-    //   right: '3%'
-    // },
+    legend: {
+      data: ['均值上限', '均值下限'],
+      top: '0',
+      right: '3%'
+    },
     grid: {
       left: '3%',
       right: '4%',
@@ -436,6 +447,16 @@ function setChart5(jzData) {
         name: '均值',
         data: jzData != null ? jzData.yDatas : [],
         type: 'line'
+      },
+      {
+        name: '均值上限',
+        data: jzData != null ? jzData.jzsx : [],
+        type: 'line'
+      },
+      {
+        name: '均值下限',
+        data: jzData != null ? jzData.jzxx : [],
+        type: 'line'
       }
     ]
   })
@@ -445,6 +466,20 @@ function setChart5(jzData) {
   }
 }
 
+
+const detectionProjectChange = async()=> {
+  if(queryParams.proCode==''){
+
+  }
+  queryParams.detectionItemContentId = null
+  const _detectionItemList = await TemplateItemDetailsApi.selectDetectionItems(queryParams.itemCode , queryParams.detectionType)
+  if (_detectionItemList != null && _detectionItemList.length != 0) {
+    detectionItemList.value = _detectionItemList
+    queryParams.detectionItemContentId = _detectionItemList[0].value
+  }
+  initData()
+}
+
 const detectionItemChange = async()=> {
   detectionItemList.value = null
   queryParams.detectionItemContentId = null
@@ -474,7 +509,6 @@ const changTabIndex = async (tIndexV) => {
   tabIndex.value = tIndexV
   queryParams.ecTab = tIndexV
   const dvDatas = await ZlnalysisAPI.getZcnlEcharts(queryParams)
-  // console.log(dvDatas , '333333')
   if (dvDatas != null) {
     if (tIndexV == 0) {
       setChart1(dvDatas.menMap)
@@ -515,7 +549,7 @@ const initData = async () => {
 }
 
 const initQuerys = async () => {
-  const dictOptions = await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE)
+  const dictOptions = await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE)//查询物料类型
   if (dictOptions != null && dictOptions.length != 0) {
     queryParams.detectionType = dictOptions[0].value + ''
   }