liwei19941102 1 год назад
Родитель
Сommit
7ae3207e45

+ 2 - 1
src/components/Map/index.vue

@@ -41,7 +41,8 @@
     const getDictsData = (param) => {
         getDicts(param).then(res => {
             for (var index in res.data) {
-                if (res.data[index].cssClass == '1') {
+                console.log(res.data[index])
+                if (res.data[index].listClass == 'default') {
                     var obj = res.data[index].dictValue.split(",");
                     // console.log(obj.toString())
                     var location = formatGCJ(Number(obj[0]), Number(obj[1]));

+ 2 - 2
src/components/Map/videoMap.vue

@@ -51,14 +51,14 @@
     const getDictsData = (param) => {
         getDicts(param).then(res => {
             for (var index in res.data) {
-                if (res.data[index].cssClass == '2') {
+                if (res.data[index].listClass == 'success') {
                     console.log(res.data[index])
                     var obj = res.data[index].dictValue.split(",");
                     // console.log(obj.toString())
                     var location = formatGCJ(Number(obj[0]), Number(obj[1]));
                     // console.log(location.toString())
                     addMarker(location, res.data[index], '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png', 'kdlocation')
-                } else if (res.data[index].cssClass == '3') {
+                } else if (res.data[index].listClass == 'warning') {
                     console.log(res.data[index])
                     var obj = res.data[index].dictValue.split(",");
                     // console.log(obj.toString())

+ 287 - 0
src/views/site/index.vue

@@ -0,0 +1,287 @@
+<template>
+    <div class="p-2">
+      <!-- <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <div class="mb-[10px]" v-show="showSearch">
+          <el-card shadow="hover">
+            <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+              <el-form-item label="字典名称" prop="dictType">
+                <el-select v-model="queryParams.dictType" style="width: 200px">
+                  <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="字典标签" prop="dictLabel">
+                <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable style="width: 200px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </div>
+      </transition> -->
+      <el-card shadow="hover">
+        <template #header>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:dict:remove']">
+                删除
+              </el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </template>
+  
+        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="字典编码" align="center" prop="dictCode" v-if="false" />
+          <el-table-column label="字典标签" align="center" prop="dictLabel">
+            <template #default="scope">
+              <span v-if="(scope.row.listClass === '' || scope.row.listClass === 'default') && (scope.row.cssClass === '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+              <el-tag v-else :type="(scope.row.listClass === 'primary' || scope.row.listClass === 'default') ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="字典键值" align="center" prop="dictValue" />
+          <el-table-column label="字典排序" align="center" prop="dictSort" />
+          <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-tooltip content="修改" placement="top">
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"></el-button>
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top">
+                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+  
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-card>
+      <!-- 添加或修改参数配置对话框 -->
+      <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+        <el-form ref="dataFormRef" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="字典类型">
+            <el-input v-model="form.dictType" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="数据标签" prop="dictLabel">
+            <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+          </el-form-item>
+          <el-form-item label="数据键值" prop="dictValue">
+            <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+          </el-form-item>
+          <el-form-item label="样式属性" prop="cssClass">
+            <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+          </el-form-item>
+          <el-form-item label="显示排序" prop="dictSort">
+            <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+          </el-form-item>
+          <el-form-item label="回显样式" prop="listClass">
+            <el-select v-model="form.listClass">
+              <el-option
+                v-for="item in listClassOptions"
+                :key="item.value"
+                :label="item.label + '(' + item.value + ')'"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script setup name="Data" lang="ts">
+  import useDictStore from '@/store/modules/dict'
+  import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+  import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+  import { DictTypeVO } from '@/api/system/dict/type/types';
+  import { DictDataForm, DictDataQuery, DictDataVO } from "@/api/system/dict/data/types";
+  
+  const { proxy } = getCurrentInstance() as ComponentInternalInstance
+  const route = useRoute();
+  
+  const dataList = ref<DictDataVO[]>([]);
+  const loading = ref(true);
+  const showSearch = ref(true);
+  const ids = ref<Array<string | number>>([]);
+  const single = ref(true);
+  const multiple = ref(true);
+  const total = ref(0);
+  const defaultDictType = ref("");
+  const typeOptions = ref<DictTypeVO[]>([]);
+  
+  const dataFormRef = ref<ElFormInstance>();
+  const queryFormRef = ref<ElFormInstance>();
+  
+  
+  const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+  });
+  
+  // 数据标签回显样式
+  const listClassOptions = ref<Array<{ value: string, label: string }>>([
+    { value: "default", label: "快递站点" },
+    { value: "success", label: "驿站站点" },
+    { value: "warning", label: "班车站点" },
+  ]);
+  
+  const initFormData: DictDataForm = {
+    dictCode: undefined,
+    dictLabel: '',
+    dictValue: '',
+    cssClass: '',
+    listClass: "default",
+    dictSort: 0,
+    remark: ''
+  }
+  const data = reactive<PageData<DictDataForm, DictDataQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      dictName: '',
+      dictType: '',
+      dictLabel: ''
+    },
+    rules: {
+      dictLabel: [{ required: true, message: "数据标签不能为空", trigger: "blur" }],
+      dictValue: [{ required: true, message: "数据键值不能为空", trigger: "blur" }],
+      dictSort: [{ required: true, message: "数据顺序不能为空", trigger: "blur" }]
+    }
+  });
+  
+  const { queryParams, form, rules } = toRefs(data);
+  
+  /** 查询字典类型详细 */
+  const getTypes = async (dictId: string | number) => {
+    const { data } = await getType(dictId);
+    queryParams.value.dictType = data.dictType;
+    defaultDictType.value = data.dictType;
+    getList();
+  }
+  
+  /** 查询字典类型列表 */
+  const getTypeList = async () => {
+    const res = await getDictOptionselect()
+    typeOptions.value = res.data;
+  }
+  /** 查询字典数据列表 */
+  const getList = async () => {
+    loading.value = true;
+    const res = await listData(queryParams.value);
+    dataList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  }
+  /** 取消按钮 */
+  const cancel = () => {
+    dialog.visible = false;
+    reset();
+  }
+  /** 表单重置 */
+  const reset = () => {
+    form.value = { ...initFormData };
+    dataFormRef.value?.resetFields();
+  }
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+  }
+  /** 返回按钮操作 */
+  const handleClose = () => {
+    const obj = { path: "/system/dict" };
+    proxy?.$tab.closeOpenPage(obj);
+  }
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    queryParams.value.dictType = defaultDictType.value;
+    handleQuery();
+  }
+  /** 新增按钮操作 */
+  const handleAdd = () => {
+    reset();
+    form.value.dictType = queryParams.value.dictType;
+    dialog.visible = true;
+    dialog.title = "添加字典数据";
+  }
+  /** 多选框选中数据 */
+  const handleSelectionChange = (selection: DictDataVO[]) => {
+    ids.value = selection.map(item => item.dictCode);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+  }
+  /** 修改按钮操作 */
+  const handleUpdate = async (row?: DictDataVO) => {
+    reset();
+    const dictCode = row?.dictCode || ids.value[0];
+    const res = await getData(dictCode);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改字典数据";
+  }
+  /** 提交按钮 */
+  const submitForm = () => {
+    dataFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        form.value.dictCode ? await updateData(form.value) : await addData(form.value);
+        useDictStore().removeDict(queryParams.value.dictType);
+        proxy?.$modal.msgSuccess("操作成功");
+        dialog.visible = false;
+        await getList();
+  
+      }
+    });
+  }
+  /** 删除按钮操作 */
+  const handleDelete = async (row?: DictDataVO) => {
+    const dictCodes = row?.dictCode || ids.value;
+    await proxy?.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?');
+    await delData(dictCodes);
+    await getList();
+    proxy?.$modal.msgSuccess("删除成功");
+    useDictStore().removeDict(queryParams.value.dictType);
+  
+  }
+  /** 导出按钮操作 */
+  const handleExport = () => {
+    proxy?.download("system/dict/data/export", {
+      ...queryParams.value
+    }, `dict_data_${new Date().getTime()}.xlsx`);
+  }
+  
+  onMounted(() => {
+    getTypes("1761920556316213250");
+    getTypeList();
+  })
+  </script>
+  

+ 24 - 1
src/views/statics/passengerFlow.vue

@@ -70,7 +70,7 @@
               <div style="width: 80%;">
                 <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
                   <el-form-item label="路线">
-                    <el-select v-model="queryParams2.line" placeholder="请选择路线" style="width: 120px">
+                    <el-select v-model="queryParams2.line" placeholder="请选择路线" style="width: 120px" @change="getSiteList">
                       <el-option v-for="item in carPathList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                   </el-form-item>
@@ -167,6 +167,7 @@ const dialog = reactive < DialogOption > ({
 });
 
 const sites = ref([]);
+const siteList = ref([]);
 const table = ref(tableElm)
 const table1 = ref(tableElm)
 const table2 = ref(tableElm)
@@ -300,6 +301,7 @@ const goadd = () => {
 const getSites = () => {
     listData({ dictType: "tbl_sites" }).then(res2 => {
         sites.value = res2.rows;
+        siteList.value =  res2.rows
     });
 }
 
@@ -457,6 +459,27 @@ const handleExport = () => {
     }, `carInfo_${new Date().getTime()}.xlsx`)
 }
 
+const getSiteList = () =>{
+    console.log(queryParams2.value.line)
+    var lineData = []
+    for(var index in carPathList.value){
+        if(queryParams2.value.line == carPathList.value[index].id){
+            lineData = JSON.parse(carPathList.value[index].stationList) 
+        }
+    }
+    var site = []
+    for(var i in lineData){
+        site.push(lineData[i].data)
+            //  if(i == 0 || i == lineData.length - 1){
+            //     site.push(lineData[i].data)
+            //  }else{
+            //     site.push(lineData[i])
+            //  }
+    }
+    console.log(site)
+    sites.value = site
+}
+
 const initData = async () => {
     const res = await listCarPath({ pageSize: 1000 });
     carPathList.value = res.rows