Selaa lähdekoodia

修改流程配置

tengmingxue 1 vuosi sitten
vanhempi
commit
1540d13d44

+ 14 - 14
src/views/dashboard/workbench/component/SpatialAnnlysis.vue

@@ -48,20 +48,20 @@ export default defineComponent({
     const queryData = async () => {
       // const res = await GetXldAnalysisStatistics()
       let seriesData = [0, 0, 0, 0];
-      const res = await queryBusinessStatistics({
-        startTime: "2000-01-01",
-        endTime: moment().format('YYYY-MM-DD'),
-      });
-      if (res) {
-        // NSFX:泥沙分析
-        // YMFX:淹没分析
-        // YLFX:雨量分析
-        // YBFX: 预报分析
-        seriesData[0] = res?.NSFX ? res?.NSFX["1"] + res?.NSFX["2"] : 0;//1是成功,2是失败
-        seriesData[1] = res?.YMFX ? res?.YMFX["1"] + res?.YMFX["2"] : 0;
-        seriesData[2] = res?.YLFX ? res?.YLFX["1"] + res?.YLFX["2"] : 0;
-        seriesData[3] = res?.YBFX ? res?.YBFX["1"] + res?.YBFX["2"] : 0;
-      }
+      // const res = await queryBusinessStatistics({
+      //   startTime: "2000-01-01",
+      //   endTime: moment().format('YYYY-MM-DD'),
+      // });
+      // if (res) {
+      //   // NSFX:泥沙分析
+      //   // YMFX:淹没分析
+      //   // YLFX:雨量分析
+      //   // YBFX: 预报分析
+      //   seriesData[0] = res?.NSFX ? res?.NSFX["1"] + res?.NSFX["2"] : 0;//1是成功,2是失败
+      //   seriesData[1] = res?.YMFX ? res?.YMFX["1"] + res?.YMFX["2"] : 0;
+      //   seriesData[2] = res?.YLFX ? res?.YLFX["1"] + res?.YLFX["2"] : 0;
+      //   seriesData[3] = res?.YBFX ? res?.YBFX["1"] + res?.YBFX["2"] : 0;
+      // }
       const option = getOption(seriesData);
       mychart.value.setOption(option);
     };

+ 56 - 20
src/views/dataAdmin/dataAdmin/configProcess/AddProcess.vue

@@ -48,6 +48,7 @@
                 :columns="pColumns"
                 :pagination="false"
                 :customRow="customRow"
+                :rowClassName="setRowClassName"
                 style="height: 100%"
               >
                 <template #operation="{ record }">
@@ -143,7 +144,9 @@ export default defineComponent({
     const formState = reactive({
       type: '',
       name: '',
-      steps: ref([{ xh: 1, name: '', model: 'update', dept: [], user: [], userList: [] }]),
+      steps: ref([
+        { xh: 1, name: '', model: 'update', dept: [], user: [], userList: [], active: true },
+      ]),
     });
 
     const rules = {
@@ -166,7 +169,7 @@ export default defineComponent({
     });
 
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-      await resetFields();
+      //await resetFields();
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       postData.value = data?.record ? data.record : null;
@@ -223,7 +226,15 @@ export default defineComponent({
         formState.type = dbs ? dbs.value : '0';
         formState.name = flowInfo['FLOWNAME'];
         formState.steps = [
-          { xh: 1, name: flowInfo['FLOWNAME'], model: '1', dept: [], user: [], userList: [] },
+          {
+            xh: 1,
+            name: flowInfo['FLOWNAME'],
+            model: '1',
+            dept: [],
+            user: [],
+            userList: [],
+            active: true,
+          },
         ];
         // flowNode.map((item, index) => {
         //   const user = flowNodePerson.filter((fp) => item['ID'] === fp['FLOWNODEID']);
@@ -256,9 +267,9 @@ export default defineComponent({
           id = '';
         while ((node = recursionByTreeData(id))) {
           const user = flowNodePerson.filter((fp) => node['ID'] === fp['FLOWNODEID']);
-          let userList = user.map(item=>{
-            return {...item,userId:item.USERID}
-          })
+          let userList = user.map((item) => {
+            return { ...item, userId: item.USERID };
+          });
           let model = '2'; //并行
           //判断是串行还是并行,如果存在生一个审核人或者下一个审核人则为逐级,否则就是并行
           user.map((item) => {
@@ -274,9 +285,10 @@ export default defineComponent({
                   return u['USERID'];
                 })
               : [],
-            userList: userList,//[],
+            userList: userList, //[],
+            active: false,
           });
-          id = node['ID']
+          id = node['ID'];
           index++;
         }
         /***2024-02-04 编辑 ---结束**/
@@ -408,7 +420,9 @@ export default defineComponent({
       resetForm();
       formState.type = '';
       formState.name = '';
-      formState.steps = [{ xh: 1, name: '', model: 'update', dept: [], user: [], userList: [] }];
+      formState.steps = [
+        { xh: 1, name: '', model: 'update', dept: [], user: [], userList: [], active: true },
+      ];
       currStep.value = null;
       (addStepForm.value as any)?.clearFormData();
     };
@@ -457,7 +471,7 @@ export default defineComponent({
         });
       });
 
-      console.log('步骤信息steps',steps)
+      console.log('步骤信息steps', steps);
       //生成审核数据
       for (let i = 0; i < steps.length; i++) {
         const step = steps[i];
@@ -529,20 +543,32 @@ export default defineComponent({
     };
 
     const customRow = (record, index) => {
-      console.log(record, index);
       return {
-        on: {
-          // 鼠标单击行
-          click: (event) => {
-            event.currentTarget.parentNode.querySelectorAll('tr').forEach((item) => {
-              item.style.background = 'white';
-            });
-            event.currentTarget.style.background = 'green';
-          },
-        },
+        // on: {
+        //   // 鼠标单击行
+        //   click: (event) => {
+        //     event.currentTarget.parentNode.querySelectorAll('tr').forEach((item) => {
+        //       item.style.background = 'white';
+        //     });
+        //     event.currentTarget.style.background = 'green';
+        //   },
+        // },
+        onClick: (event) => {// 点击行
+          formState.steps.forEach(item=>{
+            if(item.xh === record.xh){
+              item.active = item.xh === record.xh
+              editStep(record)
+            } 
+            else item.active = false
+          })
+        },       
       };
     };
 
+    const setRowClassName = (record) => {
+      return record?.active ? 'lightRow' : 'nolightRow';
+    };
+
     return {
       optType,
       currVersion,
@@ -572,6 +598,7 @@ export default defineComponent({
       clearFormData,
       paramsToFormData,
       setSeleteItem,
+      setRowClassName,
     };
   },
 });
@@ -625,4 +652,13 @@ export default defineComponent({
     height: calc(100% - 88px);
   }
 }
+
+::v-deep.ant-table-wrapper {
+  .lightRow {
+    background: rgba(45, 116, 231, 0.2) !important;
+  }
+  .nolightRow {
+    background: #fff !important;
+  }
+}
 </style>

+ 12 - 12
src/views/dataAdmin/dataAdmin/configProcess/configData.js

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-28 21:12:52
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-09-24 19:26:33
+ * @LastEditTime: 2024-03-05 17:35:52
  * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\configProcess\configData.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -13,10 +13,10 @@ export const columns = [
     title: '流程业务',
     dataIndex: 'FLOWNAME',
   },
-  {
-    title: '版本',
-    dataIndex: 'VERSION',
-  },
+  // {
+  //   title: '版本',
+  //   dataIndex: 'VERSION',
+  // },
   {
     title: '启用状态',
     dataIndex: 'STATUS',
@@ -96,11 +96,11 @@ export const stepColumns = [
     width: '56%',
     align:'center',
   },
-  {
-    title: '操作',
-    dataIndex: 'operation',
-    width: '20%',
-    align:'center',
-    slots: { customRender: 'operation' },
-  },
+  // {
+  //   title: '操作',
+  //   dataIndex: 'operation',
+  //   width: '20%',
+  //   align:'center',
+  //   slots: { customRender: 'operation' },
+  // },
 ];

+ 8 - 6
src/views/dataAdmin/dataAdmin/configProcess/index.vue

@@ -7,22 +7,18 @@
       <!-- 表格右上角按钮 -->
       <template #toolbar>
         <Authority>
-          <a-button type="primary" @click="addMethod">新增流程</a-button>
+          <a-button type="primary" @click="addMethod">新增</a-button>
         </Authority>
         <!-- :value="authList.deleteAuth" -->
         <Authority>
           <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
-            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 删除 </a-button>
           </Popconfirm>
         </Authority>
       </template>
       <!-- 表格操作栏 -->
       <template #action="{ record }">
         <TableAction :actions="[
-          {
-            label: '查看',
-            onClick: handleView.bind(null, record),
-          },
           {
             label: '编辑',
             onClick: handleEdit.bind(null, record),
@@ -36,6 +32,10 @@
               confirm: handleDeleteOrBatchDelete.bind(null, record),
             },
           },
+          {
+            label: '详情',
+            onClick: handleView.bind(null, record),
+          },
         ]" />
       </template>
       <!-- <template #pdate="{ record }">
@@ -112,6 +112,8 @@ export default defineComponent({
       bordered: true,
       // 表格控制序号显示
       showIndexColumn: true,
+      //是否可以自适应高度(如果置于PageWrapper组件内,请勿启用PageWrapper的fixedHeight属性,二者不可同时使用)
+      canResize: false,
       // 表格操作栏
       actionColumn: {
         width: 200,