diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6348fb1 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6348fb1 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 08af378..2e9c94e 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -12,7 +12,7 @@ const request = axios.create({ // baseURL: window.sessionStorage.getItem("baseURL")!, - baseURL: 'http://11.100.6.182:5000', + baseURL: 'http://113.194.84.171:20009', // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: "json", diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6348fb1 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 08af378..2e9c94e 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -12,7 +12,7 @@ const request = axios.create({ // baseURL: window.sessionStorage.getItem("baseURL")!, - baseURL: 'http://11.100.6.182:5000', + baseURL: 'http://113.194.84.171:20009', // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: "json", diff --git a/src/views/administrator/alarm/components/alarmList.vue b/src/views/administrator/alarm/components/alarmList.vue index 9fff6bc..d1ee67e 100644 --- a/src/views/administrator/alarm/components/alarmList.vue +++ b/src/views/administrator/alarm/components/alarmList.vue @@ -55,7 +55,7 @@ .disc { line-height: 26px; margin-top: 20px; - font-size: 22px; + font-size: 18px; font-weight: 600; word-break: break-all; // @include textoverflow(3) diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6348fb1 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 08af378..2e9c94e 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -12,7 +12,7 @@ const request = axios.create({ // baseURL: window.sessionStorage.getItem("baseURL")!, - baseURL: 'http://11.100.6.182:5000', + baseURL: 'http://113.194.84.171:20009', // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: "json", diff --git a/src/views/administrator/alarm/components/alarmList.vue b/src/views/administrator/alarm/components/alarmList.vue index 9fff6bc..d1ee67e 100644 --- a/src/views/administrator/alarm/components/alarmList.vue +++ b/src/views/administrator/alarm/components/alarmList.vue @@ -55,7 +55,7 @@ .disc { line-height: 26px; margin-top: 20px; - font-size: 22px; + font-size: 18px; font-weight: 600; word-break: break-all; // @include textoverflow(3) diff --git a/src/views/administrator/alarm/index.vue b/src/views/administrator/alarm/index.vue index 427afd2..f6ec72d 100644 --- a/src/views/administrator/alarm/index.vue +++ b/src/views/administrator/alarm/index.vue @@ -9,7 +9,7 @@ :mode="['date']" title="开始日期" cancelBtn="清除" - format="YYYY-MM-DD" + format="YYYY-MM-DD HH:mm:ss" :end="new Date().toLocaleDateString()" @confirm="onConfirmStartDate" @cancel="startCancel" @@ -23,7 +23,7 @@ :mode="['date']" title="结束日期" cancelBtn="清除" - format="YYYY-MM-DD" + format="YYYY-MM-DD HH:mm:ss" :end="new Date().toLocaleDateString()" @confirm="onConfirmEndDate" @cancel="endCancel" diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6348fb1 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 08af378..2e9c94e 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -12,7 +12,7 @@ const request = axios.create({ // baseURL: window.sessionStorage.getItem("baseURL")!, - baseURL: 'http://11.100.6.182:5000', + baseURL: 'http://113.194.84.171:20009', // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: "json", diff --git a/src/views/administrator/alarm/components/alarmList.vue b/src/views/administrator/alarm/components/alarmList.vue index 9fff6bc..d1ee67e 100644 --- a/src/views/administrator/alarm/components/alarmList.vue +++ b/src/views/administrator/alarm/components/alarmList.vue @@ -55,7 +55,7 @@ .disc { line-height: 26px; margin-top: 20px; - font-size: 22px; + font-size: 18px; font-weight: 600; word-break: break-all; // @include textoverflow(3) diff --git a/src/views/administrator/alarm/index.vue b/src/views/administrator/alarm/index.vue index 427afd2..f6ec72d 100644 --- a/src/views/administrator/alarm/index.vue +++ b/src/views/administrator/alarm/index.vue @@ -9,7 +9,7 @@ :mode="['date']" title="开始日期" cancelBtn="清除" - format="YYYY-MM-DD" + format="YYYY-MM-DD HH:mm:ss" :end="new Date().toLocaleDateString()" @confirm="onConfirmStartDate" @cancel="startCancel" @@ -23,7 +23,7 @@ :mode="['date']" title="结束日期" cancelBtn="清除" - format="YYYY-MM-DD" + format="YYYY-MM-DD HH:mm:ss" :end="new Date().toLocaleDateString()" @confirm="onConfirmEndDate" @cancel="endCancel" diff --git a/src/views/administrator/equipment/index.vue b/src/views/administrator/equipment/index.vue index 3cdaa4a..e572512 100644 --- a/src/views/administrator/equipment/index.vue +++ b/src/views/administrator/equipment/index.vue @@ -55,14 +55,14 @@ value: "全部", }, { - label: "报警", - value: "报警", - }, - { label: "正常", value: "正常", }, { + label: "报警", + value: "报警", + }, + { label: "离线", value: "离线", }, @@ -70,9 +70,9 @@ ]; const statusMap: {[key: string]: string} = { '全部': '', - '正常': '1', - '报警': '2', - '离线': '3', + '正常': '0', + '报警': '1', + '离线': '2', } const listQuery = ref({ // 请求参数