Merge branch 'master' of http://94.191.59.107:3000/wukai/jy2024-ui

src/views/obj/obj/component/step4.vue

@@ -50,7 +50,7 @@ const handleConfigMetrics=(row)=>{
 }
 
 const queryList=()=>{
-  listMetrics({objId:props.rowId,pageSize:100}).then(res=>{
+  listMetrics({objId:props.rowId,pageSize:100,params:{type:2}}).then(res=>{
     listData.value = res.rows
   })
 }

src/views/obj/pp/link.vue

@@ -16,7 +16,7 @@ const {proxy} = getCurrentInstance();
 const src = ref("");
 
 function init() {
-  proxy.getConfigKey("pp.url").then(response => {
+  proxy.getConfigKey("pp.web.url").then(response => {
     src.value = response.msg
   })
 }

src/views/system/config/index.vue

@@ -1,49 +1,49 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="参数名称" prop="configName">
-            <el-input
-               v-model="queryParams.configName"
-               placeholder="请输入参数名称"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="参数键名" prop="configKey">
-            <el-input
-               v-model="queryParams.configKey"
-               placeholder="请输入参数键名"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="系统内置" prop="configType">
-            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
-               <el-option
-                  v-for="dict in sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px;">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-            ></el-date-picker>
-         </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-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">-->
+<!--         <el-form-item label="参数名称" prop="configName">-->
+<!--            <el-input-->
+<!--               v-model="queryParams.configName"-->
+<!--               placeholder="请输入参数名称"-->
+<!--               clearable-->
+<!--               style="width: 240px"-->
+<!--               @keyup.enter="handleQuery"-->
+<!--            />-->
+<!--         </el-form-item>-->
+<!--         <el-form-item label="参数键名" prop="configKey">-->
+<!--            <el-input-->
+<!--               v-model="queryParams.configKey"-->
+<!--               placeholder="请输入参数键名"-->
+<!--               clearable-->
+<!--               style="width: 240px"-->
+<!--               @keyup.enter="handleQuery"-->
+<!--            />-->
+<!--         </el-form-item>-->
+<!--         <el-form-item label="系统内置" prop="configType">-->
+<!--            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>-->
+<!--               <el-option-->
+<!--                  v-for="dict in sys_yes_no"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--               />-->
+<!--            </el-select>-->
+<!--         </el-form-item>-->
+<!--         <el-form-item label="创建时间" style="width: 308px;">-->
+<!--            <el-date-picker-->
+<!--               v-model="dateRange"-->
+<!--               value-format="YYYY-MM-DD"-->
+<!--               type="daterange"-->
+<!--               range-separator="-"-->
+<!--               start-placeholder="开始日期"-->
+<!--               end-placeholder="结束日期"-->
+<!--            ></el-date-picker>-->
+<!--         </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-row :gutter="10" class="mb8">
          <el-col :span="1.5">
@@ -65,16 +65,16 @@
                v-hasPermi="['system:config:edit']"
             >修改</el-button>
          </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:config:remove']"
-            >删除</el-button>
-         </el-col>
+<!--         <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--               type="danger"-->
+<!--               plain-->
+<!--               icon="Delete"-->
+<!--               :disabled="multiple"-->
+<!--               @click="handleDelete"-->
+<!--               v-hasPermi="['system:config:remove']"-->
+<!--            >删除</el-button>-->
+<!--         </el-col>-->
          <el-col :span="1.5">
             <el-button
                type="warning"
@@ -97,26 +97,26 @@
       </el-row>
 
       <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="参数主键" align="center" prop="configId" />
-         <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-         <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-         <el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" />
-         <el-table-column label="系统内置" align="center" prop="configType">
-            <template #default="scope">
-               <dict-tag :options="sys_yes_no" :value="scope.row.configType" />
-            </template>
-         </el-table-column>
-         <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 type="selection" width="55" align="center" />-->
+         <el-table-column label="参数主键" align="center" prop="configId" width="100"/>
+         <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" width="255"/>
+         <el-table-column label="参数键名" align="left" prop="configKey" :show-overflow-tooltip="true"  width="200"/>
+         <el-table-column label="参数键值" align="left" prop="configValue" :show-overflow-tooltip="true" width="255"/>
+<!--         <el-table-column label="系统内置" align="left" prop="configType" width="55">-->
+<!--            <template #default="scope">-->
+<!--               <dict-tag :options="sys_yes_no" :value="scope.row.configType" />-->
+<!--            </template>-->
+<!--         </el-table-column>-->
+         <el-table-column label="备注" align="left" 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="150" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" >修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
+<!--               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>-->
             </template>
          </el-table-column>
       </el-table>
@@ -185,7 +185,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     configName: undefined,
     configKey: undefined,
     configType: undefined