代码提交

src/assets/iconfont/iconfont.scss

@@ -20,6 +20,7 @@
 .icon-tuichu::before {
   content: "\e645";
 }
+
 .icon-xiaoxi::before {
   font-size: 21.2px;
   content: "\e61f";

src/layouts/components/Header/components/PasswordDialog.vue

@@ -1,14 +1,4 @@
 <template>
-  <el-dialog v-model="dialogVisible" title="修改密码" width="500px" draggable>
-    <span>This is Password</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
-      </span>
-    </template>
-  </el-dialog>
-
   <!-- 修改密码对话框 -->
   <el-dialog v-model="dialogVisible" title="修改密码"  width="700px" append-to-body>
     <el-form ref="formRef" :model="userForm" :rules="rules" label-width="120px">

src/views/system/stations/components/translation.vue

@@ -4,11 +4,37 @@
       <div style="flex-grow: 1;height: 66vh;overflow-y: auto;overflow-x: hidden">
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small"  @selection-change="handleSelectionChange">
+            <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" style="max-height: 66vh;"  @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="40" align="center"/>
               <template v-for="item in columns" :key="item">
                 <el-table-column v-bind="item" :align="item.align ?? 'left'" :reserve-selection="item.type == 'selection'">
                   <template #default="scope">
+                    <template v-if="item.prop === 'b'">
+                      <el-select
+                        class="no-border-select"
+                        v-model="scope.row.b"
+                        size="small">
+                        <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </template>
+                    <template v-if="item.prop === 'c'">
+                      <el-select
+                        class="no-border-select"
+                        v-model="scope.row.c"
+                        size="small">
+                        <el-option
+                          v-for="item in options2"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </template>
                     <template v-if="item.prop === 'operation'">
                       <el-tooltip
                         class="box-item"
@@ -255,10 +281,76 @@ const columns2 = reactive<ColumnProps[]>([
   { prop: "b", label: "未结冰", width:200},
   { prop: "c", label: "结冰", width:200 }
 ]);
+
+const options = [
+  {
+    value: '1',
+    label: '人工',
+  },
+  {
+    value: '2',
+    label: '自动',
+  }
+]
+
+const options2 = [
+  {
+    value: '1',
+    label: '超声风传感器',
+  },
+  {
+    value: '2',
+    label: '干湿表',
+  },
+  {
+    value: '3',
+    label: '振筒气压计',
+  },
+  {
+    value: '4',
+    label: '雨量器',
+  },
+  {
+    value: '5',
+    label: '能见度/天气现象传感器',
+  },
+  {
+    value: '5',
+    label: 'DSS1型雪深观测仪',
+  },
+  {
+    value: '6',
+    label: '地面温度传感器',
+  },
+  {
+    value: '7',
+    label: '大气电场传感器',
+  },
+  {
+    value: '8',
+    label: '雷电预警仪',
+  },{
+    value: '9',
+    label: '日照传感器',
+  },{
+    value: '10',
+    label: '总辐射传感器',
+  },{
+    value: '11',
+    label: '光照度传感器',
+  }
+]
 </script>
 
 <style scoped>
 .table-box{
   height: 100%;
 }
+
+
+::v-deep .no-border-select .el-select__wrapper  {
+  box-shadow: 0 0 0 0px!important;
+  background-color: #00000000;
+}
+
 </style>