123

src/components/Header.vue

@@ -158,7 +158,8 @@ export default {
 
 .popper-user-box .nickname {
   position: relative;
-  color: #ffffff;
+  color: #000;
+  font-size: 20px;
 }
 
 .popper-user-box .nickname .logout {

src/components/PzSet.vue

@@ -58,30 +58,33 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="数据位" prop="dataBits" clearable>
-          <el-select v-model="form2.dataBits">
-            <el-option v-for="item in dataBitsArr" :label="item.name" :value="item.value" :key="item.value"
-              clearable></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="波特率" prop="baudRate" clearable>
           <el-select v-model="form2.baudRate">
             <el-option v-for="item in baudRateArr" :label="item.name" :value="item.value" :key="item.value"
               clearable></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="停止位" prop="stopBits" clearable>
-          <el-select v-model="form2.stopBits">
-            <el-option v-for="item in stopBitsArr" :label="item.name" :value="item.value" :key="item.value"
-              clearable></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="校验类型" prop="parity" clearable>
           <el-select v-model="form2.parity">
             <el-option v-for="item in parityArr" :label="item.name" :value="item.value" :key="item.value"
               clearable></el-option>
           </el-select>
         </el-form-item>
+       
+        <el-form-item label="数据位" prop="dataBits" clearable>
+          <el-select v-model="form2.dataBits">
+            <el-option v-for="item in dataBitsArr" :label="item.name" :value="item.value" :key="item.value"
+              clearable></el-option>
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="停止位" prop="stopBits" clearable>
+          <el-select v-model="form2.stopBits">
+            <el-option v-for="item in stopBitsArr" :label="item.name" :value="item.value" :key="item.value"
+              clearable></el-option>
+          </el-select>
+        </el-form-item>
+       
       </fieldset>
     </el-form>
     <!-- 3: 'plc_s7' -->

src/components/Sidebar.vue

@@ -2,7 +2,7 @@
   <el-aside class="aside">
     <div class="head">
       <div>
-        <img src="../assets/logo2.png" alt="logo" />
+        <img src="/favicon.ico" alt="logo" />
         <span>数据控制</span>
       </div>
     </div>
@@ -63,13 +63,6 @@ export default {
           iconName: 'Management',
           children: [],
         },
-        {
-          id: 2,
-          name: "规则引擎",
-          index: "/rules",
-          iconName: 'Management',
-          children: [],
-        },
         // {
         //   id: 4,
         //   name: "透传管理",
@@ -105,6 +98,13 @@ export default {
             // },
           ],
         },
+        {
+          id: 2,
+          name: "规则引擎",
+          index: "/rules",
+          iconName: 'Management',
+          children: [],
+        }
       ],
     });
     return {

src/css/index.scss

@@ -321,4 +321,7 @@ s {
 }
 .el-drawer__header {
   margin-bottom: 0 !important;
+}
+.el-popper {
+  background: rgb(209, 235, 188) !important;
 }

src/utils/index.js

@@ -31,7 +31,7 @@ export const pathMap = {
   login: '登录',
   home: '设备信息',
   level: '网络配置',
-  model: '模块管理',
+  model: '模板管理',
   page: '驱动管理',
   data: '实时数据',
   report: '上报管理',

src/views/Login.vue

@@ -2,7 +2,7 @@
   <div class="login-body">
     <div class="login-container">
       <div class="head">
-        <img class="logo" src="../assets/logo2.png" />
+        <img class="logo" src="/favicon.ico" />
       </div>
       <div class="bottom">
         <div class="left-bottom"></div>

src/views/Model.vue

@@ -132,7 +132,7 @@ export default {
     };
 
     const delData = (item) => {
-      ElMessageBox.confirm("确定删除该数据?", "提示", {
+      ElMessageBox.confirm("确定删除该数据?", "删除模板", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/Page.vue

@@ -195,7 +195,7 @@ export default {
         return;
 
       }
-      ElMessageBox.confirm("确定删除该数据?", "提示", {
+      ElMessageBox.confirm("确定删除该数据?", "删除驱动", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -209,7 +209,7 @@ export default {
             ElMessage.success(res.message || "删除成功");
             getTableData();
           } else {
-            ElMessage.error(res.message | "删除失败");
+            ElMessage.error(res.message || "删除失败");
           }
         })
         .catch(() => {