libushang пре 8 месеци
родитељ
комит
dbf07fadad

+ 4 - 0
src/types/auto-imports.d.ts

@@ -312,6 +312,10 @@ declare module 'vue' {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+    readonly ElLoading: UnwrapRef<typeof import('element-plus/es')['ElLoading']>
+    readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
+    readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
+    readonly ElNotification: UnwrapRef<typeof import('element-plus/es')['ElNotification']>
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>

+ 16 - 2
src/types/components.d.ts

@@ -19,13 +19,19 @@ declare module 'vue' {
     Dialog: typeof import('./../components/Dialog/index.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
+    ElAnchor: typeof import('element-plus/es')['ElAnchor']
+    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -36,26 +42,36 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -66,8 +82,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

+ 13 - 7
src/views/informationissue/informationApplication.vue

@@ -99,13 +99,13 @@
         </div>
       </div>
     </div>
+    <ContactSelect
+      v-model="contactSelectState.show"
+      :tree-data="treeData"
+      :default-check-data="selectContactSelectData"
+      @confirm="handleContactSelectData"
+    />
   </div>
-  <ContactSelect
-    v-model="contactSelectState.show"
-    :tree-data="treeData"
-    :default-check-data="selectContactSelectData"
-    @confirm="handleContactSelectData"
-  />
 </template>
 
 <script setup lang="ts">
@@ -266,6 +266,11 @@ const fetchTreeData = async () => {
     console.error('Failed to fetch information:', error);
   }
 };
+
+const openUserSelect = async() => {
+
+};
+
 onMounted(() => {
   fetchTreeData();
   formData.value.publish_time = formattedCurrentTime.value;
@@ -274,7 +279,8 @@ onMounted(() => {
       presetTemplates.value.push({ value: item.name, label: item.name, content: item.content });
     });
     getUser({}).then((res) => {
-      users.value = res.data.map((user) => ({ value: user.username, username: user.username }));
+      // console.log('res:', res);
+      users.value = res.rows.map((user) => ({ value: user.username, username: user.username }));
     });
   });
 });

+ 5 - 1
src/views/informationissue/informationApproval.vue

@@ -62,7 +62,7 @@
                     <el-row :gutter="18">
                       <el-col :span="6">
                         <el-form-item label="发布时间:" prop="releaseTime">
-                          <el-button type="text" @click="publishNow">立即发布</el-button>
+                          <el-button @click="publishNow">立即发布</el-button>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
@@ -231,6 +231,10 @@ const fetchInformation = async () => {
   }
 };
 
+const publishNow = ()=> {
+
+};
+
 // 审批form
 const form2Ref = ref(null);
 const buttonLoading = ref(false);

+ 2 - 2
src/views/informationissue/informationList.vue

@@ -220,7 +220,7 @@ let informationApprovalState = reactive({
 
 const handleView = (row) => {
   if (row) {
-    informationViewState.eventId = row.id; // 假设eventId是id字段
+    informationViewState.eventId = row.id+""; // 假设eventId是id字段
     informationViewState.show = true;
   }
 };
@@ -233,7 +233,7 @@ const handleUpdate = (row) => {
 
 const handleApproval = (row) => {
   if (row) {
-    informationApprovalState.eventId = row.id; // 假设eventId是id字段
+    informationApprovalState.eventId = row.id+""; // 假设eventId是id字段
     informationApprovalState.show = true;
   }
 };

+ 5 - 2
src/views/informationissue/informationView.vue

@@ -94,7 +94,7 @@
                     <el-row :gutter="18">
                       <el-col :span="6">
                         <el-form-item label="发布时间:" prop="publish_time">
-                          <el-button type="text" disabled @click="publishNow">立即发布</el-button>
+                          <el-button disabled @click="publishNow">立即发布</el-button>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
@@ -164,8 +164,8 @@
         </div>
       </div>
     </div>
+    <SendDetail v-if="sendDetailState.show" :info_id="sendDetailState.info_id" @close="handleCancel" />
   </div>
-  <SendDetail v-if="sendDetailState.show" :info_id="sendDetailState.info_id" @close="handleCancel" />
 </template>
 
 <script setup lang="ts">
@@ -234,6 +234,9 @@ const showSendDetails = () => {
   sendDetailState.info_id = props.eventId; // 假设eventId是id字段
   sendDetailState.show = true;
 };
+const publishNow = () => {
+
+};
 
 const showTemplateExample = () => {
   ElMessage.info('点击了查看模板样例');

+ 3 - 3
src/views/inspectionWork/patrolTask.vue

@@ -75,10 +75,10 @@
         <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
       </div>
     </div>
+    <PatrolSubTasks v-if="patrolSubTasksState.show" :event-id="patrolSubTasksState.eventId" @close="handleCancel" />
+    <PatrolTaskEdit v-if="patrolTaskEditState.show" :event-id="patrolTaskEditState.eventId" @close="handleCancel" @refresh="fetchWorkrData" />
+    <PatrolTaskAdd v-if="patrolTaskAddState.show" @close="handleCancel" @refresh="fetchWorkrData" />
   </div>
-  <PatrolSubTasks v-if="patrolSubTasksState.show" :event-id="patrolSubTasksState.eventId" @close="handleCancel" />
-  <PatrolTaskEdit v-if="patrolTaskEditState.show" :event-id="patrolTaskEditState.eventId" @close="handleCancel" @refresh="fetchWorkrData" />
-  <PatrolTaskAdd v-if="patrolTaskAddState.show" @close="handleCancel" @refresh="fetchWorkrData" />
 </template>
 <script setup lang="ts">
 import { onMounted, reactive, ref } from 'vue';

+ 41 - 40
src/views/setting/riskPrevention/userManage.vue

@@ -58,50 +58,51 @@
       </el-table>
     </div>
     <pagination v-show="total > 0" v-model:page="queryForm.page" v-model:limit="queryForm.pageSize" :total="total" @pagination="getList" />
-  </div>
-  <!-- 新增/修改弹窗 -->
-  <div v-show="addDialog.visible" class="common-dialog">
-    <div class="common-dialog-content">
-      <div class="common-dialog-title-box">
-        <i class="common-dialog-title-icon" />
-        <div>{{ addDialog.title }}</div>
+
+    <!-- 新增/修改弹窗 -->
+    <div v-show="addDialog.visible" class="common-dialog">
+      <div class="common-dialog-content">
+        <div class="common-dialog-title-box">
+          <i class="common-dialog-title-icon" />
+          <div>{{ addDialog.title }}</div>
+        </div>
+        <div class="common-dialog-box">
+          <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="120px">
+            <el-form-item label="单位名称:" prop="unitId">
+              <el-select v-model="addForm.unitId" placeholder="请选择单位" clearable style="width: 468px !important">
+                <el-option v-for="item in unitList" :key="item.deptId" :label="item.deptName" :value="item.deptId"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="联系人:" prop="contactName">
+              <el-input v-model="addForm.contactName" placeholder="请输入联系人" style="width: 468px !important" />
+            </el-form-item>
+            <el-form-item label="职务:" prop="position">
+              <el-input v-model="addForm.position" placeholder="请输入职务" style="width: 468px !important" />
+            </el-form-item>
+            <el-form-item label="粤政易手机号码:" prop="phone">
+              <el-input v-model="addForm.phone" placeholder="请输入粤政易手机号码" style="width: 468px !important" />
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="common-dialog-footer" style="display: flex; justify-content: center">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
       </div>
-      <div class="common-dialog-box">
-        <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="120px">
-          <el-form-item label="单位名称:" prop="unitId">
-            <el-select v-model="addForm.unitId" placeholder="请选择单位" clearable style="width: 468px !important">
-              <el-option v-for="item in unitList" :key="item.deptId" :label="item.deptName" :value="item.deptId"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="联系人:" prop="contactName">
-            <el-input v-model="addForm.contactName" placeholder="请输入联系人" style="width: 468px !important" />
-          </el-form-item>
-          <el-form-item label="职务:" prop="position">
-            <el-input v-model="addForm.position" placeholder="请输入职务" style="width: 468px !important" />
-          </el-form-item>
-          <el-form-item label="粤政易手机号码:" prop="phone">
-            <el-input v-model="addForm.phone" placeholder="请输入粤政易手机号码" style="width: 468px !important" />
-          </el-form-item>
+
+      <el-dialog v-model="showImportDlg" title="导入人员" width="500px" append-to-body>
+        <el-form ref="importFormRef" :model="importForm" :rules="importRules">
+          <FileUpload v-model="importForm.filename" :file-type="['xls', 'xlsx']" :limit="1" />
         </el-form>
-      </div>
-      <div class="common-dialog-footer" style="display: flex; justify-content: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitImportForm">确 定</el-button>
+            <el-button @click="cancelImport">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
     </div>
   </div>
-
-  <el-dialog v-model="showImportDlg" title="导入人员" width="500px" append-to-body>
-    <el-form ref="importFormRef" :model="importForm" :rules="importRules">
-      <FileUpload v-model="importForm.filename" :file-type="['xls', 'xlsx']" :limit="1" />
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="submitImportForm">确 定</el-button>
-        <el-button @click="cancelImport">取 消</el-button>
-      </div>
-    </template>
-  </el-dialog>
 </template>
 
 <script setup lang="ts">