页面修改

suerprisePlus

2024-06-12 76c68b73ec61c505ef91ae2e46ed4eeb704c130b

页面修改

 .env.development

@@ -5,13 +5,13 @@
ENV = 'development'

# å¼€å‘环境
VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://192.168.11.203/prod-api'

# è·¯ç”±æ‡’加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

# åŽç«¯æŽ¥å£åœ°å€
VUE_APP_SERVER_API_URL = 'http://192.168.11.14:8080'
VUE_APP_SERVER_API_URL = 'http://192.168.11.203:80/prod-api/'

# Mqtt消息服务器连接地址
VUE_APP_MQTT_SERVER_URL = 'ws://101.201.75.67:8083/mqtt'

 build/index.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
const { run } = require('runjs')
const chalk = require('chalk')
const config = require('../vue.config.js')
const rawArgv = process.argv.slice(2)
const args = rawArgv.join(' ')

if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
  const report = rawArgv.includes('--report')

  run(`vue-cli-service build ${args}`)

  const port = 9526
  const publicPath = config.publicPath

  var connect = require('connect')
  var serveStatic = require('serve-static')
  const app = connect()

  app.use(
    publicPath,
    serveStatic('./dist', {
      index: ['index.html', '/']
    })
  )

  app.listen(port, function () {
    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
    if (report) {
      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
    }

  })
} else {
  run(`vue-cli-service build ${args}`)
}

 src/api/iot/modelLibrary.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
import request from '@/utils/request'

// æŸ¥è¯¢é€šç”¨ç‰©æ¨¡åž‹åˆ—表
export function listModelLibrary(query) {
  return request({
    url: '/iot/ModelLibrary/list',
    method: 'get',
    params: query
  })
}
 

 src/api/system/dict/data.js

@@ -2,6 +2,7 @@

// æŸ¥è¯¢å­—典数据列表
export function listData(query) {
  console.log("listData",query);
  return request({
    url: '/system/dict/data/list',
    method: 'get',
@@ -11,6 +12,7 @@

// æŸ¥è¯¢å­—典数据详细
export function getData(dictCode) {
  console.log("listData",dictCode);
  return request({
    url: '/system/dict/data/' + dictCode,
    method: 'get'
@@ -19,6 +21,7 @@

// æ ¹æ®å­—典类型查询字典数据信息
export function getDicts(dictType) {

  return request({
    url: '/system/dict/data/type/' + dictType,
    method: 'get'

 src/components/DictData/index.js

@@ -31,6 +31,7 @@
          } else {
            return new Promise((resolve, reject) => {
              getDicts(dictMeta.type).then(res => {
                console.log("test",res);
                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
                resolve(res.data)
              }).catch(error => {

 src/layout/components/Navbar.vue

@@ -7,11 +7,11 @@

    <div class="right-menu">
      <template v-if="device!=='mobile'">
        <search id="header-search" class="right-menu-item" />
        <!-- <search id="header-search" class="right-menu-item" /> -->
        
        <el-tooltip content="源码地址" effect="dark" placement="bottom">
        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
        </el-tooltip>
        </el-tooltip> -->

        <el-tooltip content="文档地址" effect="dark" placement="bottom">
          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />

 src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@
  },
  data() {
    return {
      title: 'FastBee',
      title: 'TerraDT',
      logo: logoImg
    }
  }

 src/utils/request.js

@@ -13,6 +13,7 @@

axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// åˆ›å»ºaxios实例
console.log( process.env.VUE_APP_BASE_API);
const service = axios.create({
  // axios中请求配置有baseURL选项，表示请求URL公共部分
  baseURL: process.env.VUE_APP_BASE_API,

 src/views/iot/modelLibrary/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,118 @@
<template>
    <div v-loading="loading" class="modelLibiraryBox">
        <el-card>
            <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" style="margin-bottom: -20px">
                <el-form-item label="模型名称" prop="templateName">
                    <el-input v-model="queryParams.templateName" placeholder="请输入模型名称" clearable size="small" @keyup.enter.native="handleQuery" />
                </el-form-item>
                <el-form-item label="模型类别" prop="type">
                    <el-select v-model="queryParams.type" placeholder="请选择模型类别" clearable size="small">
                        <el-option v-for="dict in dict.type.iot_model_library_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                    </el-select>
                </el-form-item>
                <el-form-item>
                    <el-button type="primary" icon="el-icon-search" size="mini">搜索</el-button>
                    <el-button icon="el-icon-refresh" size="mini">重置</el-button>
                </el-form-item>
                <el-form-item style="float: right">
                    <el-button type="primary" plain icon="el-icon-plus" size="mini" v-hasPermi="['iot:modelLibrary:add']">新增</el-button>
                </el-form-item>
            </el-form>
        </el-card>
        <el-card class="modelLibiraryContent">
            <div class="modelLibiraryTable">
                <el-table :data="templateList" border>
                    <el-table-column label="模型名称" align="center" prop="name" />
                    <el-table-column label="模型类型" align="center" prop="type" />
                    <el-table-column label="模型大小" align="center" prop="type" />
                    <el-table-column label="模型地址" align="center" prop="path" />
                    <el-table-column label="创建时间" align="center" prop="createime" />
                    <el-table-column label="描述" align="center" prop="bak" />
                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                        <template slot-scope="scope">
                            <el-button size="small" type="primary" style="padding: 5px" icon="el-icon-edit" v-hasPermi="['iot:template:query']" v-if="scope.row.isSys == '0' ? true : !isTenant">修改</el-button>
                            <el-button size="small" type="danger" style="padding: 5px" icon="el-icon-delete" v-hasPermi="['iot:template:remove']" v-if="scope.row.isSys == '0' ? true : !isTenant">删除</el-button>
                            <el-button size="small" type="warning" style="padding: 5px" icon="el-icon-download" v-hasPermi="['iot:template:query']" v-if="scope.row.isSys == '0' ? true : !isTenant">下载</el-button>
                        </template>
                    </el-table-column>
                </el-table>
                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
            </div>
        </el-card>
        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false"></el-dialog>
    </div>
</template>

<script>
// import { listModelLibrary } from '@/api/iot/modelLibrary';
export default {
    name: 'modelLibirary',
    dicts: ['iot_model_library_type'],
    data() {
        return {
            loading: false,
            queryParams: {
                pageNum: 1,
                pageSize: 10,
                name: null,
                type: null,
            },
            // æ˜¯å¦ä¸ºç§Ÿæˆ·
            isTenant: false,
            templateList: [
                {
                    name: 'test',
                },
            ],
            // æ€»æ¡æ•°
            total: 0,
            title: '',
            // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
            open: false,
        };
    },
    created() {
        this.init();
    },
    methods: {
        init() {
            if (this.$store.state.user.roles.indexOf('tenant') !== -1) {
                this.isTenant = true;
            }

            this.getList();
        },
        getList() {
            // listModelLibrary(this.queryParams).then((response) => {
            // }) ;
        },
    },
};
</script>

<style lang="scss" scoped>
.modelLibiraryBox {
    padding: 6px;
    width: 100%;
    height: 100%;
    position: absolute;
    display: flex;
    flex-direction: column;
    .modelLibiraryContent {
        margin: 6px 0px;
        flex: 1;
        position: relative;

        ::v-deep .el-card__body {
            padding: 15px !important;
        }
        .modelLibiraryTable {
            width: calc(100% - 30px);
            height: calc(100% - 36px);
            position: absolute;
            display: flex;
            flex-direction: column;
        }
    }
}
</style>

 src/views/iot/template/index.vue

@@ -450,6 +450,7 @@
  created() {
    this.getList();
    this.init();

  },
  methods: {
    init() {
@@ -461,10 +462,12 @@
    getList() {
      this.loading = true;
      listTemplate(this.queryParams).then((response) => {
        console.log(response);
        this.templateList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
 ;
    },
    // å–消按钮
    cancel() {

 src/views/system/dict/data.vue

@@ -3,30 +3,15 @@
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="字典名称" prop="dictType">
        <el-select v-model="queryParams.dictType">
          <el-option
            v-for="item in typeOptions"
            :key="item.dictId"
            :label="item.dictName"
            :value="item.dictType"
          />
                    <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
          @keyup.enter.native="handleQuery"
        />
                <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
          <el-option
            v-for="dict in dict.type.sys_normal_disable"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
                    <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
        </el-select>
      </el-form-item>
      <el-form-item>
@@ -37,55 +22,19 @@

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:dict:add']"
        >新增</el-button>
                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:dict:edit']"
        >修改</el-button>
                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:dict:remove']"
        >删除</el-button>
                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-close"
          size="mini"
          @click="handleClose"
        >关闭</el-button>
                <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose">关闭</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -114,31 +63,13 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:dict:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dict:remove']"
          >删除</el-button>
                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />

    <!-- æ·»åŠ æˆ–修改参数配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -160,21 +91,12 @@
        </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-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="status">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
                        <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
@@ -190,11 +112,11 @@
</template>

<script>
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data';
import { optionselect as getDictOptionselect, getType } from '@/api/system/dict/type';

export default {
  name: "Data",
    name: 'Data',
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -213,37 +135,37 @@
      // å­—典表格数据
      dataList: [],
      // é»˜è®¤å­—典类型
      defaultDictType: "",
            defaultDictType: '',
      // å¼¹å‡ºå±‚标题
      title: "",
            title: '',
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // æ•°æ®æ ‡ç­¾å›žæ˜¾æ ·å¼
      listClassOptions: [
        {
          value: "default",
          label: "默认"
                    value: 'default',
                    label: '默认',
        },
        {
          value: "primary",
          label: "主要"
                    value: 'primary',
                    label: '主要',
        },
        {
          value: "success",
          label: "成功"
                    value: 'success',
                    label: '成功',
        },
        {
          value: "info",
          label: "信息"
                    value: 'info',
                    label: '信息',
        },
        {
          value: "warning",
          label: "警告"
                    value: 'warning',
                    label: '警告',
        },
        {
          value: "danger",
          label: "危险"
        }
                    value: 'danger',
                    label: '危险',
                },
      ],
      // ç±»åž‹æ•°æ®å­—å…¸
      typeOptions: [],
@@ -253,33 +175,26 @@
        pageSize: 10,
        dictName: undefined,
        dictType: undefined,
        status: undefined
                status: undefined,
      },
      // è¡¨å•å‚æ•°
      form: {},
      // è¡¨å•æ ¡éªŒ
      rules: {
        dictLabel: [
          { required: true, message: "数据标签不能为空", trigger: "blur" }
        ],
        dictValue: [
          { required: true, message: "数据键值不能为空", trigger: "blur" }
        ],
        dictSort: [
          { required: true, message: "数据顺序不能为空", trigger: "blur" }
        ]
      }
                dictLabel: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
                dictValue: [{ required: true, message: '数据键值不能为空', trigger: 'blur' }],
                dictSort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
            },
    };
  },
  created() {
    const dictId = this.$route.params && this.$route.params.dictId;
    this.getType(dictId);
        this.getType('optionselect');
    this.getTypeList();
  },
  methods: {
    /** æŸ¥è¯¢å­—典类型详细 */
    getType(dictId) {
      getType(dictId).then(response => {
            getType(dictId).then((response) => {
        this.queryParams.dictType = response.data.dictType;
        this.defaultDictType = response.data.dictType;
        this.getList();
@@ -287,14 +202,14 @@
    },
    /** æŸ¥è¯¢å­—典类型列表 */
    getTypeList() {
      getDictOptionselect().then(response => {
            getDictOptionselect().then((response) => {
        this.typeOptions = response.data;
      });
    },
    /** æŸ¥è¯¢å­—典数据列表 */
    getList() {
      this.loading = true;
      listData(this.queryParams).then(response => {
            listData(this.queryParams).then((response) => {
        this.dataList = response.rows;
        this.total = response.total;
        this.loading = false;
@@ -314,10 +229,10 @@
        cssClass: undefined,
        listClass: 'default',
        dictSort: 0,
        status: "0",
        remark: undefined
                status: '0',
                remark: undefined,
      };
      this.resetForm("form");
            this.resetForm('form');
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
@@ -326,12 +241,12 @@
    },
    /** è¿”回按钮操作 */
    handleClose() {
      const obj = { path: "/system/dict" };
            const obj = { path: '/system/dict' };
      this.$tab.closeOpenPage(obj);
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
            this.resetForm('queryForm');
      this.queryParams.dictType = this.defaultDictType;
      this.handleQuery();
    },
@@ -339,40 +254,40 @@
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加字典数据";
            this.title = '添加字典数据';
      this.form.dictType = this.queryParams.dictType;
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.dictCode)
      this.single = selection.length!=1
      this.multiple = !selection.length
            this.ids = selection.map((item) => item.dictCode);
            this.single = selection.length != 1;
            this.multiple = !selection.length;
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.reset();
      const dictCode = row.dictCode || this.ids
      getData(dictCode).then(response => {
            const dictCode = row.dictCode || this.ids;
            getData(dictCode).then((response) => {
        this.form = response.data;
        this.open = true;
        this.title = "修改字典数据";
                this.title = '修改字典数据';
      });
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
            this.$refs['form'].validate((valid) => {
        if (valid) {
          if (this.form.dictCode != undefined) {
            updateData(this.form).then(response => {
                        updateData(this.form).then((response) => {
              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
              this.$modal.msgSuccess("修改成功");
                            this.$modal.msgSuccess('修改成功');
              this.open = false;
              this.getList();
            });
          } else {
            addData(this.form).then(response => {
                        addData(this.form).then((response) => {
              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
              this.$modal.msgSuccess("新增成功");
                            this.$modal.msgSuccess('新增成功');
              this.open = false;
              this.getList();
            });
@@ -383,20 +298,28 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const dictCodes = row.dictCode || this.ids;
      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
            this.$modal
                .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？')
                .then(function () {
        return delData(dictCodes);
      }).then(() => {
                })
                .then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
                    this.$modal.msgSuccess('删除成功');
        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
      }).catch(() => {});
                })
                .catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      this.download('system/dict/data/export', {
        ...this.queryParams
      }, `data_${new Date().getTime()}.xlsx`)
    }
  }
            this.download(
                'system/dict/data/export',
                {
                    ...this.queryParams,
                },
                `data_${new Date().getTime()}.xlsx`
            );
        },
    },
};
</script>

 vue.config.js

@@ -6,11 +6,12 @@
}

const CompressionPlugin = require('compression-webpack-plugin');
const { log } = require('console');

const name = process.env.VUE_APP_TITLE || '泰瑞工业数字孪生管理平台'; // ç½‘页标题

const port = process.env.port || process.env.npm_config_port || 80; // ç«¯å£

console.log( "123",process.env.VUE_APP_SERVER_API_URL);
// vue.config.js é…ç½®è¯´æ˜Ž
//官方vue.config.js å‚考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
// è¿™é‡Œåªåˆ—一部分，具体配置参考文档