diff --git a/.env b/.env index 462b376..126ec7e 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_PORT = 3100 # 网站标题 -VITE_GLOB_APP_TITLE = 磐石市供热信息化平台 +VITE_GLOB_APP_TITLE = 磐石市乡镇供热在线监测平台 # 简称,此变量只能是字符/下划线 VITE_GLOB_APP_SHORT_NAME = 供热信息化平台 diff --git a/.env.development b/.env.development index fb3498c..5d8b39e 100644 --- a/.env.development +++ b/.env.development @@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/jeecgboot","http://localhost:8050/jeecg-boot"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8050/jeecg-boot #后台接口父地址(必填) VITE_GLOB_API_URL=/jeecgboot diff --git a/src/api/dashboard/api.ts b/src/api/dashboard/api.ts index df94be9..006ef8f 100644 --- a/src/api/dashboard/api.ts +++ b/src/api/dashboard/api.ts @@ -4,6 +4,7 @@ enum Api { slcx = '/exportapi/homeApi/slcx', cqglfgswd = '/exportapi/homeApi/cqglfgswd', getStaticList = '/exportapi/homeApi/getStaticList', + getStaticNowList = '/exportapi/homeApi/getStaticNowList', glfzb = '/exportapi/homeApi/glfzb', } @@ -25,6 +26,9 @@ export const cqglfgswd = () => { export const getStaticList = (params) => { return defHttp.post({ url: Api.getStaticList,params }); }; +export const getStaticNowList = (params) => { + return defHttp.post({ url: Api.getStaticNowList,params }); +}; /** * diff --git a/src/assets/loginmini/style/img/register.jpg b/src/assets/loginmini/style/img/register.jpg index ae1a1a9..f475b2d 100644 Binary files a/src/assets/loginmini/style/img/register.jpg and b/src/assets/loginmini/style/img/register.jpg differ diff --git a/src/assets/loginmini/style/img/title.png b/src/assets/loginmini/style/img/title.png index 836aaf7..42e6434 100644 Binary files a/src/assets/loginmini/style/img/title.png and b/src/assets/loginmini/style/img/title.png differ diff --git a/src/views/heating/heatanalysis/XzHeatanalysisList.vue b/src/views/heating/heatanalysis/XzHeatanalysisList.vue new file mode 100644 index 0000000..ffb6e1f --- /dev/null +++ b/src/views/heating/heatanalysis/XzHeatanalysisList.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/heating/history/XzHeatanalysisHistoryListJx.vue b/src/views/heating/history/XzHeatanalysisHistoryListJx.vue new file mode 100644 index 0000000..24be557 --- /dev/null +++ b/src/views/heating/history/XzHeatanalysisHistoryListJx.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/src/views/staticList/GlfrlljxList.vue b/src/views/staticList/GlfrlljxList.vue index a6b4213..4810764 100644 --- a/src/views/staticList/GlfrlljxList.vue +++ b/src/views/staticList/GlfrlljxList.vue @@ -46,7 +46,7 @@ function prepareOptions(records: any[]) { const cityX = buildXAxis(city, 'view028'); console.log("🚀 ~ prepareOptions ~ cityX:", cityX) - const citySW = city.map((r: any) => safeNum(r.view037)); + const citySW = city.map((r: any) => safeNum(r.view041)); cityOption = { title: { text: '乡镇锅炉房热流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, diff --git a/src/views/staticList/GlfrlljxListHistory.vue b/src/views/staticList/GlfrlljxListHistory.vue index 1be109d..c6265ec 100644 --- a/src/views/staticList/GlfrlljxListHistory.vue +++ b/src/views/staticList/GlfrlljxListHistory.vue @@ -72,7 +72,7 @@ function prepareOptions(records: any[]) { const { city } = splitByRegion(records); const cityX = buildXAxis(city, 'datatime'); - const citySW = city.map((r: any) => safeNum(r.view037)); + const citySW = city.map((r: any) => safeNum(r.view041)); cityOption = { title: { text: '乡镇锅炉房历史热流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, diff --git a/src/views/staticList/GlfslljxList.vue b/src/views/staticList/GlfslljxList.vue index 133293a..1930e74 100644 --- a/src/views/staticList/GlfslljxList.vue +++ b/src/views/staticList/GlfslljxList.vue @@ -46,7 +46,7 @@ function prepareOptions(records: any[]) { const cityX = buildXAxis(city, 'view028'); console.log("🚀 ~ prepareOptions ~ cityX:", cityX) - const citySW = city.map((r: any) => safeNum(r.view041)); + const citySW = city.map((r: any) => safeNum(r.view037)); cityOption = { title: { text: '乡镇锅炉房水流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, diff --git a/src/views/staticList/XzGlfghsList.vue b/src/views/staticList/XzGlfghsList.vue new file mode 100644 index 0000000..2c61c49 --- /dev/null +++ b/src/views/staticList/XzGlfghsList.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/staticList/XzGlfghsListHistory.vue b/src/views/staticList/XzGlfghsListHistory.vue new file mode 100644 index 0000000..199b790 --- /dev/null +++ b/src/views/staticList/XzGlfghsListHistory.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/staticList/XzGlfrlList.vue b/src/views/staticList/XzGlfrlList.vue new file mode 100644 index 0000000..9876521 --- /dev/null +++ b/src/views/staticList/XzGlfrlList.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/staticList/XzGlfrlListHistory.vue b/src/views/staticList/XzGlfrlListHistory.vue new file mode 100644 index 0000000..1198691 --- /dev/null +++ b/src/views/staticList/XzGlfrlListHistory.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/staticList/XzGlfsllList.vue b/src/views/staticList/XzGlfsllList.vue new file mode 100644 index 0000000..b706978 --- /dev/null +++ b/src/views/staticList/XzGlfsllList.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/staticList/XzGlfsllListHistory.vue b/src/views/staticList/XzGlfsllListHistory.vue new file mode 100644 index 0000000..dd2037c --- /dev/null +++ b/src/views/staticList/XzGlfsllListHistory.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/staticList/XzGlfylList.vue b/src/views/staticList/XzGlfylList.vue new file mode 100644 index 0000000..b123fc7 --- /dev/null +++ b/src/views/staticList/XzGlfylList.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/staticList/XzGlfylListHistory.vue b/src/views/staticList/XzGlfylListHistory.vue new file mode 100644 index 0000000..feb28b2 --- /dev/null +++ b/src/views/staticList/XzGlfylListHistory.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue index 46ef334..de27433 100644 --- a/src/views/system/loginmini/MiniLogin.vue +++ b/src/views/system/loginmini/MiniLogin.vue @@ -2,7 +2,7 @@
- 磐石市供热信息化平台 +   
@@ -60,8 +60,8 @@ //账号登录表单字段 const formData = reactive({ inputCode: '', - username: 'system', - password: '123456', + username: '', + password: '', }); //定时器 const timer = ref(null); @@ -147,4 +147,8 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 8970f7e..cceab2a 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -279,10 +279,10 @@ confirm: handleFrozen.bind(null, record, 1), }, }, - { - label: '代理人', - onClick: handleAgentSettings.bind(null, record.username), - }, + // { + // label: '代理人', + // onClick: handleAgentSettings.bind(null, record.username), + // }, ]; } diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index 6930b3a..bb92c83 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -14,41 +14,6 @@ export const columns: BasicColumn[] = [ dataIndex: 'realname', width: 100, }, - { - title: '头像', - dataIndex: 'avatar', - width: 120, - customRender: render.renderAvatar, - }, - { - title: '性别', - dataIndex: 'sex', - width: 80, - sorter: true, - customRender: ({ text }) => { - return render.renderDict(text, 'sex'); - }, - }, - { - title: '生日', - dataIndex: 'birthday', - width: 100, - }, - { - title: '手机号', - dataIndex: 'phone', - width: 100, - }, - { - title: '部门', - width: 150, - dataIndex: 'orgCodeTxt', - }, - { - title: '负责部门', - width: 150, - dataIndex: 'departIds_dictText', - }, { title: '状态', dataIndex: 'status_dictText', @@ -189,6 +154,7 @@ export const formSchema: FormSchema[] = [ componentProps: { labelKey: 'name', }, + ifShow: false, }, { label: '角色', @@ -206,6 +172,7 @@ export const formSchema: FormSchema[] = [ label: '所属部门', field: 'selecteddeparts', component: 'JSelectDept', + ifShow: false, componentProps: ({ formActionType, formModel }) => { return { sync: false, @@ -242,12 +209,14 @@ export const formSchema: FormSchema[] = [ async: true, multiple: true }, + ifShow: false, }, { label: '身份', field: 'userIdentity', component: 'RadioGroup', defaultValue: 1, + ifShow: false, componentProps: ({ formModel }) => { return { options: [ @@ -260,6 +229,15 @@ export const formSchema: FormSchema[] = [ }; }, }, + { + label: "锅炉房", + field: 'sourceId', + component: 'JSelectMultiple', + componentProps:{ + dictCode:"bl_heatsource,source_name,id,region_type = '乡镇'" + }, + //colProps: {span: 6}, + }, { label: '负责部门', field: 'departIds', @@ -276,11 +254,13 @@ export const formSchema: FormSchema[] = [ componentProps: { fileMax: 1, }, + ifShow: false, }, { label: '生日', field: 'birthday', component: 'DatePicker', + ifShow: false, }, { label: '性别', @@ -291,12 +271,13 @@ export const formSchema: FormSchema[] = [ placeholder: '请选择性别', stringToNumber: true, }, + ifShow: false, }, { label: '邮箱', field: 'email', component: 'Input', - required: true, + ifShow: false, dynamicRules: ({ model, schema }) => { return [ { ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0], trigger: 'blur' }, @@ -308,7 +289,7 @@ export const formSchema: FormSchema[] = [ label: '手机号码', field: 'phone', component: 'Input', - required: true, + ifShow: false, dynamicRules: ({ model, schema }) => { return [ { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0], trigger: 'blur' }, @@ -320,12 +301,14 @@ export const formSchema: FormSchema[] = [ label: '座机', field: 'telephone', component: 'Input', + ifShow: false, rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }], }, { label: '工作流引擎', field: 'activitiSync', defaultValue: 1, + ifShow: false, component: 'JDictSelectTag', componentProps: { dictCode: 'activiti_sync',