Browse Source

更新

master
宋国强 2 years ago
parent
commit
edac876e1d
  1. 2
      src/components/UploadFile/src/Preview.vue
  2. 2
      src/views/Home/Index.vue
  3. 4
      src/views/Login/components/LoginForm.vue
  4. 22
      src/views/detection/recordsDetails/index.vue
  5. 4
      src/views/spc/itembasic/itembasic.data.ts

2
src/components/UploadFile/src/Preview.vue

@ -19,7 +19,7 @@
@click="dialogTableVisible = false" @click="dialogTableVisible = false"
/> />
<img :src="chooseItem.url" alt="" v-if="isImg(chooseItem)" /> <img :src="chooseItem.url" alt="" v-if="isImg(chooseItem)" />
<video controls muted loop width="80%" v-if="isVideo(chooseItem)"> <video controls muted loop style="width: 80%;height: 500px;" v-if="isVideo(chooseItem)">
<source :src="chooseItem.url" /> <source :src="chooseItem.url" />
</video> </video>
<!-- <iframe frameborder="0" <!-- <iframe frameborder="0"

2
src/views/Home/Index.vue

@ -26,7 +26,7 @@
<el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="mt-14px"> <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="mt-14px">
<el-card shadow="never"> <el-card shadow="never">
<div class="title font-size-18px font-bold mb-10px">项目物料检测类型时间清单</div> <div class="title font-size-18px font-bold mb-10px">项目物料检测类型时间清单</div>
<el-table :data="tableData1" style="width: 100%"> <el-table :data="tableData1" style="width: 100%" height="450px">
<el-table-column label="序号" width="80" type="index" align="center" /> <el-table-column label="序号" width="80" type="index" align="center" />
<el-table-column prop="itemCode" label="物料代码" align="center" /> <el-table-column prop="itemCode" label="物料代码" align="center" />
<el-table-column prop="itemName" label="物料名称" align="center" /> <el-table-column prop="itemName" label="物料名称" align="center" />

4
src/views/Login/components/LoginForm.vue

@ -8,12 +8,12 @@
<div class="font-size-18px">您好欢迎使用<span class="color-[rgb(74,154,236)]">长春华涛SPC系统</span></div> <div class="font-size-18px">您好欢迎使用<span class="color-[rgb(74,154,236)]">长春华涛SPC系统</span></div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" label="租户名称"> <el-form-item v-if="loginData.tenantEnable === 'true'" label="租户名称">
<el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')" <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
link type="primary" /> link type="primary" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item label="用户名"> <el-form-item label="用户名">
<el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')" <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"

22
src/views/detection/recordsDetails/index.vue

@ -142,7 +142,7 @@ const { tableObject, tableMethods } = useTable({
// //
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
const message = useMessage() //
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const formLoading = ref(false) // const formLoading = ref(false) //
@ -248,14 +248,14 @@ const handleImport = () => {
importFormRef.value.open() importFormRef.value.open()
} }
// //
const importTemplateData = reactive({ // const importTemplateData = reactive({
templateUrl: '', // templateUrl: '',
templateTitle: '检测记录详细导入模版.xls' // templateTitle: '.xls'
}) // })
// //
const importSuccess = () => { // const importSuccess = () => {
getList() // getList()
} // }
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
@ -341,9 +341,9 @@ const uploadOpen=ref(false)
const importTemplateData= ref(props.importTemplateData) const importTemplateData= ref(props.importTemplateData)
const accept= ref(props.accept) const accept= ref(props.accept)
const mode = ref(props.mode)//.1 const mode = ref(props.mode)//.1
const updateIsDisable = ref(props.updateIsDisable)//, // const updateIsDisable = ref(props.updateIsDisable)//,
const appendIsDisable = ref(props.appendIsDisable)//, // const appendIsDisable = ref(props.appendIsDisable)//,
const coverIsDisable = ref(props.coverIsDisable)//, // const coverIsDisable = ref(props.coverIsDisable)//,
const updatePart = ref(props.updatePart)// const updatePart = ref(props.updatePart)//
const outFile = ref(props.outFile)// const outFile = ref(props.outFile)//

4
src/views/spc/itembasic/itembasic.data.ts

@ -3,8 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
import {Project } from '@/views/spc/project/project.data' import {Project } from '@/views/spc/project/project.data'
import * as ProjectApi from '@/api/spc/project/index' import * as ProjectApi from '@/api/spc/project/index'
import * as itembasicApi from '@/api/spc/itembasic/index' import * as itembasicApi from '@/api/spc/itembasic/index'
const itembasicList = await itembasicApi.getList({}); const itembasicList = itembasicApi.getList(null);
const projectList = await ProjectApi.getList({}); const projectList = ProjectApi.getList(null);
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
/** /**

Loading…
Cancel
Save