Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
733ef4c15e
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import colorTool from "@/utils/color";
|
import colorTool from "@/utils/color";
|
||||||
|
import i18n from '@/locales'
|
||||||
export default {
|
export default {
|
||||||
name: "App",
|
name: "App",
|
||||||
data() {
|
data() {
|
||||||
|
|
@ -26,7 +27,8 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
locale() {
|
locale() {
|
||||||
return this.$i18n.messages[this.$i18n.locale].el;
|
const lang = i18n.global.locale.value
|
||||||
|
return i18n.global.messages.value?.[lang]?.el
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,9 @@ const messages = {
|
||||||
const i18n = createI18n({
|
const i18n = createI18n({
|
||||||
locale: tool.data.get("APP_LANG") || sysConfig.LANG,
|
locale: tool.data.get("APP_LANG") || sysConfig.LANG,
|
||||||
fallbackLocale: 'zh-cn',
|
fallbackLocale: 'zh-cn',
|
||||||
globalInjection: true,
|
globalInjection: false,
|
||||||
messages,
|
messages,
|
||||||
|
legacy: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export default i18n;
|
export default i18n;
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ app.use(DataVVue3);
|
||||||
|
|
||||||
//挂载app
|
//挂载app
|
||||||
app.mount("#app");
|
app.mount("#app");
|
||||||
|
app.config.globalProperties.$t = i18n.global.t
|
||||||
|
|
||||||
const debounce = (fn, delay) => {
|
const debounce = (fn, delay) => {
|
||||||
let timer = null;
|
let timer = null;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
||||||
:query="query" @dataChange="updateCount">
|
:query="query" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
||||||
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
||||||
:query="query" @dataChange="updateCount">
|
:query="query" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
||||||
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
||||||
:query="query" @dataChange="updateCount">
|
:query="query" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
<el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
|
||||||
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
<el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
<scTable v-if="activeName==10" ref="table" :data="data1" :params="params" :query="query" size="large" >
|
<scTable v-if="activeName==10" ref="table" :data="data1" :params="params" :query="query" size="large" row-key="id">
|
||||||
<el-table-column prop="index" label="序号"></el-table-column>
|
<el-table-column prop="index" label="序号"></el-table-column>
|
||||||
<el-table-column prop="cphm" label="车牌号码/登记号码"></el-table-column>
|
<el-table-column prop="cphm" label="车牌号码/登记号码"></el-table-column>
|
||||||
<el-table-column prop="clsbdm" label="车辆识别代码(VIN)"></el-table-column>
|
<el-table-column prop="clsbdm" label="车辆识别代码(VIN)"></el-table-column>
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
</scTable>
|
</scTable>
|
||||||
<scTable v-else-if="activeName==20" ref="table" :data="data2" :params="params" :query="query" size="large" style=""
|
<scTable v-else-if="activeName==20" ref="table" :data="data2" :params="params" :query="query" size="large" style=""
|
||||||
@row-click="rowClick" @dataChange="updateCount">
|
@row-click="rowClick" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column prop="index" label="序号"></el-table-column>
|
<el-table-column prop="index" label="序号"></el-table-column>
|
||||||
<el-table-column prop="cphm" label="车牌号码/登记号码"></el-table-column>
|
<el-table-column prop="cphm" label="车牌号码/登记号码"></el-table-column>
|
||||||
<el-table-column prop="clsbdm" label="车辆识别代码(VIN)"></el-table-column>
|
<el-table-column prop="clsbdm" label="车辆识别代码(VIN)"></el-table-column>
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
|
|
||||||
</scTable>
|
</scTable>
|
||||||
<scTable v-else-if="activeName==30" ref="table" :data="data3" :params="params" :query="query" size="large" style=""
|
<scTable v-else-if="activeName==30" ref="table" :data="data3" :params="params" :query="query" size="large" style=""
|
||||||
@row-click="rowClick" @dataChange="updateCount">
|
@row-click="rowClick" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column prop="index" label="序号"></el-table-column>
|
<el-table-column prop="index" label="序号"></el-table-column>
|
||||||
<el-table-column prop="hbdjbh" label="环保登记编号"></el-table-column>
|
<el-table-column prop="hbdjbh" label="环保登记编号"></el-table-column>
|
||||||
<el-table-column prop="jxscrq" label="机械生产日期"></el-table-column>
|
<el-table-column prop="jxscrq" label="机械生产日期"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable :apiObj="apiObj" size="large" :params="params" :query="query" @row-click="rowClick">
|
<scTable :apiObj="apiObj" size="large" :params="params" :query="query" @row-click="rowClick" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="设备编号"></el-table-column>
|
<el-table-column prop="number" label="设备编号"></el-table-column>
|
||||||
<el-table-column prop="name" label="设备名称"></el-table-column>
|
<el-table-column prop="name" label="设备名称"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
|
<scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
|
||||||
style="" @row-click="rowClick">
|
style="" @row-click="rowClick" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="设备编号"></el-table-column>
|
<el-table-column prop="number" label="设备编号"></el-table-column>
|
||||||
<el-table-column prop="name" label="设备名称"></el-table-column>
|
<el-table-column prop="name" label="设备名称"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
<scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
|
||||||
:query="query" @dataChange="updateCount">
|
:query="query" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="number" label="排放口编号"></el-table-column>
|
<el-table-column prop="number" label="排放口编号"></el-table-column>
|
||||||
<el-table-column prop="name" label="排放口名称"></el-table-column>
|
<el-table-column prop="name" label="排放口名称"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :data="data" :params="params" :query="query" size="large" style=""
|
<scTable ref="table" :data="data" :params="params" :query="query" size="large" style=""
|
||||||
@row-click="rowClick" @dataChange="updateCount">
|
@row-click="rowClick" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column prop="index" label="序号"></el-table-column>
|
<el-table-column prop="index" label="序号"></el-table-column>
|
||||||
<el-table-column prop="bcrkbh" label="出入口编号"></el-table-column>
|
<el-table-column prop="bcrkbh" label="出入口编号"></el-table-column>
|
||||||
<el-table-column prop="dzbh" label="道闸编号"></el-table-column>
|
<el-table-column prop="dzbh" label="道闸编号"></el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<scTable ref="table" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
|
<scTable ref="table" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
|
||||||
@row-click="rowClick" @dataChange="updateCount">
|
@row-click="rowClick" @dataChange="updateCount" row-key="id">
|
||||||
<el-table-column type="index" width="50" />
|
<el-table-column type="index" width="50" />
|
||||||
<el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
|
<el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
|
||||||
<el-table-column prop="access_time" label="过门禁时间"></el-table-column>
|
<el-table-column prop="access_time" label="过门禁时间"></el-table-column>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue