Commit abfeddf1 by wenyi.chen

V1确定版本

parent d203b03e
...@@ -65,7 +65,7 @@ import { ElMessageBox, ElMessage } from 'element-plus'; ...@@ -65,7 +65,7 @@ import { ElMessageBox, ElMessage } from 'element-plus';
// 引入组件 // 引入组件
const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue')); const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
const AddDialog = defineAsyncComponent(() => import('/@/views/norm/list/dialog.vue')); const AddDialog = defineAsyncComponent(() => import('/@/views/norm/list/dialog.vue'));
const DetailDialog = defineAsyncComponent(() => import('/@/views/norm/list/details.vue')); const DetailDialog = defineAsyncComponent(() => import('/@/views/dataScreening/list/details.vue'));
const EditDialog = defineAsyncComponent(() => import('/@/views/norm/list/edit.vue')); const EditDialog = defineAsyncComponent(() => import('/@/views/norm/list/edit.vue'));
const ImporDialog = defineAsyncComponent(() => import('/@/views/norm/list/impor.vue')); const ImporDialog = defineAsyncComponent(() => import('/@/views/norm/list/impor.vue'));
const router = useRouter(); const router = useRouter();
...@@ -157,7 +157,6 @@ const getList = () => { ...@@ -157,7 +157,6 @@ const getList = () => {
{ label:'发布时间', prop: 'created_at',width:180}, { label:'发布时间', prop: 'created_at',width:180},
{ label:'领取进度', prop: 'receivedQuantity',width:180}, { label:'领取进度', prop: 'receivedQuantity',width:180},
{ label:'完成进度', prop: 'collectsQuantity',width:180}, { label:'完成进度', prop: 'collectsQuantity',width:180},
{ label:'操作', prop: 'cao',width:280},
]; ];
state.columns = arr; state.columns = arr;
let sign = 0; let sign = 0;
...@@ -175,7 +174,6 @@ const getList = () => { ...@@ -175,7 +174,6 @@ const getList = () => {
'created_at':item.created_at, 'created_at':item.created_at,
'receivedQuantity': item.receivedQuantity, 'receivedQuantity': item.receivedQuantity,
'collectsQuantity': item.collectsQuantity, 'collectsQuantity': item.collectsQuantity,
'cao': 'cao',
} }
item.custom.forEach(function(items, indexs, arrs) { item.custom.forEach(function(items, indexs, arrs) {
if(items.user_filled==0){ if(items.user_filled==0){
...@@ -190,9 +188,6 @@ const getList = () => { ...@@ -190,9 +188,6 @@ const getList = () => {
} }
} }
}); });
// state.columns.push({ label: '操作', width="200", prop: ''})
// list[customTitle[vlues]['index']] =items.extend_value;
// state.columns.push( { label: '操作' })
state.tableData.data.push(list); state.tableData.data.push(list);
}); });
console.log(customTitle) console.log(customTitle)
......
...@@ -37,7 +37,7 @@ const viteConfig = defineConfig((mode) => { ...@@ -37,7 +37,7 @@ const viteConfig = defineConfig((mode) => {
hmr: true, hmr: true,
proxy: { proxy: {
'/dev': { '/dev': {
target: 'http://gcspider.raisound.com:81/data-collect-api-dev', target: 'http://gcspider.raisound.com:81/data-collect-api',
// target: 'https://data-collect.raisound.com/smart-detection', // target: 'https://data-collect.raisound.com/smart-detection',
// target: 'http://192.168.10.168/data-collect-api', // target: 'http://192.168.10.168/data-collect-api',
ws: true, ws: 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