Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java

@@ -58,7 +58,7 @@ public class SysDictType extends BaseEntity
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下划线）")
     public String getDictType()
     {
         return dictType;

zkqy-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -57,6 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != 0">
 			AND r.tenant_id = #{tenantId}
 		</if>
+		<if test="tenantId == null">
+			and r.tenant_id is null
+		</if>
+		<if test="tenantName != null and tenantName != ''">
+			and t.tenant_name like concat('%', #{tenantName}, '%')
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by r.role_sort

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/utils/request.js

@@ -94,8 +94,10 @@ service.interceptors.response.use(res => {
     }
     return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
   } else if (code === 500) {
-    Message({ message: msg, type: 'error' })
-    return Promise.reject(new Error(msg))
+    console.log(msg);
+    // Message({ message: msg, type: 'error' })
+    // return Promise.reject(new Error(msg))
+    return Promise.resolve()
   } else if (code === 601) {
     Message({ message: msg, type: 'warning' })
     return Promise.reject('error')

zkqy-ui/src/views/bpmprocess/scriptManage.vue

@@ -393,9 +393,9 @@ export default {
         industryType: [
           { required: true, message: "请选择脚本类型", trigger: "change" },
         ],
-        tableName: [
-          { required: true, message: "请选择数据表", trigger: "change" },
-        ],
+        // tableName: [
+        //   { required: true, message: "请选择数据表", trigger: "change" },
+        // ],
       },
 
       // 代码编辑器相关数据

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/index.vue

@@ -55,7 +55,7 @@
       <div class="name">{{ nickName }}</div>
       <div class="tenant-name">{{ tenantName }}</div>
       <div class="date">{{ date }}</div>
-      <div class="title">欢迎登录CALL智能制造平台</div>
+      <div class="title">欢迎登录Mec OS 工业应用操作系统</div>
     </div>
   </div>
 </template>

zkqy-ui/src/views/login.vue

@@ -10,8 +10,8 @@
         <el-col :span="12" class="comlogo"></el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple-dark title">
-            <!-- 工业应用操作系统 -->
-            智能制造平台
+            工业应用操作系统
+            <!-- 智能制造平台 -->
           </div></el-col
         >
       </el-row>
@@ -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/relateTable/index.vue

@@ -772,6 +772,7 @@ export default {
         delete this.conditionDefault[this.isSearchIndex];
       }
       this.isSearchDialog = status;
+      console.log(111, this.relyFileds);
       this.conditionDefaultValueMap = "";
     },
     // 添加依赖字段取消
@@ -786,6 +787,7 @@ export default {
         this.conditionDefault[this.isSearchIndex] =
           this.conditionDefaultValueMap;
       } else {
+        console.log(this.tableDataList, this.editIndex);
         if (this.tableDataList.length !== 0) {
           this.relyFileds.tableName =
             this.tableDataList[this.editIndex - 1]?.dtTableName;
@@ -1615,6 +1617,7 @@ export default {
     },
     // 新增一个联动表格
     addOneTable() {
+      this.editIndex = this.tableDataList.length;
       this.relateTitle = true;
       if (this.relateTitle) {
         this.tableItemForm = {};

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -36,10 +36,10 @@
           >重置
         </el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -84,10 +84,10 @@
           v-hasPermi="['system:engineering:export']"
           >导出
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="primary"
           plain
           icon="el-icon-download"
           size="mini"
@@ -108,26 +108,25 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
+      <!-- <el-table-column label="编号" align="center" prop="id" /> -->
       <!-- <el-table-column label="工程key" align="center" prop="engineeringKey" /> -->
       <el-table-column label="工程名称" align="center" prop="engineeringName" />
-      <el-table-column label="下载次数" align="center" prop="downloadNumber" />
+      <!-- <el-table-column label="下载次数" align="center" prop="downloadNumber" /> -->
       <el-table-column
         label="下载时间"
         align="center"
         prop="downloadTime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.downloadTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
       <!-- <el-table-column label="租户编号" align="center" prop="tenantId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建者ID" align="center" prop="createById" />
       <el-table-column label="更新者ID" align="center" prop="updateById" /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -161,7 +160,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

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"