logo替换/代码同步

zkqy-ui/src/layout/index.vue

@@ -5,8 +5,8 @@
       <el-row>
         <el-col :span="12">
           <span>
-            <!-- <img src="../assets/images/mec_logo1.png" alt="" class="imgg" /> -->
-            <img src="../assets/images/comlo.png" alt="" class="imgg" />
+            <img src="../assets/images/mec_logo1.png" alt="" class="imgg" />
+            <!-- <img src="../assets/images/comlo.png" alt="" class="imgg" /> -->
           </span>
         </el-col>
         <el-col :span="4" :offset="8">

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -47,12 +47,15 @@
         </div>
       </div>
       <div class="show-body">
-        <TaskList
-          v-for="(item, index) of tableData"
-          :key="index + 1"
-          :num="index + 1"
-          :cardData="item"
-        ></TaskList>
+        <template v-if="tableData.length > 0">
+          <TaskList
+            v-for="(item, index) of tableData"
+            :key="index + 1"
+            :num="index + 1"
+            :cardData="item"
+          ></TaskList>
+        </template>
+        <el-empty v-else description="暂无数据"></el-empty>
         <pagination
           v-show="total > 0"
           :total="total"
@@ -121,7 +124,7 @@ export default {
       res = dataList.map((item) => {
         let baseObj = {
           benTaskProcessKey: item.taskKey, //任务编号
-          bepTaskName: item.taskName, //任务名称
+          bepTaskName: item.taskPlanName, //任务名称
           benCreateTime: item.nodeLogList[0].taskNodeType
             ? item.nodeLogList[0].createTime
             : "", //开始或结束时间  需要根据bepTaskProcessState状态 来判定

zkqy-ui/src/views/login.vue

@@ -352,8 +352,8 @@ export default {
   margin-top: 57px;
   width: 194px;
   height: 64px;
-  // background: url(../assets/images/mec_logo_login.png);
-  background: url(../assets/images/comp.png);
+  background: url(../assets/images/mec_logo_login.png);
+  // background: url(../assets/images/comp.png);
   /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
   opacity: 1;
 }

zkqy-ui/src/views/system/role/index.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="租户名称" prop="tenantName">
+      <!-- <el-form-item label="租户名称" prop="tenantName">
         <el-input
           v-model="queryParams.tenantName"
           placeholder="请输入租户名称"
@@ -24,7 +24,7 @@
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="权限字符" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"