bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
zhouzy062 2024-03-05 09:10:29 +08:00
parent d5ca3c7b95 05e3e10f17
commit 2da530bc41
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -300,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from ma_machine where ma_id = #{maId} and ma_code = #{maCode}
</select>
<select id="getMachineByQrCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, msi.supplier as maVender, m.out_fac_time, m.out_fac_code,
m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
mmb.label_code labelCode,m.inspect_man as inspectMan,m.inspect_status as inspectStatus,m.phone as phone
@ -310,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
left join ma_supplier_info msi on m.ma_vender = msi.supplier_id
where m.qr_code = #{qrCode}
</select>
<select id="getLeaseProject" resultType="com.bonus.sgzb.base.api.domain.SltAgreementApply">

15
sgzb-ui/src/views/stquery/deviceStatusRecord.vue
View File

@ -76,11 +76,6 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -88,9 +83,15 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
</el-form-item>
</el-form>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
<!-- <el-col :span="1.5">
</el-col> -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
<el-table

6
sgzb-ui/vue.config.js
View File

@ -36,14 +36,18 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://112.29.103.165:21626`,//线上环境-重庆
// target: `http://112.29.103.165:21624`,//线上环境-宁夏
target: `http://112.29.103.165:21624`,//线上环境-宁夏
// target: `http://192.168.0.14:21624`,//线上环境
// target: `http://1.12.248.179:23028`,//线上环境-南网
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.14:8080`,//超
<<<<<<< HEAD
// target: `http://10.40.92.12:8080`,//韩
=======
// target: `http://10.40.92.4:8080`,//韩
>>>>>>> 60e10fcdb5fa5b1f3f423613cecb9f517dd746d5
// target: `http://10.40.92.209:8080`,//川
changeOrigin: true,