bug

package.json

@@ -63,7 +63,7 @@
     "vue": "^3.0.4",
     "vue-baidu-map": "^0.21.22",
     "vue-echarts": "^6.0.0-rc.6",
-    "vue-i18n": "^10.0.5",
+    "vue-i18n": "^10.0.6",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^4.0.0-rc.6",
     "vuex": "^4.0.0-rc.2",

src/i18n/language/en.js

@@ -5,6 +5,7 @@ const en = {
     username: 'Please enter username/mobile number',
     password: 'Please enter password',
     login: 'Login',
+    use: 'Cloud platform free to use',
   },
   defalult: {
     grzx: 'Personal Center',
@@ -143,6 +144,9 @@ const en = {
     sjhm: 'Mobile number',
     yx: 'Email',
     bdxm: 'Bound project',
+    dh: 'tel',
+    gs: 'company',
+    zw: 'post',
   },
   maintenance: {
     zxbx: 'Online repair reporting',
@@ -256,6 +260,8 @@ const en = {
     ccsj: 'Transmission time',
     qxzqgq: 'Please select sensor',
     zhi: 'Value',
+    gscTps: 'Formula calculation, such as x / 100, can be left blank',
+    gsTps: 'Formula calculation, such as x * 100, can be left blank',
   },
   vehicles: {
     clmc: 'Vehicle name',

src/i18n/language/zh.js

@@ -5,6 +5,7 @@ const zh = {
     username: '请输入用户名/手机号',
     password: '请输入密码',
     login: '登录',
+    use: '云平台免费使用',
   },
   defalult: {
     grzx: '个人中心',
@@ -141,6 +142,9 @@ const zh = {
     sjhm: '手机号码',
     yx: '邮箱',
     bdxm: '绑定项目',
+    dh: '电话',
+    gs: '公司',
+    zw: '职位',
   },
 
   maintenance: {
@@ -255,6 +259,8 @@ const zh = {
     ccsj: '传输时间',
     qxzqgq: '请选择传感器',
     zhi: '值',
+    gscTps: '公式计算，如x/100 可不填',
+    gsTps: '公式计算，如x*100 可不填',
   },
   vehicles: {
     clmc: '车辆名称',

src/vab/components/VabAvatar/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-badge
+  <!--    <el-badge
     class="item"
     :value="total"
     max="99"
@@ -10,8 +10,8 @@
       {{ $t('device.xmdp') }}
     </el-link>
     <i class="el-icon-message-solid"></i>
-    <!--    <el-button type="danger" size="mini" @click="jumpAlarm">报警</el-button>-->
-  </el-badge>
+  <el-button type="danger" size="mini" @click="jumpAlarm">报警</el-button>
+  </el-badge>-->
   <el-dropdown
     style="margin-left: 20px"
     @command="handleCommand"

src/vab/components/VabNavBar/index.vue

@@ -19,9 +19,9 @@
               :value="item.id"
             ></el-option>
           </el-select>
-          <el-link type="primary" :href="url" target="_blank">
+          <!--    <el-link type="primary" :href="url" target="_blank">
             {{ $t('device.sydp') }}
-          </el-link>
+          </el-link>-->
           <!--          <el-dropdown @command="onToggleProject">-->
           <!--            <span class="el-dropdown-link cursor">-->
           <!--              {{ activeProject.name }}-->

src/views/iot/alarmuser.vue

@@ -18,7 +18,7 @@
       ></el-table-column>
       <el-table-column
         prop="phone"
-        label="电话"
+        :label="$t('staff.dh')"
         width="120"
         align="center"
       ></el-table-column>

src/views/iot/sensor/add.vue

@@ -144,6 +144,19 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item :label="$t('sensor.sxgs')">
+          <el-input
+            v-model="form.formulaUp"
+            :placeholder="$t('sensor.gscTps')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('sensor.xsgs')">
+          <el-input
+            v-model="form.formulaDown"
+            :placeholder="$t('sensor.gsTps')"
+          ></el-input>
+        </el-form-item>
       </el-form>
       <vab-query-form>
         <el-button type="primary" @click="save">
@@ -212,8 +225,8 @@ export default {
         functionCode: '',
         dataFormat: '',
         sort: '',
-        // formulaUp: '',
-        // formulaDown: '',
+        formulaUp: '',
+        formulaDown: '',
         readWrite: '',
         homeShowFlag: '',
         img: '',
@@ -290,8 +303,8 @@ export default {
       if (form.unit != undefined) {
         this.form.unit = form.unit.dataCode;
       }
-      // this.form.formulaUp = form.formulaUp;
-      // this.form.formulaDown = form.formulaDown;
+      this.form.formulaUp = form.formulaUp;
+      this.form.formulaDown = form.formulaDown;
       if (form.dataFormat != undefined) {
         this.form.dataFormat = form.dataFormat.dataCode;
       }

src/views/login/index.vue

@@ -1,41 +1,21 @@
 <template>
   <div class="login-container">
     <div class="login-logo">
-      <!--<el-image :src="require('@/assets/login_images/logo.png')"></el-image>-->
-      <!--<el-button class="login-el-button" type="primary" @click="trialShow">
-        云平台免费使用
-      </el-button>-->
+      <el-button class="login-el-button" type="primary" @click="trialShow">
+        {{ $t('login.use') }}
+      </el-button>
     </div>
     <div class="login">
-      <img
-        :src="require('@/assets/login_images/login_wrap.png')"
-        style="width: 100%"
-      />
       <div class="el-tabs">
-        <div class="el-tabs-left">
-          <div style="text-align: center">
-            <img
-              class="el-tabs-ewm"
-              style="width: 160px; height: 160px; margin: auto"
-              :src="codeUrl"
-              alt=""
-            />
-            <div>
-              <!-- <span v-show="show" class="getCode" @click="getQrCode">
-                点击扫码登录
-              </span>
-              <span v-show="!show" class="count">{{ count }}s后失效</span>-->
-            </div>
-          </div>
-        </div>
         <div class="el-tabs-right">
-          <el-form ref="form" :model="form" label-width="100px">
+          <el-form ref="form" :model="form" label-width="0px">
             <el-form-item prop="userName">
               <el-input
                 v-model="form.userName"
                 v-focus
                 :placeholder="$t('login.username')"
                 tabindex="1"
+                class="el-input_tran"
                 type="text"
               >
                 <template #prefix>
@@ -43,11 +23,12 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item prop="passwords">
+            <el-form-item prop="passwords" style="margin-top: 30px">
               <el-input
                 :key="passwordType"
                 ref="password"
                 v-model="form.passwords"
+                class="el-input_tran"
                 :placeholder="$t('login.password')"
                 :type="passwordType"
                 tabindex="2"
@@ -76,8 +57,7 @@
               :loading="loading"
               class="login-btn"
               type="primary"
-              size="small"
-              style="width: 77%; margin-left: 23%"
+              style="width: 120%; margin: 30px -10%"
               @click="handleLogin"
             >
               {{ $t('login.login') }}
@@ -353,36 +333,28 @@ export default {
     margin-left: 50px;
   }
   .login {
-    width: 660px;
     margin: auto;
     position: relative;
-    .el-tabs__nav-wrap::after {
-      background-color: white;
-    }
-    .el-tabs {
-      position: absolute;
-      top: 80px;
-      left: 0;
-      width: 560px;
-      margin: 30px 60px;
+    width: 100vw;
+    height: 100vh;
     display: flex;
-      justify-content: space-between;
+    justify-content: center;
     align-items: center;
-      .el-tabs__nav-wrap {
-        padding: 30px 0;
-        padding-left: 120px;
-      }
-      .el-tabs-left {
-        width: 200px;
-        .getCode {
-          color: white;
-        }
-        .count {
-          color: white;
-        }
+
+    .el-tabs {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: url('~@/assets/login_images/login_wrap.png') no-repeat;
+      width: 570px;
+      height: 400px;
+      .el-input_tran {
+        transform: scale(1.2);
+        width: 400px;
       }
+
       .el-tabs-right {
-        width: 350px;
+        margin-top: 80px;
         .el-form-item {
           margin-bottom: 10px !important;
           .el-input__inner {
@@ -403,6 +375,10 @@ export default {
   justify-content: flex-end;
   align-items: center;
   padding: 30px 60px 60px;
+  position: fixed;
+  right: 0;
+  z-index: 1;
+
   .login-el-button {
     background: rgba(2, 35, 115, 0.6);
   }

src/views/login/trialAdd.vue

@@ -20,21 +20,21 @@
               autocomplete="off"
             ></el-input>
           </el-form-item>
-          <el-form-item label="电话">
+          <el-form-item :label="$t('staff.dh')">
             <el-input
               v-model="form.phone"
               size="small"
               autocomplete="off"
             ></el-input>
           </el-form-item>
-          <el-form-item label="公司">
+          <el-form-item :label="$t('staff.gs')">
             <el-input
               v-model="form.company"
               size="small"
               autocomplete="off"
             ></el-input>
           </el-form-item>
-          <el-form-item label="职务">
+          <el-form-item :label="$t('staff.zw')">
             <el-input
               v-model="form.position"
               size="small"
@@ -54,7 +54,7 @@
             style="width: 100%"
             @click="save"
           >
-            提交
+            {{ $t('defalult.tjtn') }}
           </el-button>
         </el-form>
       </div>
@@ -77,8 +77,8 @@ export default {
         email: '',
       },
       rules: {
-        name: [{ required: true, trigger: 'blur', message: '请输入姓名' }],
-        phone: [{ required: true, trigger: 'blur', message: '请输入手机号' }],
+        name: [{ required: true, trigger: 'blur', message: 'name' }],
+        phone: [{ required: true, trigger: 'blur', message: 'phone' }],
       },
     };
   },

src/views/server/siteDetails/technology.vue

@@ -44,7 +44,7 @@ export default {
     deviceCode: function (newVal, oldVal) {
       this.queryForm.deviceCode = newVal;
       this.src =
-        'https://dp.lidinghb.com/chudy_visual/view/' +
+        'http://world.lidinghb.com:8088/chudy_visual/view/' +
         newVal[1] +
         '?' +
         'deviceCode=' +

src/views/set/intention/add.vue

@@ -20,7 +20,7 @@
           autocomplete="off"
         ></el-input>
       </el-form-item>
-      <el-form-item label="公司" prop="company">
+      <el-form-item :label="$t('staff.gs')" prop="company">
         <el-input
           v-model.trim="form.company"
           size="small"

src/views/set/intention/index.vue

@@ -29,7 +29,7 @@
       ></el-table-column>
       <el-table-column
         prop="company"
-        label="公司"
+        :label="$t('staff.gs')"
         width="250"
         align="center"
       ></el-table-column>