logo修改

.env

@@ -1,7 +1,7 @@
 # 所有环境默认
 
 # 页面 title 前缀
-VUE_APP_TITLE=数量监测智能眼系统
+VUE_APP_TITLE=物联网系统
 
 # 网络请求公用地址
 VUE_APP_API=/api/

.env.development

@@ -1,5 +1,5 @@
 # 开发环境
 
 # 页面 title 前缀
-VUE_APP_TITLE=数量监测智能眼系统
+VUE_APP_TITLE=物联网系统
 

public/index.html

@@ -48,7 +48,7 @@
             href="https://github.com/d2-projects/d2-admin"
             target="_blank">
             <!-- https://github.com/d2-projects/d2-admin -->
-            紫光软件 数量监测系统
+            紫光软件 物联网系统
           </a>
         </div>
       </div>

src/layout/header-aside/layout.vue

@@ -16,7 +16,7 @@
         </router-link> -->
         <!-- <div ><img src="../../assets/images/leftLog.jpeg" alt=""></div> -->
         <div class="imgFather" flex-box="0">
-          <img src="../../assets/images/logo_big.png"  alt="" />
+          <img src="../../assets/images/logo1.png"  alt="" />
           <!-- <img v-if="asideCollapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
           <img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`"> -->
         </div>

src/libs/util.js

@@ -13,7 +13,7 @@ const util = {
  * @param {String} title 标题
  */
 util.title = function (titleText) {
-  const processTitle = process.env.VUE_APP_TITLE || '数量监测智能眼系统'
+  const processTitle = process.env.VUE_APP_TITLE || '物联网系统'
   // window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ''}`
   //浏览器标题
   window.document.title = `${processTitle}`

src/views/demo/productManage/compontents/addDialog.vue

@@ -75,6 +75,11 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="协议类型：" prop="protocolType">
+          <el-select v-model="addForm.protocolType" placeholder="请选择">
+            <el-option v-for="(item,index) in xyArr" :key="index" :label="item.enumName" :value="item.enumCode"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="产品描述：">
           <el-input
             style="width: 80%"
@@ -108,6 +113,7 @@ export default {
       },
       orgCode:"",
       ckLists: [],
+      xyArr:[],
       typeLists: [],
       addForm: {},
       dialogFormVisible: false,
@@ -119,6 +125,9 @@ export default {
         proCategoryCode: [
           { required: true, message: "请选择产品分类", trigger: "blur" },
         ],
+        protocolType: [
+          { required: true, message: "请选择协议类型", trigger: "blur" },
+        ],
       },
     };
   },
@@ -135,6 +144,7 @@ export default {
     },
     getInfo(row) {
       this.addForm = row;
+      this.addForm.protocolType=this.addForm.protocolType.replace(/\s+/g,"")
       // this.addForm = row;
       this.addForm.label = row.proCategoryName;
     },
@@ -175,6 +185,23 @@ export default {
         .catch((err) => {
           console.log(err);
         });
+      var condition = {
+        enumCode: 120000,
+      };
+      condition = JSON.stringify(condition);
+      var data = {
+        condition: condition,
+      };
+      api
+        .dataDic(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.xyArr = res.data[0].children;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
 
     //新建产品提交

src/views/demo/productManage/productInfo/index.vue

@@ -360,8 +360,14 @@ export default {
         {
           name: "创建时间",
           val: [res.data.createTime],
-          name1: "产品描述",
-          val1: [res.data.proDescription],
+          name1: "协议类型",
+          val1: [res.data.protocolTypeName],
+        },
+        {
+          name: "产品描述",
+          val: [res.data.proDescription],
+          name1: "",
+          val1: [''],
         },
       ]
           }

src/views/system/login/page.vue

@@ -17,7 +17,7 @@
           class="page-login--content-main"
           flex="dir:top main:center cross:center">
           <!-- logo -->
-          <img class="page-login--logo" src="./image/logo.png">
+          <img class="page-login--logo" src="./image/logo2.png">
           <!-- form -->
           <div class="page-login--form">
             <el-card shadow="never">