feat: Logo&组态样式调整

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 联通数科数采平台
+VUE_APP_TITLE = 联通数科云组态平台
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 联通数科数采平台
+VUE_APP_TITLE = 联通数科云组态平台
 
 # 生产环境配置
 ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 联通数科数采平台
+VUE_APP_TITLE = 联通数科云组态平台
 
 NODE_ENV = production
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "fastbee",
     "version": "2.5.2",
-    "description": "联通数科数采平台",
+    "description": "联通数科云组态平台",
     "author": "kerwincui",
     "license": "AGPL3.0",
     "scripts": {

src/lang/zh-CN/lg.json

@@ -36,7 +36,7 @@
     "login.989807-34": "微信登录",
     "login.989807-35": "注册账号",
     "login.989807-36": "账号绑定",
-    "login.989807-37": "联通数科数采平台",
+    "login.989807-37": "联通数科云组态平台",
     "login.989807-38": "FastBee开源物联网平台，简单易用，\n更适合中小企业和个人学习使用的物联网平台。",
     "login.989807-39": "FastBee系统采用国内流行度最高的技术栈，帮助更多的企业实现设备联网控制和监测。",
     "login.989807-40": "查看文档",

src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
     <div class="sidebar-logo-container" :class="{ collapse: collapse }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
         <transition name="sidebarLogoFade">
             <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-                <img v-if="logo" :src="logo" class="sidebar-logo" />
+                <img v-if="logo" src="@/assets/images/logo.png" class="sidebar-logo" />
                 <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }" style="padding-left: 10px">{{ title }}</h1>
             </router-link>
             <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-                <img v-if="logo" :src="logo" class="sidebar-logo" />
+                <img v-if="logo" src="@/assets/images/logo.png" class="sidebar-logo" />
                 <span class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }" style="padding-left: 10px">{{ title }}</span>
             </router-link>
         </transition>
@@ -51,9 +51,10 @@ export default {
             getDept(deptId).then((response) => {
                 const data = response.data;
                 if (data.logoName) {
-                    this.title = data.logoName.length > 8 ? data.logoName.slice(0, 8) : data.logoName;
+                    // this.title = data.logoName.length > 8 ? data.logoName.slice(0, 8) : data.logoName;
+                  this.title = "云组态平台"
                 } else {
-                    this.title = 'FastBee';
+                    this.title = '云组态平台';
                 }
                 if (data.deptLogo) {
                     this.logo = this.baseUrl + data.deptLogo;
@@ -122,6 +123,8 @@ export default {
     &.collapse {
         .sidebar-logo {
             margin-right: 0px;
+            width: 30px; // 30
+            height: 30px; // 30
         }
     }
 }

src/views/bigScreen/home.vue

@@ -10,7 +10,7 @@
                 <div class="guang"></div>
                 <div class="d-flex jc-center">
                     <div class="title">
-                        <span class="title-text">联通数科数采平台</span>
+                        <span class="title-text">联通数科云组态平台</span>
                     </div>
                 </div>
                 <div class="timers ">

src/views/iot/device/device-edit.vue

@@ -167,11 +167,11 @@
                     <span slot="label">{{ $t('device.device-edit.148398-77') }}</span>
                     <device-modbus-task ref="deviceModbusTask" :device="form" />
                 </el-tab-pane>
-                <!--组太应用-->
-                <el-tab-pane name="scada" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && isShowScada == true" lazy>
-                    <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>
-                    <device-scada ref="deviceScada" :device="form" />
-                </el-tab-pane>
+                <!--组态应用-->
+<!--                <el-tab-pane name="scada" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && isShowScada == true" lazy>-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>-->
+<!--                    <device-scada ref="deviceScada" :device="form" />-->
+<!--                </el-tab-pane>-->
                 <!--实时监测-->
 <!--                <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">-->
 <!--                    <span slot="label">{{ $t('device.device-edit.148398-51') }}</span>-->

src/views/iot/product/product-edit.vue

@@ -240,10 +240,11 @@
                     <span slot="label">{{ $t('product.product-edit.473153-41') }}</span>
                     <config-sip ref="configSip" :product="form" />
                 </el-tab-pane>
-                <el-tab-pane name="scada" v-if="form.deviceType !== 3 && isShowScada == true" lazy>
-                    <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>
-                    <product-scada ref="productScada" :product="form" />
-                </el-tab-pane>
+<!--              组态应用-->
+<!--                <el-tab-pane name="scada" v-if="form.deviceType !== 3 && isShowScada == true" lazy>-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>-->
+<!--                    <product-scada ref="productScada" :product="form" />-->
+<!--                </el-tab-pane>-->
             </el-tabs>
         </el-card>
     </div>

src/views/scada/topo/components/topoProperties.vue

@@ -2687,4 +2687,7 @@ export default {
     height: 400px;
     overflow-y: auto;
 }
+.el-form-item::v-deep .el-form-item__label {
+  color: white !important;
+}
 </style>

src/views/scada/topo/editor.vue

@@ -605,6 +605,7 @@ export default {
         .right-aside-open {
             width: 270px !important;
             transition: width 0.5s;
+            background: #222b3c;
         }
 
         .aside-close {