diff --git a/Dockerfile b/Dockerfile index ef5651d..aa23629 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,6 @@ COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh # 使用脚本作为入口点 -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["bash","/entrypoint.sh"] EXPOSE 80 diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue index e0f0ad6..2b25c1a 100644 --- a/src/views/indexSun.vue +++ b/src/views/indexSun.vue @@ -682,8 +682,8 @@ firstFormOne.value = []; const params = { centerId: centerId.value, - startDate: '2000-01-01', - endDate: '2030-12-31', + // startDate: '2000-01-01', + // endDate: '2030-12-31', }; indexModalTitle.value = '今日应急'; modalApi.value = todayEmergencyListApi; diff --git a/src/views/indexSun/centerMap.vue b/src/views/indexSun/centerMap.vue index 0f97de8..cc8fd99 100644 --- a/src/views/indexSun/centerMap.vue +++ b/src/views/indexSun/centerMap.vue @@ -741,6 +741,7 @@ .item-two { color: #00ccff; + text-align: right; } } diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts index cdf3719..be43e5e 100644 --- a/src/views/indexSun/indexSun.ts +++ b/src/views/indexSun/indexSun.ts @@ -687,21 +687,21 @@ export const centerMapFromList = [ // options: checkData, // defaultValue: '', // }, - { - label: '是否成功控降', - field: 'successFlag', - type: 'select', - placeholder: '请选择是否成功控降', - options: isTrueOfFalse, - defaultValue: '', - }, - { - label: '单位名称', - field: 'departName', - type: 'input', - placeholder: '请输入单位名称', - defaultValue: '', - }, + // { + // label: '是否成功控降', + // field: 'successFlag', + // type: 'select', + // placeholder: '请选择是否成功控降', + // options: isTrueOfFalse, + // defaultValue: '', + // }, + // { + // label: '单位名称', + // field: 'departName', + // type: 'input', + // placeholder: '请输入单位名称', + // defaultValue: '', + // }, ]; export const twoRNewColumns = [ @@ -717,8 +717,8 @@ export const twoRNewColumns = [ }, { title: '性别', - dataIndex: 'sex', - key: 'sex', + dataIndex: 'sexCode', + key: 'sexCode', width: 50, customRender: ({ text }) => { switch (text) { diff --git a/src/views/indexSun/twoNewR.data.ts b/src/views/indexSun/twoNewR.data.ts index 556970e..c51689a 100644 --- a/src/views/indexSun/twoNewR.data.ts +++ b/src/views/indexSun/twoNewR.data.ts @@ -68,14 +68,14 @@ export const list = [ field: 'hypertension', span: 24, options: [ - { - label: '否', - value: 0, - }, { label: '是', value: 1, }, + { + label: '否', + value: 2, + }, ], }, { @@ -123,14 +123,14 @@ export const list = [ field: 'diabetes', span: 24, options: [ - { - label: '否', - value: 0, - }, { label: '是', value: 1, }, + { + label: '否', + value: 2, + }, ], }, { diff --git a/src/views/indexSun/twoNewR.vue b/src/views/indexSun/twoNewR.vue index f8b0c7f..9898d82 100644 --- a/src/views/indexSun/twoNewR.vue +++ b/src/views/indexSun/twoNewR.vue @@ -112,7 +112,6 @@ } function handlePolice(item: any) { - debugger; openInfor.value = true; showSping.value = true; userInfo.value = {};