中英文功能配置

.hbuilderx/launch.json

@@ -1,20 +1,23 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

commons/commons.css

@@ -67,8 +67,8 @@
 }
 
 .commons-close {
-	background: rgba(153, 153, 153, 0.20);
-	color: #999999;
+	background: rgba(153, 153, 153, 0.20)!important;
+	color: #999999!important;
 }
 
 .commons-before-40 {

components/commons-header/index.vue

@@ -3,7 +3,7 @@
 		<view class="header-banner">
 			<view class="back">
 				
-				<!-- <span class="icon"  @click="backFn" style="font-size: 30rpx;">&#xe6c5;</span> -->
+				<span v-if="isBack"  @click="backFn"  class="iconfont">&#xe6c5;</span>
 				
 			</view>
 			<view class="center-title">
@@ -69,6 +69,10 @@
 			title:{
 				type:String,
 			},
+			isBack:{
+				type:Boolean,
+				default:true,
+			},
 		},
 		data(){
 			return {

lang/index.js

@@ -1,7 +1,11 @@
-import zh from './zh'
-import en from './en'
+//这里是设置的自动引入文件。
+const files = require.context('.', false, /\.js$/)
+const languages = {}
+files.keys().forEach(key => {
+  if (key === './index.js') return
+  const item = files(key).default
+  let name = key.replace(/.\/|.js/g, '')
+  languages[name] = item || 'cn'
+})
 
-export default {
-	'en': en,
-	'zh': zh
-}
+export default languages;

main.js

@@ -13,16 +13,8 @@ uni.getStorage({
 		Vue.prototype.$userInfo = null
 	}
 })
-uni.getStorage({
-	key: "Authorization",
-	success(_data) {
-		console.log(_data)
-		Vue.prototype.$token = _data.data
-	},
-	fail() {
-		Vue.prototype.$token = false
-	}
-})
+Vue.prototype.$token = uni.getStorageSync('Authorization')
+
 //公用链接
 import env from '@/util/env.js'
 Vue.prototype.$baseUrl = env.baseUrl
@@ -31,27 +23,39 @@ import httpServer from "@/util/http.js"
 Vue.prototype.$get = httpServer.get
 Vue.prototype.$post = httpServer.post
 
+import w_md5 from "js_sdk/zww-md5/w_md5.js"
+Vue.prototype.$w_md5 = w_md5; 
 
 import Mixin from './polyfill/mixins'
 Vue.mixin(Mixin)
 
-
-// #ifndef VUE3
-
+import VueI18n from 'vue-i18n';
+Vue.use(VueI18n)
+const i18n = new VueI18n({ 
+	// #ifdef MP 	
+	locale: 'zh-CN', //初始化,保证刷新页面也保留
+	// #endif
+	// #ifdef APP-PLUS
+	locale: plus.storage.getItem('locale') || 'zh-CN', //初始化,保证刷新页面也保留
+	// #endif
+	// #ifdef H5
+	locale: localStorage.getItem('locale') || 'zh-CN', //初始化,保证刷新页面也保留
+	// #endif
+	// 加载语言文件的内容
+	messages: { 
+		'zh-CN': require('./lang/cn.js').lang, 
+		'en': require('./lang/en.js').lang
+	}
+})
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
+	i18n,
     ...App
 })
 app.$mount()
-// #endif
-
-// #ifdef VUE3
-import { createSSRApp } from 'vue'
-export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
-}
-// #endif
+
+
+
+
+

pages.json

@@ -41,13 +41,13 @@
 			"path": "pages/TUI-Login/login",
 			"style": {}
 		},
-		{
-			"path": "pages/user/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"navigationStyle": "custom"
-			}
-		},
+		// {
+		// 	"path": "pages/user/login",
+		// 	"style": {
+		// 		"navigationBarTitleText": "登录",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
 		{
 			"path": "pages/home",
 			"style": {
@@ -84,6 +84,15 @@
 			}
 		},
 		{
+			"path": "pages/equipment/packingMachine",
+			"style": {
+				"navigationBarTitleText": "包装机",
+				"navigationStyle": "custom"
+			}
+		},
+		
+		
+		{
 			"path": "pages/equipment/shengchang",
 			"style": {
 				"navigationBarTitleText": "生产",
@@ -97,6 +106,14 @@
 				"navigationStyle": "custom"
 			}
 		},
+		
+		{
+			"path": "pages/equipment/rollPrinter",
+			"style": {
+				"navigationBarTitleText": "滚印机",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/equipment/sterilization",
 			"style": {
@@ -200,36 +217,36 @@
 				"iconPath": "static/btn_shebei_gray.png",
 				"selectedIconPath": "static/btn_shebei_blue.png"
 			},
-			{
-				"pagePath": "pages/im/im",
-				"text": "协作",
-				"iconPath": "static/btn_sc_gray.png",
-				"selectedIconPath": "static/btn_sc_blue.png"
-			},
-			{
-				"pagePath": "pages/equipment/shengchang",
-				"text": "生产",
-				"iconPath": "static/btn_shengc_gray.png",
-				"selectedIconPath": "static/btn_shengc_blue.png"
-			},
-			{
-				"pagePath": "pages/equipment/jinxiaocun",
-				"text": "进销存",
-				"iconPath": "static/btn_jxc_gray.png",
-				"selectedIconPath": "static/btn_jxc_blue.png"
-			}
 			// {
 			// 	"pagePath": "pages/im/im",
-			// 	"text": "通讯录",
+			// 	"text": "协作",
+			// 	"iconPath": "static/btn_sc_gray.png",
+			// 	"selectedIconPath": "static/btn_sc_blue.png"
+			// },
+			// {
+			// 	"pagePath": "pages/equipment/shengchang",
+			// 	"text": "生产",
 			// 	"iconPath": "static/btn_shengc_gray.png",
 			// 	"selectedIconPath": "static/btn_shengc_blue.png"
 			// },
 			// {
-			// 	"pagePath": "pages/user/user",
-			// 	"text": "我的",
-			// 	"iconPath": "static/btn_mine_gray.png",
-			// 	"selectedIconPath": "static/btn_mine_blue.png"
+			// 	"pagePath": "pages/equipment/jinxiaocun",
+			// 	"text": "进销存",
+			// 	"iconPath": "static/btn_jxc_gray.png",
+			// 	"selectedIconPath": "static/btn_jxc_blue.png"
 			// }
+			// {
+			// 	"pagePath": "pages/im/im",
+			// 	"text": "通讯录",
+			// 	"iconPath": "static/btn_shengc_gray.png",
+			// 	"selectedIconPath": "static/btn_shengc_blue.png"
+			// },
+			{
+				"pagePath": "pages/user/user",
+				"text": "我的",
+				"iconPath": "static/btn_mine_gray.png",
+				"selectedIconPath": "static/btn_mine_blue.png"
+			}
 		]
 	},
 	"globalStyle": {

pages/equipment/equipment.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="equipment">
-		<commons-header></commons-header>
-		<view  v-if="!isJinbian" class="search-warp">
+		<commons-header :isBack="false"></commons-header>
+		
+		<!-- <view  v-if="!isJinbian" class="search-warp">
 			<view class="left-select" @click="openSelectQd(2)">
 				<span class="icon">&#xe6c4;</span>
 				<span style="margin:0 10rpx">1号生产线</span>
@@ -9,25 +10,25 @@
 			</view>
 			<view class="right-select" @click="openSelectQd(1)">
 				<span class="icon">&#xe6c3;</span>
-				<span style="margin: 0 10rpx;">状态</span>
+				<span style="margin: 0 10rpx;">{{$t('equipment.stat')}}</span>
 				<span class="icon">&#xe6b9;</span>
 			</view>
-		</view>
-		<view  class="content">
+		</view> -->
+		<view  class="content" style="margin-top:128rpx">
 			<ul>
-				<li>
-					<view class="list-warp"  @click="toDtl">
+				<li v-for="i in listData" :key="i.id">
+					<view class="list-warp"  @click="toDtl" v-if="i.type == 1">
 						<view class="list-main-info">
 							<view class="img">
 								<image src="../../static/images/icon_bzj@2x.png" mode=""></image>
 							</view>
 							<view class="text">
 								<view class="list-main-title">
-									注塑机
-									<span>运行中</span>
+									注塑机 
+									<span class="commons-close">{{offLine}}</span>
 								</view>
 								<view class="list-main-model">
-									产品型号：SMT-1029
+									{{$t('equipment.model')}}：{{i.equipmentNo}}
 								</view>
 							</view>
 							<view class="more">
@@ -42,29 +43,9 @@
 								检测系统
 							</view> -->
 						</view>
-						<view class="list-title">
-							辅助机器
-						</view>
-						<view class="auxiliary-warp">
-							<view class="auxiliary-list-box">
-								<view class="auxiliary-img">
-									<image src="../../static/images/icon_xlj@2x.png" mode=""></image>
-								</view>
-								<view class="auxiliary-text">
-									<view class="auxiliary-text-title">
-										下料机
-									</view>
-									<view class="model">
-										产品型号：SMT-2071
-									</view>
-								</view>
-								<view class="auxiliary-before commons-normal">
-									运行中
-								</view>
-							</view>
-						</view>
+						
 					</view>
-					<view class="list-warp"  @click="toDtl3">
+					<!-- <view class="list-warp"  @click="toDtl3">
 						<view class="list-main-info">
 							<view class="img">
 								<image src="../../static/images/icon_bzj@2x.png" mode=""></image>
@@ -72,26 +53,18 @@
 							<view class="text">
 								<view class="list-main-title">
 									注塑机
-									<span class="standby">待机</span>
+									<span class="standby commons-close">{{offLine}}</span>
 								</view>
 								<view class="list-main-model">
-									产品型号：SMT-1029
+									{{$t('equipment.model')}}：SMT-1029
 								</view>
 							</view>
 							<view class="more">
 								<i class="iconfont">&#xe6bb;</i>
 							</view>
 						</view>
-						<!-- <view class="tag">
-							<view class="tag-box">
-								自动模式
-							</view>
-							<view class="tag-box">
-								检测系统
-							</view>
-						</view> -->
 						<view class="list-title">
-							辅助机器
+							{{$t('equipment.auxiliaryMachine')}}
 						</view>
 						<view class="auxiliary-warp">
 							
@@ -104,18 +77,41 @@
 										下料机
 									</view>
 									<view class="model">
-										产品型号：SMT-2071
+										{{$t('equipment.model')}}：SMT-2071
 									</view>
 								</view>
 								<view class="auxiliary-before commons-close">
-									离线
+									{{offLine}}
 								</view>
 							</view>
 							
 						</view>
+					</view> -->
+				</li>
+				<li @click="toDtl5"  v-for="i in listData" :key="i.id" v-if="i.type === 8">
+					<view class="list-warp">
+						<view class="list-main-info">
+							<view class="img">
+								<image src="../../static/images/icon_bzj@2x.png" mode=""></image>
+							</view>
+							<view class="text">
+								<view class="list-main-title">
+									包装机
+									<span class="commons-close">{{offLine}}</span>
+								</view>
+								<view class="list-main-model">
+									{{$t('equipment.model')}}：{{i.equipmentNo}}
+									<span style="margin-left: 30rpx;">{{$t('equipment.yield')}}：200 pcs/min</span>
+								</view>
+							</view>
+							<view class="more">
+								<span class="iconfont">&#xe6bb;</span>
+							</view>
+						</view>
 					</view>
+					
 				</li>
-				<li  @click="toDtl2">
+				<li  @click="toDtl2"  v-for="i in listData" :key="i.id" v-if="i.type == 9">
 					<view class="list-warp">
 						<view class="list-main-info">
 							<view class="img">
@@ -124,10 +120,10 @@
 							<view class="text">
 								<view class="list-main-title">
 									灭菌柜
-									<span>运行中</span>
+									<span>{{running}}</span>
 								</view>
 								<view class="list-main-model">
-									产品型号：SMT-5010
+									{{$t('equipment.model')}}：{{i.equipmentNo}}
 								</view>
 							</view>
 							<view class="more">
@@ -136,10 +132,10 @@
 						</view>
 						<view class="tag">
 							<view class="tag-box">
-								平均温度:67.5℃
+								{{$t('equipment.temperature')}}:67.5℃
 							</view>
 							<view class="tag-box">
-								平均湿度:67.5%RH
+								{{$t('equipment.humidity')}}:67.5%RH
 							</view>
 						</view>
 					</view>
@@ -161,32 +157,32 @@
 				
 				<ul>
 					<li @click="selectMaterialList()">
-						运行中
+						{{running}}
 					</li>
 					<li @click="selectMaterialList()">
-						待机
+						{{standby}}
 					</li>
 					<li @click="selectMaterialList()">
-						离线
+						{{offLine}}
 					</li>
 				</ul>
 			</view>
-		</uni-popup>
-		<ul v-if="isJinbian" class="jinbian-list">
-			<li class="jinbian-list-box">
-				<view class="list-title">
+		</uni-popup> 
+		<ul  class="jinbian-list"> 
+			<li class="jinbian-list-box"   v-for="i in listData" :key="i.id" v-if="i.type == 6">
+				<!-- <view class="list-title">
 					分组1 <i class="iconfont">&#xe71b;</i>
-				</view>
+				</view> -->
 				<view class="list-content">
 					<view class="equ-list" @click="toDtl4()">
-						<view class="state">
-							状态
+						<view class="state" style="background:#999">
+							{{offLine}}
 						</view>
 						<view class="img-or-text">
 							<image src="../../static/jinbian/icon_jbj.png" mode=""></image>
 							<view class="text">
 								<h3>设备1</h3>
-								<p>型号：SMT-202201 <span>今日产量：200</span></p>
+								<p>{{$t('equipment.model')}}：{{i.equipmentNo}} <span>{{$t('equipment.yield')}}：200</span></p>
 							</view>
 						</view>
 						<view class="tags">
@@ -212,40 +208,6 @@
 							</view>
 						</view>
 					</view>
-					<view class="equ-list">
-						<view class="state">
-							状态
-						</view>
-						<view class="img-or-text">
-							<image src="../../static/jinbian/icon_jbj.png" mode=""></image>
-							<view class="text">
-								<h3>设备1</h3>
-								<p>型号：SMT-202201 <span>今日产量：200</span></p>
-							</view>
-						</view>
-						<view class="tags">
-							<view class="tag-box">
-								<view class="tag-icon-box">
-									<span class="icon">&#xe735;</span>
-								</view>
-								EBC
-							</view>
-							<view class="tag-box">
-								<view class="tag-icon-box">
-									<span class="icon">&#xe733;</span>
-								</view>
-								
-								贾卡
-							</view>
-							<view class="tag-box">
-								<view class="tag-icon-box">
-									<span class="icon">&#xe734;</span>
-								</view>
-								
-								横移
-							</view>
-						</view>
-					</view>
 				</view>
 			</li>
 		</ul>
@@ -265,28 +227,23 @@
 		},
 		data() {
 			return {
+				offLine:this.$t('equipment.offLine'),
+				standby:this.$t('equipment.standby'),
+				running:this.$t('equipment.running'),
 				userInfoData: [],
 				notificationData:[],
-				isJinbian:true,//控制是否是经编
+				isJinbian:false,//控制是否是经编
+				listData:[],
 			}
 		},
 		onLoad() {
 			const v = this
-			// v.$post('/wx/login/getUserInfo').then(res => {
-			// 	v.userInfoData = res.data
-			// 	Vue.prototype.$userInfo = res.data
-			// 	uni.setStorage({
-			// 		key: "userInfo",
-			// 		data: res.data,
-			// 		success(res) {
-
-			// 		},
-			// 		fail(res) {}
-			// 	})
-			// })
-			// v.$post('/wx/message/notification',{}).then(res=>{
-			// 	v.notificationData = res.data
-			// })
+			v.$post('/api/syringe-production/factoryProduct/list',{}).then(res => {
+				
+				v.listData = res.data
+				console.log(v.listData )
+			})
+			
 		},
 		methods: {
 			selectMaterialList(){
@@ -306,6 +263,11 @@
 					title: '该设备待机中，暂无数据！'
 				})
 			},
+			toDtl5(){
+				uni.navigateTo({
+					url: '/pages/equipment/packingMachine'
+				})
+			},
 			toDtl4(){
 				console.log(123123)
 				uni.navigateTo({
@@ -333,8 +295,8 @@
 </script>
  
 <style lang="less">
-	.jinbian-list{
-		padding-top:156rpx;
+	.jinbian-list{  
+		
 		.jinbian-list-box{
 			margin-bottom: 24rpx;
 			background-color: #fff;

pages/equipment/equipmentDemo.vue

@@ -144,6 +144,28 @@
 						</view>
 					</view>
 				</li>
+				<li  @click="toDtlUrl('rollPrinter')">
+					<view class="list-warp">
+						<view class="list-main-info">
+							<view class="img">
+								<image src="~@/static/images/icon_mjg@2x.png" mode=""></image>
+							</view>
+							<view class="text">
+								<view class="list-main-title">
+									滚印机
+									<span>运行中</span>
+								</view>
+								<view class="list-main-model">
+									产品型号：SMT-5010
+								</view>
+							</view>
+							<view class="more">
+								<span class="iconfont">&#xe6bb;</span>
+							</view>
+						</view>
+						
+					</view>
+				</li>
 			</ul>
 		</view>
 		<uni-popup v-if="!isJinbian" ref="popup2" type="bottom">
@@ -224,6 +246,12 @@
 					this.$refs.popup2.open('top')
 				}
 			},
+			toDtlUrl(_url){
+				console.log(_url)
+				uni.navigateTo({
+					url: '/pages/equipment/' + _url
+				})
+			},
 			toDtl3(){
 				uni.showToast({
 					icon:"none",
@@ -231,7 +259,6 @@
 				})
 			},
 			toDtl4(){
-				console.log(123123)
 				uni.navigateTo({
 					url: '/pages/equipment/warpKnitting'
 				})

pages/equipment/injectionMolding.vue

@@ -16,7 +16,7 @@
 						设备状态
 					</view>
 					<view class="state-text">
-						正常
+						离线
 					</view>
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						工作模式
 					</view>
 					<view class="state-text">
-						自动
+						离线
 					</view>
 				</view>
 			</view>
@@ -132,64 +132,64 @@
 				tongdao:[
 					{
 						name:"通道1",
-						yali:10,
-						sudu:70,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:50,
-						sudu:80,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:80,
-						sudu:50,
+						yali:0,
+						sudu:0,
 					},{
 						name:"通道1",
-						yali:40,
-						sudu:40,
+						yali:0,
+						sudu:0,
 					}
 				],
 				tongdao1:[
 					{
 						name:"通道1",
-						yali:12,
-						sudu:72,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:53,
-						sudu:83,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:84,
-						sudu:55,
+						yali:0,
+						sudu:0,
 					},{
 						name:"通道1",
-						yali:46,
-						sudu:46,
+						yali:0,
+						sudu:0,
 					}
 				],
 				tongdao2:[
 					{
 						name:"通道1",
-						yali:6,
-						sudu:66,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:44,
-						sudu:84,
+						yali:0,
+						sudu:0,
 					},
 					{
 						name:"通道1",
-						yali:54,
-						sudu:33,
+						yali:0,
+						sudu:0,
 					},{
 						name:"通道1",
-						yali:22,
-						sudu:11,
+						yali:0,
+						sudu:0,
 					}
 				],
 				userInfoData: [],
@@ -219,21 +219,21 @@
 					series: [
 						{
 							name: "实际产量",
-							data: [200, 410, 350, 400, 440, 450]
+							data: [0, 0, 0, 0, 0, 0]
 						},{
 							name: "极限产量",
-							data: [500, 500, 500, 500, 500, 500]
+							data: [0, 0, 0, 0, 0, 0]
 						},
 					]
 				},
 				qiehuantype:1,
-				tongti:80,
-				yeya:80,
+				tongti:0,
+				yeya:0,
 			}
 		},
 		onLoad() {
 			const v = this
-			v.qiehuan()
+			//v.qiehuan()
 		},
 		methods: {
 			toInstructionsVideo(){

pages/equipment/sterilization.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 注塑机 -->
+	<!-- 灭菌柜 -->
 	<view class="equipmentDtl">
 		<commons-header title='灭菌柜'></commons-header>
 		<view class="equ-img">

pages/equipment/warpKnitting.vue

@@ -16,7 +16,7 @@
 						设备状态
 					</view>
 					<view class="state-text" style="color: #3FBF31;">
-						运行
+						离线
 					</view>
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						主轴转速
 					</view>
 					<view class="state-text">
-						400 RPM
+						0 RPM
 					</view>
 				</view>
 			</view>
@@ -37,17 +37,17 @@
 			<li>
 				<image src="../../static/jinbian/icon_ebc2.png" mode=""></image>
 				<p>EBC</p>
-				<view class="state-text">运行</view>
+				<view class="state-text">离线</view>
 			</li>
 			<li>
 				<image src="../../static/jinbian/icon_jk2.png" mode=""></image>
 				<p>贾卡</p>
-				<view class="state-text">运行</view>
+				<view class="state-text">离线</view>
 			</li>
 			<li>
 				<image src="../../static/jinbian/icon_hy.png" mode=""></image>
 				<p>横移</p>
-				<view class="state-text">运行</view>
+				<view class="state-text">离线</view>
 			</li>
 		</ul>
 		<view class="echarts">
@@ -72,7 +72,7 @@
 					<view class="text">
 						<view class="list-label">当前布长</view>
 						<view class="list-val">
-							200M
+							0M
 						</view>
 					</view>
 				</view>
@@ -81,7 +81,7 @@
 					<view class="text">
 						<view class="list-label">设定布长</view>
 						<view class="list-val">
-							200M
+							0M
 						</view>
 					</view>
 				</view>
@@ -92,7 +92,7 @@
 					<view class="list-label" style="line-height: 80rpx;">密度</view>
 				</view>
 				<view class="list-val"  style="line-height: 80rpx;">
-					200M
+					0M
 				</view>
 			</view>
 			<view class="list-long">
@@ -101,8 +101,8 @@
 					<view class="list-label" style="line-height: 80rpx;font-size: 28rpx;font-weight: bold;">送经轴1</view>
 				</view>
 				<view class="list-val"  style="line-height: 40rpx;color: #666666;font-size: 24rpx;">
-					<p>剩余圈数：35 N</p>
-					<p>剩余时间：35 H</p>
+					<p>剩余圈数：0 N</p>
+					<p>剩余时间：0 H</p>
 				</view>
 			</view>
 			<view class="list-bc mt-24">
@@ -130,7 +130,7 @@
 					<view class="text">
 						<view class="list-label">工艺宽度</view>
 						<view class="list-val">
-							200
+							0
 						</view>
 					</view>
 				</view>
@@ -139,7 +139,7 @@
 					<view class="text">
 						<view class="list-label">工艺高度</view>
 						<view class="list-val">
-							200
+							0
 						</view>
 					</view>
 				</view>
@@ -156,7 +156,7 @@
 					<view class="list-label" style="line-height: 80rpx;">总轴数</view>
 				</view>
 				<view class="list-val"  style="line-height: 80rpx;">
-					3
+					0
 				</view>
 			</view>
 		</view>
@@ -202,11 +202,11 @@
 					categories: ["2016", "2017", "2018", "2019", "2020", "2021"],
 					series: [{
 							name: "极限产量",
-							data: [15,15,15,15,15,15,15,15]
+							data: [0,0,0,0,0,0,0,0]
 						},
 						{
 							name: "实际产量", 
-							data: [70, 40, 65, 100, 44, 68]
+							data: [0, 0, 0, 0, 0, 0]
 						},
 						
 					]

pages/user/login.vue

@@ -4,13 +4,13 @@
 
 		<view class="login-header">
 			<image src="../../static/logo.png" mode=""></image>
-			<h2>ByteSailing管理系统</h2>
+			<h2>{{$t('login.title')}}</h2>
 
 		</view>
 		<view class="login-form">
-			<uni-easyinput type="text" v-model="loginForm.tenantId" placeholder="请输入租户ID" />
-			<uni-easyinput type="text" v-model="loginForm.username" placeholder="请输入账号" />
-			<uni-easyinput type="password" v-model="loginForm.password" placeholder="请输入密码" />
+			<uni-easyinput type="text" v-model="loginForm.tenantId" :placeholder="$t('login.form.tenantId')" />
+			<uni-easyinput type="text" v-model="loginForm.username" :placeholder="$t('login.form.username')" />
+			<uni-easyinput type="password" v-model="loginForm.password" :placeholder="$t('login.form.password')" />
 			
 			<!-- <uni-easyinput type="text" v-model="loginForm.code" placeholder="验证码" />
 			<image :src="image" @click="getCodeImg" style="width:200rpx;height:100rpx" mode=""></image> -->
@@ -20,11 +20,14 @@
 				<view class="check-icon-warp">
 					<i class="iconfont" style="margin-right:16rpx">&#xe6cb;</i>
 				</view>
-				已阅读并同意：Bytesailing <span>服务条款</span> 和 <span>隐私协议</span>
+				{{$t('login.agreement.text')}} 
+				<span>{{$t('login.agreement.clause')}}</span> 
+				{{$t('login.agreement.and')}} 
+				<span>{{$t('login.agreement.agreement')}}</span>
 				
 			</view>
-			<button type="default" @click="lodingFn">登录</button>
-			<p @click="toDemo" class="demo">demo示例</p>
+			<button type="default" @click="lodingFn">{{$t('login.loginText')}}</button>
+			<p @click="toDemo" class="demo">{{$t('login.demo')}}</p>
 		</view>
 
 
@@ -52,7 +55,7 @@
 					//密码
 					password: '',
 					//账号类型
-					type: 'account',
+					type: 'loginWithoutVerificationCode',
 					//验证码的值
 					code: '',
 					//验证码的索引
@@ -81,40 +84,55 @@
 				const v = this
 			},
 			lodingFn() {
-				const v = this
-				if(v.loginForm.password == 'admin' && v.loginForm.username == 'admin'){
-					uni.switchTab({
-						url: '/pages/equipment/equipment'
-					})
-				}else{
-					uni.showToast({
-						icon:"none",
-						title: '账号密码错误！'
-					})
+				function filter(str) { // 特殊字符转义
+					str += ''; // 隐式转换
+					str = str.replace(/%/g, '%25');
+					str = str.replace(/\+/g, '%2B');
+					str = str.replace(/ /g, '%20');
+					str = str.replace(/\//g, '%2F');
+					str = str.replace(/\?/g, '%3F');
+					str = str.replace(/&/g, '%26');
+					str = str.replace(/\=/g, '%3D');
+					str = str.replace(/#/g, '%23');
+					return str;
 				}
 				
-				return
-				
+				function formateObjToParamStr(paramObj) {
+					const sdata = [];
+					for (let attr in paramObj) {
+						sdata.push(`${attr}=${filter(paramObj[attr])}`);
+					}
+					return sdata.join('&');
+				}
+				const loginForm = {...this.loginForm}
+				loginForm.password = this.$w_md5.hex_md5_32(loginForm.password)
 				uni.request({
-					url:v.$baseUrl + '/api/blade-auth/oauth/token?' + getParams(v.loginForm),
-
+					url: 'http://36.134.91.96:10001/api' + '/blade-auth/oauth/token?' + formateObjToParamStr(loginForm),
 					method: 'POST',
 					header: {
-						'Captcha-Key': this.loginForm.key,
-						'Captcha-Code': this.loginForm.code,
-						'Tenant-Id': this.loginForm.tenantId,
-						'Content-Type': 'application/json;charset=UTF-8',
-						'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+						'Content-Type': 'application/json',
+						'Captcha-Key': loginForm.key,
+						'Captcha-Code': loginForm.code,
+						'Tenant-Id': loginForm.tenantId,
+						'Authorization':'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
+						'Blade-Auth': undefined
 					},
-					success: (res) => {
-						console.log(res)
-						uni.switchTab({
-							url: '/pages/equipment/equipment'
-						})
+					success: res => {
+						if(res.statusCode == 200){
+							uni.setStorageSync('token', res.data.access_token)
+							uni.setStorageSync('Authorization', res.data)
+							Vue.prototype.$token = res.data
+							uni.reLaunch({
+								url: '/pages/equipment/equipment'
+							})
+						}else{
+							console.log(res)
+							uni.showToast({
+								icon:"none",
+								title: '账号密码错误！'
+							})
+						}
 					},
-					fail: (err) => {
-						console.log(err)
-					}
 				});
 			},
 			getCodeImg() {

unpackage/debug/.roid.ins

@@ -1 +1 @@
-installed
+forceInstall

unpackage/dist/dev/app-plus/androidPrivacy.json

@@ -1 +1,3 @@
-{"prompt":"template"}
+{
+    "prompt" : "template"
+}

unpackage/dist/dev/mp-weixin/app.json

@@ -1,14 +1,16 @@
 {
   "pages": [
+    "pages/user/login",
     "pages/equipment/equipment",
+    "pages/equipment/equipmentDemo",
     "pages/im/im",
     "pages/TUI-Login/login",
-    "pages/user/login",
     "pages/home",
     "pages/production/production",
     "pages/user/user",
     "pages/equipment/assemblyMachine",
     "pages/equipment/injectionMolding",
+    "pages/equipment/packingMachine",
     "pages/equipment/shengchang",
     "pages/equipment/jinxiaocun",
     "pages/equipment/sterilization",
@@ -46,22 +48,10 @@
         "selectedIconPath": "static/btn_shebei_blue.png"
       },
       {
-        "pagePath": "pages/im/im",
-        "text": "协作",
-        "iconPath": "static/btn_sc_gray.png",
-        "selectedIconPath": "static/btn_sc_blue.png"
-      },
-      {
-        "pagePath": "pages/equipment/shengchang",
-        "text": "生产",
-        "iconPath": "static/btn_shengc_gray.png",
-        "selectedIconPath": "static/btn_shengc_blue.png"
-      },
-      {
-        "pagePath": "pages/equipment/jinxiaocun",
-        "text": "进销存",
-        "iconPath": "static/btn_jxc_gray.png",
-        "selectedIconPath": "static/btn_jxc_blue.png"
+        "pagePath": "pages/user/user",
+        "text": "我的",
+        "iconPath": "static/btn_mine_gray.png",
+        "selectedIconPath": "static/btn_mine_blue.png"
       }
     ]
   },

unpackage/dist/dev/mp-weixin/common/main.js

@@ -7,11 +7,10 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(createApp, uni) {__webpack_require__(/*! uni-pages */ 5);
+/* WEBPACK VAR INJECTION */(function(uni, createApp) {__webpack_require__(/*! uni-pages */ 5);
 
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6));
 
-
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
 
 
@@ -36,15 +35,24 @@ var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
 
 
 
+var _env = _interopRequireDefault(__webpack_require__(/*! @/util/env.js */ 17));
 
 
+var _http = _interopRequireDefault(__webpack_require__(/*! @/util/http.js */ 18));
 
 
 
+var _w_md = _interopRequireDefault(__webpack_require__(/*! js_sdk/zww-md5/w_md5.js */ 19));
 
 
+var _mixins = _interopRequireDefault(__webpack_require__(/*! ./polyfill/mixins */ 20));
 
 
+var _vueI18n = _interopRequireDefault(__webpack_require__(/*! vue-i18n */ 21));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // @ts-ignore
+wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;_vue.default.prototype.$token = false;_vue.default.prototype.$userInfo = null;uni.getStorage({ key: "userInfo", success: function success(_data) {_vue.default.prototype.$userInfo = _data.data;}, fail: function fail() {_vue.default.prototype.$userInfo = null;} });uni.getStorage({ key: "Authorization", success: function success(_data) {console.log(_data);_vue.default.prototype.$token = _data.data;}, fail: function fail() {_vue.default.prototype.$token = false;} }); //公用链接
+_vue.default.prototype.$baseUrl = _env.default.baseUrl; //公用请求
+_vue.default.prototype.$get = _http.default.get;_vue.default.prototype.$post = _http.default.post;_vue.default.prototype.$w_md5 = _w_md.default;_vue.default.mixin(_mixins.default);_vue.default.use(_vueI18n.default);var i18n = new _vueI18n.default({
+  locale: 'zh-CN', //初始化,保证刷新页面也保留
 
 
 
@@ -52,20 +60,20 @@ var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
 
 
 
-
-var _env = _interopRequireDefault(__webpack_require__(/*! @/util/env.js */ 17));
-
-
-var _http = _interopRequireDefault(__webpack_require__(/*! @/util/http.js */ 18));
-
+  // 加载语言文件的内容
+  messages: {
+    'zh-CN': __webpack_require__(/*! ./lang/cn.js */ 22).lang,
+    'en': __webpack_require__(/*! ./lang/en.js */ 23).lang } });
 
 
+_vue.default.config.productionTip = false;
+_App.default.mpType = 'app';
+var app = new _vue.default(_objectSpread({
+  i18n: i18n },
+_App.default));
 
-var _mixins = _interopRequireDefault(__webpack_require__(/*! ./polyfill/mixins */ 19));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // @ts-ignore
-wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;_vue.default.config.productionTip = false;_App.default.mpType = 'app';var app = new _vue.default(_objectSpread({}, _App.default));createApp(app).$mount();_vue.default.prototype.$token = false;_vue.default.prototype.$userInfo = null;uni.getStorage({ key: "userInfo", success: function success(_data) {_vue.default.prototype.$userInfo = _data.data;}, fail: function fail() {_vue.default.prototype.$userInfo = null;} });uni.getStorage({ key: "Authorization", success: function success(_data) {console.log(_data);_vue.default.prototype.$token = _data.data;}, fail: function fail() {_vue.default.prototype.$token = false;} }); //公用链接
-_vue.default.prototype.$baseUrl = _env.default.baseUrl; //公用请求
-_vue.default.prototype.$get = _http.default.get;_vue.default.prototype.$post = _http.default.post;_vue.default.mixin(_mixins.default);
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+createApp(app).$mount();
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"]))
 
 /***/ }),
 /* 1 */,

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -35,9 +35,10 @@
 	content: "";
 	display: block;
 	height: 30rpx;
-	width: 4rpx;
+	width: 8rpx;
 	position: absolute;
 	left: 20rpx;
+	border-radius: 4rpx;
 	top: 18rpx;
 	background-color: #007AFF;
 }
@@ -54,8 +55,8 @@
 	color: #F54A45;
 }
 .commons-close {
-	background: rgba(153, 153, 153, 0.20);
-	color: #999999;
+	background: rgba(153, 153, 153, 0.20)!important;
+	color: #999999!important;
 }
 .commons-before-40 {
 	width: 40rpx;