diff --git a/.env.development b/.env.development index 32502d1..fc339fe 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV = 'development' # 开发环境 VITE_APP_BASE_API = '/dev-api' # # 开发环境 接口代理地址 -VITE_APP_PROXY_API = 'http://192.168.1.222:8080' +# VITE_APP_PROXY_API = 'http://192.168.1.222:8080' # 开发环境 接口代理地址 -# VITE_APP_PROXY_API = 'http://192.168.1.215:8080' +VITE_APP_PROXY_API = 'http://192.168.1.215:8080' # 图片基础地址 VITE_IMG_URL = 'http://192.168.1.222:8080' diff --git a/src/assets/icons/svg/a-Equipmentmaintenancerecords.svg b/src/assets/icons/svg/a-Equipmentmaintenancerecords.svg new file mode 100644 index 0000000..897b2c9 --- /dev/null +++ b/src/assets/icons/svg/a-Equipmentmaintenancerecords.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/a-wuliaozu1.svg b/src/assets/icons/svg/a-wuliaozu1.svg new file mode 100644 index 0000000..41f4b54 --- /dev/null +++ b/src/assets/icons/svg/a-wuliaozu1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/banner.svg b/src/assets/icons/svg/banner.svg new file mode 100644 index 0000000..e867b81 --- /dev/null +++ b/src/assets/icons/svg/banner.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/baoxiuxiangmu.svg b/src/assets/icons/svg/baoxiuxiangmu.svg new file mode 100644 index 0000000..794d49f --- /dev/null +++ b/src/assets/icons/svg/baoxiuxiangmu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/caigou.svg b/src/assets/icons/svg/caigou.svg new file mode 100644 index 0000000..4e40cca --- /dev/null +++ b/src/assets/icons/svg/caigou.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/cangku_kucun.svg b/src/assets/icons/svg/cangku_kucun.svg new file mode 100644 index 0000000..0f89727 --- /dev/null +++ b/src/assets/icons/svg/cangku_kucun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/fangwusheshi.svg b/src/assets/icons/svg/fangwusheshi.svg new file mode 100644 index 0000000..811e942 --- /dev/null +++ b/src/assets/icons/svg/fangwusheshi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/gongyingshang.svg b/src/assets/icons/svg/gongyingshang.svg new file mode 100644 index 0000000..c4bad46 --- /dev/null +++ b/src/assets/icons/svg/gongyingshang.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/home.svg b/src/assets/icons/svg/home.svg new file mode 100644 index 0000000..95ec452 --- /dev/null +++ b/src/assets/icons/svg/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/kucunchaxun.svg b/src/assets/icons/svg/kucunchaxun.svg new file mode 100644 index 0000000..573bb0b --- /dev/null +++ b/src/assets/icons/svg/kucunchaxun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/lingyongchuku.svg b/src/assets/icons/svg/lingyongchuku.svg new file mode 100644 index 0000000..197c59b --- /dev/null +++ b/src/assets/icons/svg/lingyongchuku.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/navicon-cgrkd.svg b/src/assets/icons/svg/navicon-cgrkd.svg new file mode 100644 index 0000000..9a973e1 --- /dev/null +++ b/src/assets/icons/svg/navicon-cgrkd.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shebeidanganchaxun.svg b/src/assets/icons/svg/shebeidanganchaxun.svg new file mode 100644 index 0000000..b7da6a9 --- /dev/null +++ b/src/assets/icons/svg/shebeidanganchaxun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shoufeixiangmu.svg b/src/assets/icons/svg/shoufeixiangmu.svg new file mode 100644 index 0000000..e700c60 --- /dev/null +++ b/src/assets/icons/svg/shoufeixiangmu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xiaoxileixing.svg b/src/assets/icons/svg/xiaoxileixing.svg new file mode 100644 index 0000000..4687940 --- /dev/null +++ b/src/assets/icons/svg/xiaoxileixing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunijishezhi.svg b/src/assets/icons/svg/xunijishezhi.svg new file mode 100644 index 0000000..040cb8b --- /dev/null +++ b/src/assets/icons/svg/xunijishezhi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/system/Sdb/SdbCashier/cashier.vue b/src/views/system/Sdb/SdbCashier/cashier.vue index 8e5e858..e3ff125 100644 --- a/src/views/system/Sdb/SdbCashier/cashier.vue +++ b/src/views/system/Sdb/SdbCashier/cashier.vue @@ -1,9 +1,106 @@ - + diff --git a/src/views/system/Sdb/SdbCashier/history.vue b/src/views/system/Sdb/SdbCashier/history.vue index 8e5e858..39cc30e 100644 --- a/src/views/system/Sdb/SdbCashier/history.vue +++ b/src/views/system/Sdb/SdbCashier/history.vue @@ -1,9 +1,95 @@ - + diff --git a/src/views/system/Sdb/SdbCashier/index.vue b/src/views/system/Sdb/SdbCashier/index.vue index 7bea6a9..140d0fc 100644 --- a/src/views/system/Sdb/SdbCashier/index.vue +++ b/src/views/system/Sdb/SdbCashier/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/Sdb/SdbElectricityDevice/index.vue b/src/views/system/Sdb/SdbElectricityDevice/index.vue index a26c1a2..ccaf349 100644 --- a/src/views/system/Sdb/SdbElectricityDevice/index.vue +++ b/src/views/system/Sdb/SdbElectricityDevice/index.vue @@ -41,7 +41,7 @@ > - 批量更新固件 + diff --git a/src/views/system/equipment/Category/index.vue b/src/views/system/equipment/Category/index.vue index d6a58bd..2dc3183 100644 --- a/src/views/system/equipment/Category/index.vue +++ b/src/views/system/equipment/Category/index.vue @@ -1,5 +1,6 @@