Skip to content

P
product_library
Commit c73e05c7 by wenyi.chen
Options

线上

parent dfda4d33
Showing with 163 additions and 39 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/getHost.js
......@@ -3,28 +3,28 @@ export function getHost() {
if (process.env.NODE_ENV === 'development') {
return '/dev'
} else {
return '/product_library_api'
return '/element-plus-api_v1'
}
}
export function getUploadUrl() {
if (process.env.NODE_ENV === 'development') {
return '/dev/api/upload/picture'
} else {
return '/product_library_api/api/upload/picture'
return '/element-plus-api_v1/api/upload/picture'
}
}
export function getUploadPdf() {
if (process.env.NODE_ENV === 'development') {
return '/dev/api/getUploadUrl'
} else {
return '/product_library_api/api/getUploadUrl'
return '/element-plus-api_v1/api/getUploadUrl'
}
}
export function getServerUrl() {
if (process.env.NODE_ENV === 'development') {
return '/dev/api'
} else {
return '/product_library_api/api'
return '/element-plus-api_v1/api'
}
}
......
src/views/product_info/list/allocation.vue
......@@ -18,30 +18,30 @@
<div class="page-main" ref="pageMain">
<el-card shadow="hover" style="height:100%;">
<!-- <Toolbar ref="ToolbarRef" v-model:showSearch="showSearch" @queryTable="getList" @search="search" :columns="columns"/> -->
<Toolbar ref="ToolbarRef" v-model:showSearch="showSearch" @queryTable="getList" @search="search" :columns="columns"/>
<el-table :data="state.tableData.data" style="width: 100%" :height="state.tableHeight"
ref="multipleTableRef">
<el-table-column label="序号" type="index" width="100" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="product_id" label="产品ID" key="product_id" v-if="columns[0].visible" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="productInfo.page_url" label="页面URL" key="page_url" v-if="columns[2].visible" width="200" align="center">
<el-table-column prop="page_url" label="页面URL" key="page_url" v-if="columns[2].visible" width="200" align="center">
<template #default="scope">
<el-link type="primary" :href="scope.row.productInfo.page_url" target ="_blank">{{scope.row.productInfo.page_url}}</el-link>
<el-link type="primary" :href="scope.row.page_url" target ="_blank">{{scope.row.page_url}}</el-link>
</template>
</el-table-column>
<el-table-column prop="productInfo.product_categ_name" label="产品分类名称" key="product_categ_name" v-if="columns[3].visible" width="200" align="center"></el-table-column>
<el-table-column prop="productInfo.product_name" label="产品名称" key="product_name" v-if="columns[4].visible" width="200" align="center"></el-table-column>
<el-table-column prop="productInfo.product_model" label="产品型号" key="product_model" v-if="columns[5].visible" width="200" align="center"></el-table-column>
<el-table-column prop="productInfo.describe" label="功能描述" key="describe" v-if="columns[6].visible" width="250" show-overflow-tooltip align="center">
<el-table-column prop="product_categ_name" label="产品分类名称" key="product_categ_name" v-if="columns[3].visible" width="200" align="center"></el-table-column>
<el-table-column prop="product_name" label="产品名称" key="product_name" v-if="columns[4].visible" width="200" align="center"></el-table-column>
<el-table-column prop="product_model" label="产品型号" key="product_model" v-if="columns[5].visible" width="200" align="center"></el-table-column>
<el-table-column prop="describe" label="功能描述" key="describe" v-if="columns[6].visible" width="250" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="productInfo.parameter" label="规格参数" key="parameter" v-if="columns[7].visible" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="parameter" label="规格参数" key="parameter" v-if="columns[7].visible" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="inspect_status" key="verify_type" v-if="columns[12].visible" label="检查状态" width="200" align="center">
<template #default="scope">
<el-tag type="info" v-if="scope.row.productInfo.inspect_status ==''||scope.row.productInfo.inspect_status ==null||scope.row.productInfo.inspect_status ==0">待分配</el-tag>
<el-tag v-if="scope.row.productInfo.inspect_status ==1">检查完成</el-tag>
<el-tag type="warning" v-if="scope.row.productInfo.inspect_status ==2">检查中</el-tag>
<el-tag type="danger" v-if="scope.row.productInfo.inspect_status ==3">检查异常</el-tag>
<el-tag type="danger" v-if="scope.row.productInfo.inspect_status ==4">数据异常</el-tag>
<el-tag type="danger" v-if="scope.row.productInfo.inspect_status ==5">数据废弃</el-tag>
<el-tag type="info" v-if="scope.row.inspect_status ==''||scope.row.inspect_status ==null||scope.row.inspect_status ==0">待检查</el-tag>
<el-tag v-if="scope.row.inspect_status ==1">检查完成</el-tag>
<el-tag type="warning" v-if="scope.row.inspect_status ==2">检查中</el-tag>
<el-tag type="danger" v-if="scope.row.inspect_status ==3">检查异常</el-tag>
<el-tag type="danger" v-if="scope.row.inspect_status ==4">数据异常</el-tag>
<el-tag type="danger" v-if="scope.row.inspect_status ==5">数据废弃</el-tag>
</template>
</el-table-column>
<el-table-column prop="adminInfo.name" label="检查人员" key="verify_user_id" v-if="columns[9].visible" width="200" align="center"></el-table-column>
......@@ -54,7 +54,7 @@
<el-table-column prop="distribute_time" key="distribute_time" label="分发时间" v-if="columns[10].visible" width="200" align="center"></el-table-column>
<el-table-column label="操作" width="200" fixed="right" align="center">
<template #default="scope">
<el-button size="small" @click="setup(scope.row.id)" type="primary">检查数据</el-button>
<el-button size="small" @click="setup(scope.row.allocation_id)" type="primary">检查数据</el-button>
</template>
</el-table-column>
......@@ -90,7 +90,7 @@ const SetupDialog = defineAsyncComponent(() => import('/@/views/product_info/lis
const AddDialog = defineAsyncComponent(() => import('/@/views/product_info/list/add.vue'));
const DistributeDialog = defineAsyncComponent(() => import('/@/views/product_info/list/distribute.vue'));
const Toolbar = defineAsyncComponent(() => import('/@/components/RightToolbar/index.vue'));
const Search = defineAsyncComponent(() => import('/@/views/product_info/list/search.vue'));
const Search = defineAsyncComponent(() => import('/@/views/search/allocation.vue'));
// 定义变量内容
const AddDialogRef = ref()
......@@ -146,12 +146,15 @@ const search = () => {
* 搜索条件
*/
const searchData = (va) => {
console.log(va)
productApi().list({search:va}).then(res => {
if(va){
productApi().productAllocationList(va).then(res => {
state.tableData.data = res.data.data
state.tableData.total = res.data.total
console.log(res.data.data)
}).catch(() => {
})
}
}
......
src/views/product_info/list/inspect.vue
......@@ -42,7 +42,7 @@
</el-row>
</div>
<div style="margin-top: 5px;">
<div class="number"><span>产品编号：</span><span>RS1722417085980508</span></div>
<div class="number"><span>产品编号：</span><span>{{ state.info.product_number}}</span></div>
<el-form ref="dialogFormRef" :model="state.info" size="default" label-width="100px" v-loading="state.dataLoading" label-position="right" style="width: 500px;">
<el-form-item label="企业名称:" prop="企业名称">
<el-input v-model="state.info.enterprise_name" placeholder="企业名称" clearable disabled></el-input>
......@@ -70,16 +70,16 @@
</el-form-item>
</el-form>
<div style="margin-top: 30px;padding-right: 50px;">
<el-button type="danger" :loading="state.btnLoading" @click="abnormal(4)">数据异常</el-button>
<el-button type="warning" :loading="state.btnLoading" @click="abnormal(5)">数据废弃</el-button>
<el-button type="primary" style="float: right;" :loading="state.btnLoading" @click="onSubmit()">检查完成</el-button>
<el-button type="danger" :loading="state.btnLoading" @click="abnormal(4)" >数据异常</el-button>
<el-button type="warning" :loading="state.btnLoading" @click="abnormal(5)" >数据废弃</el-button>
<el-button type="primary" style="float: right;" :loading="state.btnLoading" @click="onSubmit()" >检查完成</el-button>
</div>
</div>
</div>
</el-col>
<el-col :span="16"><div class="grid-content bg-purple-light">
<!-- <div style="float: right;"><el-link type="primary" href="https://element.eleme.io">主要链接</el-link></div> -->
<div><iframe :src="state.info.page_url" width="100%" height="830px" style=" border: #909399 1px dotted ; padding: 15px;" ></iframe></div>
<div><iframe :src="state.info.page_url" style=" border: #909399 1px dotted ; padding: 15px;" :height="state.tableHeight" width="100%"></iframe></div>
</div>
</el-col>
</el-row>
......@@ -89,6 +89,7 @@
<script setup name="systemRoleDialog">
const router = useRouter();
import { getCurrentInstance } from 'vue';
import { ElMessage } from 'element-plus';
import { create } from 'lodash';
import { productApi } from '/@/api/product'
......@@ -116,6 +117,7 @@ const state = reactive({
number:{},
xhr:null, // 请求对象
mscontent:'',
tableHeight: '30vh',
});
......@@ -138,6 +140,7 @@ const apiData = JSON.parse(JSON.stringify(state.info))
productApi().productAllocationSave(apiData).then(res => {
state.btnLoading = false
ElMessage.success('ok');
page_turning(state.number.after)
emit('refresh');
closeDialog();
}).catch(() => {
......@@ -168,6 +171,7 @@ const abnormal = (type) => {
productApi().productAllocationAbnormal(apiData).then(res => {
state.btnLoading = false
ElMessage.success('ok');
page_turning(state.number.after)
emit('refresh');
closeDialog();
}).catch(() => {
......@@ -178,6 +182,7 @@ const abnormal = (type) => {
const getProductAllocation = () => {
productApi().productAllocationSee({id:state.query_id}).then(res => {
state.info.id= res.data.productAllocationInfo.id
state.info.product_number= res.data.productInfo.product_id
state.info.product_id= res.data.productInfo.id
state.info.inspect_status= res.data.productInfo.inspect_status
state.info.enterprise_name= res.data.enterpriseInfo.enterprise_name
......@@ -279,6 +284,23 @@ defineExpose({
// this.$router.push('/target')
router.push({ path: '/product_info/allocation'});
}
const handleKeyDown = (event) => {
//监听 ctrl+s
if (event.key === '1' && event.altKey) {
abnormal(4)
}
if (event.key === '2' && event.altKey) {
abnormal(5)
}
if (event.key === '3' && event.altKey) {
onSubmit()
}
if (event.key === '4' && event.altKey) {
source_address(state.info.page_url)
}
}
created:{
if(router.currentRoute.value.query.id =="" ||router.currentRoute.value.query.id==null|| router.currentRoute.value.query.id==undefined){
router.push({ path: '/product_info/list'});
......@@ -286,10 +308,14 @@ created:{
state.query_id = router.currentRoute.value.query.id
getProductAllocation()
}
let height = window.innerHeight-70;
state.tableHeight = height+"px";
}
onMounted(() => {
// fileContentExtraction()
document.addEventListener('keydown',handleKeyDown)
});
onUnmounted(() => {
document.removeEventListener('keydown',handleKeyDown)
});
</script>
......
src/views/search/allocation.vue 0 → 100644
<template>
<div class="system-role-dialog-container">
<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="700px" @close="closeDialog" :close-on-click-modal="false">
<el-form ref="dialogFormRef" :model="state.ruleForm" :rules="state.rules" size="default" label-width="200px"
v-loading="state.dataLoading" label-position="right" style="width:100%">
<el-divider>模糊搜索条件</el-divider>
<el-form-item label="产品ID" prop="product_id">
<el-input v-model="state.ruleForm.product_id" placeholder="请输入产品ID" clearable></el-input>
</el-form-item>
<el-form-item label="产品名称" prop="product_name">
<el-input v-model="state.ruleForm.product_name" placeholder="请输入产品名称" clearable></el-input>
</el-form-item>
<el-form-item label="状态" prop="inspect_status">
<el-select v-model="state.ruleForm.inspect_status" filterable placeholder="请选择检查状态" size="default" style="width: 100%;">
<el-option v-for="(item, index) in state.verifyTypeList" :key="index" :label="item.name"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog()" size="default">取 消</el-button>
<el-button type="primary" :loading="state.btnLoading" @click="onSubmit(dialogFormRef)"
size="default">确认</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script setup name="systemRoleDialog">
import { ElMessage } from 'element-plus';
import { enterpriseApi } from '/@/api/enterpriseInfo'
import { Session } from '/@/utils/storage';
// 定义子组件向父组件传值/事件
// const emit = defineEmits(['refresh']);
const emits = defineEmits(['search-to-parent']);
// 定义变量内容
const dialogFormRef = ref();
const state = reactive({
taskId: null,
ruleForm: {
},
rules: {
},
dialog: {
isShowDialog: false,
title: '搜索条件',
submitTxt: '',
},
dataLoading: false,
btnLoading: false,
userList:[],
userId:'',
verifyTypeList:[
{name:'待分配',value:0},
{name:'检查完成',value:1},
{name:'检查中',value:'2'},
{name:'数据异常',value:'3'},
{name:'检查异常',value:'4'},
{name:'数据废弃',value:'5'}
],
enterpriseList:[
],
enterpriseId:'',
});
// 打开弹窗
const openDialog = () => {
state.dialog.isShowDialog = true;
state.dialog.title = '搜索条件';
};
// 关闭弹窗
const closeDialog = () => {
dialogFormRef.value.resetFields();
state.dialog.isShowDialog = false;
};
// 提交
const onSubmit = () => {
emits('search-to-parent', state.ruleForm);
// state.ruleForm = {};
};
// 暴露变量
defineExpose({
openDialog,
});
onMounted(() => {
});
</script>
<style scoped lang="scss"></style>
\ No newline at end of file
src/views/task/list/enterprise_allocation.vue
......@@ -13,6 +13,7 @@
</div> -->
<!-- <el-button size="default" type="primary" @click="add()" >新增产品</el-button>
<el-button size="default" type="primary" @click="distribute()" >产品分发</el-button> -->
<!-- <el-button size="default" type="primary" @click="allocation()" >分配任务</el-button> -->
<el-button size="default" type="primary" @click="allocation()" >分配任务</el-button>
</div>
......@@ -48,7 +49,6 @@
</el-card>
</div>
<AddDialog ref="AddDialogRef" @refresh="getList()" />
<DistributeDialog ref="DistributeDialogRef" @refresh="getList()" />
<SetupDialog ref="SetupDialogRef" @refresh="getList()" />
<Search ref="SearchDialogRef" @search-to-parent="searchData" />
</div>
......@@ -64,13 +64,11 @@ import { Session } from '/@/utils/storage';
const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
const SetupDialog = defineAsyncComponent(() => import('/@/views/product_info/list/setup.vue'));
const AddDialog = defineAsyncComponent(() => import('/@/views/product_info/list/add.vue'));
const DistributeDialog = defineAsyncComponent(() => import('/@/views/product_info/list/distribute.vue'));
const Toolbar = defineAsyncComponent(() => import('/@/components/RightToolbar/index.vue'));
const Search = defineAsyncComponent(() => import('/@/views/product_info/list/search.vue'));
// 定义变量内容
const AddDialogRef = ref()
const DistributeDialogRef = ref()
const SetupDialogRef = ref()
const SearchDialogRef = ref()
......
src/views/task/list/user_enterprise.vue
......@@ -48,7 +48,6 @@
</el-card>
</div>
<AddDialog ref="AddDialogRef" @refresh="getList()" />
<DistributeDialog ref="DistributeDialogRef" @refresh="getList()" />
<SetupDialog ref="SetupDialogRef" @refresh="getList()" />
<Search ref="SearchDialogRef" @search-to-parent="searchData" />
</div>
......@@ -64,13 +63,11 @@ import { Session } from '/@/utils/storage';
const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
const SetupDialog = defineAsyncComponent(() => import('/@/views/product_info/list/setup.vue'));
const AddDialog = defineAsyncComponent(() => import('/@/views/product_info/list/add.vue'));
const DistributeDialog = defineAsyncComponent(() => import('/@/views/product_info/list/distribute.vue'));
const Toolbar = defineAsyncComponent(() => import('/@/components/RightToolbar/index.vue'));
const Search = defineAsyncComponent(() => import('/@/views/product_info/list/search.vue'));
// 定义变量内容
const AddDialogRef = ref()
const DistributeDialogRef = ref()
const SetupDialogRef = ref()
const SearchDialogRef = ref()
......
src/views/task/list/user_task_group.vue
......@@ -35,7 +35,6 @@
</el-card>
</div>
<AddDialog ref="AddDialogRef" @refresh="getList()" />
<DistributeDialog ref="DistributeDialogRef" @refresh="getList()" />
</div>
</template>
......@@ -48,11 +47,9 @@ import { Session } from '/@/utils/storage';
// 引入组件
const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
const AddDialog = defineAsyncComponent(() => import('/@/views/task/list/add.vue'));
const DistributeDialog = defineAsyncComponent(() => import('/@/views/task/list/distribute.vue'));
// 定义变量内容
const AddDialogRef = ref()
const DistributeDialogRef = ref()
const SearchDialogRef = ref()
const state = reactive({
......
vite.config.js
......@@ -37,7 +37,7 @@ const viteConfig = defineConfig((mode) => {
hmr: true,
proxy: {
'/dev': {
target: 'http://gcspider.raisound.com:81/product_library_api',
target: 'http://gcspider.raisound.com:81/element-plus-api_v1',
// target: 'http://192.168.10.168/smart-detection',
ws: true,
changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment