Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/components/common/seekPage.vue

@@ -196,8 +196,7 @@
       seekList: {
         type: Array,
         default: () => []
-      },
-      keyValue: ''
+      }
     },
 
     components: {},

src/components/selectReleaseRules/search.vue

@@ -31,7 +31,7 @@
             placeholder: '规则名称'
           },
           {
-            label: '记录表分类:',
+            label: '记录规则分类',
             value: 'classify',
             type: 'select',
             placeholder: '记录表分类',

src/components/selectReleaseRules/select-release-rules.vue

@@ -117,7 +117,7 @@
             formatter: (row) => {
               return (
                 row.frequencyValue +
-                this.getDictValue('记录规则频率', row.frequencyUnit)
+                this.getDictValue('记录规则频率', row.frequencyUnit + '')
               );
             }
           },

src/store/modules/user.js

@@ -5,7 +5,7 @@ import { formatMenus, toTreeData, formatTreeData } from 'ele-admin';
 import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
 import { getCurrentUserAuthorityDeptAPI } from '@/api/system/organization';
-import { getCurrentUser,setCurrentUser } from '@/utils/token-util';
+import { getCurrentUser, setCurrentUser } from '@/utils/token-util';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -90,7 +90,7 @@ export default {
   },
   actions: {
     async getCurrentUserAuthorityDept({ commit }) {
-      return []
+      return [];
       const info = await getCurrentUserAuthorityDeptAPI();
       commit('setAuthorityDept', info);
     },
@@ -129,7 +129,7 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit, state }) {
-      let currentUser = getCurrentUser()
+      let currentUser = getCurrentUser();
       const result = await getResourcesTree({
         groupId: currentUser.currentGroupId,
         roleId: currentUser.currentRoleId
@@ -169,7 +169,7 @@ export default {
             parentIdField: 'parentId'
           })
       );
-      console.log('menus--', menus);
+      console.log('menus--', homePath, menus);
       commit('setMenus', menus);
       commit('setAuthoritiesRouter', authoritiesRouter);
       // const menus = result;

src/views/material/product/components/index-search.vue

@@ -19,7 +19,7 @@
             clearable
             size="small"
             v-model.trim="where.searchKey"
-            placeholder="型号、牌号"
+            placeholder="型号、规格、牌号"
           />
         </el-form-item>
       </el-col>

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -63,11 +63,11 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="启用时间" required prop="startDate">
+          <el-form-item label="启用日期" required prop="startDate">
             <el-date-picker
               v-model="formData.startDate"
               type="date"
-              placeholder="请选择启用时间"
+              placeholder="请选择启用日期"
               size="small"
               style="width: 100%"
             ></el-date-picker>
@@ -75,11 +75,11 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="停止时间" required prop="stopDate">
+          <el-form-item label="停用日期" required prop="stopDate">
             <el-date-picker
               v-model="formData.stopDate"
               type="date"
-              placeholder="请选择停止时间"
+              placeholder="请选择停用日期"
               size="small"
               style="width: 100%"
             />
@@ -460,10 +460,10 @@
           classify: [
             { required: true, message: '请选择规则类型', trigger: 'change' }
           ],
-          // startDate 启用时间要大于当前时间
-          // stopDate 停用时间要大于当前时间并且大于启用时间
+          // startDate 启用日期要大于当前时间
+          // stopDate 停用时间要大于当前时间并且大于启用日期
           startDate: [
-            { required: true, message: '请选择启用时间', trigger: 'change' },
+            { required: true, message: '请选择启用日期', trigger: 'change' },
             { validator: this.validateStartDate, trigger: 'change' }
           ],
           stopDate: [
@@ -677,16 +677,16 @@
           }
         });
       },
-      // startDate 启用时间要大于当前时间
+      // startDate 启用日期要大于当前时间
       validateStartDate(rule, value, callback) {
         const startDate = this.formData.startDate;
         if (!startDate) {
-          return callback(new Error('启用时间不能为空'));
+          return callback(new Error('启用日期不能为空'));
         }
 
         callback();
       },
-      // stopDate 停用时间要大于当前时间并且大于启用时间
+      // stopDate 停用时间要大于当前时间并且大于启用日期
       validateStopDate(rule, value, callback) {
         const startDate = this.formData.startDate;
         const stopDate = this.formData.stopDate;
@@ -695,7 +695,7 @@
           startDate &&
           new Date(stopDate) <= new Date(startDate)
         ) {
-          return callback(new Error('停用时间必须大于启用时间'));
+          return callback(new Error('停用时间必须大于启用日期'));
         }
 
         callback();

src/views/rulesManagement/releaseRules/components/search.vue

@@ -31,7 +31,7 @@
             placeholder: '规则名称'
           },
           {
-            label: '记录表分类:',
+            label: '记录规则分类',
             value: 'classify',
             type: 'select',
             placeholder: '记录表分类',

src/views/technology/route/components/user-detail.vue

@@ -103,6 +103,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="排序:" prop="sort">
+            {{ form.sort }}
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -250,7 +255,7 @@
             size: -1
           });
 
-          let arr = res.list.map((it) => {
+          let arr = res?.list?.map((it) => {
             it.detail.orderNum = it.orderNum;
             return it.detail;
           });

src/views/technology/route/components/user-edit.vue

@@ -88,7 +88,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8">
+          <el-form-item label="排序:" prop="sort">
+            <el-input  v-model="form.sort" type="number" />
+          </el-form-item>
+        </el-col>
         <!-- <el-col :span="8">
           <el-form-item label="类型:" prop="routeType">
             <el-select v-model="form.routeType" placeholder="请选择">

src/views/technology/route/components/user-taskinstance.vue

@@ -368,13 +368,12 @@
           });
 
           console.log(res, '_________res');
-          let arr = res.list.map((it) => {
+          let arr = res?.list?.map((it) => {
             it.detail.orderNum = it.orderNum;
 
             return it.detail;
-          });
+          })||[];
 
-          console.log(arr, '_____arr');
           this.$refs.table.setData([...arr]);
         }
       },

src/views/technology/route/index.vue

@@ -207,6 +207,13 @@
           //   align: 'center',
           //   showOverflowTooltip: true
           // },
+          {
+            prop: 'sort',
+            label: '排序',
+            showOverflowTooltip: true,
+            align: 'center',
+            width: 110,
+          },
           {
             prop: 'code',
             label: '工艺路线编码',

vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
 
         // target: 'http://192.168.1.251:18087',
 
-        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {