fix: BUG修改

This commit is contained in:
kun 2024-06-08 15:51:10 +08:00
parent ed4e73ec8d
commit c09edaf307
5 changed files with 34 additions and 16 deletions

View File

@ -18,7 +18,8 @@ var COMPANY = '' //通用
// COMPANY = 'jlw'//金林湾 // COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj'//上海张江 // COMPANY = 'shzj'//上海张江
// COMPANY = 'shjg'//上海优益(上海建工) // COMPANY = 'shjg'//上海优益(上海建工)
COMPANY = 'agjt'//鞍钢集团 // COMPANY = 'agjt'//鞍钢集团
COMPANY = 'zkax'//中科安信
var PROJECT = { var PROJECT = {
local_test: 'common', // 普通版 local_test: 'common', // 普通版

View File

@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@ -186,7 +186,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址 axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址
} else if (process.env.NODE_ENV == "debug") { } else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com"; axios.defaults.baseURL = "https://www.ceshi.com";

View File

@ -141,17 +141,17 @@
<img src="@/assets/images/icon-bigData.png" alt srcset /> <img src="@/assets/images/icon-bigData.png" alt srcset />
指挥部大屏 指挥部大屏
</p> --> </p> -->
<!-- <p <p
v-show=" v-show="
$route.path.indexOf('projectIndex') != -1 && $route.path.indexOf('projectIndex') != -1 &&
$store.state.userInfo.projectKanban == 0 $store.state.userInfo.projectKanban == 0 && COMPANY != 'agjt'
" "
class="header-btn" class="header-btn"
@click="toOverview2()" @click="toOverview2()"
> >
<img src="@/assets/images/icon-bigData.png" alt srcset /> <img src="@/assets/images/icon-bigData.png" alt srcset />
数据看板 数据看板
</p> --> </p>
<p <p
v-for="(item, index) in $store.state.menuList" v-for="(item, index) in $store.state.menuList"
:key="index" :key="index"

View File

@ -52,20 +52,20 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://192.168.34.155:19111/image/", //洁本地
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl BASEURL: baseUrl
// ? baseUrl ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址

View File

@ -188,7 +188,24 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- AI设备 --> <!-- AI设备 -->
<el-form-item label="AI设备" prop="aiDeviceId"> <el-form-item label="AI设备" prop="aiDeviceId" v-if="COMPANY == 'agjt'">
<el-select
v-model="form.aiDeviceId"
multiple
:placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%"
clearable
>
<el-option
v-for="item in aiDeviceList"
:key="item.id"
:label="item.hardwareName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="AI设备" v-else>
<el-select <el-select
v-model="form.aiDeviceId" v-model="form.aiDeviceId"
multiple multiple