中英文翻译

package.json

@@ -52,6 +52,7 @@
     "mockjs": "^1.1.0",
     "node-ssh": "^13.2.0",
     "nprogress": "^0.2.0",
+    "qrcode": "^1.5.4",
     "qs": "^6.10.1",
     "quill-image-drop-module": "^1.0.3",
     "quill-image-resize-module": "^3.0.0",

src/i18n/language/en.js

@@ -225,6 +225,7 @@ const en = {
     dw: 'Unit',
     dxqx: 'Read-write permission',
     sjgs: 'Data format',
+    cgqlx: 'sensor type',
     sfdtxs: 'Display on map page or not',
     sxgs: 'Uplink formula',
     xsgs: 'Downlink formula',

src/i18n/language/zh.js

@@ -224,6 +224,7 @@ const zh = {
     dw: '单位',
     dxqx: '读写权限',
     sjgs: '数据格式',
+    cgqlx: '传感器类型',
     sfdtxs: '是否在地图页面显示',
     sxgs: '上行公式',
     xsgs: '下行公式',

src/views/iot/sensor/add.vue

@@ -6,12 +6,7 @@
     @close="close"
   >
     <div class="manage-container">
-      <el-form
+      <el-form ref="form" :model="form" label-width="150" label-position="left">
-        ref="form"
-        :model="form"
-        label-width="100px"
-        label-position="left"
-      >
         <el-form-item :label="$t('sensor.cgqmc')">
           <el-input
             v-model="form.name"
@@ -22,7 +17,7 @@
           <el-select
             ref="select"
             v-model="form.img"
-            style="width: 100%"
+            style="width: 70%"
             :placeholder="$t('defalult.qxz')"
             @change="changeSelection"
           >
@@ -77,7 +72,7 @@
           <el-input v-model="data.remark" placeholder="1"></el-input>
         </el-form-item>
         <el-form-item v-if="isConfig" :label="$t('sensor.cgdlx')">
-          <el-select v-model="data.type" :placeholder="$t('sensor.qsrcgdlx')">
+          <el-select v-model="form.type" :placeholder="$t('sensor.qsrcgdlx')">
             <el-option
               v-for="item in typeData"
               :key="item.dataCode"
@@ -185,21 +180,21 @@ export default {
       writeData: [],
       homeShowFlagData: [
         {
-          label: '显示',
+          label: 'show',
           value: 1,
         },
         {
-          label: '不显示',
+          label: 'No Show',
           value: 0,
         },
       ],
       convertFlagData: [
         {
-          label: '是',
+          label: 'yes',
           value: 1,
         },
         {
-          label: '否',
+          label: 'no',
           value: 0,
         },
       ],
@@ -233,7 +228,7 @@ export default {
       },
       config: '',
       isNumber: false,
-      isConfig: false,
+      isConfig: true,
       dialogFormVisible: false,
       title: '',
       diffData: {},
@@ -270,10 +265,10 @@ export default {
     },
     showEdit(row, status) {
       if (!status) {
-        this.title = '添加传感器';
+        this.title = 'add sensor';
         this.getDeviceData(row);
       } else {
-        this.title = '编辑传感器';
+        this.title = 'exit sensor';
         this.assignment(row);
       }
       this.getDictData();
@@ -286,6 +281,7 @@ export default {
         this.form.attribute = form.attribute.dataCode;
       }
       this.form.id = form.id;
+      this.form.type = form.type.dataCode;
       this.form.name = form.name;
       this.form.img = form.img;
       this.form.addressId = form.addressId;

src/views/iot/sensor/index.vue

@@ -92,7 +92,12 @@
         width="200"
         align="center"
       ></el-table-column>
-
+      <el-table-column
+        prop="type.dataValue"
+        :label="$t('sensor.cgqlx')"
+        width="200"
+        align="center"
+      ></el-table-column>
       <el-table-column
         prop="status"
         :label="$t('sensor.sfdtxs')"

src/views/iot/ywry/qcode.vue

@@ -10,8 +10,6 @@
     </el-button>
 
     <div id="printCanvas" class="container">
-      <img src="@/assets/mb.png" />
-
       <div class="date">{{ currentDate }}</div>
       <img :src="qcodeImg" class="qrcodeimg" ass />
       <div class="qrcodeSn">{{ sn }}</div>

src/views/server/siteDetails/index.vue

@@ -28,10 +28,11 @@
       <div class="site-top-base">
         <div class="map-left-base">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane :label="$t('siteDetails.zddp')" name="first">
+            <!-- <el-tab-pane :label="$t('siteDetails.zddp')" name="first">
               <site-index ref="site" :deviceCode="queryForm.id"></site-index>
             </el-tab-pane>
-            <!--
+         -->
+
             <el-tab-pane :label="$t('siteDetails.zdzt')" name="second">
               <technology-index
                 ref="technology"
@@ -39,14 +40,13 @@
               ></technology-index>
             </el-tab-pane>
 
-         -->
+            <!--  <el-tab-pane :label="$t('siteDetails.jksp')" name="third">
-            <el-tab-pane :label="$t('siteDetails.jksp')" name="third">
               <video-index
                 ref="video"
                 :deviceCode="queryForm.deviceCode"
               ></video-index>
-            </el-tab-pane>
+            </el-tab-pane>   -->
-            <el-tab-pane :label="$t('siteDetails.szdbl')" name="fourth">
+            <!--   <el-tab-pane :label="$t('siteDetails.szdbl')" name="fourth">
               <water-index
                 ref="water"
                 :deviceCode="queryForm.deviceCode"
@@ -57,7 +57,7 @@
                 ref="image"
                 :deviceCode="queryForm.deviceCode"
               ></image-index>
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </div>
         <div class="map-right-base">
@@ -156,7 +156,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'first',
+      activeName: 'second',
       activeDataName: 'data-first',
       listLoading: false,
       deviceData: [],